Changeset 11608 in josm for trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

Timestamp:

2017-02-25T03:14:20+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14402 - add blacklist for leisure area values to avoid false positives - improve globally the detection of keys/tags

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (5 diffs)

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

@@ -706 +706 @@
      * Replies true, if the map of key/value pairs of this primitive is not empty.
      *
-     * @return true, if the map of key/value pairs of this primitive is not empty; false
-     *   otherwise
+     * @return true, if the map of key/value pairs of this primitive is not empty; false otherwise
      */
     @Override
@@ -718 +717 @@
      *
      * @param key the key
-     * @return true, if his primitive has a tag with key <code>key</code>
-     */
+     * @return true, if this primitive has a tag with key <code>key</code>
+     */
+    @Override
     public boolean hasKey(String key) {
         return key != null && indexOfKey(keys, key) >= 0;
@@ -728 +728 @@
      *
      * @param keys the keys
-     * @return true, if his primitive has a tag with any of the <code>keys</code>
+     * @return true, if this primitive has a tag with any of the <code>keys</code>
      * @since 11587
      */
@@ -758 +758 @@
 
     /**
-     * Tests whether this primitive contains a tag consisting of {@code key} and {@code values}.
+     * Tests whether this primitive contains a tag consisting of {@code key} and {@code value}.
      * @param key the key forming the tag.
      * @param value value forming the tag.
-     * @return true iff primitive contains a tag consisting of {@code key} and {@code value}.
+     * @return true if primitive contains a tag consisting of {@code key} and {@code value}.
      */
     public boolean hasTag(String key, String value) {
@@ -781 +781 @@
      * @param key the key forming the tag.
      * @param values one or many values forming the tag.
-     * @return true iff primitive contains a tag consisting of {@code key} and any of {@code values}.
+     * @return true if primitive contains a tag consisting of {@code key} and any of {@code values}.
      */
     public boolean hasTag(String key, Collection<String> values) {
         return values.contains(get(key));
     }
+
+    /**
+     * Tests whether this primitive contains a tag consisting of {@code key} and a value different from {@code value}.
+     * @param key the key forming the tag.
+     * @param value value not forming the tag.
+     * @return true if primitive contains a tag consisting of {@code key} and a value different from {@code value}.
+     * @since 11608
+     */
+    public boolean hasTagDifferent(String key, String value) {
+        String v = get(key);
+        return v != null && !v.equals(value);
+    }
+
+    /**
+     * Tests whether this primitive contains a tag consisting of {@code key} and none of {@code values}.
+     * @param key the key forming the tag.
+     * @param values one or many values forming the tag.
+     * @return true if primitive contains a tag consisting of {@code key} and none of {@code values}.
+     * @since 11608
+     */
+    public boolean hasTagDifferent(String key, String... values) {
+        return hasTagDifferent(key, Arrays.asList(values));
+    }
+
+    /**
+     * Tests whether this primitive contains a tag consisting of {@code key} and none of {@code values}.
+     * @param key the key forming the tag.
+     * @param values one or many values forming the tag.
+     * @return true if primitive contains a tag consisting of {@code key} and none of {@code values}.
+     * @since 11608
+     */
+    public boolean hasTagDifferent(String key, Collection<String> values) {
+        String v = get(key);
+        return v != null && !values.contains(v);
+    }
 }