Changeset 16008 in josm for trunk

Timestamp:

2020-03-03T08:00:14+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18835: unexpected full recursive download of children relations makes some edits impossible

• This is a partly revert of r15811 which changed the meaning of "download members" to "download complete members". Now - as before r15811 - only way and node members are completed. This also applies when overpass api is used. For some relations, e.g. 1311341 (the boundary of Spain), the full recursion has to download thousands of sub relations, which is likely to fail.
• Cancel button did not work while relation members were downloaded.

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchOverpassObjectReader.java (modified) (1 diff)
• MultiFetchServerObjectReader.java (modified) (2 diffs)

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

@@ -35 +35 @@
                 case MULTIPOLYGON:
                 case RELATION:
-                    sb.append(list);
-                    if (recurseDownRelations)
-                        sb.append(">>;");
+                    if (recurseDownRelations) {
+                        sb.append('(').append(list);
+                        sb.setLength(sb.length()-1); // remove semicolon
+                        //recurse down only one level, see #18835
+                        sb.append("->.r;.r;rel(r);.r;way(r);>;.r;node(r););");
+                    } else {
+                        sb.append(list);
+                    }
                     break;
                 case CLOSEDWAY:

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

@@ -446 +446 @@
             return;
         }
-        // OSM multi-fetch api may return invisible objects
+        // OSM multi-fetch api may return invisible objects, we don't try to get details for them
         for (Relation r : outputDataSet.getRelations()) {
             if (!r.isVisible())
                 toDownload.remove(r.getUniqueId());
         }
-        while (!toDownload.isEmpty()) {
+        // fetch full info for all visible relations
+        for (long id : toDownload) {
             if (isCanceled())
                 return;
-            final Set<Long> addedRelations = new LinkedHashSet<>();
-
-            for (long id : toDownload) {
-                OsmServerObjectReader reader = new OsmServerObjectReader(id, OsmPrimitiveType.RELATION, true /* full*/);
-                DataSet ds = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
-                if (ds != null) {
-                    ds.getRelations().stream().map(OsmPrimitive::getUniqueId).filter(uid -> uid != id)
-                            .forEach(addedRelations::add);
-                }
-                merge(ds);
-            }
-            if (addedRelations.isEmpty())
-                break;
-            toDownload = addedRelations;
+            OsmServerObjectReader reader = new OsmServerObjectReader(id, OsmPrimitiveType.RELATION, true/* full*/);
+            DataSet ds = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
+            merge(ds);
         }
     }
@@ -484 +474 @@
     /**
      * Should downloaded relations be complete?
-     * @param recurseDownRelations true: yes, recurse down to retrieve the complete relation
+     * @param recurseDownRelations true: yes, recurse down to retrieve the members of the relation
+     * This will download sub relations, complete way members and nodes. Members of sub relations are not
+     * retrieved unless they are also members of the relations. See #18835.
      * @return this
      * @since 15811