Changeset 15811 in josm for trunk/test/unit/org

Timestamp:

2020-02-03T06:35:22+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18566: Download object: member of relations always downloaded (18566.3.patch)

• return same result when downloading objects, no matter if overpass api is enabled or not.
• fix an EDT violation in class ChildRelationBrowser
• let MultiFetchOverpassObjectReader create a single overpass query, no matter how many objects are requested

(gives much better reaction times).

• use multi-fetch in ChildRelationBrowser to reduce duplicated code. Small disadvantage: When downloading multiple members of a relation the dialog doesn't update after each member. Should not matter much as the overall time for multiple members is shorter

I tried to keep the code backward compatible. Plugins reverter and undelete should continue to work.

File:

• trunk/test/unit/org/openstreetmap/josm/io/MultiFetchOverpassObjectReaderTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/io/MultiFetchOverpassObjectReaderTest.java

@@ -5 +5 @@
 
 import java.util.Arrays;
-import java.util.TreeSet;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -30 +31 @@
      */
     @Test
-    public void testBuildRequestString() {
-        String requestString = new MultiFetchOverpassObjectReader()
-                .buildRequestString(OsmPrimitiveType.WAY, new TreeSet<>(Arrays.asList(130L, 123L, 126L)));
-        assertEquals("interpreter?data=" + Utils.encodeUrl("(way(123);>;way(126);>;way(130);>;);out meta;"), requestString);
+    public void testBuildRequestWaysString() {
+        MultiFetchOverpassObjectReader reader = new MultiFetchOverpassObjectReader();
+        reader.append(Arrays.asList(new Way(123), new Way(126), new Way(130)));
+        String requestString = reader.buildComplexRequestString();
+        assertEquals("(way(id:123,126,130);>;);out meta;", requestString);
+    }
+
+    /**
+     * Test {@link MultiFetchOverpassObjectReader#buildRequestString}
+     */
+    @Test
+    public void testBuildRequestRelationsString() {
+        MultiFetchOverpassObjectReader reader = new MultiFetchOverpassObjectReader();
+        reader.append(Arrays.asList(new Relation(123), new Relation(126), new Relation(130)));
+        reader.setRecurseDownRelations(true);
+        String requestString = reader.buildComplexRequestString();
+        assertEquals("relation(id:123,126,130);>>;out meta;", requestString);
+        reader.setRecurseDownRelations(false);
+        requestString = reader.buildComplexRequestString();
+        assertEquals("relation(id:123,126,130);out meta;", requestString);
+    }
+
+    /**
+     * Test {@link MultiFetchOverpassObjectReader#buildRequestString}
+     */
+    @Test
+    public void testBuildComplexString() {
+        MultiFetchOverpassObjectReader reader = new MultiFetchOverpassObjectReader();
+        reader.setRecurseDownRelations(true);
+        reader.append(Arrays.asList(new Relation(123), new Relation(126), new Relation(130), new Way(88), new Way(99),
+                new Node(1)));
+        String requestString = reader.buildComplexRequestString();
+        assertEquals("(relation(id:123,126,130);>>;(way(id:88,99);>;);node(1););out meta;", requestString);
+        reader.setRecurseDownRelations(false);
+        requestString = reader.buildComplexRequestString();
+        assertEquals("(relation(id:123,126,130);(way(id:88,99);>;);node(1););out meta;", requestString);
     }