Changeset 20390 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java

Timestamp:

2010-03-09T22:02:00+01:00 (14 years ago)

Author:

pieren

Message:

Many small fixes and improvements

File:

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

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.DeleteCommand;
-import org.openstreetmap.josm.command.SequenceCommand;
-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 static org.openstreetmap.josm.tools.I18n.trn;
-
- 
 
 /**
@@ -29 +14 @@
  */
 public class SimplifyWay {
-    public void simplifyWay(Way w, DataSet dataSet, double threshold) {
+    public void simplifyWay(Way w/*, DataSet dataSet*/, double threshold) {
         Way wnew = new Way(w);
 
-        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));
-           parents.addAll(w.getNode(i).getReferrers());
-            boolean used = false;
-            if (parents.size() == 1) {
-                used = Collections.frequency(w.getNodes(), wnew.getNode(i)) > 1;
-            } else {
-                //backRefsV.getData().remove(w);
-                parents.remove(w);
-                used = !parents.isEmpty();
-            }
-            if (!used)
-                used = wnew.getNode(i).isTagged();
+//        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));
+//           parents.addAll(w.getNode(i).getReferrers());
+//            boolean used = false;
+//            if (parents.size() == 1) {
+//                used = Collections.frequency(w.getNodes(), wnew.getNode(i)) > 1;
+//            } else {
+//                //backRefsV.getData().remove(w);
+//                parents.remove(w);
+//                used = !parents.isEmpty();
+//            }
+//            if (!used)
+//                used = wnew.getNode(i).isTagged();
+//
+//            if (used) {
+//                simplifyWayRange(wnew, i, toI, threshold);
+//                toI = i;
+//            }
+//        }
+        simplifyWayRange(wnew, 0, wnew.getNodesCount() - 1, threshold);
+        w.setNodes(wnew.getNodes());
+//        HashSet<Node> delNodes = new HashSet<Node>();
+//        delNodes.addAll(w.getNodes());
+//        delNodes.removeAll(wnew.getNodes());
 
-            if (used) {
-                simplifyWayRange(wnew, i, toI, threshold);
-                toI = i;
-            }
-        }
-        simplifyWayRange(wnew, 0, toI, threshold);
-
-        HashSet<Node> delNodes = new HashSet<Node>();
-        delNodes.addAll(w.getNodes());
-        delNodes.removeAll(wnew.getNodes());
-
-        if (wnew.getNodesCount() != w.getNodesCount()) {
-            Collection<Command> cmds = new LinkedList<Command>();
-            cmds.add(new ChangeCommand(w, wnew));
-            cmds.add(new DeleteCommand(delNodes));
-            Main.main.undoRedo.add(new SequenceCommand(trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds));
-            Main.map.repaint();
-        }
+//        if (wnew.getNodesCount() != w.getNodesCount()) {
+//            Collection<Command> cmds = new LinkedList<Command>();
+//            cmds.add(new ChangeCommand(w, wnew));
+//            cmds.add(new DeleteCommand(delNodes));
+//            Main.main.undoRedo.add(new SequenceCommand(trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds));
+//            Main.map.repaint();
+//        }
     }