geotools-commits Mailing List for GeoTools, the Java GIS toolkit (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: aaime
Date: 2012-04-30 07:22:21 -0700 (Mon, 30 Apr 2012)
New Revision: 38696

Modified:
   branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleFilterToSQL.java
   branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleSpatialFiltersTest.java
   branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/FilterToSqlHelper.java
   branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisGeographyTest.java
Log:
[GEOT-4121] DWithin filter does not work from GeoServer when passing units parameter

Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleFilterToSQL.java
===================================================================

--- branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleFilterToSQL.java	2012-04-30 14:19:05 UTC (rev 38695)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleFilterToSQL.java	2012-04-30 14:22:21 UTC (rev 38696)
@@ -265,7 +265,8 @@
     protected void doSDODistance(BinarySpatialOperator filter,
             PropertyName property, Literal geometry, Object extraData) throws IOException {
         double distance = ((DistanceBufferOperator) filter).getDistance();
-        String unit = ((DistanceBufferOperator) filter).getDistanceUnits();
+        String unit = getSDOUnitFromOGCUnit(((DistanceBufferOperator) filter).getDistanceUnits());
+
         String within = filter instanceof DWithin ? "TRUE" : "FALSE"; 
         
         out.write("SDO_WITHIN_DISTANCE(");
@@ -279,5 +280,28 @@
         else
             out.write(",'distance=" + distance + "') = '" + within + "' ");
     }
-   
+
+    /**
+     * The mapping between OGC filter units and Oracle Units.
+     * The full list of Oracle Units can be obtained by issuing
+     *  "select * from MDSYS.SDO_DIST_UNITS WHERE SDO_UNIT IS NOT NULL order by SDO_UNIT;"
+     */
+    private static final Map<String, String> UNITS_MAP = new HashMap<String, String>() {
+        {
+            put("metre", "m");
+            put("meters", "m");
+            put("kilometers", "km");
+            put("mi", "Mile");
+            put("miles", "Mile");
+            put("NM", "naut_mile");
+            put("feet", "foot");
+            put("ft", "foot");
+            put("in", "inch");
+        }
+    };
+
+    private static String getSDOUnitFromOGCUnit(String ogcUnit) {
+        Object sdoUnit = UNITS_MAP.get(ogcUnit);
+        return sdoUnit != null ? sdoUnit.toString() : ogcUnit;
+    }
 }

Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleSpatialFiltersTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleSpatialFiltersTest.java	2012-04-30 14:19:05 UTC (rev 38695)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleSpatialFiltersTest.java	2012-04-30 14:22:21 UTC (rev 38696)
@@ -16,13 +16,25 @@
  */
 package org.geotools.data.oracle;
 
+import org.geotools.data.Query;
+import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.feature.FeatureCollection;
 import org.geotools.jdbc.JDBCDataStoreAPITestSetup;
 import org.geotools.jdbc.JDBCSpatialFiltersTest;
 import org.opengis.filter.FilterFactory;
+import org.opengis.filter.FilterFactory2;
+import org.opengis.filter.expression.Literal;
+import org.opengis.filter.expression.PropertyName;
 import org.opengis.filter.spatial.BBOX;
+import org.opengis.filter.spatial.DWithin;
 
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+
 public class OracleSpatialFiltersTest extends JDBCSpatialFiltersTest {
 
     @Override
@@ -39,4 +51,45 @@
         FeatureCollection features = dataStore.getFeatureSource(tname("road")).getFeatures(bbox);
         checkSingleResult(features, "r2");
     }
+
+    // As reported in GEOS-4384 (http://jira.codehaus.org/browse/GEOS-4384)
+    public void testSDODWithinOGCUnits() throws Exception {
+        // express the same distance in different ways and check results
+        validateOGCUnitUsage(10, "kilometers");
+        validateOGCUnitUsage(10, "km");
+        validateOGCUnitUsage(10, "kilometer");
+        // this one does not work... not sure why 
+        // validateOGCUnitUsage(10000 * 1000, "mm");
+        validateOGCUnitUsage(10000, "m");
+        validateOGCUnitUsage(10000, "metre");
+        validateOGCUnitUsage(10000, "meters");
+        validateOGCUnitUsage(10000 / 0.0254, "in");
+        validateOGCUnitUsage(10000 / 0.3048, "feet");
+        validateOGCUnitUsage(10000 / 0.3048, "foot");
+        validateOGCUnitUsage(10000 / 0.3048, "ft");
+        validateOGCUnitUsage(10000 / 1609.344, "mi");
+        validateOGCUnitUsage(10000 / 1609.344, "mile");
+        validateOGCUnitUsage(10000 / 1609.344, "miles");
+        validateOGCUnitUsage(10000 / 1852, "NM");
+      }
+
+    private void validateOGCUnitUsage(double distance, String unit) throws Exception {
+        Coordinate coordinate = new Coordinate(3.031, 2.754);
+        GeometryFactory factory = new GeometryFactory();
+        Point point = factory.createPoint(coordinate);
+        Geometry[] geometries = {point};
+        GeometryCollection geometry = new GeometryCollection(geometries, factory );
+
+        FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(null);
+
+        PropertyName geomName = ff.property(aname("geom"));
+        Literal lit = ff.literal(geometry);
+        
+        DWithin dwithinGeomFilter  = ((FilterFactory2) ff).dwithin(geomName, lit, distance, unit);
+        Query query = new Query(tname("road"), dwithinGeomFilter);
+        SimpleFeatureCollection features = dataStore.getFeatureSource(tname("road")).getFeatures(query);
+        assertEquals(1, features.size());
+        checkSingleResult(features, "r2");
+    }
+
 }

Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/FilterToSqlHelper.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/FilterToSqlHelper.java	2012-04-30 14:19:05 UTC (rev 38695)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/FilterToSqlHelper.java	2012-04-30 14:22:21 UTC (rev 38696)
@@ -19,7 +19,9 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.geotools.data.jdbc.FilterToSQL;
 import org.geotools.factory.CommonFactoryFinder;
