Changeset 9325 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-01-05T23:48:02+01:00 (9 years ago)

Author:

simon04

Message:

see #7670 fix #7647 - Fetching objects via Overpass API recurses down

Thus, there is no need for separately querying way nodes, or relation members.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/UpdatePrimitivesTask.java (modified) (3 diffs)
• io/MultiFetchOverpassObjectReader.java (modified) (1 diff)
• io/MultiFetchServerObjectReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java

@@ -92 +92 @@
             if (primitive instanceof Node && !primitive.isNew()) {
                 reader.append(primitive);
-            } else if (primitive instanceof Way) {
-                Way way = (Way) primitive;
-                for (Node node: way.getNodes()) {
-                    if (!node.isNew()) {
-                        reader.append(node);
-                    }
-                }
             }
         }
@@ -107 +100 @@
         for (OsmPrimitive primitive : toUpdate) {
             if (primitive instanceof Way && !primitive.isNew()) {
+                // this also adds way nodes
                 reader.append(primitive);
             }
@@ -116 +110 @@
         for (OsmPrimitive primitive : toUpdate) {
             if (primitive instanceof Relation && !primitive.isNew()) {
+                // this also adds relation members
                 reader.append(primitive);
             }

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

@@ -31 +31 @@
         return OverpassServerPreference.getOverpassServer();
     }
+
+    @Override
+    protected boolean recursesDown() {
+        // see https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL#Recurse_down_.28.3E.29 for documentation
+        // accomplished using >; in the query string above
+        return true;
+    }
 }

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

@@ -171 +171 @@
         if (way == null) return this;
         if (way.isNew()) return this;
-        for (Node node: way.getNodes()) {
+        for (Node node: !recursesDown() ? way.getNodes() : Collections.<Node>emptyList()) {
             if (!node.isNew()) {
                 remember(node.getPrimitiveId());
@@ -190 +190 @@
         if (relation.isNew()) return this;
         remember(relation.getPrimitiveId());
-        for (RelationMember member : relation.getMembers()) {
+        for (RelationMember member : !recursesDown() ? relation.getMembers() : Collections.<RelationMember>emptyList()) {
             if (OsmPrimitiveType.from(member.getMember()).equals(OsmPrimitiveType.RELATION)) {
                 // avoid infinite recursion in case of cyclic dependencies in relations
@@ -403 +403 @@
     public Set<PrimitiveId> getMissingPrimitives() {
         return missingPrimitives;
+    }
+
+    /**
+     * Whether this reader fetches nodes when loading ways, or members when loading relations.
+     *
+     * @return {@code true} if the reader recurses down
+     */
+    protected boolean recursesDown() {
+        return false;
     }