Changeset 9856 in josm for trunk/src/org

Timestamp:

2016-02-23T13:29:54+01:00 (8 years ago)

Author:

simon04

Message:

fix #12547 see #12469 - Fix Overpass API "Build query" for Java 7

File:

• trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java (modified) (4 diffs)

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

@@ -3 +3 @@
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.Reader;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 
 import javax.script.Invocable;
@@ -14 +11 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.CachedFile;
 
 /**
@@ -40 +38 @@
 
     private OverpassTurboQueryWizard() {
-        try (final Reader reader = new InputStreamReader(
-                getClass().getResourceAsStream("/data/overpass-wizard.js"), StandardCharsets.UTF_8)) {
+
+        try (final CachedFile file = new CachedFile("resource://data/overpass-wizard.js");
+             final Reader reader = file.getContentReader()) {
             engine.eval("var console = {error: " + Main.class.getCanonicalName() + ".warn};");
             engine.eval("var global = {};");
             engine.eval(reader);
+            engine.eval("var overpassWizard = function(query) {" +
+                    "  return global.overpassWizard(query, {" +
+                    "    comment: false," +
+                    "    outputFormat: 'xml'," +
+                    "    outputMode: 'recursive_meta'" +
+                    "  });" +
+                    "}");
         } catch (ScriptException | IOException ex) {
             throw new RuntimeException("Failed to initialize OverpassTurboQueryWizard", ex);
@@ -58 +64 @@
     public String constructQuery(String search) throws UncheckedParseException {
         try {
-            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");
-                    } }
-            );
+            final Object result = ((Invocable) engine).invokeFunction("overpassWizard", search);
             if (Boolean.FALSE.equals(result)) {
                 throw new UncheckedParseException();