Changeset 35976 in osm for applications/editors/josm/plugins/imagery-xml-bounds

Timestamp:

2022-06-14T20:11:21+02:00 (3 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/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java (modified) (4 diffs)

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java

@@ -23 +23 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -342 +342 @@
     }
 
-    protected static final boolean areNodeListAndBboxEqual(List<Node> nodes, BBox bBox) {
+    protected static boolean areNodeListAndBboxEqual(List<Node> nodes, BBox bBox) {
         if (nodes.size() == 5) {
             Map<Double, List<Integer>> latMap = new HashMap<>();
             Map<Double, List<Integer>> lonMap = new HashMap<>();
 
-            for (int i=0; i<4; i++) {
-                LatLon c = nodes.get(i).getCoor();
+            for (int i = 0; i < 4; i++) {
+                ILatLon c = nodes.get(i);
                 if (i > 1) {
-                    LatLon b = nodes.get(i-1).getCoor();
+                    ILatLon b = nodes.get(i - 1);
                     if (b.lat() != c.lat() && b.lon() != c.lon()) {
                         return false;
                     }
                 }
-                List<Integer> latList = latMap.get(c.lat());
-                if (latList == null) {
-                    latList = new ArrayList<>();
-                    latMap.put(c.lat(), latList);
-                }
+                List<Integer> latList = latMap.computeIfAbsent(c.lat(), lat -> new ArrayList<>(1));
                 latList.add(i);
-                List<Integer> lonList = lonMap.get(c.lon());
-                if (lonList == null) {
-                    lonList = new ArrayList<>();
-                    lonMap.put(c.lon(), lonList);
-                }
+                List<Integer> lonList = lonMap.computeIfAbsent(c.lon(), lon -> new ArrayList<>(1));
                 lonList.add(i);
             }
@@ -392 +384 @@
     }
 
-    protected static final String getNodeListShape(List<Node> nodes) {
+    protected static String getNodeListShape(List<Node> nodes) {
         StringBuilder result = new StringBuilder("            <shape>\n");
         int size = nodes.size();
@@ -402 +394 @@
             if (j == size)
                 j = 0;
-            LatLon ll = nodes.get(i).getCoor();
+            ILatLon ll = nodes.get(i);
             result.append("<point lat='")
                   .append(DF.format(ll.lat())).append("' lon='")