svn - r34224 - branches/geometry/spike/geomet
|
|
svn_geotools
|
Author: jive
Date: 2009-10-24 23:25:35 -0400 (Sat, 24 Oct 2009) New Revision: 34224 Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java Log: more fun Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java =================================================================== --- branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java 2009-10-25 03:11:00 UTC (rev 34223) +++ branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java 2009-10-25 03:25:35 UTC (rev 34224) @@ -3,6 +3,8 @@ import java.util.List; import org.osgeo.commons.crs.CRS; +import org.osgeo.commons.uom.Angle; +import org.osgeo.commons.uom.Length; import org.osgeo.geometry.multi.MultiCurve; import org.osgeo.geometry.multi.MultiGeometry; import org.osgeo.geometry.multi.MultiLineString; @@ -11,13 +13,28 @@ import org.osgeo.geometry.points.Points; import org.osgeo.geometry.primitive.Curve; import org.osgeo.geometry.primitive.LineString; +import org.osgeo.geometry.primitive.LinearRing; import org.osgeo.geometry.primitive.Point; import org.osgeo.geometry.primitive.Polygon; import org.osgeo.geometry.primitive.Ring; +import org.osgeo.geometry.primitive.Surface; +import org.osgeo.geometry.primitive.patches.PolygonPatch; +import org.osgeo.geometry.primitive.patches.SurfacePatch; import org.osgeo.geometry.primitive.segments.Arc; import org.osgeo.geometry.primitive.segments.ArcByBulge; +import org.osgeo.geometry.primitive.segments.ArcByCenterPoint; +import org.osgeo.geometry.primitive.segments.ArcString; +import org.osgeo.geometry.primitive.segments.ArcStringByBulge; +import org.osgeo.geometry.primitive.segments.BSpline; +import org.osgeo.geometry.primitive.segments.Bezier; +import org.osgeo.geometry.primitive.segments.Circle; +import org.osgeo.geometry.primitive.segments.CircleByCenterPoint; import org.osgeo.geometry.primitive.segments.CurveSegment; +import org.osgeo.geometry.primitive.segments.Geodesic; +import org.osgeo.geometry.primitive.segments.GeodesicString; +import org.osgeo.geometry.primitive.segments.Knot; import org.osgeo.geometry.primitive.segments.LineStringSegment; +import org.osgeo.geometry.primitive.segments.OffsetCurve; /** * GeometryBuilder that is method compatible with the deegree requirements. @@ -135,7 +152,7 @@ public Envelope createEnvelope( double[] min, double[] max, CRS crs ) { Point lowerCorner = factory.point(null, min, crs ); Point upperCorner = factory.point(null, max, crs ); - return factory.envelope( lowerCorner, upperCorner); + return factory.envelope( lowerCorner, upperCorner, crs); } /** @@ -156,7 +173,7 @@ public Envelope createEnvelope( double minx, double miny, double maxx, double maxy, CRS crs ) { Point lowerCorner = createPoint(null, minx, miny, crs ); Point upperCorner = createPoint(null, maxx, maxy, crs ); - return factory.envelope( lowerCorner, upperCorner); + return factory.envelope( lowerCorner, upperCorner, crs); } /** @@ -314,7 +331,7 @@ * @return created {@link ArcByCenterPoint} */ public ArcByCenterPoint createArcByCenterPoint( Point midPoint, Length radius, Angle startAngle, Angle endAngle ) { - return new DefaultArcByCenterPoint( midPoint, radius, startAngle, endAngle ); + return factory.arcByCenterPoint(midPoint, radius, startAngle, endAngle); } /** @@ -325,7 +342,7 @@ * @return created {@link ArcString} */ public ArcString createArcString( Points points ) { - return new DefaultArcString( points ); + return factory.arcString(points); } /** @@ -343,7 +360,7 @@ * @return created {@link ArcStringByBulge} */ public ArcStringByBulge createArcStringByBulge( Points points, double[] bulges, Points normals ) { - return new DefaultArcStringByBulge( points, bulges, normals ); + return factory.arcStringByBulge(points, bulges, normals); } /** @@ -360,7 +377,7 @@ * @return created {@link Bezier} */ public Bezier createBezier( Points points, int degree, Knot knot1, Knot knot2 ) { - return new DefaultBezier( points, degree, knot1, knot2 ); + return factory.bezier(points, degree, knot1, knot2); } /** @@ -377,7 +394,7 @@ * @return created {@link BSpline} */ public BSpline createBSpline( Points points, int degree, List<Knot> knots, boolean isPolynomial ) { - return new DefaultBSpline( points, degree, knots, isPolynomial ); + return factory.bSpline(points, degree, knots, isPolynomial); } /** @@ -393,7 +410,7 @@ * @return created {@link Arc} */ public Circle createCircle( Point p1, Point p2, Point p3 ) { - return new DefaultCircle( p1, p2, p3 ); + return factory.circle(p1, p2, p3); } /** @@ -405,7 +422,7 @@ * @return created {@link CircleByCenterPoint} */ public CircleByCenterPoint createCircleByCenterPoint( Point midPoint, Length radius, Angle startAngle ) { - return new DefaultCircleByCenterPoint( midPoint, radius, startAngle ); + return factory.circleByCenterPoint(midPoint, radius, startAngle); // huh? } /** @@ -418,7 +435,7 @@ * @return created {@link Geodesic} */ public Geodesic createGeodesic( Point p1, Point p2 ) { - return new DefaultGeodesic( p1, p2 ); + return factory.geodesic(p1, p2); } /** @@ -429,7 +446,7 @@ * @return created {@link GeodesicString} */ public GeodesicString createGeodesicString( Points points ) { - return new DefaultGeodesicString( points ); + return factory.geodesicString(points); } /** @@ -444,7 +461,7 @@ * @return created {@link GeodesicString} */ public OffsetCurve createOffsetCurve( Curve baseCurve, Point direction, Length distance ) { - return new DefaultOffsetCurve( baseCurve, direction, distance ); + return factory.offsetCurve(baseCurve, direction, distance); } /** @@ -460,7 +477,7 @@ * @return created {@link Surface} */ public Surface createSurface( String id, List<SurfacePatch> patches, CRS crs ) { - return new DefaultSurface( id, crs, pm, patches ); + return factory.surface(id, patches, crs); } /** @@ -473,7 +490,7 @@ * @return created {@link PolygonPatch} */ public PolygonPatch createPolygonPatch( Ring exteriorRing, List<Ring> interiorRings ) { - return new DefaultPolygonPatch( exteriorRing, interiorRings ); + return factory.polygonPatch(exteriorRing, interiorRings); } /** @@ -488,7 +505,7 @@ * @return created {@link Ring} */ public Ring createRing( String id, CRS crs, List<Curve> members ) { - return new DefaultRing( id, crs, pm, members ); + return factory.ring(id, crs, members); } /** @@ -503,7 +520,7 @@ * @return created {@link Ring} */ public LinearRing createLinearRing( String id, CRS crs, Points points ) { - return new DefaultLinearRing( id, crs, pm, points ); + return factory.linearRing(id, crs, points); } /** Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java =================================================================== --- branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java 2009-10-25 03:11:00 UTC (rev 34223) +++ branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java 2009-10-25 03:25:35 UTC (rev 34224) @@ -158,37 +158,9 @@ * coordinate reference system, may be null * @return created {@link Envelope} */ - public Envelope envelope( Point lowerCorner, Point upperCorner ); + public Envelope envelope( Point lowerCorner, Point upperCorner, CRS crs); /** - * Creates an {@link Envelope} in 2D space. - * - * @param minx - * minimum x corner coordinate - * @param miny - * minimum y corner coordinate - * @param maxx - * maximum x corner coordinate - * @param maxy - * maximum y corner coordinate - * @param crs - * coordinate reference system, may be null - * @return created {@link Envelope} - */ - public Envelope envelope( double minx, double miny, double maxx, double maxy, CRS crs ); - - /** - * Create an {@link Envelope} from a list of Doubles. - * - * @param lowerCorner - * @param upperCorner - * @param crs - * coordinate reference system, may be null - * @return the envelope - */ - public Envelope envelope( List<Double> lowerCorner, List<Double> upperCorner, CRS crs ); - - /** * Creates an untyped multi geometry from a list of {@link Geometry}s. * * @param id Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java =================================================================== --- branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java 2009-10-25 03:11:00 UTC (rev 34223) +++ branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java 2009-10-25 03:25:35 UTC (rev 34224) @@ -127,7 +127,7 @@ public Envelope createEnvelope( double[] min, double[] max, CRS crs ) { Point lowerCorner = factory.point(null, min, crs ); Point upperCorner = factory.point(null, max, crs ); - return factory.envelope( lowerCorner, upperCorner); + return factory.envelope( lowerCorner, upperCorner, crs ); } /** @@ -148,7 +148,7 @@ public Envelope createEnvelope( double minx, double miny, double maxx, double maxy, CRS crs ) { Point lowerCorner = createPoint(null, minx, miny, crs ); Point upperCorner = createPoint(null, maxx, maxy, crs ); - return factory.envelope( lowerCorner, upperCorner); + return factory.envelope( lowerCorner, upperCorner, crs); } /** ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ GeoTools-commits mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/geotools-commits |
||||||||||||||||
| Free Embeddable Forum Powered by Nabble | Help |
