[Geotools-commits] svn - r38481 - in branches/2.7.x/modules/library/main/src: main/java/org/geotools/filter test/java/org/geotools/filter

[<svn...@os...>]

Author: aaime
Date: 2012-01-15 10:21:29 -0800 (Sun, 15 Jan 2012)
New Revision: 38481

Modified:
   branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/FilterDOMParser.java
   branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/GeometryFilterImpl.java
   branches/2.7.x/modules/library/main/src/test/java/org/geotools/filter/DOMParserTest.java
Log:
[GEOT-4004] FilterDomParser handles Crosses as Touches (patch by Jan De Moerloose)

Modified: branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/FilterDOMParser.java
===================================================================
--- branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/FilterDOMParser.java	2012-01-15 17:55:59 UTC (rev 38480)
+++ branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/FilterDOMParser.java	2012-01-15 18:21:29 UTC (rev 38481)
@@ -435,7 +435,7 @@
                     return FILTER_FACT.touches( left, right );
                     
                 case FilterType.GEOMETRY_CROSSES:
-                    return FILTER_FACT.touches( left, right );
+                    return FILTER_FACT.crosses( left, right );
                     
                 case FilterType.GEOMETRY_WITHIN:
                     return FILTER_FACT.within( left, right );

Modified: branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/GeometryFilterImpl.java
===================================================================
--- branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/GeometryFilterImpl.java	2012-01-15 17:55:59 UTC (rev 38480)
+++ branches/2.7.x/modules/library/main/src/main/java/org/geotools/filter/GeometryFilterImpl.java	2012-01-15 18:21:29 UTC (rev 38481)
@@ -263,6 +263,8 @@
             operator = " disjoint ";
         } else if (filterType == GEOMETRY_INTERSECTS) {
             operator = " intersects ";
+        } else if (filterType == GEOMETRY_TOUCHES) {
+            operator = " touches ";
         } else if (filterType == GEOMETRY_CROSSES) {
             operator = " crosses ";
         } else if (filterType == GEOMETRY_WITHIN) {

Modified: branches/2.7.x/modules/library/main/src/test/java/org/geotools/filter/DOMParserTest.java
===================================================================
--- branches/2.7.x/modules/library/main/src/test/java/org/geotools/filter/DOMParserTest.java	2012-01-15 17:55:59 UTC (rev 38480)
+++ branches/2.7.x/modules/library/main/src/test/java/org/geotools/filter/DOMParserTest.java	2012-01-15 18:21:29 UTC (rev 38481)
@@ -35,6 +35,7 @@
 import org.opengis.filter.expression.Literal;
 import org.opengis.filter.expression.PropertyName;
 import org.opengis.filter.spatial.Beyond;
+import org.opengis.filter.spatial.Crosses;
 import org.opengis.filter.spatial.DWithin;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -43,6 +44,7 @@
 
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
 import com.vividsolutions.jts.geom.Point;
 
 /**
@@ -236,6 +238,15 @@
         LOGGER.fine("parsed filter is " + test);
     }
 
+    public void testCrosses() throws Exception {
+        Filter test = parseDocument("crosses.xml");
+        assertTrue(test instanceof Crosses);
+        Crosses cr = (Crosses) test;
+        assertEquals("the_geom", ((PropertyName) cr.getExpression1()).getPropertyName());
+        assertTrue(((Literal) cr.getExpression2()).getValue() instanceof LineString);
+        LOGGER.fine("parsed filter is " + test);
+    }
+
     public void test28() throws Exception {
         FidFilter filter = (FidFilter) parseDocumentFirst("test28.xml");
         String[] fids = filter.getFids();