Changeset 35976 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2022-06-14T20:11:21+02:00 (2 years ago)

Author:

taylor.smock

Message:

see #22104: Remove usages of Node#getCoor where possible

This also accounts for cases where Node has the methods used later,
so a new LatLon is unnecessary.

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (modified) (8 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.GraphicsEnvironment;
-import java.awt.Point;
 import java.io.IOException;
 import java.io.InputStream;
@@ -25 +24 @@
 import javax.swing.Icon;
 import javax.swing.JOptionPane;
-import javax.xml.crypto.dsig.TransformException;
 
 import org.geotools.geometry.jts.JTS;
@@ -37 +35 @@
 import org.geotools.util.factory.Hints;
 import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
 import org.opengis.geometry.MismatchedDimensionException;
 import org.opengis.referencing.FactoryException;
@@ -44 +43 @@
 import org.opengis.referencing.crs.ProjectedCRS;
 import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.datum.Datum;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.OperationNotFoundException;
+import org.opengis.referencing.operation.TransformException;
 import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -54 +55 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.projection.datum.Datum;
 import org.openstreetmap.josm.data.validation.tests.DuplicateWay;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -113 +113 @@
             LatLon ll = new LatLon(p.getY(), p.getX());
             for (Node node : nodes.values()) {
-                if (node.getCoor().equalsEpsilon(ll, ILatLon.MAX_SERVER_PRECISION)) {
+                if (node.equalsEpsilon(ll, ILatLon.MAX_SERVER_PRECISION)) {
                     return node;
                 }
@@ -261 +261 @@
         CoordinateSystem cs2 = crs2.getCoordinateSystem();
         if (!compareDebug("cs", cs1, cs2)) {
-            Integer dim1 = cs1.getDimension();
-            Integer dim2 = cs2.getDimension();
+            int dim1 = cs1.getDimension();
+            int dim2 = cs2.getDimension();
             if (compareDebug("cs.dim", dim1, dim2)) {
                 for (int i = 0; i < dim1; i++) {
@@ -397 +397 @@
                 }
 
-                if (candidates.size() > 0) {
+                if (!candidates.isEmpty()) {
                     CoordinateReferenceSystem newCRS = candidates.get(0);
                     try {