@@ -55,6 +57,24 @@
     
     protected static final String IO_ERROR = "io problem writing filter";
     
+    /**
+     * Conversion factor from common units to meter
+     */
+    private static final Map<String, Double> UNITS_MAP = new HashMap<String, Double>() {
+        {
+            put("kilometers", 1000.0);
+            put("kilometer", 1000.0);
+            put("mm", 0.001);
+            put("millimeter", 0.001);
+            put("mi", 1609.344);
+            put("miles", 1609.344);
+            put("NM", 1852d);
+            put("feet", 0.3048);
+            put("ft", 0.3048);
+            put("in", 0.0254);
+        }
+    };
+    
     private static final Envelope WORLD = new Envelope(-180, 180, -90, 90);
     
     FilterToSQL delegate;
@@ -112,7 +132,7 @@
             out.write(",");
             geometry.accept(delegate, extraData);
             out.write(",");
-            out.write(Double.toString(filter.getDistance()));
+            out.write(toMeters(filter.getDistance(), filter.getDistanceUnits()));
             out.write(")");
         }
         if ((filter instanceof DWithin && swapped)
@@ -126,6 +146,19 @@
         }
     }
 
+    private String toMeters(double distance, String unit) {
+        // only geography uses metric units
+        if(isCurrentGeography()) {
+            Double conversion = UNITS_MAP.get(unit);
+            if(conversion != null) {
+                return String.valueOf(distance * conversion);
+            }
+        }
+        
+        // in case unknown unit or not geography, use as-is
+        return String.valueOf(distance);
+    }
+
     void visitComparisonSpatialOperator(BinarySpatialOperator filter,
             PropertyName property, Literal geometry, boolean swapped, Object extraData)
             throws IOException {

Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisGeographyTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisGeographyTest.java	2012-04-30 14:19:05 UTC (rev 38695)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisGeographyTest.java	2012-04-30 14:22:21 UTC (rev 38696)
@@ -16,11 +16,27 @@
  */
 package org.geotools.data.postgis;
 
+import org.geotools.data.Query;
+import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.factory.CommonFactoryFinder;
+import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.FeatureIterator;
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.JDBCGeographyTest;
 import org.geotools.jdbc.JDBCGeographyTestSetup;
+import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
+import org.opengis.filter.FilterFactory2;
+import org.opengis.filter.expression.Literal;
+import org.opengis.filter.expression.PropertyName;
+import org.opengis.filter.spatial.DWithin;
 
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+
 public class PostgisGeographyTest extends JDBCGeographyTest {
 
     @Override
@@ -40,4 +56,53 @@
         SimpleFeatureType ft = dataStore.getFeatureSource(tname("geopoint")).getSchema();
         assertEquals("geography", ft.getGeometryDescriptor().getUserData().get(JDBCDataStore.JDBC_NATIVE_TYPENAME));
     }
+    
+    // As reported in GEOS-4384 (http://jira.codehaus.org/browse/GEOS-4384)
+    public void testDWithinOGCUnits() throws Exception {
+        validateOGCUnitUsage(10000, "m");
+        validateOGCUnitUsage(10000, "metre");
+        validateOGCUnitUsage(10000, "meters");
+        validateOGCUnitUsage(10000 * 1000, "mm");
+        validateOGCUnitUsage(10, "kilometers");
+        validateOGCUnitUsage(10, "km");
+        validateOGCUnitUsage(10, "kilometer");
+        validateOGCUnitUsage(10000 / 0.0254, "in");
+        validateOGCUnitUsage(10000 / 0.3048, "feet");
+        validateOGCUnitUsage(10000 / 0.3048, "foot");
+        validateOGCUnitUsage(10000 / 0.3048, "ft");
+        validateOGCUnitUsage(10000 / 1609.344, "mi");
+        validateOGCUnitUsage(10000 / 1609.344, "mile");
+        validateOGCUnitUsage(10000 / 1609.344, "miles");
+        validateOGCUnitUsage(10000 / 1852, "NM");
+      }
+
+    private void validateOGCUnitUsage(double distance, String unit) throws Exception {
+        Coordinate coordinate = new Coordinate(-110, 30);
+        GeometryFactory factory = new GeometryFactory();
+        Point point = factory.createPoint(coordinate);
+        Geometry[] geometries = {point};
+        GeometryCollection geometry = new GeometryCollection(geometries, factory );
+
+        FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(null);
+
+        PropertyName geomName = ff.property(aname("geo"));
+        Literal lit = ff.literal(geometry);
+        
+        DWithin dwithinGeomFilter  = ((FilterFactory2) ff).dwithin(geomName, lit, distance, unit);
+        Query query = new Query(tname("geopoint"), dwithinGeomFilter);
+        SimpleFeatureCollection features = dataStore.getFeatureSource(tname("geopoint")).getFeatures(query);
+        assertEquals(1, features.size());
+        checkSingleResult(features, "Town");
+    }
+    
+    protected void checkSingleResult(FeatureCollection features, String name) {
+        assertEquals(1, features.size());
+        FeatureIterator fr = features.features();
+        assertTrue(fr.hasNext());
+        SimpleFeature f = (SimpleFeature) fr.next();
+        assertNotNull(f);
+        assertEquals(name, f.getAttribute(aname("name")));
+        assertFalse(fr.hasNext());
+        fr.close();
+    }
 }





