Author: jive
Date: 2009-10-24 22:45:00 -0400 (Sat, 24 Oct 2009)
New Revision: 34217
Modified:
branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java
Log:
now compiles
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 02:31:25 UTC (rev 34216)
+++ branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java 2009-10-25 02:45:00 UTC (rev 34217)
@@ -2,12 +2,6 @@
import java.util.List;
-import org.deegree.geometry.standard.DefaultEnvelope;
-import org.deegree.geometry.standard.multi.DefaultMultiGeometry;
-import org.deegree.geometry.standard.multi.DefaultMultiLineString;
-import org.deegree.geometry.standard.multi.DefaultMultiPoint;
-import org.deegree.geometry.standard.multi.DefaultMultiPolygon;
-import org.deegree.geometry.standard.primitive.DefaultPoint;
import org.osgeo.commons.crs.CRS;
import org.osgeo.geometry.multi.MultiCurve;
import org.osgeo.geometry.multi.MultiGeometry;
@@ -26,7 +20,7 @@
* @author Jody Garnett
*/
public class SimpleGeometryBuilder {
-
+
private GeometryFactory factory;
public SimpleGeometryBuilder( GeometryFactory factory ){
@@ -152,7 +146,9 @@
* @return created {@link Envelope}
*/
public Envelope createEnvelope( double minx, double miny, double maxx, double maxy, CRS crs ) {
- return createEnvelope(
+ Point lowerCorner = createPoint(null, minx, miny, crs );
+ Point upperCorner = createPoint(null, maxx, maxy, crs );
+ return factory.envelope( lowerCorner, upperCorner);
}
/**
@@ -188,7 +184,7 @@
* @return created {@link MultiGeometry}
*/
public MultiGeometry<Geometry> createMultiGeometry( String id, CRS crs, List<Geometry> members ) {
- return new DefaultMultiGeometry<Geometry>( id, crs, pm, members );
+ return factory.multiGeometry(id, crs, members );
}
/**
@@ -203,7 +199,7 @@
* @return created {@link MultiPoint}
*/
public MultiPoint createMultiPoint( String id, CRS crs, List<Point> members ) {
- return new DefaultMultiPoint( id, crs, pm, members );
+ return factory.multiPoint( id, crs, members );
}
/**
@@ -218,7 +214,7 @@
* @return created {@link MultiLineString}
*/
public MultiLineString createMultiLineString( String id, CRS crs, List<LineString> members ) {
- return new DefaultMultiLineString( id, crs, pm, members );
+ return factory.multiLineString(id, crs, members);
}
/**
@@ -233,6 +229,6 @@
* @return created {@link MultiPolygon}
*/
public MultiPolygon createMultiPolygon( String id, CRS crs, List<Polygon> members ) {
- return new DefaultMultiPolygon( id, crs, pm, members );
+ return factory.multiPolygon(id, crs, members);
}
}
------------------------------------------------------------------------------
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
