Changeset 18922 in osm for applications/editors/josm/plugins/osmarender/src/org

Timestamp:

2009-12-03T20:56:33+01:00 (15 years ago)

Author:

guggis

Message:

'Updated to new referrer support in OsmPrimitive'

File:

• applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java

@@ -11 +11 @@
 import java.io.PrintWriter;
 import java.util.HashSet;
+import java.util.Set;
 
 import javax.swing.JLabel;
@@ -25 +26 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -54 +54 @@
             }
 
-            CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet(), true);
+            Set<OsmPrimitive> parents = new HashSet<OsmPrimitive>();
             DataSet fromDataSet = new DataSet();
             for (Node n : Main.main.getCurrentDataSet().getNodes()) {
                 if (n.isUsable() && n.getCoor().isWithin(b)) {
                     fromDataSet.addPrimitive(n);
-                    n.visit(backRefsV);
+                    parents.addAll(n.getReferrers());
                 }
             }
-            for (OsmPrimitive p : new HashSet<OsmPrimitive>(backRefsV.getData())) {
+            for (OsmPrimitive p : new HashSet<OsmPrimitive>(parents)) {
                 if (p instanceof Way) {
                     for (Node n : ((Way) p).getNodes()) {
                         if (n.getCoor().isWithin(b))
-                            backRefsV.getData().add(n);
+                                parents.add(n);
                     }
                 }
             }
-            for (OsmPrimitive p : backRefsV.getData())
+            for (OsmPrimitive p : parents)
                 fromDataSet.addPrimitive(p);