HTM-1965: Implement zipped shapefile extract

Author: mprins

pom.xml

@@ -347,6 +347,10 @@ SPDX-License-Identifier: MIT
             <groupId>org.geotools</groupId>
             <artifactId>gt-referencing</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-shapefile</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-wfs-ng</artifactId>

src/main/java/org/tailormap/api/controller/LayerExtractController.java

@@ -28,6 +28,7 @@
 import org.geotools.api.filter.sort.SortOrder;
 import org.geotools.filter.text.cql2.CQLException;
 import org.geotools.filter.text.ecql.ECQL;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -198,8 +199,18 @@ public ResponseEntity<?> extract(
       attributes.add(sourceFT.getDefaultGeometryAttribute());
     }
 
-    if (outputFormat == ExtractOutputFormat.XLSX) {
-      validateExcelLimits(sourceFT, attributes, filter);
+    // check if filter has valid syntax (it could still be invalid wrt feature type)
+    Filter parsedCQL = null;
+    try {
+      if (!StringUtils.isBlank(filter)) {
+        parsedCQL = ECQL.toFilter(filter);
+      }
+    } catch (CQLException e) {
+      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid filter");
+    }
+
+    if (ExtractOutputFormat.XLSX.equals(outputFormat)) {
+      validateExcelLimits(sourceFT, attributes, parsedCQL);
     }
 
     SortOrder sortingOrder = SortOrder.ASCENDING;
@@ -213,7 +224,7 @@ public ResponseEntity<?> extract(
 
     //noinspection JvmTaintAnalysis Not a Path Traversal Sink because the clientId is validated
     this.createLayerExtractService.createLayerExtract(
-        clientId, sourceFT, attributes, filter, sortBy, sortingOrder, outputFormat, outputFileName);
+        clientId, sourceFT, attributes, parsedCQL, sortBy, sortingOrder, outputFormat, outputFileName);
 
     //noinspection JvmTaintAnalysis Not an XSS sink because the response is a json message
     return ResponseEntity.accepted()
@@ -227,9 +238,9 @@ public ResponseEntity<?> extract(
    *
    * @param featureType requested FT
    * @param attributes requested attributes
-   * @param filterCQL requested filter
+   * @param filter requested filter
    */
-  private void validateExcelLimits(TMFeatureType featureType, Set<String> attributes, String filterCQL) {
+  private void validateExcelLimits(TMFeatureType featureType, Set<String> attributes, @Nullable Filter filter) {
     if (attributes.size() > ExcelDataStore.getMaxColumns()) {
       throw new ResponseStatusException(
           HttpStatus.BAD_REQUEST,
@@ -245,8 +256,7 @@ private void validateExcelLimits(TMFeatureType featureType, Set<String> attribut
         q.setPropertyNames(attributes.toArray(new String[0]));
       }
 
-      if (!StringUtils.isBlank(filterCQL)) {
-        Filter filter = ECQL.toFilter(filterCQL);
+      if (filter != null) {
         q.setFilter(filter);
       }
       final int featCount = inputFeatureSource.getCount(q);
@@ -255,10 +265,12 @@ private void validateExcelLimits(TMFeatureType featureType, Set<String> attribut
             HttpStatus.BAD_REQUEST,
             "Excel format does not support more than " + ExcelDataStore.getMaxRows() + " rows");
       }
-    } catch (CQLException | IOException e) {
+    } catch (IOException e) {
       throw new ResponseStatusException(
           HttpStatus.INTERNAL_SERVER_ERROR,
           "Failed to count all features for Excel extract: " + e.getMessage());
+    } catch (IllegalArgumentException e) {
+      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid filter");
     } finally {
       if (inputFeatureSource != null) {
         inputFeatureSource.getDataStore().dispose();

src/main/java/org/tailormap/api/geotools/collection/ProgressReportingFeatureCollection.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2026 B3Partners B.V.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+package org.tailormap.api.geotools.collection;
+
+import java.util.function.IntConsumer;
+import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.data.simple.SimpleFeatureIterator;
+import org.geotools.feature.collection.DecoratingSimpleFeatureCollection;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * A decorating feature collection that will pass a callback to the iterator to report the number of features provided.
+ */
+public class ProgressReportingFeatureCollection extends DecoratingSimpleFeatureCollection {
+  private final int progressInterval;
+  private final IntConsumer progressCallback;
+
+  /**
+   * Creates a new {@code ProgressReportingFeatureCollection} that wraps the given delegate and reports progress at
+   * the specified interval.
+   *
+   * @param delegate the underlying {@link SimpleFeatureCollection} to decorate
+   * @param progressInterval the number of features between each progress callback invocation; must be greater than
+   *     {@code 0}
+   * @param progressCallback a callback that receives the current feature count at each interval; may be {@code null}
+   */
+  public ProgressReportingFeatureCollection(
+      SimpleFeatureCollection delegate, int progressInterval, @Nullable IntConsumer progressCallback) {
+    super(delegate);
+    if (progressInterval <= 0) {
+      throw new IllegalArgumentException("progressInterval must be greater than 0");
+    }
+    this.delegate = delegate;
+    this.progressInterval = progressInterval;
+    this.progressCallback = progressCallback;
+  }
+
+  @Override
+  public SimpleFeatureIterator features() {
+    return new ProgressReportingFeatureIterator(delegate.features(), progressInterval, progressCallback);
+  }
+}

src/main/java/org/tailormap/api/geotools/collection/ProgressReportingFeatureIterator.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2026 B3Partners B.V.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+package org.tailormap.api.geotools.collection;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.IntConsumer;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.data.simple.SimpleFeatureIterator;
+import org.geotools.feature.collection.DecoratingSimpleFeatureIterator;
+import org.jspecify.annotations.Nullable;
+
+/** A decorating feature iterator that will call a callback after a specified number of features are handled. */
+public class ProgressReportingFeatureIterator extends DecoratingSimpleFeatureIterator {
+
+  private final AtomicInteger count = new AtomicInteger(0);
+  private final int progressInterval;
+  private final IntConsumer progressCallback;
+  private SimpleFeatureIterator iterator;
+
+  /**
+   * Creates an iterator that reports progress after every configured number of processed features.
+   *
+   * @param iterator the wrapped feature iterator, must not be {@code null}
+   * @param progressInterval the number of processed features between progress updates, must be greater than {@code 0}
+   * @param progressCallback the callback that receives the current processed feature count; may be {@code null}
+   * @throws IllegalArgumentException if {@code progressInterval <= 0}
+   */
+  public ProgressReportingFeatureIterator(
+      SimpleFeatureIterator iterator, int progressInterval, @Nullable IntConsumer progressCallback) {
+    super(iterator);
+    if (progressInterval <= 0) {
+      throw new IllegalArgumentException("progressInterval must be greater than 0");
+    }
+    this.iterator = iterator;
+    this.progressInterval = progressInterval;
+    this.progressCallback = progressCallback;
+  }
+
+  @Override
+  public SimpleFeature next() {
+    if (count.incrementAndGet() % progressInterval == 0) {
+      if (progressCallback != null) {
+        progressCallback.accept(count.get());
+      }
+    }
+    return iterator.next();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return iterator.hasNext();
+  }
+
+  @Override
+  public void close() {
+    iterator.close();
+    iterator = null;
+    count.set(0);
+  }
+}