Changeset 2407 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

2009-11-08T13:38:44+01:00 (16 years ago)

Author:

jttt

Message:

Added support for referrers

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java

@@ -4 +4 @@
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -11 +9 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 
@@ -23 +20 @@
 public class CollectBackReferencesVisitor extends AbstractVisitor {
 
-    private final DataSet ds;
     private final boolean indirectRefs;
 
     private Collection<OsmPrimitive> data = new HashSet<OsmPrimitive>();
-    private Map<OsmPrimitive, Collection<OsmPrimitive>> lookupTable = new HashMap<OsmPrimitive, Collection<OsmPrimitive>>();
 
 
     /**
-     * Construct a back reference counter.
-     * has time complexity O(n) - so it is appropriate not to call it in cycle
-     * @param ds The dataset to operate on.
+     * @param ds This parameter is ignored
      */
     public CollectBackReferencesVisitor(DataSet ds) {
-       this(ds, true);
+        this(true);
     }
 
     /**
-     * Construct a back reference counter.
-     * has time complexity O(n) - so it is appropriate not to call it in cycle
-     * @param ds The dataset to operate on.
+     * @param ds This parameter is ignored
      * @param indirectRefs Make also indirect references?
      */
     public CollectBackReferencesVisitor(DataSet ds, boolean indirectRefs) {
-       this.ds = ds;
-       this.indirectRefs = indirectRefs;
-       if(ds != null)
-          makeLookupTable();
+        this.indirectRefs = indirectRefs;
     }
-    
-    private void makeLookupTable() {
-        for (Way w : ds.getWays()) {
-            for (Node n : w.getNodes()) {
-                if (!lookupTable.containsKey(n)) lookupTable.put(n, new HashSet<OsmPrimitive>());
-                lookupTable.get(n).add(w);
-            }
-        }
-        for (Relation r : ds.getRelations()) {
-            for (RelationMember m : r.getMembers()) {
-                OsmPrimitive o = m.getMember();
-                if (!lookupTable.containsKey(o)) lookupTable.put(o, new HashSet<OsmPrimitive>());
-                lookupTable.get(o).add(r);
-            }
-        }
+
+    public CollectBackReferencesVisitor(boolean indirectRefs) {
+        this.indirectRefs = indirectRefs;
     }
+
 
     /**
@@ -72 +49 @@
      */
     public Collection<OsmPrimitive> getData(){
-       return data;
+        return data;
     }
 
     /**
-     * Initialize data before associated visit calls 
+     * Initialize data before associated visit calls
      */
     public void initialize(){
-       data = new HashSet<OsmPrimitive>();
+        data = new HashSet<OsmPrimitive>();
     }
 
     public void visit(OsmPrimitive o) {
-       if(lookupTable.containsKey(o)){
-          Collection<OsmPrimitive> c = lookupTable.get(o);
-          Collection<OsmPrimitive> oldData = new HashSet<OsmPrimitive>(data);
-          data.addAll(c);
-          if(indirectRefs)
-             for(OsmPrimitive oo : c)
-                if(!oldData.contains(oo))
-                   visit(oo);
-       }
+        Collection<OsmPrimitive> c = o.getReferrers();
+        Collection<OsmPrimitive> oldData = new HashSet<OsmPrimitive>(data);
+        data.addAll(c);
+        if(indirectRefs) {
+            for(OsmPrimitive oo : c)
+                if(!oldData.contains(oo)) {
+                    visit(oo);
+                }
+        }
+
     }
-    
+
     public void visit(Node n) {
-       visit((OsmPrimitive)n);
+        visit((OsmPrimitive)n);
     }
 
     public void visit(Way w) {
-       visit((OsmPrimitive)w);
+        visit((OsmPrimitive)w);
     }
 
     public void visit(Relation r) {
-       visit((OsmPrimitive)r);
+        visit((OsmPrimitive)r);
     }
 }