Use TemplateLibrary.generateI18N for street names

opentripplanner · Feb 12, 2015 · a608107 · a608107
1 parent 9f25cb2
commit a608107
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java
@@ -17,6 +17,8 @@ the License, or (at your option) any later version.
 
 import java.util.HashMap;
 import java.util.Map;
+
+import org.opentripplanner.graph_builder.impl.osm.TemplateLibrary;
 import org.opentripplanner.util.I18NString;
 import org.opentripplanner.util.NonLocalizedString;
 import org.opentripplanner.util.TranslatedString;
@@ -147,7 +149,7 @@ public Boolean isTag(String tag, String value) {
      */
     public I18NString getAssumedName() {
         if (_tags.containsKey("name"))
-            return TranslatedString.getI18NString(getTagsByPrefix("name", true));
+            return TranslatedString.getI18NString(TemplateLibrary.generateI18N("{name}", this));
 
         if (_tags.containsKey("otp:route_name"))
             return new NonLocalizedString(_tags.get("otp:route_name"));
@@ -165,23 +167,11 @@ public I18NString getAssumedName() {
     }
 
     public Map<String, String> getTagsByPrefix(String prefix) {
-        return getTagsByPrefix(prefix, false);
-    }
-
-    private Map<String, String> getTagsByPrefix(String prefix, boolean removePrefix) {
         Map<String, String> out = new HashMap<String, String>();
         for (Map.Entry<String, String> entry : _tags.entrySet()) {
             String k = entry.getKey();
             if (k.equals(prefix) || k.startsWith(prefix + ":")) {
-                if (removePrefix){
-                    if (k.equals(prefix)){
-                        out.put(null, entry.getValue());
-                    } else{
-                        out.put(k.replaceFirst(prefix + ":", ""), entry.getValue());
-                    }
-                } else {
-                    out.put(k, entry.getValue());
-                }
+                out.put(k, entry.getValue());
             }
         }