Index: applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java =================================================================== --- applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java (revision 16735) +++ applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java (revision 17361) @@ -142,5 +142,5 @@ // This is copied from SimplifyAction and should be probably ported to tools - for (Node node : way.nodes) { + for (Node node : way.getNodes()) { if(askedAlready) break; boolean isInsideOneBoundingBox = false; @@ -327,6 +327,6 @@ private ArrayList addIntersections(Way a, Way b) { boolean same = a.equals(b); - int nodesSizeA = a.nodes.size(); - int nodesSizeB = b.nodes.size(); + int nodesSizeA = a.getNodesCount(); + int nodesSizeB = b.getNodesCount(); // We use OsmPrimitive here instead of Node because we later need to split a way at these nodes. @@ -339,17 +339,17 @@ for (int j = (same ? i + 2 : 0); j < nodesSizeB - 1; j++) { // Avoid re-adding nodes that already exist on (some) intersections - if(a.nodes.get(i).equals(b.nodes.get(j)) || a.nodes.get(i+1).equals(b.nodes.get(j))) { - nodes.add(b.nodes.get(j)); + if(a.getNode(i).equals(b.getNode(j)) || a.getNode(i+1).equals(b.getNode(j))) { + nodes.add(b.getNode(j)); continue; } else - if(a.nodes.get(i).equals(b.nodes.get(j+1)) || a.nodes.get(i+1).equals(b.nodes.get(j+1))) { - nodes.add(b.nodes.get(j+1)); + if(a.getNode(i).equals(b.getNode(j+1)) || a.getNode(i+1).equals(b.getNode(j+1))) { + nodes.add(b.getNode(j+1)); continue; } LatLon intersection = getLineLineIntersection( - a.nodes.get(i) .getEastNorth().east(), a.nodes.get(i) .getEastNorth().north(), - a.nodes.get(i+1).getEastNorth().east(), a.nodes.get(i+1).getEastNorth().north(), - b.nodes.get(j) .getEastNorth().east(), b.nodes.get(j) .getEastNorth().north(), - b.nodes.get(j+1).getEastNorth().east(), b.nodes.get(j+1).getEastNorth().north()); + a.getNode(i) .getEastNorth().east(), a.getNode(i) .getEastNorth().north(), + a.getNode(i+1).getEastNorth().east(), a.getNode(i+1).getEastNorth().north(), + b.getNode(j) .getEastNorth().east(), b.getNode(j) .getEastNorth().north(), + b.getNode(j+1).getEastNorth().east(), b.getNode(j+1).getEastNorth().north()); if(intersection == null) continue; @@ -359,9 +359,9 @@ nodes.add(n); // The distance is needed to sort and add the nodes in direction of the way - nodesA.add(new NodeToSegs(i, n, a.nodes.get(i).getCoor())); + nodesA.add(new NodeToSegs(i, n, a.getNode(i).getCoor())); if(same) - nodesA.add(new NodeToSegs(j, n, a.nodes.get(j).getCoor())); + nodesA.add(new NodeToSegs(j, n, a.getNode(j).getCoor())); else - nodesB.add(new NodeToSegs(j, n, b.nodes.get(j).getCoor())); + nodesB.add(new NodeToSegs(j, n, b.getNode(j).getCoor())); } } @@ -508,5 +508,5 @@ private Collection getNodesFromWays(Collection ways) { Collection allNodes = new ArrayList(); - for(Way w: ways) allNodes.addAll(w.nodes); + for(Way w: ways) allNodes.addAll(w.getNodes()); return allNodes; } @@ -524,8 +524,8 @@ for(Way w: multigonWays) { Polygon poly = new Polygon(); - for(Node n: (w).nodes) poly.addPoint(latlonToXY(n.getCoor().lat()), latlonToXY(n.getCoor().lon())); + for(Node n: (w).getNodes()) poly.addPoint(latlonToXY(n.getCoor().lat()), latlonToXY(n.getCoor().lon())); for(Node n: multigonNodes) { - if(!(w).nodes.contains(n) && poly.contains(latlonToXY(n.getCoor().lat()), latlonToXY(n.getCoor().lon()))) { + if(!(w).containsNode(n) && poly.contains(latlonToXY(n.getCoor().lat()), latlonToXY(n.getCoor().lon()))) { getWaysByNode(innerWays, multigonWays, n); } @@ -549,5 +549,5 @@ private void getWaysByNode(Collection innerWays, Collection w, Node n) { for(Way way : w) { - if(!(way).nodes.contains(n)) continue; + if(!(way).containsNode(n)) continue; if(!innerWays.contains(way)) innerWays.add(way); // Will need this later for multigons } @@ -566,5 +566,5 @@ if(innerWays.contains(w)) continue; - if(w.nodes.size() <= 2) + if(w.getNodesCount() <= 2) cmds.add(new DeleteCommand(w)); else @@ -608,6 +608,6 @@ continue; } - if(a.nodes.get(0).equals(b.nodes.get(0)) || - a.nodes.get(a.nodes.size()-1).equals(b.nodes.get(b.nodes.size()-1))) { + if(a.getNode(0).equals(b.getNode(0)) || + a.getNode(a.getNodesCount()-1).equals(b.getNode(b.getNodesCount()-1))) { Main.main.getCurrentDataSet().setSelected(b); new ReverseWayAction().actionPerformed(null); @@ -634,5 +634,5 @@ private ArrayList fixMultigons(Collection uninterestingWays, Way outerWay) { Collection innerNodes = getNodesFromWays(uninterestingWays); - Collection outerNodes = outerWay.nodes; + Collection outerNodes = outerWay.getNodes(); // The newly created inner ways. uninterestingWays is passed by reference and therefore modified in-place @@ -646,9 +646,9 @@ wayIterator: for(Way w : uninterestingWays) { boolean hasInnerNodes = false; - for(Node n : w.nodes) { + for(Node n : w.getNodes()) { if(outerNodes.contains(n)) continue wayIterator; if(!hasInnerNodes && innerNodes.contains(n)) hasInnerNodes = true; } - if(!hasInnerNodes || w.nodes.size() < 2) continue; + if(!hasInnerNodes || w.getNodesCount() < 2) continue; possibleWays.add(w); } @@ -703,7 +703,7 @@ for(int j=i+1; j < ways.size(); j++) { Way b = ways.get(j); - List revNodes = new ArrayList(b.nodes); + List revNodes = new ArrayList(b.getNodes()); Collections.reverse(revNodes); - if(a.nodes.equals(b.nodes) || a.nodes.equals(revNodes)) { + if(a.getNodes().equals(b.getNodes()) || a.getNodes().equals(revNodes)) { removables.add(a); continue outer; @@ -745,12 +745,12 @@ */ private boolean wayIsCollapsed(Way w) { - if(w.nodes.size() <= 3) return true; + if(w.getNodesCount() <= 3) return true; // If a way contains more than one node twice, it must be collapsed (only start/end node may be the same) Way x = new Way(w); int count = 0; - for(Node n : w.nodes) { - x.nodes.remove(n); - if(x.nodes.contains(n)) count++; + for(Node n : w.getNodes()) { + x.removeNode(n); + if(x.containsNode(n)) count++; if(count == 2) return true; } @@ -767,9 +767,9 @@ if(w1.equals(w2)) return false; - if(w1.nodes.get(0).equals(w2.nodes.get(0))) return true; - if(w1.nodes.get(0).equals(w2.nodes.get(w2.nodes.size()-1))) return true; - - if(w1.nodes.get(w1.nodes.size()-1).equals(w2.nodes.get(0))) return true; - if(w1.nodes.get(w1.nodes.size()-1).equals(w2.nodes.get(w2.nodes.size()-1))) return true; + if(w1.getNode(0).equals(w2.getNode(0))) return true; + if(w1.getNode(0).equals(w2.getNode(w2.getNodesCount()-1))) return true; + + if(w1.getNode(w1.getNodesCount()-1).equals(w2.getNode(0))) return true; + if(w1.getNode(w1.getNodesCount()-1).equals(w2.getNode(w2.getNodesCount()-1))) return true; return false; @@ -839,6 +839,6 @@ if(!newRel.members.contains(rm)) newRel.members.add(rm); // Add tags - for (String key : r.rel.keys.keySet()) { - newRel.put(key, r.rel.keys.get(key)); + for (String key : r.rel.keySet()) { + newRel.put(key, r.rel.get(key)); } // Delete old relation @@ -862,7 +862,7 @@ */ private void stripTags(Way x) { - if(x.keys == null) return; + if(x.getKeys() == null) return; Way y = new Way(x); - for (String key : x.keys.keySet()) + for (String key : x.keySet()) y.remove(key); cmds.add(new ChangeCommand(x, y)); Index: applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java =================================================================== --- applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java (revision 16735) +++ applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java (revision 17361) @@ -11,4 +11,5 @@ import java.util.HashSet; import java.util.LinkedList; +import java.util.List; import javax.swing.JOptionPane; @@ -52,5 +53,5 @@ // 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,11 +106,11 @@ 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,5 +118,5 @@ } if (!used) - used = wnew.nodes.get(i).isTagged(); + used = wnew.getNode(i).isTagged(); if (used) { @@ -127,8 +128,8 @@ HashSet delNodes = new HashSet(); - 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 cmds = new LinkedList(); cmds.add(new ChangeCommand(w, wnew)); @@ -143,7 +144,10 @@ ArrayList ns = new ArrayList(); 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 nodes = wnew.getNodes(); + for (int j = to - 1; j > from; j--) { + nodes.remove(j); + } + nodes.addAll(from + 1, ns); + wnew.setNodes(nodes); } } @@ -154,10 +158,10 @@ */ public void simplifyWayRange(Way wnew, int from, int to, ArrayList 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,5 +176,5 @@ 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); }