Changeset 12031 in josm for trunk/src

Timestamp:

2017-04-30T22:45:11+02:00 (8 years ago)

Author:

Don-vip

Message:

add Node.getParentWays()

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInLineAction.java (modified) (2 diffs)
• actions/SplitWayAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (4 diffs)
• actions/UnJoinNodeWayAction.java (modified) (1 diff)
• data/osm/Node.java (modified) (2 diffs)
• data/validation/tests/Highways.java (modified) (1 diff)
• gui/mappaint/mapcss/ConditionFactory.java (modified) (1 diff)

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

@@ -90 +90 @@
         Set<Way> waysRef = null;
         for (Node n: nodes) {
-            Collection<Way> ref = OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
+            Collection<Way> ref = n.getParentWays();
             if (waysRef == null)
                 waysRef = new HashSet<>(ref);
@@ -187 +187 @@
                 if (selectedWays.isEmpty())
                     // No selected way, all way containing this node are used
-                    involvedWays = OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class);
+                    involvedWays = selectedNode.getParentWays();
                 else
                     // Selected way, use only these ways

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

@@ -371 +371 @@
         if (selectedNodes.size() == 1) {
             Node n = selectedNodes.get(0);
-            List<Way> referredWays =
-                OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
+            List<Way> referredWays = n.getParentWays();
             Way inTheMiddle = null;
             for (Way w: referredWays) {

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

@@ -96 +96 @@
             checkAndConfirmOutlyingUnglue();
             int count = 0;
-            for (Way w : OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class)) {
+            for (Way w : selectedNode.getParentWays()) {
                 if (!w.isUsable() || w.getNodesCount() < 1) {
                     continue;
@@ -126 +126 @@
             for (Node n : selectedNodes) {
                 int count = 0;
-                for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+                for (Way w : n.getParentWays()) {
                     if (!w.isUsable()) {
                         continue;
@@ -332 +332 @@
         if (!(n instanceof Node))
             return false;
-        if (OsmPrimitive.getFilteredList(n.getReferrers(), Way.class).isEmpty())
+        if (((Node) n).getParentWays().isEmpty())
             return false;
 
@@ -564 +564 @@
         // According to previous check, only one valid way through that node
         Way way = null;
-        for (Way w: OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class)) {
+        for (Way w: selectedNode.getParentWays()) {
             if (w.isUsable() && w.getNodesCount() >= 1) {
                 way = w;

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

@@ -152 +152 @@
 
         // List of ways shared by all nodes
-        List<Way> result = new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(), Way.class));
+        List<Way> result = new ArrayList<>(selectedNodes.get(0).getParentWays());
         for (int i = 1; i < selectedNodes.size(); i++) {
-            List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
+            List<Way> ref = selectedNodes.get(i).getParentWays();
             result.removeIf(way -> !ref.contains(way));
         }

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -4 +4 @@
 import java.awt.geom.Area;
 import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -429 +430 @@
         return coor != null && !coor.isIn(area);
     }
+
+    /**
+     * Replies the set of referring ways.
+     * @return the set of referring ways
+     * @since 12031
+     */
+    public List<Way> getParentWays() {
+        return getFilteredList(getReferrers(), Way.class);
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

@@ -186 +186 @@
         carsWays = 0;
 
-        for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+        for (Way w : n.getParentWays()) {
             String highway = w.get(HIGHWAY);
             if (highway != null) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

@@ -695 +695 @@
          */
         static boolean unconnected(Environment e) { // NO_UCD (unused code)
-            return e.osm instanceof Node && OsmPrimitive.getFilteredList(e.osm.getReferrers(), Way.class).isEmpty();
+            return e.osm instanceof Node && ((Node) e.osm).getParentWays().isEmpty();
         }