Changeset 6841 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-02-12T00:55:05+01:00 (10 years ago)

Author:

Don-vip

Message:

see #9680 - Boost multipolygon computation performance by caching Areas

File:

• trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26 +27 @@
         public final List<Boolean> reversed;
         public final List<Node> nodes;
+        public final Area area;
 
         public JoinedPolygon(List<Way> ways, List<Boolean> reversed) {
@@ -31 +33 @@
             this.reversed = reversed;
             this.nodes = this.getNodes();
+            this.area = Geometry.getArea(nodes);
         }
 
@@ -38 +41 @@
          */
         public JoinedPolygon(Way way) {
-            this.ways = Collections.singletonList(way);
-            this.reversed = Collections.singletonList(Boolean.FALSE);
-            this.nodes = this.getNodes();
-        }
-
+            this(Collections.singletonList(way), Collections.singletonList(Boolean.FALSE));
+        }
 
         /**
@@ -233 +233 @@
                 }
 
-                PolygonIntersection intersection = Geometry.polygonIntersection(outerWay.nodes, innerWay.nodes);
+                PolygonIntersection intersection = Geometry.polygonIntersection(outerWay.area, innerWay.area);
 
                 if (intersection == PolygonIntersection.FIRST_INSIDE_SECOND) {