Changeset 17361 in osm for applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java

Timestamp:

2009-08-30T17:49:38+02:00 (17 years ago)

Author:

guggis

Message:

Cleanup of deprecated data API for OsmPrimitive and Way

File:

• applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java (modified) (8 diffs)

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java

@@ -11 +11 @@
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JOptionPane;
@@ -52 +53 @@
                     // bounding box. Otherwise nodes may get deleted that are necessary by
                     // unloaded ways (see Ticket #1594)
-                    for (Node node : way.nodes) {
+                    for (Node node : way.getNodes()) {
                         boolean isInsideOneBoundingBox = false;
                         for (Bounds b : bounds) {
@@ -105 +106 @@
         Way wnew = new Way(w);
 
-        int toI = wnew.nodes.size() - 1;
-        for (int i = wnew.nodes.size() - 1; i >= 0; i--) {
+        int toI = wnew.getNodesCount() - 1;
+        for (int i = wnew.getNodesCount() - 1; i >= 0; i--) {
             CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet(), false);
-            backRefsV.visit(wnew.nodes.get(i));
+            backRefsV.visit(wnew.getNode(i));
             boolean used = false;
             if (backRefsV.data.size() == 1) {
-                used = Collections.frequency(w.nodes, wnew.nodes.get(i)) > 1;
+                used = Collections.frequency(w.getNodes(), wnew.getNode(i)) > 1;
             } else {
                 backRefsV.data.remove(w);
@@ -117 +118 @@
             }
             if (!used)
-                used = wnew.nodes.get(i).isTagged();
+                used = wnew.getNode(i).isTagged();
 
             if (used) {
@@ -127 +128 @@
 
         HashSet<Node> delNodes = new HashSet<Node>();
-        delNodes.addAll(w.nodes);
-        delNodes.removeAll(wnew.nodes);
-
-        if (wnew.nodes.size() != w.nodes.size()) {
+        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));
@@ -143 +144 @@
             ArrayList<Node> ns = new ArrayList<Node>();
             simplifyWayRange(wnew, from, to, ns, thr);
-            for (int j = to - 1; j > from; j--)
-                wnew.nodes.remove(j);
-            wnew.nodes.addAll(from + 1, ns);
+            List<Node> nodes = wnew.getNodes();
+            for (int j = to - 1; j > from; j--) {               
+                nodes.remove(j);                
+            }            
+            nodes.addAll(from + 1, ns);
+            wnew.setNodes(nodes);
         }
     }
@@ -154 +158 @@
      */
     public void simplifyWayRange(Way wnew, int from, int to, ArrayList<Node> ns, double thr) {
-        Node fromN = wnew.nodes.get(from), toN = wnew.nodes.get(to);
+        Node fromN = wnew.getNode(from), toN = wnew.getNode(to);
 
         int imax = -1;
         double xtemax = 0;
         for (int i = from + 1; i < to; i++) {
-            Node n = wnew.nodes.get(i);
+            Node n = wnew.getNode(i);
             double xte = Math.abs(EARTH_RAD
                     * xtd(fromN.getCoor().lat() * Math.PI / 180, fromN.getCoor().lon() * Math.PI / 180, toN.getCoor().lat() * Math.PI
@@ -172 +176 @@
         if (imax != -1 && xtemax >= thr) {
             simplifyWayRange(wnew, from, imax, ns, thr);
-            ns.add(wnew.nodes.get(imax));
+            ns.add(wnew.getNode(imax));
             simplifyWayRange(wnew, imax, to, ns, thr);
         }