Changeset 30162 in osm for applications/editors

Timestamp:

2014-01-01T14:26:21+01:00 (11 years ago)

Author:

simon04

Message:

JOSM/mirrored_download: apply URL encoding hack which has been removed from core (see #josm8566)

Location:

applications/editors/josm/plugins/mirrored_download

Files:

• build.xml (modified) (1 diff)
• src/mirrored_download/MirroredDownloadAction.java (modified) (1 diff)

applications/editors/josm/plugins/mirrored_download/build.xml

@@ -5 +5 @@
     <property name="commit.message" value=""/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="6589"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadAction.java

@@ -56 +56 @@
             dialog.rememberSettings();
             Bounds area = dialog.getSelectedDownloadArea();
-            DownloadOsmTask task = new DownloadOsmTask();
+            DownloadOsmTask task = new DownloadOsmTask() {
+
+                protected final String encodePartialUrl(String url, String safePart) {
+                    if (url != null && safePart != null) {
+                        int pos = url.indexOf(safePart);
+                        if (pos > -1) {
+                            pos += safePart.length();
+                            try {
+                                return url.substring(0, pos) + URLEncoder.encode(url.substring(pos), "UTF-8").replaceAll("\\+", "%20");
+                            } catch (UnsupportedEncodingException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                    return url;
+                }
+
+                @Override
+                protected String modifyUrlBeforeLoad(String url) {
+                    if (url.matches(PATTERN_OVERPASS_API_URL)) {
+                        return encodePartialUrl(url, "/interpreter?data="); // encode only the part after the = sign
+                    } else if (url.matches(PATTERN_OVERPASS_API_XAPI_URL)) {
+                        return encodePartialUrl(url, "/xapi?"); // encode only the part after the ? sign
+                    } else {
+                        return url;
+                    }
+                }
+
+            };
             Future<?> future = task.download(
                     new MirroredDownloadReader(area, dialog.getOverpassType(), dialog.getOverpassQuery()),