Changeset 13430 in josm for trunk

Timestamp:

2018-02-17T15:40:42+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15943 - allow to search empty values

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/Tagged.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Tagged.java

@@ -76 +76 @@
     /**
      * Replies true if there is a tag with key <code>key</code>.
+     * The value could however be empty. See {@link #hasTag(String)} to check for non-empty tags.
      *
      * @param key the key
      * @return true, if there is a tag with key <code>key</code>
+     * @see #hasTag(String)
      * @since 11608
      */
     default boolean hasKey(String key) {
         return get(key) != null;
+    }
+
+    /**
+     * Replies true if there is a non-empty tag with key <code>key</code>.
+     *
+     * @param key the key
+     * @return true, if there is a non-empty tag with key <code>key</code>
+     * @see Tagged#hasKey(String)
+     * @since 13430
+     */
+    default boolean hasTag(String key) {
+        String v = get(key);
+        return v != null && !v.isEmpty();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -836 +836 @@
                 return false;
             case MISSING_KEY:
-                return osm.get(key) == null;
+                return !osm.hasTag(key);
             case ANY:
                 return true;
             case ANY_VALUE:
-                return osm.get(key) != null;
+                return osm.hasTag(key);
             case ANY_KEY:
                 for (String v:osm.getKeys().values()) {

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -496 +496 @@
 
     /**
+     * Test empty values.
+     * @throws SearchParseError never
+     */
+    @Test
+    public void testEmptyValues15943() throws SearchParseError {
+        Match matcher = SearchCompiler.compile("access=");
+        assertTrue(matcher.match(new Tag("access", null)));
+        assertTrue(matcher.match(new Tag("access", "")));
+        assertFalse(matcher.match(new Tag("access", "private")));
+    }
+
+    /**
      * Unit test of {@link SearchCompiler.ExactKeyValue.Mode} enum.
      */
@@ -562 +574 @@
     }
 
-
     /**
      * Ensures that correct presets are stored in the {@link org.openstreetmap.josm.data.osm.search.SearchCompiler.Preset}