Ticket #18164: 18164.patch

src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

@@ -5 +5 @@
 
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -143 +144 @@
     private Optional<String> tryParseSearchTerm(String searchTerm) {
         try {
             return Optional.of(overpassQueryBuilder.constructQuery(searchTerm));
-        } catch (UncheckedParseException | IllegalStateException ex) {
+        } catch (IOException | UncheckedParseException ex) {
             Logging.error(ex);
             JOptionPane.showMessageDialog(
                     dsPanel.getParent(),

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
 import java.io.IOException;
-import java.io.Reader;
+import java.net.URL;
 
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
  * 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.
  *
- * Requires a JavaScript {@link ScriptEngine}.
+ * This involves a HTTP request to an overpass-wizard-server.
  * @since 8744
  */
 public final class OverpassTurboQueryWizard {
 
     private static OverpassTurboQueryWizard instance;
-    private final ScriptEngine engine = Utils.getJavaScriptEngine();
 
     /**
      * Replies the unique instance of this class.
@@ -35 +29 @@
         return instance;
     }
 
-    private OverpassTurboQueryWizard() {
-        try (CachedFile file = new CachedFile("resource://data/overpass-wizard.js");
-             Reader reader = file.getContentReader()) {
-            if (engine != null) {
-                engine.eval("var console = {error: " + Logging.class.getCanonicalName() + ".warn};");
-                engine.eval("var global = {};");
-                engine.eval(reader);
-                engine.eval("var overpassWizardJOSM = function(query) {" +
-                        "  return overpassWizard(query, {" +
-                        "    comment: false," +
-                        "    timeout: " + Config.getPref().getInt("overpass.wizard.timeout", 90) + "," +
-                        "    outputFormat: 'xml'," +
-                        "    outputMode: 'recursive_meta'" +
-                        "  });" +
-                        "}");
-            }
-        } catch (ScriptException | IOException ex) {
-            throw new IllegalStateException("Failed to initialize OverpassTurboQueryWizard", ex);
-        }
-    }
-
     /**
      * Builds an Overpass QL from a {@link org.openstreetmap.josm.actions.search.SearchAction} like query.
      * @param search the {@link org.openstreetmap.josm.actions.search.SearchAction} like query
      * @return an Overpass QL query
      * @throws UncheckedParseException when the parsing fails
+     * @throws IOException in case of I/O error
      */
-    public String constructQuery(String search) {
-        if (engine == null) {
-            throw new IllegalStateException("Failed to retrieve JavaScript engine");
-        }
-        try {
-            final Object result = ((Invocable) engine).invokeFunction("overpassWizardJOSM", search);
-            if (Boolean.FALSE.equals(result)) {
-                throw new UncheckedParseException();
-            }
-            return (String) result;
-        } catch (NoSuchMethodException e) {
-            throw new IllegalStateException(e);
-        } catch (ScriptException e) {
-            throw new UncheckedParseException("Failed to execute OverpassTurboQueryWizard", e);
+    public String constructQuery(String search) throws UncheckedParseException, IOException {
+        String url = Config.getPref().get("overpass.wizard.server", "https://overpass-wizard.josm.eu/overpass-wizard/")
+                + "?search=" + Utils.encodeUrl(search)
+                + "&comment=false"
+                + "&timeout=" + Config.getPref().getInt("overpass.wizard.timeout", 90)
+                + "&outputFormat=xml"
+                + "&outputMode=recursive_meta";
+        final String query = HttpClient.create(new URL(url))
+                .connect()
+                .fetchContent();
+        if ("false".equals(query)) {
+            throw new UncheckedParseException();
         }
+        return query;
     }
 }

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

@@ -10 +10 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.time.LocalDateTime;
 import java.util.regex.Matcher;
@@ -57 +58 @@
         NameFinder.NOMINATIM_URL_PROP.put("http://localhost:" + wireMockRule.port() + NOMINATIM_URL_PATH);
     }
 
-    private String getExpandedQuery(String search) {
+    private String getExpandedQuery(String search) throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery(search);
         final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), null, query)
                 .getRequestForBbox(1, 2, 3, 4)
@@ -69 +70 @@
      * Tests evaluating the extended query feature {@code bbox}.
      */
     @Test
-    public void testBbox() {
+    public void testBbox() throws IOException {
         final String query = getExpandedQuery("amenity=drinking_water");
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:2.0,1.0,4.0,3.0];\n" +
@@ -118 +119 @@
      * Tests evaluating the extended query feature {@code date} through {@code newer:} operator.
      */
     @Test
-    public void testDateNewer() {
+    public void testDateNewer() throws IOException {
         final String query = getExpandedQuery("type:node and newer:3minutes");
         String statement = query.substring(query.indexOf("node(newer:\"") + 12, query.lastIndexOf("\");"));
         assertNotNull(DateUtils.fromString(statement));
@@ -128 +129 @@
      * Tests evaluating the extended query feature {@code geocodeArea}.
      */
     @Test
-    public void testGeocodeArea() {
+    public void testGeocodeArea() throws IOException {
         stubNominatim("London");
         final String query = getExpandedQuery("amenity=drinking_water in London");
         assertEquals("" +

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
+
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -25 +27 @@
      * Test {@code key=value}.
      */
     @Test
-    public void testKeyValue() {
+    public void testKeyValue() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity=drinking_water");
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -40 +42 @@
      * Test {@code key!=value}.
      */
     @Test
-    public void testKeyNotValue() {
+    public void testKeyNotValue() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity!=drinking_water");
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -55 +57 @@
      * Test {@code foo=bar and baz=42}.
      */
     @Test
-    public void testBooleanAnd() {
+    public void testBooleanAnd() throws IOException {
         final String expected = "" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
@@ -72 +74 @@
      * Test {@code foo=bar or baz=42}.
      */
     @Test
-    public void testBooleanOr() {
+    public void testBooleanOr() throws IOException {
         final String expected = "" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
@@ -90 +92 @@
      * Test {@code (foo=* or bar=*) and (asd=* or fasd=*)}.
      */
     @Test
-    public void testBoolean() {
+    public void testBoolean() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("(foo=* or bar=*) and (asd=* or fasd=*)");
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -108 +110 @@
      * Test {@code foo=bar and (type:node or type:way)}.
      */
     @Test
-    public void testType() {
+    public void testType() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar and (type:node or type:way)");
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -124 +126 @@
      * Test {@code user:foo or uid:42}.
      */
     @Test
-    public void testUser() {
+    public void testUser() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("user:foo or uid:42");
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -140 +142 @@
      * Test {@code foo=bar and (type:node or type:way)}.
      */
     @Test
-    public void testEmpty() {
+    public void testEmpty() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo='' and type:way");
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -155 +157 @@
      * Test geocodeArea.
      */
     @Test
-    public void testInArea() {
+    public void testInArea() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar in Josmland");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -172 +174 @@
      */
     @Test
     @Ignore("preset handling not implemented")
-    public void testPreset() {
+    public void testPreset() throws IOException {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("Hospital");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -187 +189 @@
      * Test erroneous value.
      */
     @Test(expected = UncheckedParseException.class)
-    public void testErroneous() {
+    public void testErroneous() throws IOException {
         OverpassTurboQueryWizard.getInstance().constructQuery("foo");
     }
 }