Allowing dateline crossing requests

src/community/wfs3/src/main/java/org/geoserver/wfs3/kvp/GetFeatureKvpRequestReader.java

@@ -8,26 +8,30 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.xml.namespace.QName;
 import org.eclipse.emf.ecore.EObject;
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.FeatureTypeInfo;
 import org.geoserver.catalog.NamespaceInfo;
 import org.geoserver.config.GeoServer;
+import org.geoserver.platform.ServiceException;
+import org.geoserver.wfs.request.Query;
 import org.geoserver.wfs3.GetFeatureType;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.util.DateRange;
+import org.locationtech.jts.geom.Envelope;
 import org.opengis.feature.type.FeatureType;
 import org.opengis.filter.Filter;
 import org.opengis.filter.FilterFactory;
 import org.opengis.filter.expression.Literal;
 import org.opengis.filter.expression.PropertyName;
 import org.opengis.filter.identity.FeatureId;
-import org.opengis.filter.spatial.BBOX;
-import org.opengis.geometry.Envelope;
 
 public class GetFeatureKvpRequestReader extends org.geoserver.wfs.kvp.GetFeatureKvpRequestReader {
 
@@ -81,8 +85,7 @@ private Filter getFullFilter(Map kvp) throws IOException {
             filters.add(filterFactory.id(ids));
         }
         if (kvp.containsKey("bbox")) {
-            Envelope bbox = (Envelope) kvp.get("bbox");
-            BBOX bboxFilter = bboxFilter((org.locationtech.jts.geom.Envelope) bbox);
+            Filter bboxFilter = bboxFilter(kvp.get("bbox"));
             filters.add(bboxFilter);
         }
         if (kvp.containsKey("time")) {
@@ -162,4 +165,50 @@ private List<String> getTimeProperties(QName typeName) throws IOException {
     protected void ensureMutuallyExclusive(Map kvp, String[] keys, EObject request) {
         // no op, we actually want to handle multiple filters
     }
+
+    protected void handleBBOX(Map kvp, EObject eObject) throws Exception {
+        // set filter from bbox
+        Filter bboxFilter = bboxFilter(kvp.get("bbox"));
+
+        List<Query> queries = getQueries(eObject);
+        List filters = new ArrayList();
+
+        for (Iterator<Query> it = queries.iterator(); it.hasNext(); ) {
+            Query q = it.next();
+
+            List typeName = q.getTypeNames();
+            Filter filter;
+            if (typeName.size() > 1) {
+                // TODO: not sure what to do here, just going to and them up
+                List and = new ArrayList(typeName.size());
+
+                for (Iterator t = typeName.iterator(); t.hasNext(); ) {
+                    and.add(bboxFilter);
+                }
+
+                filter = filterFactory.and(and);
+            } else {
+                filter = bboxFilter;
+            }
+
+            filters.add(filter);
+        }
+
+        querySet(eObject, "filter", filters);
+    }
+
+    private Filter bboxFilter(Object bbox) {
+        if (bbox instanceof Envelope) {
+            return super.bboxFilter((Envelope) bbox);
+        } else if (bbox instanceof ReferencedEnvelope[]) {
+            ReferencedEnvelope[] envelopes = (ReferencedEnvelope[]) bbox;
+            List<Filter> filters =
+                    Stream.of(envelopes)
+                            .map(e -> (Filter) super.bboxFilter(e))
+                            .collect(Collectors.toList());
+            return filterFactory.or(filters);
+        }
+        throw new ServiceException(
+                "Internal error, did not expect to find this value for the bbox: " + bbox);
+    }
 }

src/community/wfs3/src/main/java/org/geoserver/wfs3/kvp/WFS3BBoxKvpParser.java

@@ -0,0 +1,65 @@
+/* (c) 2017 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ */
+package org.geoserver.wfs3.kvp;
+
+import org.geoserver.wfs.kvp.BBoxKvpParser;
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.referencing.CRS;
+import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.opengis.referencing.FactoryException;
+import org.opengis.referencing.NoSuchAuthorityCodeException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+/**
+ * A parser that allows dateline crossing envelopes. TODO: Same as the OpenSearch one, the class
+ * will eventually have to be either moved to core or merged with its based class.
+ *
+ * @author Andrea Aime
+ */
+public class WFS3BBoxKvpParser extends BBoxKvpParser {
+
+    @Override
+    protected Object buildEnvelope(
+            int countco,
+            double minx,
+            double miny,
+            double minz,
+            double maxx,
+            double maxy,
+            double maxz,
+            String srs)
+            throws NoSuchAuthorityCodeException, FactoryException {
+        if (countco > 4) {
+            throw new IllegalArgumentException(
+                    "Too many coordinates, openSearch cannot handle non flat envelopes yet");
+        }
+
+        CoordinateReferenceSystem crs = srs == null ? null : CRS.decode(srs, true);
+        if (crs == null) {
+            crs = DefaultGeographicCRS.WGS84;
+        }
+        minx = rollLongitude(minx);
+        maxx = rollLongitude(maxx);
+
+        if (minx > maxx) {
+            // dateline crossing case
+            return new ReferencedEnvelope[] {
+                new ReferencedEnvelope(minx, 180, miny, maxy, crs),
+                new ReferencedEnvelope(-180, maxx, miny, maxy, crs),
+            };
+        } else {
+            return new ReferencedEnvelope(minx, maxx, miny, maxy, crs);
+        }
+    }
+
+    protected static double rollLongitude(final double x) {
+        double mod = (x + 180) % 360;
+        if (mod == 0) {
+            return x > 0 ? 180 : -180;
+        } else {
+            return mod - 180;
+        }
+    }
+}

src/community/wfs3/src/main/resources/applicationContext.xml

@@ -44,6 +44,10 @@
 
   <!-- KVP parsing -->
   <bean id="wfs3TimeKvpParser" class="org.geoserver.wfs3.kvp.TimeKvpParser"/>
+  <bean id="wfs3BBOXKvpParser" class="org.geoserver.wfs3.kvp.WFS3BBoxKvpParser">
+    <property name="service" value="WFS"/>
+    <property name="version" value="3.0.0"/>
+  </bean>
   <bean id="apiKvpRequestReader" class="org.geoserver.wfs3.kvp.APIRequestKVPReader"/>
   <bean id="contentKvpRequestReader" class="org.geoserver.wfs3.kvp.LandingPageRequestKVPReader"/>
   <bean id="collectionKvpRequestReader" class="org.geoserver.wfs3.kvp.CollectionRequestKVPReader"/>

src/community/wfs3/src/test/java/org/geoserver/wfs3/FeatureTest.java

@@ -80,6 +80,20 @@ public void testBBoxFilter() throws Exception {
                 1, json.read("features[?(@.id == 'PrimitiveGeoFeature.f002')]", List.class).size());
     }
 
+    @Test
+    public void testBBoxDatelineCrossingFilter() throws Exception {
+        String roadSegments = getEncodedName(MockData.PRIMITIVEGEOFEATURE);
+        DocumentContext json =
+                getAsJSONPath("wfs3/collections/" + roadSegments + "/items?bbox=170,0,60,3", 200);
+        assertEquals("FeatureCollection", json.read("type", String.class));
+        // should return only f002 and f003
+        assertEquals(2, (int) json.read("features.length()", Integer.class));
+        assertEquals(
+                1, json.read("features[?(@.id == 'PrimitiveGeoFeature.f001')]", List.class).size());
+        assertEquals(
+                1, json.read("features[?(@.id == 'PrimitiveGeoFeature.f002')]", List.class).size());
+    }
+
     @Test
     public void testTimeFilter() throws Exception {
         String roadSegments = getEncodedName(MockData.PRIMITIVEGEOFEATURE);

src/wfs/src/main/java/org/geoserver/wfs/kvp/BaseFeatureKvpRequestReader.java

@@ -110,7 +110,7 @@ public Object read(Object request, Map kvp, Map rawKvp) throws Exception {
             if (typeNames == null) {
                 typeNames = (List) kvp.get("typeNames");
             }
-            List list = new ArrayList();
+            List<List<QName>> list = new ArrayList<>();
 
             for (Iterator itr = typeNames.iterator(); itr.hasNext(); ) {
                 Object obj = itr.next();
@@ -135,6 +135,7 @@ public Object read(Object request, Map kvp, Map rawKvp) throws Exception {
 
             kvp.put("typeName", list);
             querySet(eObject, "typeName", list);
+            typeNames = list;
         } else {
             // check for featureId and infer typeName
             // in WFS 2.0 it is resourceId