Index: trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java (revision 8684) +++ trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java (revision 8684) @@ -0,0 +1,225 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.concurrent.Future; + +import javax.swing.*; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; +import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.DataSource; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.preferences.CollectionProperty; +import org.openstreetmap.josm.data.preferences.StringProperty; +import org.openstreetmap.josm.gui.HelpAwareOptionPane; +import org.openstreetmap.josm.gui.download.DownloadDialog; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import org.openstreetmap.josm.gui.widgets.HistoryComboBox; +import org.openstreetmap.josm.io.BoundingBoxDownloader; +import org.openstreetmap.josm.io.OsmTransferException; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Utils; + +public class OverpassDownloadAction extends JosmAction { + + public OverpassDownloadAction() { + super(tr("Download from Overpass API ..."), "download-overpass", tr("Download map data from Overpass API server."), + null, true, "overpassdownload/download", true); + putValue("help", ht("/Action/OverpassDownload")); + } + + @Override + public void actionPerformed(ActionEvent e) { + OverpassDownloadDialog dialog = OverpassDownloadDialog.getInstance(); + dialog.restoreSettings(); + dialog.setVisible(true); + if (!dialog.isCanceled()) { + dialog.rememberSettings(); + Bounds area = dialog.getSelectedDownloadArea(); + DownloadOsmTask task = new DownloadOsmTask(); + Future future = task.download( + new OverpassDownloadReader(area, dialog.getOverpassQuery()), + dialog.isNewLayerRequired(), area, null); + Main.worker.submit(new PostDownloadHandler(task, future)); + } + } + + static class OverpassDownloadDialog extends DownloadDialog { + + protected HistoryComboBox overpassWizard; + protected JTextArea overpassQuery; + private static OverpassDownloadDialog instance; + static final CollectionProperty OVERPASS_WIZARD_HISTORY = new CollectionProperty("download.overpass.wizard", new ArrayList()); + + private OverpassDownloadDialog(Component parent) { + super(parent); + cbDownloadOsmData.setEnabled(false); + cbDownloadOsmData.setSelected(false); + cbDownloadGpxData.setVisible(false); + cbDownloadNotes.setVisible(false); + cbStartup.setVisible(false); + } + + static public OverpassDownloadDialog getInstance() { + if (instance == null) { + instance = new OverpassDownloadDialog(Main.parent); + } + return instance; + } + + @Override + protected void buildMainPanelAboveDownloadSelections(JPanel pnl) { + + pnl.add(new JLabel(), GBC.eol()); // needed for the invisible checkboxes cbDownloadGpxData, cbDownloadNotes + + final String tooltip = tr("Builds an Overpass query using the Overpass Turbo query wizard"); + overpassWizard = new HistoryComboBox(); + overpassWizard.setToolTipText(tooltip); + final JButton buildQuery = new JButton(tr("Build query")); + buildQuery.addActionListener(new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + final String overpassWizardText = overpassWizard.getText(); + try { + overpassQuery.setText(OverpassTurboQueryWizard.getInstance().constructQuery(overpassWizardText)); + } catch (OverpassTurboQueryWizard.ParseException ex) { + HelpAwareOptionPane.showOptionDialog( + Main.parent, + tr("The Overpass wizard could not parse the following query:" + + Utils.joinAsHtmlUnorderedList(Collections.singleton(overpassWizardText))), + tr("Parse error"), + JOptionPane.ERROR_MESSAGE, + null + ); + } + } + }); + buildQuery.setToolTipText(tooltip); + pnl.add(buildQuery, GBC.std().insets(5, 5, 5, 5)); + pnl.add(overpassWizard, GBC.eol().fill(GBC.HORIZONTAL)); + + overpassQuery = new JTextArea("[timeout:15];", 8, 80); + JScrollPane scrollPane = new JScrollPane(overpassQuery); + pnl.add(new JLabel(tr("Overpass query: ")), GBC.std().insets(5, 5, 5, 5)); + GBC gbc = GBC.eol().fill(GBC.HORIZONTAL); + gbc.ipady = 200; + pnl.add(scrollPane, gbc); + } + + public String getOverpassQuery() { + return overpassQuery.getText(); + } + + @Override + public void restoreSettings() { + super.restoreSettings(); + overpassWizard.setPossibleItems(OVERPASS_WIZARD_HISTORY.get()); + } + + @Override + public void rememberSettings() { + super.rememberSettings(); + overpassWizard.addCurrentItemToHistory(); + OVERPASS_WIZARD_HISTORY.put(overpassWizard.getHistory()); + } + + } + + static class OverpassDownloadReader extends BoundingBoxDownloader { + + final String overpassQuery; + static final StringProperty OVERPASS_URL = new StringProperty("download.overpass.url", "https://overpass-api.de/api/"); + + public OverpassDownloadReader(Bounds downloadArea, String overpassQuery) { + super(downloadArea); + this.overpassQuery = overpassQuery.trim(); + } + + @Override + protected String getBaseUrl() { + return OVERPASS_URL.get(); + } + + @Override + protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) { + if (overpassQuery.isEmpty()) + return super.getRequestForBbox(lon1, lat1, lon2, lat2); + else { + String realQuery = completeOverpassQuery(overpassQuery); + try { + return "interpreter?data=" + URLEncoder.encode(realQuery, "UTF-8") + "&bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2; + } catch (UnsupportedEncodingException e) { + throw new IllegalStateException(); + } + } + } + + private String completeOverpassQuery(String query) { + int firstColon = query.indexOf(";"); + if (firstColon == -1) { + return "[bbox];" + query; + } + int bboxPos = query.indexOf("[bbox"); + if (bboxPos > -1 && bboxPos < firstColon) { + return query; + } + + int bracketCount = 0; + int pos = 0; + for (; pos < firstColon; ++pos) { + if (query.charAt(pos) == '[') + ++bracketCount; + else if (query.charAt(pos) == '[') + --bracketCount; + else if (bracketCount == 0) { + if (!Character.isWhitespace(query.charAt(pos))) + break; + } + } + + if (pos < firstColon) { + // We start with a statement, not with declarations + return "[bbox];" + query; + } + + // We start with declarations. Add just one more declaration in this case. + return "[bbox]" + query; + } + + @Override + public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException { + + DataSet ds = super.parseOsm(progressMonitor); + + // add bounds if necessary (note that Overpass API does not return bounds in the response XML) + if (ds != null && ds.dataSources.isEmpty()) { + if (crosses180th) { + Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0); + DataSource src = new DataSource(bounds, getBaseUrl()); + ds.dataSources.add(src); + + bounds = new Bounds(lat1, -180.0, lat2, lon2); + src = new DataSource(bounds, getBaseUrl()); + ds.dataSources.add(src); + } else { + Bounds bounds = new Bounds(lat1, lon1, lat2, lon2); + DataSource src = new DataSource(bounds, getBaseUrl()); + ds.dataSources.add(src); + } + } + + return ds; + } + } +} Index: trunk/src/org/openstreetmap/josm/actions/OverpassTurboQueryWizard.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OverpassTurboQueryWizard.java (revision 8684) +++ trunk/src/org/openstreetmap/josm/actions/OverpassTurboQueryWizard.java (revision 8684) @@ -0,0 +1,81 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.actions; + +import javax.script.Invocable; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.util.regex.Pattern; + +/** + * Uses Overpass Turbo query wizard code + * to build an Overpass QL from a {@link org.openstreetmap.josm.actions.search.SearchAction} like query. + * + * Requires a JavaScript {@link ScriptEngine}. + */ +public class OverpassTurboQueryWizard { + + private static OverpassTurboQueryWizard instance; + private final ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript"); + + /** + * An exception to indicate a failed parse. + */ + public static class ParseException extends RuntimeException { + } + + /** + * Replies the unique instance of this class. + * + * @return the unique instance of this class + */ + public static synchronized OverpassTurboQueryWizard getInstance() { + if (instance == null) { + instance = new OverpassTurboQueryWizard(); + } + return instance; + } + + 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 turbo = {ffs: {noPresets: true}};"); + engine.eval("var console = {log: function(){}};"); + engine.eval(reader); + engine.eval("var construct_query = turbo.ffs().construct_query;"); + } catch (ScriptException | IOException ex) { + throw new RuntimeException("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 ParseException when the parsing fails + */ + public String constructQuery(String search) throws ParseException { + try { + final Object result = ((Invocable) engine).invokeFunction("construct_query", search); + if (result == Boolean.FALSE) { + throw new ParseException(); + } + 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}})", ""); + return query; + } catch (NoSuchMethodException e) { + throw new IllegalStateException(); + } catch (ScriptException e) { + throw new RuntimeException("Failed to execute OverpassTurboQueryWizard", e); + } + } + +} Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8683) +++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8684) @@ -82,4 +82,5 @@ import org.openstreetmap.josm.actions.OrthogonalizeAction; import org.openstreetmap.josm.actions.OrthogonalizeAction.Undo; +import org.openstreetmap.josm.actions.OverpassDownloadAction; import org.openstreetmap.josm.actions.PasteAction; import org.openstreetmap.josm.actions.PasteTagsAction; @@ -169,4 +170,6 @@ /** File / Download from OSM... **/ public final DownloadAction download = new DownloadAction(); + /** File / Download from Overpass API... **/ + public final OverpassDownloadAction overpassDownload = new OverpassDownloadAction(); /** File / Download object... **/ public final DownloadPrimitiveAction downloadPrimitive = new DownloadPrimitiveAction(); @@ -642,4 +645,5 @@ fileMenu.addSeparator(); add(fileMenu, download); + add(fileMenu, overpassDownload); add(fileMenu, downloadPrimitive); add(fileMenu, searchNotes);