Changeset 15359 in josm for trunk

Timestamp:

2019-09-19T13:13:01+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17058, fix #18097 - fix MapCSSTagChecker.getLocation

Location:

trunk

Files:

• data/validator/territories.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/DefaultGeoProperty.java (modified) (3 diffs)

trunk/data/validator/territories.mapcss

@@ -41 +41 @@
   throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
   group: tr("Airport tagging");
-  /* assertNoMatch: "way aeroway=aerodrome faa=OK12"; not properly working due to inside() */
-  /* assertMatch: "way aeroway=aerodrome faa=ORD"; */
+  assertNoMatch: "way aeroway=aerodrome faa=OK12";
+  assertMatch: "way aeroway=aerodrome faa=ORD";
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Rectangle;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -898 +897 @@
                 GeoProperty<Boolean> prop = index.getGeoProperty();
                 if (prop instanceof DefaultGeoProperty) {
-                    Rectangle bounds = ((DefaultGeoProperty) prop).getArea().getBounds();
-                    return new LatLon(bounds.getCenterY(), bounds.getCenterX());
+                    return ((DefaultGeoProperty) prop).getRandomLatLon();
                 }
             }

trunk/src/org/openstreetmap/josm/tools/DefaultGeoProperty.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.awt.Rectangle;
 import java.awt.geom.Area;
 import java.awt.geom.Path2D;
@@ -17 +18 @@
 
     private final Area area;
+    private LatLon random;
 
     /**
@@ -68 +70 @@
         return area;
     }
+
+    /**
+     * Returns a random lat/lon in the area.
+     * @return a random lat/lon in the area
+     * @since 15359
+     */
+    public final synchronized LatLon getRandomLatLon() {
+        if (random == null) {
+            Rectangle r = area.getBounds();
+            double x, y;
+            do {
+                x = r.getX() + r.getWidth() * Math.random();
+                y = r.getY() + r.getHeight() * Math.random();
+            } while (!area.contains(x, y));
+
+            random = new LatLon(y, x);
+        }
+        return random;
+    }
 }