2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (39)	Dec (70)
2002	Jan (52)	Feb (168)	Mar (248)	Apr (143)	May (418)	Jun (558)	Jul (702)	Aug (311)	Sep (141)	Oct (350)	Nov (172)	Dec (182)
2003	Jan (320)	Feb (362)	Mar (356)	Apr (218)	May (447)	Jun (203)	Jul (745)	Aug (494)	Sep (175)	Oct (422)	Nov (554)	Dec (162)
2004	Jan (217)	Feb (353)	Mar (228)	Apr (407)	May (211)	Jun (270)	Jul (264)	Aug (198)	Sep (268)	Oct (227)	Nov (118)	Dec (47)
2005	Jan (207)	Feb (243)	Mar (297)	Apr (197)	May (281)	Jun (166)	Jul (164)	Aug (92)	Sep (155)	Oct (196)	Nov (189)	Dec (114)
2006	Jan (129)	Feb (219)	Mar (274)	Apr (213)	May (245)	Jun (220)	Jul (376)	Aug (347)	Sep (179)	Oct (493)	Nov (448)	Dec (339)
2007	Jan (304)	Feb (273)	Mar (237)	Apr (186)	May (215)	Jun (320)	Jul (229)	Aug (313)	Sep (331)	Oct (279)	Nov (347)	Dec (266)
2008	Jan (332)	Feb (280)	Mar (203)	Apr (277)	May (301)	Jun (356)	Jul (292)	Aug (203)	Sep (277)	Oct (142)	Nov (210)	Dec (239)
2009	Jan (250)	Feb (193)	Mar (174)	Apr (183)	May (342)	Jun (230)	Jul (292)	Aug (161)	Sep (204)	Oct (280)	Nov (281)	Dec (175)
2010	Jan (113)	Feb (106)	Mar (199)	Apr (166)	May (298)	Jun (147)	Jul (175)	Aug (192)	Sep (71)	Oct (79)	Nov (58)	Dec (55)
2011	Jan (83)	Feb (169)	Mar (142)	Apr (207)	May (311)	Jun (183)	Jul (218)	Aug (190)	Sep (158)	Oct (197)	Nov (93)	Dec (74)
2012	Jan (92)	Feb (50)	Mar (64)	Apr (45)	May (100)	Jun (70)	Jul (3)	Aug (1)	Sep (2)	Oct (5)	Nov (7)	Dec (4)
2013	Jan (6)	Feb (2)	Mar (2)	Apr (4)	May (3)	Jun	Jul (2)	Aug	Sep	Oct (1)	Nov (1)	Dec
2014	Jan (2)	Feb (2)	Mar (2)	Apr (3)	May (3)	Jun (1)	Jul	Aug (4)	Sep	Oct (1)	Nov (1)	Dec
2015	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec (1)
2016	Jan	Feb	Mar	Apr	May (1)	Jun (1)	Jul	Aug (3)	Sep	Oct	Nov (1)	Dec
2017	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

geotools-commits Mailing List for GeoTools, the Java GIS toolkit (Page 9)

Toolkit for working with and mapping geospatial data

geotools-commits — A read only list to which all svn commit statments are posted