Changeset 16606 in josm for trunk/src

Timestamp:

2020-06-11T20:03:41+02:00 (4 years ago)

Author:

simon04

Message:

see #19320 - Fix URL encoding for taghistory.raifer.tech

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TaginfoAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TaginfoAction.java

@@ -74 +74 @@
             if (tagTable.getSelectedRowCount() == 1) {
                 final int row = tagTable.getSelectedRow();
-                final String key = Utils.encodeUrl(tagKeySupplier.apply(row)).replaceAll("\\+", "%20");
+                final String key = tagKeySupplier.apply(row);
                 Map<String, Integer> values = tagValuesSupplier.apply(row);
                 String value = values.size() == 1 ? values.keySet().iterator().next() : null;
@@ -112 +112 @@
     public String getTaginfoUrlForTag(Tag tag) {
         if (tag.getValue().isEmpty()) {
-            return taginfoUrl + "/keys/" + tag.getKey();
+            return taginfoUrl + "/keys/" + encodeKeyValue(tag.getKey());
         } else {
-            return taginfoUrl + "/tags/" + tag.getKey() + '=' + Utils.encodeUrl(tag.getValue()).replaceAll("\\+", "%20");
+            return taginfoUrl + "/tags/" + encodeKeyValue(tag.getKey()) + '=' + encodeKeyValue(tag.getValue());
         }
+    }
+
+    private static String encodeKeyValue(String string) {
+        return Utils.encodeUrl(string).replaceAll("\\+", "%20");
     }