Changeset 9704 in josm

Timestamp:

2016-02-01T16:16:17+01:00 (9 years ago)

Author:

simon04

Message:

fix #12469 - Update overpass wizard code

Location:

trunk

Files:

• data/overpass-turbo-ffs.js (deleted)
• data/overpass-wizard.js (added)
• src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
+
+import org.openstreetmap.josm.Main;
 
 import java.io.IOException;
@@ -6 +8 @@
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
-import java.util.regex.Pattern;
+import java.util.HashMap;
 
 import javax.script.Invocable;
@@ -14 +16 @@
 
 /**
- * Uses <a href="https://github.com/tyrasd/overpass-turbo/">Overpass Turbo</a> query wizard code
+ * Uses <a href="https://github.com/tyrasd/overpass-wizard/">Overpass Turbo query wizard</a> code (MIT Licensed)
  * to build an Overpass QL from a {@link org.openstreetmap.josm.actions.search.SearchAction} like query.
  *
@@ -38 +40 @@
 
     private OverpassTurboQueryWizard() {
-        // overpass-turbo is MIT Licensed
-
         try (final Reader reader = new InputStreamReader(
-                getClass().getResourceAsStream("/data/overpass-turbo-ffs.js"), StandardCharsets.UTF_8)) {
-            engine.eval("var console = {log: function(){}};");
+                getClass().getResourceAsStream("/data/overpass-wizard.js"), StandardCharsets.UTF_8)) {
+            engine.eval("var console = {error: " + Main.class.getCanonicalName() + ".warn};");
+            engine.eval("var global = {};");
             engine.eval(reader);
-            engine.eval("var construct_query = turbo.ffs().construct_query;");
         } catch (ScriptException | IOException ex) {
             throw new RuntimeException("Failed to initialize OverpassTurboQueryWizard", ex);
@@ -58 +58 @@
     public String constructQuery(String search) throws UncheckedParseException {
         try {
-            final Object result = ((Invocable) engine).invokeFunction("construct_query", search);
+            final Object result = ((Invocable) engine).invokeMethod(engine.get("global"),
+                    "overpassWizard", search, new HashMap<String, Object>() {{
+                        put("comment", false);
+                        put("outputFormat", "xml");
+                        put("outputMode", "recursive_meta");
+                    }});
             if (result == Boolean.FALSE) {
                 throw new UncheckedParseException();
             }
             String query = (String) result;
-            query = Pattern.compile("^.*\\[out:json\\]", Pattern.DOTALL).matcher(query).replaceFirst("");
-            query = Pattern.compile("^out.*", Pattern.MULTILINE).matcher(query).replaceAll("out meta;");
-            query = query.replace("({{bbox}})", "");
+            query = query.replace("[bbox:{{bbox}}]", "");
             return query;
         } catch (NoSuchMethodException e) {

trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java

@@ -18 +18 @@
     @BeforeClass
     public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init(true);
+        JOSMFixture.createUnitTestFixture().init(false);
         OverpassTurboQueryWizard.getInstance();
     }
@@ -29 +29 @@
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity=drinking_water");
         assertEquals("" +
-                "[timeout:25];\n" +
-                "// gather results\n" +
+                "[out:xml][timeout:25];\n" +
                 "(\n" +
-                "  // query part for: “amenity=drinking_water”\n" +
                 "  node[\"amenity\"=\"drinking_water\"];\n" +
                 "  way[\"amenity\"=\"drinking_water\"];\n" +
                 "  relation[\"amenity\"=\"drinking_water\"];\n" +
                 ");\n" +
-                "// print results\n" +
-                "out meta;\n" +
-                ">;\n" +
+                "(._;>;);\n" +
                 "out meta;", query);
     }