Changeset 36176 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2023-10-19T21:58:56+02:00 (16 months ago)

Author:

taylor.smock

Message:

Fix error_prone version issue and dependency updates (see #23218)

Plugins with an ivy_settings.xml file were not reading the error_prone version
from the core ivysettings.xml file. This removes redundant ivy_settings.xml files
and includes the core ivysettings.xml file in the remaining ivy_settings.xml
files.

Dependency updates:
apache-commons:

• zstd-jni: 1.5.2-5 -> 1.5.5-6
• commons-compress: 1.22 -> 1.24.0
• commons-io: 2.11.0 -> 2.14.0
• commons-lang3: 3.12.0 -> 3.13.0

apache-http:

• httpclient5: 5.1.2 -> 5.2.1
• Drops legacy httpcore, httpclient, and httpmime dependencies

ejml: 0.41 -> 0.43.1

• ejml now requires Java 11

flatlaf: 3.2 -> 3.2.2
geotools: 28.2 -> 30.0

• geotools now requires Java 11
• 30.0 had some breaking API changes, but provided a migration script

jackson: 2.14.0 -> 2.15.3
jna: 5.12.1 -> 5.13.0
log4j: 2.19.0 -> 2.21.0
lwjgl: 3.3.1 -> 3.3.3
pbf:

• protobuf-java: 3.20.3 -> 3.24.4

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionSaveRasterAs.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -16 +16 @@
     <property name="plugin.stage" value="60"/>
     <property name="plugin.requires" value="apache-commons;ejml;jts;geotools"/>
+    <property name="plugin.minimum.java.version" value="11"/>
 
     <!-- ** include targets that all plugins have in common ** -->

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionSaveRasterAs.java

@@ -21 +21 @@
 import org.geotools.gce.geotiff.GeoTiffWriteParams;
 import org.geotools.gce.geotiff.GeoTiffWriter;
-import org.geotools.geometry.Envelope2D;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
-import org.opengis.parameter.GeneralParameterValue;
-import org.opengis.parameter.ParameterValueGroup;
+import org.geotools.api.parameter.GeneralParameterValue;
+import org.geotools.api.parameter.ParameterValueGroup;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -37 +37 @@
     private static final String NAME = marktr("Save image as...");
 
-    private WMSLayer wmsLayer;
+    private final WMSLayer wmsLayer;
 
     static class FiltrePng extends FileFilter {
@@ -106 +106 @@
                     double x = wmsLayer.getImage(0).min.east();
                     double y = wmsLayer.getImage(0).min.north();
-                    Envelope2D bbox = new Envelope2D(CRS.decode("EPSG:27561"),
-                            x, y,
-                            wmsLayer.getImage(0).max.east()-x, wmsLayer.getImage(0).max.north()-y);
+                    ReferencedEnvelope bbox = ReferencedEnvelope.rect(x, y,
+                            wmsLayer.getImage(0).max.east() - x, wmsLayer.getImage(0).max.north() - y,
+                            CRS.decode("EPSG:27561"));
                     GridCoverageFactory factory = new GridCoverageFactory();
                     GridCoverage2D coverage = factory.create("tiff", bi, bbox);