svn - r34236 - in branches/geometry/modules/library/main: . src/main/java/org/geotools/util src/test/java/org/geotools/util

[svn_geotools]

Author: aaime
Date: 2009-10-25 01:02:38 -0400 (Sun, 25 Oct 2009)
New Revision: 34236

Modified:
   branches/geometry/modules/library/main/pom.xml
   branches/geometry/modules/library/main/src/main/java/org/geotools/util/GeometryConverterFactory.java
   branches/geometry/modules/library/main/src/test/java/org/geotools/util/GeometryConverterFactoryTest.java
Log:
Make the converter use the modified WKT reader that delivers OSGeo geometries, add a test for it

Modified: branches/geometry/modules/library/main/pom.xml
===================================================================
--- branches/geometry/modules/library/main/pom.xml 2009-10-25 04:52:01 UTC (rev 34235)
+++ branches/geometry/modules/library/main/pom.xml 2009-10-25 05:02:38 UTC (rev 34236)
@@ -200,6 +200,11 @@
   <!-- =========================================================== -->
   <dependencies>
     <dependency>
+      <groupId>org.osgeo</groupId>
+      <artifactId>geometry</artifactId>
+      <version>0.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.geotools</groupId>
       <artifactId>gt-api</artifactId>
       <version>${project.version}</version>

Modified: branches/geometry/modules/library/main/src/main/java/org/geotools/util/GeometryConverterFactory.java
===================================================================
--- branches/geometry/modules/library/main/src/main/java/org/geotools/util/GeometryConverterFactory.java 2009-10-25 04:52:01 UTC (rev 34235)
+++ branches/geometry/modules/library/main/src/main/java/org/geotools/util/GeometryConverterFactory.java 2009-10-25 05:02:38 UTC (rev 34236)
@@ -16,13 +16,14 @@
  */
 package org.geotools.util;
 
+import org.deegree.geometry.standard.DefaultGeometryFactory;
 import org.geotools.factory.Hints;
+import org.osgeo.geometry.WKTReader;
 
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.io.WKTReader;
 
 /**
  * Converter factory performing converstions among geometric types.
@@ -51,7 +52,7 @@
  if ( String.class.equals( source ) ) {
  return new Converter() {
  public Object convert(Object source, Class target) throws Exception {
- return new WKTReader().read( (String) source );
+ return new WKTReader(new DefaultGeometryFactory(), null).read( (String) source );
  }
  };
  }

Modified: branches/geometry/modules/library/main/src/test/java/org/geotools/util/GeometryConverterFactoryTest.java
===================================================================
--- branches/geometry/modules/library/main/src/test/java/org/geotools/util/GeometryConverterFactoryTest.java 2009-10-25 04:52:01 UTC (rev 34235)
+++ branches/geometry/modules/library/main/src/test/java/org/geotools/util/GeometryConverterFactoryTest.java 2009-10-25 05:02:38 UTC (rev 34236)
@@ -16,14 +16,19 @@
  */
 package org.geotools.util;
 
+import junit.framework.TestCase;
+
+import org.deegree.geometry.standard.DefaultGeometryFactory;
+import org.deegree.geometry.standard.points.PackedPoints;
+import org.osgeo.geometry.GeometryBuilder;
+import org.osgeo.geometry.SimpleGeometryBuilder;
+
+import com.sun.corba.se.impl.util.PackagePrefixChecker;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LinearRing;
 
-import junit.framework.TestCase;
-
 public class GeometryConverterFactoryTest extends TestCase {
 
  GeometryConverterFactory factory;
@@ -64,7 +69,7 @@
  assertEquals( new Envelope( new Coordinate( 0,0 ), new Coordinate( 1,1 ) ), envelope );
  }
 
- public void testStringToGeometry()  throws Exception {
+ public void testPolyStringToGeometry()  throws Exception {
  Geometry geometry = (Geometry) factory.createConverter( String.class, Geometry.class, null )
  .convert( "POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))", Geometry.class );
  assertNotNull( geometry );
@@ -80,6 +85,17 @@
  );
  }
 
+ public void testLineStringToGeometry()  throws Exception {
+            org.osgeo.geometry.Geometry geometry = (org.osgeo.geometry.Geometry) factory.createConverter( String.class, Geometry.class, null )
+                    .convert( "LINESTRING(0 0, 1 0, 1 1, 0 1, 0 0)", Geometry.class );
+            assertNotNull( geometry );
+            GeometryBuilder gb = new GeometryBuilder(new DefaultGeometryFactory());
+            assertTrue(
+                    gb.createLineString(null, null, new PackedPoints(new double[] {0,0, 1,0, 1,1 ,0,1, 0,0}, 2, null)).
+                    equals( geometry )    
+            );
+    }
+
  public void testGeometryToString() throws Exception {
  String wkt = (String) factory.createConverter( Geometry.class, String.class, null ).convert(
  new GeometryFactory().createPolygon(


------------------------------------------------------------------------------
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