Skip to content

Commit 5633a2d

Browse files
committed
HTM-1852 | HTM-1964: Upgrade to GeoTools 35.0 and re-instate GeoJSON extract
1 parent b05a7c2 commit 5633a2d

4 files changed

Lines changed: 3 additions & 8 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ SPDX-License-Identifier: MIT
101101
<maven.compiler.target>${java.version}</maven.compiler.target>
102102
<maven.compiler.release>${java.version}</maven.compiler.release>
103103
<project.build.outputTimestamp>2026-06-24T13:16:40Z</project.build.outputTimestamp>
104-
<geotools.version>35-RC</geotools.version>
104+
<geotools.version>35.0</geotools.version>
105105
<jts.version>1.20.0</jts.version>
106106
<okhttp.version>5.4.0</okhttp.version>
107107
<greenmail.version>2.1.9</greenmail.version>

src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tailormap-api.features.wfs_count_exact=false
2828
tailormap-api.feature.info.maxitems=30
2929

3030
# see org.tailormap.api.controller.LayerExtractController.ExtractOutputFormat for valid values
31-
tailormap-api.extract.allowed-outputformats=csv,xlsx,shape,geopackage
31+
tailormap-api.extract.allowed-outputformats=csv,xlsx,shape,geopackage,geojson
3232
# any files older than this (in minutes) in the extract output directory will be deleted by a scheduled job, to prevent filling up the disk
3333
# tailormap-api.extract.cleanup-minutes=120
3434
# the (base) directory where the extract output files are stored, should be writable by the application

src/test/java/org/tailormap/api/controller/LayerExtractControllerIntegrationTest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import org.junit.jupiter.api.TestMethodOrder;
5555
import org.junit.jupiter.api.parallel.Execution;
5656
import org.junit.jupiter.api.parallel.ExecutionMode;
57-
import org.junitpioneer.jupiter.DisabledUntil;
5857
import org.junitpioneer.jupiter.Stopwatch;
5958
import org.springframework.beans.factory.annotation.Autowired;
6059
import org.springframework.beans.factory.annotation.Value;
@@ -407,10 +406,6 @@ void should_export_large_filter_to_excel() throws Exception {
407406
}
408407
}
409408

410-
@DisabledUntil(
411-
date = "2026-07-01",
412-
reason =
413-
"This test relies on GeoTools 35.0 (or 34.4), see https://osgeo-org.atlassian.net/browse/GEOT-7894")
414409
@Test
415410
void should_export_large_filter_to_geojson() throws Exception {
416411
final String extractUrl = apiBasePath + layerBegroeidTerreindeelPostgis + extractPath + sseClientId;

src/test/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tailormap-api.admin.base-path=/api/admin
33
management.endpoints.web.base-path=/api/actuator
44
tailormap-api.new-admin-username=tm-admin
55
# see org.tailormap.api.controller.LayerExtractController.ExtractOutputFormat for valid values
6-
tailormap-api.extract.allowed-outputformats=csv,xlsx,shape,geopackage
6+
tailormap-api.extract.allowed-outputformats=csv,xlsx,shape,geopackage,geojson
77
# the number of features after which a progress report is sent back to the viewer, to update the progress bar
88
tailormap-api.extract.progress-report-interval=10
99
# any files older than this (in minutes) in the extract output directory will be deleted by a scheduled job, to prevent filling up the disk

0 commit comments

Comments
 (0)