Index: applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmDownloadSource.java =================================================================== --- applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmDownloadSource.java (revision 33627) +++ applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmDownloadSource.java (revision 33628) @@ -4,7 +4,5 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.GridBagLayout; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.FocusEvent; @@ -36,4 +34,5 @@ import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.OpenBrowser; import org.wikipedia.io.WikosmDownloadReader; @@ -76,4 +75,5 @@ public static class WikosmDownloadSourcePanel extends AbstractDownloadSourcePanel { + private static final String HELP_PAGE = "https://wiki.openstreetmap.org/wiki/Wikidata%2BOSM_SPARQL_query_service"; private static final String SIMPLE_NAME = "wikosmdownloadpanel"; private static final AbstractProperty PANEL_SIZE_PROPERTY = @@ -96,10 +96,17 @@ setLayout(new BorderLayout()); - // CHECKSTYLE.OFF: LineLength - this.wikosmQuery = new JosmTextArea( - "# " + tr("Enter your Wikosm SPARQL query below") + "\n" - + "SELECT ?osmId ?loc WHERE { BIND(osmnode:2681940767 as ?osmId). ?osmId osmm:loc ?loc . }", - 8, 80); - // CHECKSTYLE.ON: LineLength + String queryText = "# " + + tr("Find places of education at least 2km, and at most 3km from the center of the selection") + + "\n" + + "SELECT ?osmid WHERE {\n" + + " VALUES ?amenity { \"kindergarten\" \"school\" \"university\" \"college\" }\n" + + " ?osmid osmt:amenity ?amenity ;\n" + + " osmm:loc ?location .\n" + + " BIND(geof:distance({{center}}, ?location) as ?distance)\n" + + " FILTER(?distance > 2 && ?distance < 3)\n" + + "}"; + + this.wikosmQuery = new JosmTextArea(queryText, 8, 80); + this.wikosmQuery.setFont(GuiHelper.getMonospacedFont(wikosmQuery)); this.wikosmQuery.addFocusListener(new FocusListener() { @@ -149,13 +156,11 @@ }); + // TODO: Once new core is widely avialable, replace: + // Main.pref.getBoolean --> Config.getPref().getBoolean + // Main.pref.put --> Config.getPref().putBoolean referrers = new JCheckBox(tr("Download referrers (parent relations)")); referrers.setToolTipText(tr("Select if the referrers of the object should be downloaded as well, i.e.," + "parent relations and for nodes, additionally, parent ways")); - - // TODO: Once new core is widely avialable, replace: - // Main.pref.getBoolean --> Config.getPref().getBoolean - // Main.pref.put --> Config.getPref().putBoolean - referrers.setSelected(Main.pref.getBoolean("wikosm.downloadprimitive.referrers", true)); referrers.addActionListener(e -> Main.pref.put("wikosm.downloadprimitive.referrers", referrers.isSelected())); @@ -166,8 +171,19 @@ fullRel.addActionListener(e -> Main.pref.put("wikosm.downloadprimitive.full", fullRel.isSelected())); + // https://stackoverflow.com/questions/527719/how-to-add-hyperlink-in-jlabel + JButton helpLink = new JButton(); + helpLink.setText(""+tr("help")+""); + helpLink.setToolTipText(HELP_PAGE); + helpLink.setHorizontalAlignment(SwingConstants.LEFT); + helpLink.setBorderPainted(false); + helpLink.setOpaque(false); + helpLink.setBackground(Color.WHITE); + helpLink.addActionListener(e -> OpenBrowser.displayUrl(HELP_PAGE)); + JPanel centerPanel = new JPanel(new GridBagLayout()); centerPanel.add(scrollPane, GBC.eol().fill(GBC.BOTH)); centerPanel.add(referrers, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5)); centerPanel.add(fullRel, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5)); + centerPanel.add(helpLink, GBC.std().anchor(GBC.WEST).insets(10, 5, 5, 5));