Changeset 2412 in josm for trunk

Timestamp:

2009-11-08T17:51:35+01:00 (14 years ago)

Author:

jttt

Message:

Use refererrers in Draw, SplitWay and UnGlue actions

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SplitWayAction.java (modified) (4 diffs)
• actions/UnGlueAction.java (modified) (5 diffs)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (1 diff)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -15 +15 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
@@ -101 +102 @@
         // is exactly one way that all nodes are part of.
         if (selectedWay == null && selectedNodes != null) {
-            HashMap<Way, Integer> wayOccurenceCounter = new HashMap<Way, Integer>();
+            Map<Way, Integer> wayOccurenceCounter = new HashMap<Way, Integer>();
             for (Node n : selectedNodes) {
-                for (Way w : getCurrentDataSet().getWays()) {
+                for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
                     if (!w.isUsable()) {
                         continue;
@@ -294 +295 @@
         // now copy all relations to new way also
 
-        for (Relation r : getCurrentDataSet().getRelations()) {
+        for (Relation r : OsmPrimitive.getFilteredList(selectedWay.getReferrers(), Relation.class)) {
             if (!r.isUsable()) {
                 continue;

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

@@ -67 +67 @@
         if (checkSelection(selection)) {
             int count = 0;
-            for (Way w : getCurrentDataSet().getWays()) {
+            for (Way w : OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class)) {
                 if (!w.isUsable() || w.getNodesCount() < 1) {
-                    continue;
-                }
-                if (!w.containsNode(selectedNode)) {
                     continue;
                 }
@@ -92 +89 @@
             for (Node n : selectedNodes) {
                 int count = 0;
-                for (Way w : getCurrentDataSet().getWays()) {
+                for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
                     if (w.isDeleted() || w.incomplete || w.getNodesCount() < 1) {
-                        continue;
-                    }
-                    if (!w.containsNode(n)) {
                         continue;
                     }
@@ -189 +183 @@
         if (!(n instanceof Node))
             return false;
-        boolean isPartOfWay = false;
-        for (Way w : getCurrentDataSet().getWays()) {
-            if (w.containsNode((Node) n)) {
-                isPartOfWay = true;
-                break;
-            }
-        }
-        if (!isPartOfWay)
+        if (OsmPrimitive.getFilteredList(n.getReferrers(), Way.class).isEmpty())
             return false;
 
@@ -320 +307 @@
         Relation newRel = null;
         HashSet<String> rolesToReAdd = null;
-        for (Relation r : getCurrentDataSet().getRelations()) {
+        for (Relation r : OsmPrimitive.getFilteredList(originalNode.getReferrers(), Relation.class)) {
             if (r.isDeleted() || r.incomplete) {
                 continue;
@@ -365 +352 @@
             boolean firstway = true;
             // modify all ways containing the nodes
-            for (Way w : getCurrentDataSet().getWays()) {
+            for (Way w : OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class)) {
                 if (w.isDeleted() || w.incomplete || w.getNodesCount() < 1) {
-                    continue;
-                }
-                if (!w.containsNode(selectedNode)) {
                     continue;
                 }

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

@@ -773 +773 @@
     public Way getWayForNode(Node n) {
         Way way = null;
-        for (Way w : getCurrentDataSet().getWays()) {
+        for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
             if (!w.isUsable() || w.getNodesCount() < 1) {
                 continue;

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

@@ -753 +753 @@
     }
 
-    public Set<Relation> getReferringRelations(Collection<? extends OsmPrimitive> primitives) {
-        return this.getReferringRelations(new HashSet<OsmPrimitive>(primitives));
-    }
-    public Set<Relation> getReferringRelations(Set<? extends OsmPrimitive> referred) {
-        HashSet<Relation> ret = new HashSet<Relation>();
-        if (referred == null) return ret;
-        referred.remove(null); // just in case - remove null element from primitives
-        for (Relation r: relations) {
-            if (r.isDeleted() || r.incomplete) {
-                continue;
-            }
-            Set<OsmPrimitive> memberPrimitives = r.getMemberPrimitives();
-            memberPrimitives.retainAll(referred);
-            if (!memberPrimitives.isEmpty()) {
-                ret.add(r);
-            }
-        }
-        return ret;
-    }
-
     /**
      * Reindex all nodes and ways after their coordinates were changed. This is a temporary solution, reindexing should