Changeset 7422 in josm for trunk/src/org

Timestamp:

2014-08-16T18:10:32+02:00 (10 years ago)

Author:

Don-vip

Message:

see #9680 - small multipolygon computation optimization (reduces time from 26s to 19s) + fix bug in validator preferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/MultipolygonBuilder.java (modified) (4 diffs)
• gui/preferences/validator/ValidatorTestsPreference.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Rectangle;
 import java.awt.geom.Area;
 import java.util.ArrayList;
@@ -32 +33 @@
         public final List<Node> nodes;
         public final Area area;
+        public final Rectangle bounds;
 
         /**
@@ -42 +44 @@
             this.nodes = this.getNodes();
             this.area = Geometry.getArea(nodes);
+            this.bounds = area.getBounds();
         }
 
@@ -275 +278 @@
                 }
 
-                PolygonIntersection intersection = Geometry.polygonIntersection(outerWay.area, innerWay.area);
-
-                if (intersection == PolygonIntersection.FIRST_INSIDE_SECOND) {
-                    outerGood = false;  // outer is inside another polygon
-                    break;
-                } else if (intersection == PolygonIntersection.SECOND_INSIDE_FIRST) {
-                    innerCandidates.add(innerWay);
-                } else if (intersection == PolygonIntersection.CROSSING) {
-                    //ways intersect
-                    return null;
+                // Preliminary computation on bounds. If bounds do not intersect, no need to do a costly area intersection
+                if (outerWay.bounds.intersects(innerWay.bounds)) {
+                    // Bounds intersection, let's see in detail
+                    PolygonIntersection intersection = Geometry.polygonIntersection(outerWay.area, innerWay.area);
+
+                    if (intersection == PolygonIntersection.FIRST_INSIDE_SECOND) {
+                        outerGood = false;  // outer is inside another polygon
+                        break;
+                    } else if (intersection == PolygonIntersection.SECOND_INSIDE_FIRST) {
+                        innerCandidates.add(innerWay);
+                    } else if (intersection == PolygonIntersection.CROSSING) {
+                        //ways intersect
+                        return null;
+                    }
                 }
             }

trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreference.java

@@ -44 +44 @@
         }
     }
-    
+
     private JCheckBox prefUseIgnore;
     private JCheckBox prefUseLayer;
@@ -92 +92 @@
             test.addGui(testPanel);
         }
-        
+
         gui.getValidatorPreference().addSubTab(this, tr("Tests"),
                 GuiHelper.embedInVerticalScrollPane(testPanel),
@@ -105 +105 @@
         for (Test test : allTests) {
             test.ok();
-            String name = test.getClass().getSimpleName();
+            String name = test.getClass().getName();
             if(!test.enabled)
                 tests.add(name);
@@ -111 +111 @@
                 testsBeforeUpload.add(name);
         }
-        
+
         // Initializes all tests but MapCSSTagChecker because it is initialized
         // later in ValidatorTagCheckerRulesPreference.ok(),