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

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

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• AbstractPrimitive.java (modified) (5 diffs)
• OsmPrimitive.java (modified) (1 diff)
• Tagged.java (modified) (2 diffs)
• history/HistoryNode.java (modified) (1 diff)
• history/HistoryOsmPrimitive.java (modified) (8 diffs)
• history/HistoryRelation.java (modified) (1 diff)
• history/HistoryWay.java (modified) (1 diff)

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);
+    }
 }

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

@@ -1353 +1353 @@
      */
     public final boolean hasAreaTags() {
-        return hasKey("landuse", "amenity", "leisure", "building", "building:part")
-                || "yes".equals(get("area"))
-                || "riverbank".equals(get("waterway"))
+        return hasKey("landuse", "amenity", "building", "building:part")
+                || hasTag("area", "yes")
+                || hasTag("waterway", "riverbank")
+                || hasTagDifferent("leisure", "picnic_table", "slipway", "firepit")
                 || hasTag("natural", "water", "wood", "scrub", "wetland", "grassland", "heath", "rock", "bare_rock",
                                      "sand", "beach", "scree", "bay", "glacier", "shingle", "fell", "reef", "stone",

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

@@ -4 +4 @@
 import java.util.Collection;
 import java.util.Map;
+
 /**
  * Objects implement Tagged if they provide a map of key/value pairs.
  *
- *
+ * @since 2115
  */
 // FIXME: better naming? setTags(), getTags(), getKeys() instead of keySet() ?
@@ -67 +68 @@
 
     /**
+     * Replies true if there is a tag with key <code>key</code>.
+     *
+     * @param key the key
+     * @return true, if there is a tag with key <code>key</code>
+     * @since 11608
+     */
+    default boolean hasKey(String key) {
+        return get(key) != null;
+    }
+
+    /**
      * Replies the set of keys
      *

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

@@ -10 +10 @@
 
 /**
- * Represents an immutable OSM node in the context of a historical view on
- * OSM data.
- *
+ * Represents an immutable OSM node in the context of a historical view on OSM data.
+ * @since 1670
  */
 public class HistoryNode extends HistoryOsmPrimitive {

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -5 +5 @@
 
 import java.text.MessageFormat;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -19 +20 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
@@ -24 +26 @@
 
 /**
- * Represents an immutable OSM primitive in the context of a historical view on
- * OSM data.
- *
+ * Represents an immutable OSM primitive in the context of a historical view on OSM data.
+ * @since 1670
  */
-public abstract class HistoryOsmPrimitive implements Comparable<HistoryOsmPrimitive> {
+public abstract class HistoryOsmPrimitive implements Tagged, Comparable<HistoryOsmPrimitive> {
 
     private long id;
@@ -38 +39 @@
     private long version;
     private Map<String, String> tags;
-
-    protected final void ensurePositiveLong(long value, String name) {
-        if (value <= 0) {
-            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
-        }
-    }
 
     /**
@@ -119 +114 @@
     }
 
+    /**
+     * Returns the id.
+     * @return the id
+     */
     public long getId() {
         return id;
     }
 
+    /**
+     * Returns the primitive id.
+     * @return the primitive id
+     */
     public PrimitiveId getPrimitiveId() {
         return new SimplePrimitiveId(id, getType());
     }
 
+    /**
+     * Determines if the primitive is still visible.
+     * @return {@code true} if the primitive is still visible
+     */
     public boolean isVisible() {
         return visible;
     }
 
+    /**
+     * Returns the user.
+     * @return the user
+     */
     public User getUser() {
         return user;
     }
 
+    /**
+     * Returns the changeset id.
+     * @return the changeset id
+     */
     public long getChangesetId() {
         return changesetId;
     }
 
+    /**
+     * Returns the timestamp.
+     * @return the timestamp
+     */
     public Date getTimestamp() {
         return timestamp;
     }
 
+    /**
+     * Returns the version.
+     * @return the version
+     */
     public long getVersion() {
         return version;
     }
 
+    protected final void ensurePositiveLong(long value, String name) {
+        if (value <= 0) {
+            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
+        }
+    }
+
     public boolean matches(long id, long version) {
         return this.id == id && this.version == version;
@@ -155 +184 @@
     }
 
+    /**
+     * Returns the primitive type.
+     * @return the primitive type
+     */
     public abstract OsmPrimitiveType getType();
 
@@ -164 +197 @@
     }
 
-    public void put(String key, String value) {
+    @Override
+    public final void put(String key, String value) {
         tags.put(key, value);
     }
 
-    public String get(String key) {
+    @Override
+    public final String get(String key) {
         return tags.get(key);
     }
 
-    public boolean hasTag(String key) {
-        return tags.get(key) != null;
-    }
-
+    @Override
+    public final boolean hasKey(String key) {
+        return tags.containsKey(key);
+    }
+
+    @Override
+    public final Map<String, String> getKeys() {
+        return getTags();
+    }
+
+    @Override
+    public final void setKeys(Map<String, String> keys) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final void remove(String key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final void removeAll() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final boolean hasKeys() {
+        return !tags.isEmpty();
+    }
+
+    @Override
+    public final Collection<String> keySet() {
+        return Collections.unmodifiableSet(tags.keySet());
+    }
+
+    /**
+     * Replies the key/value map.
+     * @return the key/value map
+     */
     public Map<String, String> getTags() {
         return Collections.unmodifiableMap(tags);
@@ -272 +342 @@
     public String toString() {
         return getClass().getSimpleName() + " [version=" + version + ", id=" + id + ", visible=" + visible + ", "
-                + (timestamp != null ? "timestamp=" + timestamp : "") + ", "
-                + (user != null ? "user=" + user + ", " : "") + "changesetId="
+                + (timestamp != null ? ("timestamp=" + timestamp) : "") + ", "
+                + (user != null ? ("user=" + user + ", ") : "") + "changesetId="
                 + changesetId
                 + ']';

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -15 +15 @@
 
 /**
- * Represents an immutable OSM relation in the context of a historical view on
- * OSM data.
- *
+ * Represents an immutable OSM relation in the context of a historical view on OSM data.
+ * @since 1670
  */
 public class HistoryRelation extends HistoryOsmPrimitive {

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -15 +15 @@
 
 /**
- * Represents an immutable OSM way in the context of a historical view on
- * OSM data.
- *
+ * Represents an immutable OSM way in the context of a historical view on OSM data.
+ * @since 1670
  */
 public class HistoryWay extends HistoryOsmPrimitive {