Changeset 13335 in josm for trunk

Timestamp:

2018-01-19T20:15:02+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15800 - autofix common issues in overpass queries, like overpass turbo

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java

@@ -192 +192 @@
             };
 
-            return new OverpassDownloadData(query, errorReporter);
+            return new OverpassDownloadData(OverpassDownloadReader.fixQuery(query), errorReporter);
         }
 

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

@@ -394 +394 @@
         return ds;
     }
+
+    /**
+     * Fixes Overpass API query to make sure it will be accepted by JOSM.
+     * @param query Overpass query to check
+     * @return fixed query
+     * @since 13335
+     */
+    public static String fixQuery(String query) {
+        return query.replaceFirst("out( body| skel| ids)?( id| qt)?;", "out meta$2;");
+    }
 }

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

@@ -175 +175 @@
                 "out meta;").matches());
     }
+
+    /**
+     * Test {@link OverpassDownloadReader#fixQuery(String)}.
+     */
+    @Test
+    public void testFixQuery() {
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out;"));
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out body;"));
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out skel;"));
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out ids;"));
+
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out id;"));
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out body id;"));
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out skel id;"));
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out ids id;"));
+
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out qt;"));
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out body qt;"));
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out skel qt;"));
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out ids qt;"));
+
+        assertEquals("[timeout:25];\n" +
+                "(\n" +
+                "  node[\"historic\"=\"ringfort\"];\n" +
+                "  way[\"historic\"=\"ringfort\"];\n" +
+                ");\n" +
+                "out meta;",
+            OverpassDownloadReader.fixQuery("[timeout:25];\n" +
+                "(\n" +
+                "  node[\"historic\"=\"ringfort\"];\n" +
+                "  way[\"historic\"=\"ringfort\"];\n" +
+                ");\n" +
+                "out body;"));
+    }
 }