Changeset 1912 in josm

Timestamp:

2009-08-05T10:25:23+02:00 (15 years ago)

Author:

Gubaer

Message:

Updated w.getNodes().contains(..) to w.containsNode(...)

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) (6 diffs)
• src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (3 diffs)
• test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -113 +113 @@
             // distance between two nodes.
             if (nodes.size() > 0) {
-                if (nodes.size() == 1 && way.getNodes().contains(nodes.get(0))) {
+                if (nodes.size() == 1 && way.containsNode(nodes.get(0))) {
                     regular = true;
                 } else {
 
-                    center = nodes.get(way.getNodes().contains(nodes.get(0)) ? 1 : 0).getEastNorth();
+                    center = nodes.get(way.containsNode(nodes.get(0)) ? 1 : 0).getEastNorth();
                     if (nodes.size() == 2) {
                         radius = distance(nodes.get(0).getEastNorth(), nodes.get(1).getEastNorth());

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -225 +225 @@
                     continue;
                 }
-                if (w.getNodes().contains(sn)) {
+                if (w.containsNode(sn)) {
                     modify = true;
                 }

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -70 +70 @@
                     continue;
                 }
-                if (!w.getNodes().contains(selectedNode)) {
+                if (!w.containsNode(selectedNode)) {
                     continue;
                 }
@@ -95 +95 @@
                         continue;
                     }
-                    if (!w.getNodes().contains(n)) {
+                    if (!w.containsNode(n)) {
                         continue;
                     }
@@ -191 +191 @@
         boolean isPartOfWay = false;
         for(Way w : getCurrentDataSet().ways) {
-            if(w.getNodes().contains(n)) {
+            if(w.containsNode((Node)n)) {
                 isPartOfWay = true;
                 break;
@@ -232 +232 @@
                 selectedNode = (Node) p;
                 if (size == 1 || selectedWay != null)
-                    return size == 1 || selectedWay.getNodes().contains(selectedNode);
+                    return size == 1 || selectedWay.containsNode(selectedNode);
             } else if (p instanceof Way) {
                 selectedWay = (Way) p;
                 if (size == 2 && selectedNode != null)
-                    return selectedWay.getNodes().contains(selectedNode);
+                    return selectedWay.containsNode(selectedNode);
             }
         }
@@ -276 +276 @@
             if (p instanceof Node) {
                 Node n = (Node) p;
-                if (!selectedWay.getNodes().contains(n))
+                if (!selectedWay.containsNode(n))
                     return false;
                 selectedNodes.add(n);
@@ -372 +372 @@
                     continue;
                 }
-                if (!w.getNodes().contains(selectedNode)) {
+                if (!w.containsNode(selectedNode)) {
                     continue;
                 }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -128 +128 @@
                         return;
                     switch(c) {
-                    case way:
-                        Main.map.mapView.setCursor(cursorJoinWay);
+                        case way:
+                            Main.map.mapView.setCursor(cursorJoinWay);
+                            break;
+                        case node:
+                            Main.map.mapView.setCursor(cursorJoinNode);
+                            break;
+                        default:
+                            Main.map.mapView.setCursor(cursorCrosshair);
                         break;
-                    case node:
-                        Main.map.mapView.setCursor(cursorJoinNode);
-                        break;
-                    default:
-                        Main.map.mapView.setCursor(cursorCrosshair);
-                    break;
                     }
                 }
@@ -503 +503 @@
 
                 // Connected to a node that's already in the way
-                if(way.getNodes().contains(n)) {
+                if(way.containsNode(n)) {
                     wayIsFinished = true;
                     selection.clear();
@@ -810 +810 @@
 
         switch (segs.size()) {
-        case 0:
-            return;
-        case 2:
-            // This computes the intersection between
-            // the two segments and adjusts the node position.
-            Iterator<Pair<Node,Node>> i = segs.iterator();
-            Pair<Node,Node> seg = i.next();
-            EastNorth A = seg.a.getEastNorth();
-            EastNorth B = seg.b.getEastNorth();
-            seg = i.next();
-            EastNorth C = seg.a.getEastNorth();
-            EastNorth D = seg.b.getEastNorth();
-
-            double u=det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north());
-
-            // Check for parallel segments and do nothing if they are
-            // In practice this will probably only happen when a way has been duplicated
-
-            if (u == 0) return;
-
-            // q is a number between 0 and 1
-            // It is the point in the segment where the intersection occurs
-            // if the segment is scaled to lenght 1
-
-            double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u;
-            EastNorth intersection = new EastNorth(
-                    B.east() + q * (A.east() - B.east()),
-                    B.north() + q * (A.north() - B.north()));
-
-            int snapToIntersectionThreshold
-            = Main.pref.getInteger("edit.snap-intersection-threshold",10);
-
-            // only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise
-            // fall through to default action.
-            // (for semi-parallel lines, intersection might be miles away!)
-            if (Main.map.mapView.getPoint(n).distance(Main.map.mapView.getPoint(intersection)) < snapToIntersectionThreshold) {
-                n.setEastNorth(intersection);
+            case 0:
                 return;
-            }
-
-        default:
-            EastNorth P = n.getEastNorth();
-        seg = segs.iterator().next();
-        A = seg.a.getEastNorth();
-        B = seg.b.getEastNorth();
-        double a = P.distanceSq(B);
-        double b = P.distanceSq(A);
-        double c = A.distanceSq(B);
-        q = (a - b + c) / (2*c);
-        n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
+            case 2:
+                // This computes the intersection between
+                // the two segments and adjusts the node position.
+                Iterator<Pair<Node,Node>> i = segs.iterator();
+                Pair<Node,Node> seg = i.next();
+                EastNorth A = seg.a.getEastNorth();
+                EastNorth B = seg.b.getEastNorth();
+                seg = i.next();
+                EastNorth C = seg.a.getEastNorth();
+                EastNorth D = seg.b.getEastNorth();
+
+                double u=det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north());
+
+                // Check for parallel segments and do nothing if they are
+                // In practice this will probably only happen when a way has been duplicated
+
+                if (u == 0) return;
+
+                // q is a number between 0 and 1
+                // It is the point in the segment where the intersection occurs
+                // if the segment is scaled to lenght 1
+
+                double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u;
+                EastNorth intersection = new EastNorth(
+                        B.east() + q * (A.east() - B.east()),
+                        B.north() + q * (A.north() - B.north()));
+
+                int snapToIntersectionThreshold
+                = Main.pref.getInteger("edit.snap-intersection-threshold",10);
+
+                // only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise
+                // fall through to default action.
+                // (for semi-parallel lines, intersection might be miles away!)
+                if (Main.map.mapView.getPoint(n).distance(Main.map.mapView.getPoint(intersection)) < snapToIntersectionThreshold) {
+                    n.setEastNorth(intersection);
+                    return;
+                }
+
+            default:
+                EastNorth P = n.getEastNorth();
+            seg = segs.iterator().next();
+            A = seg.a.getEastNorth();
+            B = seg.b.getEastNorth();
+            double a = P.distanceSq(B);
+            double b = P.distanceSq(A);
+            double c = A.distanceSq(B);
+            q = (a - b + c) / (2*c);
+            n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
         }
     }

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java

@@ -20 +20 @@
     protected void populate() {
         Way w1 = new Way(1);
-          w1.addNode(new Node(10));
-          w1.addNode(new Node(11));
+        w1.addNode(new Node(10));
+        w1.addNode(new Node(11));
 
         Way w2 = new Way(1);
-          w2.addNode(new Node(10));
-          w2.addNode(new Node(11));
+        w2.addNode(new Node(10));
+        w2.addNode(new Node(11));
 
-       dialog.getConflictResolver().populate(w1, w2);
+        dialog.getConflictResolver().populate(w1, w2);
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm.visitor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collection;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -17 +13 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+
+import static org.junit.Assert.*;
 
 public class MergeSourceBuildingVisitorTest {
@@ -186 +184 @@
         Node n = (Node)hull.getPrimitiveById(21);
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         n = (Node)hull.getPrimitiveById(22);
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         Relation r = (Relation)hull.getPrimitiveById(40);
@@ -310 +308 @@
         Node n = (Node)lookupByName(hull.nodes, "n21");
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         n = (Node)lookupByName(hull.nodes, "n22");
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         Relation r = (Relation)lookupByName(hull.relations, "r40");