Changeset 11799 in josm for trunk/src

Timestamp:

2017-03-31T22:46:13+02:00 (7 years ago)

Author:

bastiK

Message:

fix "Area style way is not closed" validation test

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.hasOnlyAreaElemStyle(w)) {
+        if (!w.isArea() && ElemStyles.hasOnlyAreaOrTextStyleElements(w)) {
             List<Node> nodes = w.getNodes();
             if (nodes.isEmpty()) return; // fix zero nodes bug

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

@@ -538 +538 @@
      * @since 7486
      */
-    public static boolean hasOnlyAreaElemStyle(OsmPrimitive p) {
+    public static boolean hasOnlyAreaOrTextStyleElements(OsmPrimitive p) {
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {
@@ -548 +548 @@
             }
             for (StyleElement s : styles) {
-                if (!(s instanceof AreaElement)) {
+                if (!(s instanceof AreaElement || s instanceof TextElement)) {
                     return false;
                 }