Add match by osm entity Id

Signed-off-by: Holger Bruch <[email protected]>
mfdz · Jun 20, 2024 · cc8b8b2 · cc8b8b2
1 parent ca2669c
commit cc8b8b2
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 16 deletions.
diff --git a/osmosis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/Matcher.java b/osmosis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/Matcher.java
@@ -7,7 +7,7 @@
 
 public interface Matcher {
 
-	Collection<Match> match(Map<String, String> tags, TTEntityType type, String uname, int uid);
+	Collection<Match> match(long id, Map<String, String> tags, TTEntityType type, String uname, int uid);
 
 
 	void outputStats(StringBuilder output, String indent);

diff --git a/osmosis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/Translation.java b/osmosis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/Translation.java
@@ -7,7 +7,7 @@
 
 public interface Translation {
 
-	Collection<Match> match(Map<String, String> tags, TTEntityType entityType, String uname, int uid);
+	Collection<Match> match(long id, Map<String, String> tags, TTEntityType entityType, String uname, int uid);
 
 
 	Map<String, DataSource> getDataSources();

diff --git a/...is-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/AndMatcher.java b/...is-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/AndMatcher.java
@@ -29,8 +29,8 @@ public AndMatcher(Collection<Matcher> matchers, TTEntityType type, String uname,
 
 
 	@Override
-	public Collection<Match> match(Map<String, String> tags, TTEntityType entityType, String entityUname,
-			int entityUid) {
+	public Collection<Match> match(long entityId, Map<String, String> tags, TTEntityType entityType, String entityUname,
+                                   int entityUid) {
 		if (this.type != null && this.type != entityType) {
 			return null;
 		}
@@ -43,7 +43,7 @@ public Collection<Match> match(Map<String, String> tags, TTEntityType entityType
 
 		List<Match> allMatches = new ArrayList<Match>();
 		for (Matcher matcher : matchers) {
-			Collection<Match> matches = matcher.match(tags, entityType, entityUname, entityUid);
+			Collection<Match> matches = matcher.match(entityId, tags, entityType, entityUname, entityUid);
 			if (matches == null || matches.isEmpty()) {
 				return null;
 			}

diff --git a/...sis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/IdMatcher.java b/...sis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/IdMatcher.java
@@ -0,0 +1,80 @@
+// This software is released into the Public Domain.  See copying.txt for details.
+package org.openstreetmap.osmosis.tagtransform.impl;
+
+import org.openstreetmap.osmosis.tagtransform.Match;
+import org.openstreetmap.osmosis.tagtransform.Matcher;
+import org.openstreetmap.osmosis.tagtransform.TTEntityType;
+
+import java.util.*;
+
+
+public class IdMatcher implements Matcher {
+
+	private Set<Long> ids;
+	private long matchHits;
+
+	IdMatcher(Set<Long> ids) {
+		this.ids = ids;
+	}
+
+	@Override
+	public Collection<Match> match(long id, Map<String, String> tags, TTEntityType type, String uname, int uid) {
+		if (!ids.contains(id))  {
+			return null;
+		}
+		matchHits += 1;
+		return Collections.singleton(NULL_MATCH);
+	}
+
+
+	@Override
+	public void outputStats(StringBuilder output, String indent) {
+		output.append(indent);
+		output.append("Ids[");
+		int i = 0;
+		for (Long id: ids) {
+			if (++i>1) {
+				output.append(",");
+			}
+			if (i>5) {
+				output.append("...");
+				break;
+			}
+			output.append(id);
+		}
+		output.append("]: ");
+		output.append(matchHits);
+		output.append('\n');
+	}
+
+	private static final Match NULL_MATCH = new Match() {
+		@Override
+		public int getValueGroupCount() {
+			return 0;
+		}
+
+
+		@Override
+		public String getValue(int group) {
+			return null;
+		}
+
+
+		@Override
+		public String getMatchID() {
+			return null;
+		}
+
+
+		@Override
+		public int getKeyGroupCount() {
+			return 0;
+		}
+
+
+		@Override
+		public String getKey(int group) {
+			return null;
+		}
+	};
+}
diff --git a/...-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/NoTagMatcher.java b/...-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/NoTagMatcher.java
@@ -26,7 +26,7 @@ public NoTagMatcher(String keyPattern, String valuePattern) {
 
 
 	@Override
-	public Collection<Match> match(Map<String, String> tags, TTEntityType type, String uname, int uid) {
+	public Collection<Match> match(long id, Map<String, String> tags, TTEntityType type, String uname, int uid) {
 		// loop through the tags to find matches
 		for (Entry<String, String> tag : tags.entrySet()) {
 			java.util.regex.Matcher keyMatch = keyPattern.matcher(tag.getKey());

diff --git a/...sis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/OrMatcher.java b/...sis-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/OrMatcher.java
@@ -29,8 +29,8 @@ public OrMatcher(Collection<Matcher> matchers, TTEntityType type, String uname,
 
 
 	@Override
-	public Collection<Match> match(Map<String, String> tags, TTEntityType entityType, String entityUname,
-			int entityUid) {
+	public Collection<Match> match(long entityId, Map<String, String> tags, TTEntityType entityType, String entityUname,
+                                   int entityUid) {
 		if (this.type != null && this.type != entityType) {
 			return null;
 		}
@@ -43,7 +43,7 @@ public Collection<Match> match(Map<String, String> tags, TTEntityType entityType
 
 		List<Match> allMatches = new ArrayList<Match>();
 		for (Matcher matcher : matchers) {
-			Collection<Match> matches = matcher.match(tags, entityType, entityUname, entityUid);
+			Collection<Match> matches = matcher.match(entityId, tags, entityType, entityUname, entityUid);
 			if (matches != null) {
 				allMatches.addAll(matches);
 			}

diff --git a/...is-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TagMatcher.java b/...is-tagtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TagMatcher.java
@@ -30,7 +30,7 @@ public TagMatcher(String matchID, String keyPattern, String valuePattern) {
 
 
 	@Override
-	public Collection<Match> match(Map<String, String> tags, TTEntityType type, String uname, int uid) {
+	public Collection<Match> match(long id, Map<String, String> tags, TTEntityType type, String uname, int uid) {
 		List<Match> matches = new ArrayList<Match>();
 
 		// loop through the tags to find matches

diff --git a/...gtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TransformHelper.java b/...gtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TransformHelper.java
@@ -116,6 +116,7 @@ protected EntityContainer processEntityContainer(EntityContainer entityContainer
 		Entity entity = entityContainer.getEntity();
 		Collection<Tag> entityTags = entity.getTags();
 		EntityType entityType = entity.getType();
+		long id = entity.getId();
 
 		// Store the tags in a map keyed by tag key.
 		Map<String, String> tagMap = new HashMap<String, String>();
@@ -125,7 +126,7 @@ protected EntityContainer processEntityContainer(EntityContainer entityContainer
 
 		// Apply tag transformations.
 		for (Translation translation : translations) {
-			Collection<Match> matches = translation.match(tagMap, TTEntityType.fromEntityType06(entityType), entity
+			Collection<Match> matches = translation.match(id, tagMap, TTEntityType.fromEntityType06(entityType), entity
 					.getUser().getName(), entity.getUser().getId());
 			if (matches == null || matches.isEmpty()) {
 				continue;

diff --git a/...gtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TransformLoader.java b/...gtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TransformLoader.java
@@ -5,8 +5,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.xml.parsers.DocumentBuilder;
@@ -162,6 +164,8 @@ private Matcher parseMatcher(Element matcher) {
 			String k = matcher.getAttribute("k");
 			String v = matcher.getAttribute("v");
 			return new NoTagMatcher(k, v);
+		} else if (name.equals("ids")) {
+			return parseIds(matcher);
 		}
 		return null;
 	}
@@ -189,6 +193,23 @@ private Map<String, DataSource> parseDataSources(File parentDir, Element parent)
 		return dataSources;
 	}
 
+	private Matcher parseIds(Element idsElement) {
+		NodeList children = idsElement.getChildNodes();
+		Set<Long> ids = new HashSet<>();
+		for (int i = 0; i < children.getLength(); i++) {
+			if (!(children.item(i) instanceof Element)) {
+				continue;
+			}
+
+			Element element = (Element)children.item(i);
+			if (element.getTagName().equals("id")) {
+				Long id = Long.valueOf(element.getTextContent());
+				ids.add(id);
+			}
+		}
+		return new IdMatcher(ids);
+	}
+
 	private TTEntityType getType(String type) {
 		if (type == null || type.isEmpty() || type.equals("all")) {
 			return null;

diff --git a/...gtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TranslationImpl.java b/...gtransform/src/main/java/org/openstreetmap/osmosis/tagtransform/impl/TranslationImpl.java
@@ -50,14 +50,14 @@ public boolean isDropOnMatch() {
 
 
 	@Override
-	public Collection<Match> match(Map<String, String> tags, TTEntityType type, String uname, int uid) {
-		Collection<Match> matches = matcher.match(tags, type, uname, uid);
+	public Collection<Match> match(long id, Map<String, String> tags, TTEntityType type, String uname, int uid) {
+		Collection<Match> matches = matcher.match(id, tags, type, uname, uid);
 		if (matches != null && !matches.isEmpty()) {
 			Collection<Match> finds;
 			if (finder == null) {
 				finds = null;
 			} else {
-				finds = finder.match(tags, type, uname, uid);
+				finds = finder.match(id, tags, type, uname, uid);
 			}
 			if (finds != null && !finds.isEmpty()) {
 				if (matches instanceof ArrayList) {

diff --git a/osmosis-tagtransform/src/test/resources/data/template/v0_6/test-out.osm b/osmosis-tagtransform/src/test/resources/data/template/v0_6/test-out.osm
@@ -20,7 +20,9 @@
     <tag k="crossing" v="toucan"/>
     <tag k="highway" v="crossing"/>
   </node>
-  <way id="4" version="1" timestamp="2007-01-29T08:48:14Z"/>
+  <way id="4" version="1" timestamp="2007-01-29T08:48:14Z">
+    <tag k="highway" v="secondary"/>
+  </way>
   <way id="5" version="1" timestamp="2007-01-29T08:48:14Z">
     <tag k="highway" v="motorway"/>
   </way>

diff --git a/osmosis-tagtransform/src/test/resources/data/template/v0_6/translation.xml b/osmosis-tagtransform/src/test/resources/data/template/v0_6/translation.xml
@@ -186,5 +186,19 @@
     </output>
   </translation>
  -->
-
+  <translation>
+    <name>Add tag to feature identified by id</name>
+    <description>Add a tag to a specific feature, if it does not exist already</description>
+    <match type="way" mode="and">
+      <ids>
+        <id>4</id>
+        <id>5</id>
+      </ids>
+      <notag k="highway" v=".*"/>
+    </match>
+    <output>
+      <copy-all/>
+      <tag k="highway" v="secondary"/>
+    </output>
+  </translation>
 </translations>