Changeset 29365 in osm for applications/editors/josm/plugins/mirrored_download/src

Timestamp:

2013-03-15T18:42:29+01:00 (12 years ago)

Author:

roland

Message:

Fixed UTF8 character bug.

File:

• applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadAction.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.GridBagConstraints;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.LinkedList;
 import java.util.concurrent.Future;
@@ -160 +161 @@
         @Override
         protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) {
-            return overpassQuery.isEmpty() && "*".equals(overpassType)
-                    ? super.getRequestForBbox(lon1, lat1, lon2, lat2)
-                    : overpassType + "[bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2 + "]"
-                        + (MirroredDownloadPlugin.getAddMeta() ? "[@meta]" : "") + overpassQuery;
+            if (overpassQuery.isEmpty() && "*".equals(overpassType))
+                return super.getRequestForBbox(lon1, lat1, lon2, lat2);
+            else
+            {
+                if (MirroredDownloadPlugin.getAddMeta())
+                {
+                    // Overpass compatibility layer
+                    String url = overpassType + "[bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2 + "]"
+                        + "[@meta]" + overpassQuery;
+                    try
+                    {
+                        url = URLEncoder.encode(url, "UTF-8");
+                    }
+                    catch (UnsupportedEncodingException e)
+                    {
+                    }
+                    return url;
+                }
+                else
+                    // Old style XAPI
+                    return overpassType + "[bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2 + "]"
+                        + overpassQuery;
+            }
         }