Changeset 13195 in josm for trunk

Timestamp:

2017-12-06T18:55:54+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15641 - avoid CCE in MapCSSTagChecker

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (1 diff)

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

@@ -24 +24 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -311 +312 @@
                     try {
                         final String val = ai.val instanceof Expression
-                                ? (String) ((Expression) ai.val).evaluate(new Environment())
+                                ? Optional.of(((Expression) ai.val).evaluate(new Environment())).map(Object::toString).orElse(null)
                                 : ai.val instanceof String
                                 ? (String) ai.val

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -263 +263 @@
         doTestNaturalWood(14289, "example2.osm", 3, 3);
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/15641">Bug #15641</a>.
+     * @throws ParseException if an error occurs
+     */
+    @Test
+    public void testTicket15641() throws ParseException {
+        assertNotNull(buildTagChecker(
+                "relation[type=public_transport][public_transport=stop_area_group] > way {" +
+                "  throwWarning: eval(count(parent_tags(public_transport)));" +
+                "}"));
+    }
 }