Changeset 35978 in osm for applications/editors/josm/plugins/indoor_sweepline

Timestamp:

2022-06-15T20:10:48+02:00 (3 years ago)

Author:

taylor.smock

Message:

See #22115: Extract methods from LatLon into ILatLon where they are generally applicable

This uses the extracted methods where possible, and removes unnecessary
Node#getCoor calls.

Location:

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline

Files:

• CorridorGeography.java (modified) (4 diffs)
• ModelGeography.java (modified) (4 diffs)

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/CorridorGeography.java

@@ -4 +4 @@
 import java.util.Vector;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -17 +18 @@
     private static final double MIN_LENGTH = 10.;
 
-    private void setExtraElements(CorridorPart.ReachableSide side, LatLon from, LatLon to,
+    private void setExtraElements(CorridorPart.ReachableSide side, ILatLon from, ILatLon to,
             boolean extraWayUp, double minLength) {
         LatLon middleCoor = new LatLon((from.lat() + to.lat())/2.,
@@ -27 +28 @@
             middleNode.setCoor(middleCoor);
 
-        LatLon start = from;
+        ILatLon start = from;
         if (side == CorridorPart.ReachableSide.LEFT) {
             if (middleCoor.lat() < start.lat())
@@ -71 +72 @@
 
     public void appendNodes(CorridorPart.Type type, CorridorPart.ReachableSide side, String level,
-            LatLon from, LatLon to, ModelGeography target) {
+            ILatLon from, ILatLon to, ModelGeography target) {
         if (type == CorridorPart.Type.STAIRS_UP || type == CorridorPart.Type.STAIRS_DOWN) {
             setExtraElements(side, from, to, type == CorridorPart.Type.STAIRS_UP, MIN_LENGTH);

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/ModelGeography.java

@@ -85 +85 @@
 
     public void finishWay(Strip strip, int partIndex, boolean isOuter, String level) {
-        if (nodes.size() > 0) {
+        if (!nodes.isEmpty()) {
             CorridorPart part = strip.partAt(partIndex);
             strip.geographyAt(partIndex).appendNodes(part.getType(), part.getSide(), level,
-                    nodes.elementAt(nodes.size()-1).getCoor(), nodes.elementAt(0).getCoor(), this);
+                    nodes.elementAt(nodes.size()-1), nodes.elementAt(0), this);
             nodes.add(nodes.elementAt(0));
         }
@@ -98 +98 @@
     public void appendCorridorPart(CorridorPart part, CorridorGeography partGeography, int beamIndex, int partIndex,
             String level) {
-        if (nodes.size() > 0)
+        if (!nodes.isEmpty())
             partGeography.appendNodes(part.getType(), part.getSide(), level,
-                    nodes.elementAt(nodes.size()-1).getCoor(),
+                    nodes.elementAt(nodes.size()-1),
                     beamsGeography.elementAt(beamIndex).coorAt(partIndex), this);
     }
@@ -113 +113 @@
                     0, strip.width / 2.));
 
-        if (nodes.size() > 0) {
+        if (!nodes.isEmpty()) {
             CorridorPart part = strip.partAt(partIndex);
             strip.geographyAt(partIndex).appendNodes(part.getType(), part.getSide(), level,
-                    nodes.elementAt(nodes.size()-1).getCoor(), nodePool.elementAt(nodePoolCount).getCoor(), this);
+                    nodes.elementAt(nodes.size()-1), nodePool.elementAt(nodePoolCount), this);
         }
         nodes.add(nodePool.elementAt(nodePoolCount));
@@ -183 +183 @@
     private void adjustMultipolygonRelation(IndoorSweeplineModel.Type type, String level) {
         if (members.size() > 1) {
-            if (wayPool.size() > 0)
+            if (!wayPool.isEmpty())
                 wayPool.elementAt(0).removeAll();