Changeset 4629 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

Timestamp:

2011-12-03T03:08:44+01:00 (12 years ago)

Author:

Don-vip

Message:

see #6987 - optim: moving a node belonging to a MP only resets concerned PolyData objects

File:

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

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
 
@@ -176 +177 @@
         private Rectangle2D bounds;
         private final Collection<Way> ways;
+        private final List<Node> nodes;
+        private final List<PolyData> inners;
 
         public PolyData(JoinedWay joinedWay, Collection<Way> refWays) {
@@ -183 +186 @@
         public PolyData(List<Node> nodes, boolean selected, Collection<Way> refWays) {
             this.ways = Collections.unmodifiableCollection(refWays);
+            this.nodes = Collections.unmodifiableList(nodes);
             this.selected = selected;
-            boolean initial = true;
+            this.inners = new ArrayList<Multipolygon.PolyData>();
             this.poly = new Path2D.Double();
             this.poly.setWindingRule(Path2D.WIND_EVEN_ODD);
+            buildPoly();
+        }
+        
+        private void buildPoly() {
+            boolean initial = true;
             for (Node n : nodes)
             {
@@ -198 +207 @@
             }
             poly.closePath();
+            for (PolyData inner : inners) {
+                appendInner(inner.poly);
+            }
         }
 
@@ -203 +215 @@
             this.selected = copy.selected;
             this.poly = (Double) copy.poly.clone();
-            this.ways = new ArrayList<Way>(copy.ways);
+            this.ways = Collections.unmodifiableCollection(copy.ways);
+            this.nodes = Collections.unmodifiableList(copy.nodes);
+            this.inners = new ArrayList<Multipolygon.PolyData>(copy.inners);
         }
         
@@ -225 +239 @@
         }
 
-        public void addInner(Path2D.Double inner) {
+        public void addInner(PolyData inner) {
+            inners.add(inner);
+            appendInner(inner.poly);
+        }
+        
+        private void appendInner(Path2D.Double inner) {
             poly.append(inner.getPathIterator(null), false);
         }
@@ -242 +261 @@
         public Collection<Way> getWays() {
             return ways;
+        }
+        
+        private void resetPoly() {
+            poly.reset();
+            buildPoly();
+            bounds = null;
+        }
+        
+        public void nodeMoved(NodeMovedEvent event) {
+            final Node n = event.getNode();
+            boolean innerChanged = false;
+            for (PolyData inner : inners) {
+                if (inner.nodes.contains(n)) {
+                    inner.resetPoly();
+                    innerChanged = true;
+                }
+            }
+            if (nodes.contains(n) || innerChanged) {
+                resetPoly();
+            }
         }
     }
@@ -441 +480 @@
             PolyData combinedOuter = new PolyData(outerPolygons.get(0));
             for (PolyData inner: innerPolygons) {
-                combinedOuter.addInner(inner.poly);
+                combinedOuter.addInner(inner);
             }
             combinedPolygons.add(combinedOuter);
@@ -454 +493 @@
                     o = outerPolygons.get(0);
                 }
-                o.addInner(pdInner.poly);
+                o.addInner(pdInner);
             }
         }