Changeset 15447 in josm

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• gui/download/OverpassDownloadSource.java (modified) (2 diffs)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/OverpassDownloadReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -477 +477 @@
                     rememberErrorMessage(remark);
                 }
-                // need to synthesize a download bounds lest the visual indication of downloaded area doesn't work
-                dataSet.addDataSource(new DataSource(currentBounds != null ? currentBounds :
-                    new Bounds(LatLon.ZERO), "OpenStreetMap server"));
+                if (!(reader instanceof BoundingBoxDownloader)
+                        || ((BoundingBoxDownloader) reader).considerAsFullDownload()) {
+                    // need to synthesize a download bounds lest the visual indication of downloaded area doesn't work
+                    dataSet.addDataSource(new DataSource(
+                            currentBounds != null ? currentBounds : new Bounds(LatLon.ZERO), "OpenStreetMap server"));
+                }
             }
 

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;

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -256 +256 @@
         }
     }
+
+    /**
+     * @return true if download is complete for the given bounding box (not filtered)
+     */
+    public boolean considerAsFullDownload() {
+        return true;
+    }
+
 }

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -36 +37 @@
 import org.openstreetmap.josm.data.preferences.ListProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.gui.download.OverpassDownloadSource;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.NameFinder.SearchResult;
@@ -385 +387 @@
 
         DataSet ds = super.parseOsm(progressMonitor);
-
-        // add bounds if necessary (note that Overpass API does not return bounds in the response XML)
-        if (ds != null && ds.getDataSources().isEmpty() && overpassQuery.contains("{{bbox}}")) {
-            if (crosses180th) {
-                Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0);
-                DataSource src = new DataSource(bounds, getBaseUrl());
-                ds.addDataSource(src);
-
-                bounds = new Bounds(lat1, -180.0, lat2, lon2);
-                src = new DataSource(bounds, getBaseUrl());
-                ds.addDataSource(src);
-            } else {
-                Bounds bounds = new Bounds(lat1, lon1, lat2, lon2);
-                DataSource src = new DataSource(bounds, getBaseUrl());
-                ds.addDataSource(src);
-            }
-        }
-
-        return ds;
+        if (!considerAsFullDownload()) {
+            DataSet noBounds = new DataSet();
+            DataSetMerger dsm = new DataSetMerger(noBounds, ds);
+            dsm.merge(null, false);
+            return dsm.getTargetDataSet();
+        } else {
+            // add bounds if necessary (note that Overpass API does not return bounds in the response XML)
+            if (ds != null && ds.getDataSources().isEmpty() && overpassQuery.contains("{{bbox}}")) {
+                if (crosses180th) {
+                    Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0);
+                    DataSource src = new DataSource(bounds, getBaseUrl());
+                    ds.addDataSource(src);
+
+                    bounds = new Bounds(lat1, -180.0, lat2, lon2);
+                    src = new DataSource(bounds, getBaseUrl());
+                    ds.addDataSource(src);
+                } else {
+                    Bounds bounds = new Bounds(lat1, lon1, lat2, lon2);
+                    DataSource src = new DataSource(bounds, getBaseUrl());
+                    ds.addDataSource(src);
+                }
+            }
+            return ds;
+        }
     }
 
@@ -417 +424 @@
                 .replaceAll("(?s)\\[out:(csv)[^\\]]*\\]", "[out:xml]");
     }
+
+    @Override
+    public boolean considerAsFullDownload() {
+        return overpassQuery.equals(OverpassDownloadSource.FULL_DOWNLOAD_QUERY);
+    }
 }