Changeset 12700 in josm for trunk/src

Timestamp:

2017-08-30T23:25:16+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #15203 - Wrong "Area style way is not closed" message for highway=motorway_junction

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• gui/mappaint/ElemStyles.java (modified) (2 diffs)

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

@@ -114 +114 @@
     @Override
     public void visit(Way w) {
-        if (!w.isArea() && ElemStyles.hasOnlyAreaOrTextStyleElements(w)) {
+        if (!w.isArea() && ElemStyles.hasOnlyAreaElements(w)) {
             List<Node> nodes = w.getNodes();
             if (nodes.isEmpty()) return; // fix zero nodes bug

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

@@ -515 +515 @@
 
     /**
-     * Determines whether primitive has <b>only</b> an AreaElement.
+     * Determines whether primitive has area-type {@link StyleElement}s, but
+     * no line-type StyleElements.
+     * 
+     * {@link TextElement} is ignored, as it can be both line and area-type.
      * @param p the OSM primitive
-     * @return {@code true} if primitive has only an AreaElement
-     * @since 7486
-     */
-    public static boolean hasOnlyAreaOrTextStyleElements(OsmPrimitive p) {
+     * @return {@code true} if primitive has area elements, but no line elements
+     * @since 12700
+     */
+    public static boolean hasOnlyAreaElements(OsmPrimitive p) {
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {
@@ -526 +529 @@
                 return false;
             StyleElementList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, false).a;
-            if (styles.isEmpty()) {
-                return false;
-            }
+            boolean hasAreaElement = false;
             for (StyleElement s : styles) {
-                if (!(s instanceof AreaElement || s instanceof TextElement)) {
+                if (s instanceof TextElement) {
+                    continue;
+                }
+                if (s instanceof AreaElement) {
+                    hasAreaElement = true;
+                } else {
                     return false;
                 }
             }
-            return true;
+            return hasAreaElement;
         } finally {
             MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();