commit 1bd6c58c8c6d6d733d8a8051c22826620eb353d1 Author: Simon Legner Date: 2020-02-29 23:51:15 +0100 fix #18164 - Migrate OverpassTurboQueryWizard to overpass-wizard-server diff --git a/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java b/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java index 891c991c1..5de809442 100644 --- a/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java +++ b/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java @@ -5,6 +5,7 @@ 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,7 +144,7 @@ private void saveHistory() { private Optional 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(), diff --git a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java index fc4c340f8..4f7b17f1d 100644 --- a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java +++ b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java @@ -2,26 +2,20 @@ 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 Overpass Turbo query wizard 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,47 +29,26 @@ public static synchronized OverpassTurboQueryWizard getInstance() { 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; } } diff --git a/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java index 8c2d6831e..fe96ccca0 100644 --- a/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java +++ b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java @@ -10,6 +10,7 @@ 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,7 +58,7 @@ public void setUp() { 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,7 +70,7 @@ private String getExpandedQuery(String search) { * 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,7 +119,7 @@ public void testDate() { * 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,7 +129,7 @@ public void testDateNewer() { * 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("" + diff --git a/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java b/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java index 90a3a2a65..899ae0b7e 100644 --- a/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java +++ b/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java @@ -3,6 +3,8 @@ import static org.junit.Assert.assertEquals; +import java.io.IOException; + import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -25,7 +27,7 @@ * 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,7 +42,7 @@ public void testKeyValue() { * 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,7 +57,7 @@ public void testKeyNotValue() { * 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,7 +74,7 @@ public void testBooleanAnd() { * 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,7 +92,7 @@ public void testBooleanOr() { * 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,7 +110,7 @@ public void testBoolean() { * 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,7 +126,7 @@ public void testType() { * 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,7 +142,7 @@ public void testUser() { * 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,7 +157,7 @@ public void testEmpty() { * 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,7 +174,7 @@ public void testInArea() { */ @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,7 +189,7 @@ public void testPreset() { * Test erroneous value. */ @Test(expected = UncheckedParseException.class) - public void testErroneous() { + public void testErroneous() throws IOException { OverpassTurboQueryWizard.getInstance().constructQuery("foo"); } }