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

Timestamp:

2010-03-08T09:24:03+01:00 (15 years ago)

Author:

jttt

Message:

Changes in multipolygon handling (see #4661), cosmetics

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -19 +18 @@
 public class Multipolygon {
 
+    public static class JoinedWay {
+        private final List<Node> nodes;
+        private final boolean selected;
+
+        public JoinedWay(List<Node> nodes, boolean selected) {
+            this.nodes = nodes;
+            this.selected = selected;
+        }
+
+        public List<Node> getNodes() {
+            return nodes;
+        }
+
+        public boolean isSelected() {
+            return selected;
+        }
+
+        public boolean isClosed() {
+            return nodes.isEmpty() || nodes.get(nodes.size() - 1).equals(nodes.get(0));
+        }
+    }
+
     public static class PolyData {
         public enum Intersection {INSIDE, OUTSIDE, CROSSING}
@@ -26 +47 @@
         private Point lastP;
         private Rectangle bounds;
+
+        public PolyData(NavigatableComponent nc, JoinedWay joinedWay) {
+            this(nc, joinedWay.getNodes(), joinedWay.isSelected());
+        }
 
         public PolyData(NavigatableComponent nc, List<Node> nodes, boolean selected) {
@@ -92 +117 @@
     private final List<PolyData> outerPolygons = new ArrayList<PolyData>();
     private final List<PolyData> combinedPolygons = new ArrayList<PolyData>();
-    private boolean hasNonClosedWays;
 
     public Multipolygon(NavigatableComponent nc) {
@@ -137 +161 @@
         }
 
-        result.addAll(joinWays(waysToJoin));
-    }
-
-    public Collection<PolyData> joinWays(Collection<Way> join)
+        for (JoinedWay jw: joinWays(waysToJoin)) {
+            result.add(new PolyData(nc, jw));
+        }
+    }
+
+    public static Collection<JoinedWay> joinWays(Collection<Way> join)
     {
-        Collection<PolyData> res = new LinkedList<PolyData>();
+        Collection<JoinedWay> res = new ArrayList<JoinedWay>();
         Way[] joinArray = join.toArray(new Way[join.size()]);
         int left = join.size();
@@ -230 +256 @@
             }
 
-            if(!n.isEmpty() && !n.get(n.size() - 1).equals(n.get(0))) {
-                hasNonClosedWays = true;
-            }
-            PolyData pd = new PolyData(nc, n, selected);
-            res.add(pd);
+            res.add(new JoinedWay(n, selected));
         } /* while(left != 0) */
 
@@ -323 +345 @@
     }
 
-    public boolean hasNonClosedWays() {
-        return hasNonClosedWays;
-    }
-
 }