Changeset 15447 in josm for trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java

Timestamp:

2019-10-10T12:05:16+02:00 (5 years ago)

Author:

GerdP

Message:

see #18122: Don't set download bounds for incomplete Overpass queries
apply 18122-v1.patch so that Overpass queries don't set download bounds unless they are detected to return a complete result. For now, this is only detected when the user query is empty or just a comment.
TODO: This detection should also detect user written queries which return complete data

File:

• trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java

@@ -52 +52 @@
  */
 public class OverpassDownloadSource implements DownloadSource<OverpassDownloadSource.OverpassDownloadData> {
+    /** Overpass query to retrieve all nodes and related parent objects, */
+    public static final String FULL_DOWNLOAD_QUERY = "[out:xml]; \n"
+            + "(\n"
+            + "    node({{bbox}});\n"
+            + "<;\n"
+            + ");\n"
+            + "(._;>;);"
+            + "out meta;";
 
     @Override
@@ -249 +257 @@
                         JOptionPane.YES_OPTION);
                 if (doFix) {
-                    String repairedQuery = "[out:xml]; \n"
-                            + query + "\n"
-                            + "(\n"
-                            + "    node({{bbox}});\n"
-                            + "<;\n"
-                            + ");\n"
-                            + "(._;>;);"
-                            + "out meta;";
-                    this.overpassQuery.setText(repairedQuery);
+                    this.overpassQuery.setText(FULL_DOWNLOAD_QUERY);
                 } else {
                     return false;