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

Timestamp:

2013-08-02T17:08:41+02:00 (11 years ago)

Author:

roland

Message:

Added support for Global Bboxes in Overpass queries.

File:

• applications/editors/josm/plugins/mirrored_download/src/mirrored_download/OverpassDownloadAction.java (modified) (1 diff)

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

@@ -110 +110 @@
                 return url;
         }
+        
+        private String completeOverpassQuery(String query)
+        {
+            int firstColon = query.indexOf(";");
+            if (firstColon == -1)
+                return "[bbox];" + query;
+            int bboxPos = query.indexOf("[bbox");
+            if (bboxPos > -1 && bboxPos < firstColon)
+                return query;
+                
+            int bracketCount = 0;
+            int pos = 0;
+            for (; pos < firstColon; ++pos)
+            {
+                if (query.charAt(pos) == '[')
+                    ++bracketCount;
+                else if (query.charAt(pos) == '[')
+                    --bracketCount;
+                else if (bracketCount == 0)
+                {
+                    if (!Character.isWhitespace(query.charAt(pos)))
+                        break;
+                }
+            }
+            
+            if (pos < firstColon)
+                // We start with a statement, not with declarations
+                return "[bbox];" + query;
+                
+            // We start with declarations. Add just one more declaration in this case.
+            return "[bbox]" + query;
+        }
 
         @Override
         protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) {
             if (overpassQuery.isEmpty())
-                return "xapi?" + super.getRequestForBbox(lon1, lat1, lon2, lat2);
+                return "" + super.getRequestForBbox(lon1, lat1, lon2, lat2);
             else
             {
-                String url = "interpreter?data=" + overpassQuery + "&bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
-                    
+                String realQuery = completeOverpassQuery(overpassQuery);
+                String url = "interpreter?data=" + realQuery + "&bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
                 try
                 {
-                    url = "interpreter?data=" + URLEncoder.encode(overpassQuery, "UTF-8") + "&bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
+                    url = "interpreter?data=" + URLEncoder.encode(realQuery, "UTF-8") + "&bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
                 }
                 catch (UnsupportedEncodingException e) {}