Changeset 18920 in osm for applications/editors/josm/plugins/cadastre-fr/src

Timestamp:

2009-12-03T20:54:46+01:00 (15 years ago)

Author:

guggis

Message:

'Updated to new referrer support in OsmPrimitive'

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java

@@ -9 +9 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.Main;
@@ -17 +18 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -33 +34 @@
 
         int toI = wnew.getNodesCount() - 1;
+        List<OsmPrimitive> parents = new ArrayList<OsmPrimitive>();
         for (int i = wnew.getNodesCount() - 1; i >= 0; i--) {
-            CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(dataSet, false);
-            backRefsV.visit(wnew.getNode(i));
+            //CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(dataSet, false);
+            //backRefsV.visit(wnew.getNode(i));
+           parents.addAll(w.getNode(i).getReferrers());
             boolean used = false;
-            if (backRefsV.getData().size() == 1) {
+            if (parents.size() == 1) {
                 used = Collections.frequency(w.getNodes(), wnew.getNode(i)) > 1;
             } else {
-                backRefsV.getData().remove(w);
-                used = !backRefsV.getData().isEmpty();
+                //backRefsV.getData().remove(w);
+                parents.remove(w);
+                used = !parents.isEmpty();
             }
             if (!used)