MapBox response on /items breaks georeferencing fix

src/community/wfs3/src/main/java/org/geoserver/wfs3/TileDataRequest.java

@@ -5,6 +5,7 @@
 package org.geoserver.wfs3;
 
 import org.apache.commons.lang3.StringUtils;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 
 /** Current tiling request scope data, for context propagation */
 public class TileDataRequest {
@@ -13,6 +14,7 @@ public class TileDataRequest {
     private Long level;
     private Long row;
     private Long col;
+    private ReferencedEnvelope bboxEnvelope;
 
     public TileDataRequest() {}
 
@@ -51,4 +53,12 @@ public Long getCol() {
     public void setCol(Long col) {
         this.col = col;
     }
+
+    public ReferencedEnvelope getBboxEnvelope() {
+        return bboxEnvelope;
+    }
+
+    public void setBboxEnvelope(ReferencedEnvelope bboxEnvelope) {
+        this.bboxEnvelope = bboxEnvelope;
+    }
 }

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

@@ -100,8 +100,12 @@ private Filter getFullFilter(Map kvp) throws IOException {
             filters.add(filterFactory.id(ids));
         }
         if (kvp.containsKey("bbox")) {
-            Filter bboxFilter = bboxFilter(kvp.get("bbox"));
+            Object bbox = kvp.get("bbox");
+            Filter bboxFilter = bboxFilter(bbox);
             filters.add(bboxFilter);
+            // trace requested bbox envelope for use on MVT output crop
+            if (bbox instanceof ReferencedEnvelope)
+                tileData.setBboxEnvelope((ReferencedEnvelope) bbox);
         }
         if (kvp.containsKey("time")) {
             Object timeSpecification = kvp.get("time");

src/community/wfs3/src/main/java/org/geoserver/wfs3/response/GetFeatureMapboxOutputFormat.java

@@ -60,6 +60,7 @@ protected void write(
             FeatureCollectionResponse featureCollection, OutputStream output, Operation getFeature)
             throws IOException, ServiceException {
         GetFeatureType getFeatureType = (GetFeatureType) getFeature.getParameters()[0];
+
         Integer resolution =
                 getFeatureType.getResolution() != null ? getFeatureType.getResolution() : 256;
         FeatureCollection collection = featureCollection.getFeatures().get(0);
@@ -73,12 +74,7 @@ protected void write(
                         .getType()
                         .getCoordinateReferenceSystem();
         // get area envelope from GridSet if tile request data, else from collection
-        ReferencedEnvelope area =
-                ReferencedEnvelope.create(
-                        tileData.isTileRequest()
-                                ? envelopeFromTileRequestData()
-                                : collection.getBounds(),
-                        refSys);
+        ReferencedEnvelope area = getArea(collection);
         // Build the Pipeline (sort of coordinates transformer)
         Pipeline pipeline = getPipeline(area, paintArea, refSys, resolution / 32);
         // setup the vector tile encoder
@@ -205,6 +201,26 @@ private ReferencedEnvelope envelopeFromTileRequestData() {
         }
     }
 
+    private ReferencedEnvelope getArea(FeatureCollection collection) {
+        if (tileData.getBboxEnvelope() != null) {
+            return tileData.getBboxEnvelope();
+        }
+        CoordinateReferenceSystem refSys =
+                collection
+                        .getSchema()
+                        .getGeometryDescriptor()
+                        .getType()
+                        .getCoordinateReferenceSystem();
+        // get area envelope from GridSet if tile request data, else from collection
+        ReferencedEnvelope area =
+                ReferencedEnvelope.create(
+                        tileData.isTileRequest()
+                                ? envelopeFromTileRequestData()
+                                : collection.getBounds(),
+                        refSys);
+        return area;
+    }
+
     public TileDataRequest getTileData() {
         return tileData;
     }

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

@@ -62,4 +62,28 @@ public void testItemsFeatureRoadsEncode() throws Exception {
                 "LINESTRING (134.0928 90.6752, 170.6752 74.6752, 213.3248 53.3248)",
                 featuresList.get(1).getGeometry().toText());
     }
+
+    /** Tests mapbox protobuf encoding for features in items, with bbox filter */
+    @Test
+    public void testItemsFeatureBuildingsBBOX() throws Exception {
+        // get ptb inputstream
+        String roadSegments = getEncodedName(MockData.BUILDINGS);
+        // real building bbox is BBOX=0.002,0.001,0.0024,0.0008
+        // we will crop it to BBOX=0.002,0.001,0.0024,0.0003
+        String path =
+                "wfs3/collections/"
+                        + roadSegments
+                        + "/items?f=application%2Fx-protobuf%3Btype%3Dmapbox-vector&resolution=10000"
+                        + "&BBOX=0.002,0.001,0.0024,0.0003";
+        MockHttpServletResponse response = getAsServletResponse(path);
+        byte[] responseBytes = response.getContentAsByteArray();
+        VectorTileDecoder decoder = new VectorTileDecoder();
+        FeatureIterable fiter = decoder.decode(responseBytes);
+        List<Feature> featuresList = fiter.asList();
+        assertEquals(1, featuresList.size());
+        assertEquals("cite__Buildings", featuresList.get(0).getLayerName());
+        assertEquals(
+                "POLYGON ((0 73.1392, 0 0, 256 0, 256 73.1392, 0 73.1392))",
+                featuresList.get(0).getGeometry().toText());
+    }
 }