Changeset 16008 in josm for trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java

Timestamp:

2020-03-03T08:00:14+01:00 (6 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.

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java (modified) (1 diff)

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: