Changeset 7486 in josm

Timestamp:

2014-09-02T21:44:12+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10469 - Way tagged aeroway=taxiway causes warning in validator

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (added)

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

@@ -148 +148 @@
     @Override
     public void visit(Way w) {
-        if (!w.isArea() && ElemStyles.hasAreaElemStyle(w, false)) {
+        if (!w.isArea() && ElemStyles.hasOnlyAreaElemStyle(w)) {
             List<Node> nodes = w.getNodes();
             if (nodes.size()<1) return; // fix zero nodes bug

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -472 +472 @@
         return getAreaElemStyle(p, pretendWayIsClosed) != null;
     }
+
+    /**
+     * Determines whether primitive has <b>only</b> an AreaElemStyle.
+     * @param p the OSM primitive
+     * @return {@code true} if primitive has only an AreaElemStyle
+     * @since 7486
+     */
+    public static boolean hasOnlyAreaElemStyle(OsmPrimitive p) {
+        MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
+        try {
+            if (MapPaintStyles.getStyles() == null)
+                return false;
+            StyleList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, null, false).a;
+            if (styles.isEmpty()) {
+                return false;
+            }
+            for (ElemStyle s : styles) {
+                if (!(s instanceof AreaElemStyle)) {
+                    return false;
+                }
+            }
+            return true;
+        } finally {
+            MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();
+        }
+    }
 }