Merge pull request #57 from GIScience/fix/multiple_vehicle_access_res…

…trictions Methods for handling OSM tags containing enumerations
GIScience · Feb 23, 2023 · 4d3c5e7 · 4d3c5e7
2 parents 74aba0c + 286265c
commit 4d3c5e7
Showing 1 changed file with 36 additions and 2 deletions.
diff --git a/core/src/main/java/com/graphhopper/reader/ReaderElement.java b/core/src/main/java/com/graphhopper/reader/ReaderElement.java
@@ -103,6 +103,19 @@ public String getTag(String name) {
         return (String) properties.get(name);
     }
 
+    // ORS-GH MOD START - account for enumerations of multiple values
+    public String [] getTagValues(String name) {
+        String tagValue = getTag(name);
+        if (tagValue==null)
+            return new String[0];
+
+        String [] tagValues = {tagValue};
+        if (tagValue.contains(";"))
+            tagValues = tagValue.split(";");
+        return tagValues;
+    }
+    // ORS-GH MOD END
+
     @SuppressWarnings("unchecked")
     public <T> T getTag(String key, T defaultValue) {
         T val = (T) properties.get(key);
@@ -146,7 +159,14 @@ public boolean hasTag(String key, String... values) {
      * Check that a given tag has one of the specified values.
      */
     public final boolean hasTag(String key, Set<String> values) {
-        return values.contains(getTag(key, ""));
+        // ORS-GH MOD START - account for enumerations of multiple values
+        String [] tagValues = getTagValues(key);
+        for (String tagValue: tagValues) {
+            if (values.contains(tagValue))
+                return true;
+        }
+        return false;
+        // ORS-GH MOD END
     }
 
     /**
@@ -155,7 +175,10 @@ public final boolean hasTag(String key, Set<String> values) {
      */
     public boolean hasTag(List<String> keyList, Set<String> values) {
         for (String key : keyList) {
-            if (values.contains(getTag(key, "")))
+            // ORS-GH MOD START
+            //if (values.contains(getTag(key, "")))
+            if (hasTag(key, values))
+            // ORS-GH MOD END
                 return true;
         }
         return false;
@@ -172,6 +195,17 @@ public String getFirstPriorityTag(List<String> restrictions) {
         return "";
     }
 
+    // ORS-GH MOD START - account for enumerations of multiple values
+    public String [] getFirstPriorityTagValues(List<String> restrictions) {
+        String [] empty = {};
+        for (String str : restrictions) {
+            if (hasTag(str))
+                return getTagValues(str);
+        }
+        return empty;
+    }
+    // ORS-GH MOD END
+
     public void removeTag(String name) {
         properties.remove(name);
     }