Index: /trunk/src/org/openstreetmap/josm/gui/MainInitialization.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainInitialization.java (revision 15701)
+++ /trunk/src/org/openstreetmap/josm/gui/MainInitialization.java (revision 15702)
@@ -26,5 +26,4 @@
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.util.Tag2Link;
import org.openstreetmap.josm.io.FileWatcher;
import org.openstreetmap.josm.io.OsmApi;
@@ -42,4 +41,5 @@
import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Tag2Link;
import org.openstreetmap.josm.tools.Territories;
import org.openstreetmap.josm.tools.Utils;
Index: /trunk/src/org/openstreetmap/josm/gui/util/AbstractTag2LinkPopupListener.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/AbstractTag2LinkPopupListener.java (revision 15701)
+++ /trunk/src/org/openstreetmap/josm/gui/util/AbstractTag2LinkPopupListener.java (revision 15702)
@@ -9,4 +9,6 @@
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
+
+import org.openstreetmap.josm.tools.Tag2Link;
/**
Index: unk/src/org/openstreetmap/josm/gui/util/Tag2Link.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/Tag2Link.java (revision 15701)
+++ (revision )
@@ -1,177 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
-
-import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.MultiMap;
-import org.openstreetmap.josm.tools.Utils;
-
-/**
- * Extracts web links from OSM tags.
- *
- * The following rules are used:
- *
- * - internal rules for basic tags
- * - rules from Wikidata based on OSM tag or key (P1282); formatter URL (P1630); third-party formatter URL (P3303)
- * - rules from OSM Sophox based on permanent key ID (P16); formatter URL (P8)
- *
- *
- * @since 15673
- */
-public final class Tag2Link {
-
- // Related implementations:
- // - https://github.com/openstreetmap/openstreetmap-website/blob/master/app/helpers/browse_tags_helper.rb
-
- /**
- * Maps OSM keys to formatter URLs from Wikidata and OSM Sophox where {@code "$1"} has to be replaced by a value.
- */
- static MultiMap wikidataRules = new MultiMap<>();
-
- private Tag2Link() {
- // private constructor for utility class
- }
-
- /**
- * Represents an operation that accepts a link.
- */
- @FunctionalInterface
- interface LinkConsumer {
- /**
- * Performs the operation on the given arguments.
- * @param name the name/label of the link
- * @param url the URL of the link
- */
- void acceptLink(String name, String url);
- }
-
- /**
- * Initializes the tag2link rules
- */
- public static void initialize() {
- try {
- wikidataRules.clear();
- fetchRulesViaSPARQL("resource://data/tag2link.wikidata.sparql", "https://query.wikidata.org/sparql");
- fetchRulesViaSPARQL("resource://data/tag2link.sophox.sparql", "https://sophox.org/sparql");
- } catch (Exception e) {
- Logging.error("Failed to initialize tag2link rules");
- Logging.error(e);
- }
- }
-
- /**
- * Fetches rules from Wikidata using a SPARQL query.
- *
- * @param query the SPARQL query
- * @param server the query server
- * @throws IOException in case of I/O error
- */
- private static void fetchRulesViaSPARQL(final String query, final String server) throws IOException {
- final int initialSize = wikidataRules.size();
- final String sparql;
- try (CachedFile cachedFile = new CachedFile(query)) {
- sparql = new String(cachedFile.getByteContent(), StandardCharsets.UTF_8);
- }
-
- final JsonArray rules;
- try (CachedFile cachedFile = new CachedFile(server + "?query=" + Utils.encodeUrl(sparql));
- BufferedReader reader = cachedFile.setHttpAccept("application/json").getContentReader();
- JsonReader jsonReader = Json.createReader(reader)) {
- rules = jsonReader.read().asJsonObject().getJsonObject("results").getJsonArray("bindings");
- }
-
- for (JsonValue rule : rules) {
- final String key = rule.asJsonObject().getJsonObject("OSM_key").getString("value");
- final String url = rule.asJsonObject().getJsonObject("formatter_URL").getString("value");
- if (key.startsWith("Key:")) {
- wikidataRules.put(key.substring("Key:".length()), url);
- }
- }
- // We handle those keys ourselves
- Stream.of("image", "url", "website", "wikidata", "wikimedia_commons")
- .forEach(wikidataRules::remove);
-
- final int size = wikidataRules.size() - initialSize;
- Logging.info(trn(
- "Obtained {0} Tag2Link rule from {1}",
- "Obtained {0} Tag2Link rules from {1}",
- size, size, server));
- }
-
- static void getLinksForTag(String key, String value, LinkConsumer linkConsumer) {
-
- // Search
- if (key.matches("^(.+[:_])?name([:_].+)?$")) {
- linkConsumer.acceptLink(tr("Search on DuckDuckGo"), "https://duckduckgo.com/?q=" + value);
- }
-
- // Common
- final boolean valueIsURL = value.matches("^(http:|https:|www\\.).*");
- if (key.matches("^(.+[:_])?website([:_].+)?$") && valueIsURL) {
- linkConsumer.acceptLink(getLinkName(value, key), value);
- }
- if (key.matches("^(.+[:_])?source([:_].+)?$") && valueIsURL) {
- linkConsumer.acceptLink(getLinkName(value, key), value);
- }
- if (key.matches("^(.+[:_])?url([:_].+)?$") && valueIsURL) {
- linkConsumer.acceptLink(getLinkName(value, key), value);
- }
- if (key.matches("image") && valueIsURL) {
- linkConsumer.acceptLink(tr("View image"), value);
- }
-
- // Wikimedia
- final Matcher keyMatcher = Pattern.compile("wikipedia(:(?\\p{Lower}{2,}))?").matcher(key);
- final Matcher valueMatcher = Pattern.compile("((?\\p{Lower}{2,}):)?(?.*)").matcher(value);
- if (keyMatcher.matches() && valueMatcher.matches()) {
- final String lang = Utils.firstNotEmptyString("en", keyMatcher.group("lang"), valueMatcher.group("lang"));
- linkConsumer.acceptLink(tr("View Wikipedia article"), "https://" + lang + ".wikipedia.org/wiki/" + valueMatcher.group("article"));
- }
- if (key.matches("(.*:)?wikidata")) {
- OsmUtils.splitMultipleValues(value)
- .forEach(q -> linkConsumer.acceptLink(tr("View Wikidata item {0}", q), "https://www.wikidata.org/wiki/" + q));
- }
- if (key.matches("(.*:)?species")) {
- final String url = "https://species.wikimedia.org/wiki/" + value;
- linkConsumer.acceptLink(getLinkName(url, key), url);
- }
- if (key.matches("wikimedia_commons|image") && value.matches("(?i:File):.*")) {
- linkConsumer.acceptLink(tr("View image on Wikimedia Commons"), "https://commons.wikimedia.org/wiki/" + value);
- }
- if (key.matches("wikimedia_commons|image") && value.matches("(?i:Category):.*")) {
- linkConsumer.acceptLink(tr("View category on Wikimedia Commons"), "https://commons.wikimedia.org/wiki/" + value);
- }
-
- wikidataRules.getValues(key).forEach(urlFormatter -> {
- final String url = urlFormatter.replace("$1", value);
- linkConsumer.acceptLink(getLinkName(url, key), url);
- });
- }
-
- private static String getLinkName(String url, String fallback) {
- try {
- return tr("Open {0}", new URL(url).getHost());
- } catch (MalformedURLException e) {
- return tr("Open {0}", fallback);
- }
- }
-
-}
Index: /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java (revision 15702)
+++ /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java (revision 15702)
@@ -0,0 +1,180 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonReader;
+import javax.json.JsonValue;
+
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.io.CachedFile;
+
+/**
+ * Extracts web links from OSM tags.
+ *
+ * The following rules are used:
+ *
+ * - internal rules for basic tags
+ * - rules from Wikidata based on OSM tag or key (P1282); formatter URL (P1630); third-party formatter URL (P3303)
+ * - rules from OSM Sophox based on permanent key ID (P16); formatter URL (P8)
+ *
+ *
+ * @since 15673
+ */
+public final class Tag2Link {
+
+ // Related implementations:
+ // - https://github.com/openstreetmap/openstreetmap-website/blob/master/app/helpers/browse_tags_helper.rb
+
+ /**
+ * Maps OSM keys to formatter URLs from Wikidata and OSM Sophox where {@code "$1"} has to be replaced by a value.
+ */
+ static MultiMap wikidataRules = new MultiMap<>();
+
+ private Tag2Link() {
+ // private constructor for utility class
+ }
+
+ /**
+ * Represents an operation that accepts a link.
+ */
+ @FunctionalInterface
+ public interface LinkConsumer {
+ /**
+ * Performs the operation on the given arguments.
+ * @param name the name/label of the link
+ * @param url the URL of the link
+ */
+ void acceptLink(String name, String url);
+ }
+
+ /**
+ * Initializes the tag2link rules
+ */
+ public static void initialize() {
+ try {
+ wikidataRules.clear();
+ fetchRulesViaSPARQL("resource://data/tag2link.wikidata.sparql", "https://query.wikidata.org/sparql");
+ fetchRulesViaSPARQL("resource://data/tag2link.sophox.sparql", "https://sophox.org/sparql");
+ } catch (Exception e) {
+ Logging.error("Failed to initialize tag2link rules");
+ Logging.error(e);
+ }
+ }
+
+ /**
+ * Fetches rules from Wikidata using a SPARQL query.
+ *
+ * @param query the SPARQL query
+ * @param server the query server
+ * @throws IOException in case of I/O error
+ */
+ private static void fetchRulesViaSPARQL(final String query, final String server) throws IOException {
+ final int initialSize = wikidataRules.size();
+ final String sparql;
+ try (CachedFile cachedFile = new CachedFile(query)) {
+ sparql = new String(cachedFile.getByteContent(), StandardCharsets.UTF_8);
+ }
+
+ final JsonArray rules;
+ try (CachedFile cachedFile = new CachedFile(server + "?query=" + Utils.encodeUrl(sparql));
+ BufferedReader reader = cachedFile.setHttpAccept("application/json").getContentReader();
+ JsonReader jsonReader = Json.createReader(reader)) {
+ rules = jsonReader.read().asJsonObject().getJsonObject("results").getJsonArray("bindings");
+ }
+
+ for (JsonValue rule : rules) {
+ final String key = rule.asJsonObject().getJsonObject("OSM_key").getString("value");
+ final String url = rule.asJsonObject().getJsonObject("formatter_URL").getString("value");
+ if (key.startsWith("Key:")) {
+ wikidataRules.put(key.substring("Key:".length()), url);
+ }
+ }
+ // We handle those keys ourselves
+ Stream.of("image", "url", "website", "wikidata", "wikimedia_commons")
+ .forEach(wikidataRules::remove);
+
+ final int size = wikidataRules.size() - initialSize;
+ Logging.info(trn(
+ "Obtained {0} Tag2Link rule from {1}",
+ "Obtained {0} Tag2Link rules from {1}",
+ size, size, server));
+ }
+
+ /**
+ * Generates the links for the tag given by {@code key} and {@code value}, and sends 0, 1 or more links to the {@code linkConsumer}.
+ * @param key the tag key
+ * @param value the tag value
+ * @param linkConsumer the receiver of the generated links
+ */
+ public static void getLinksForTag(String key, String value, LinkConsumer linkConsumer) {
+
+ // Search
+ if (key.matches("^(.+[:_])?name([:_].+)?$")) {
+ linkConsumer.acceptLink(tr("Search on DuckDuckGo"), "https://duckduckgo.com/?q=" + value);
+ }
+
+ // Common
+ final boolean valueIsURL = value.matches("^(http:|https:|www\\.).*");
+ if (key.matches("^(.+[:_])?website([:_].+)?$") && valueIsURL) {
+ linkConsumer.acceptLink(getLinkName(value, key), value);
+ }
+ if (key.matches("^(.+[:_])?source([:_].+)?$") && valueIsURL) {
+ linkConsumer.acceptLink(getLinkName(value, key), value);
+ }
+ if (key.matches("^(.+[:_])?url([:_].+)?$") && valueIsURL) {
+ linkConsumer.acceptLink(getLinkName(value, key), value);
+ }
+ if (key.matches("image") && valueIsURL) {
+ linkConsumer.acceptLink(tr("View image"), value);
+ }
+
+ // Wikimedia
+ final Matcher keyMatcher = Pattern.compile("wikipedia(:(?\\p{Lower}{2,}))?").matcher(key);
+ final Matcher valueMatcher = Pattern.compile("((?\\p{Lower}{2,}):)?(?.*)").matcher(value);
+ if (keyMatcher.matches() && valueMatcher.matches()) {
+ final String lang = Utils.firstNotEmptyString("en", keyMatcher.group("lang"), valueMatcher.group("lang"));
+ linkConsumer.acceptLink(tr("View Wikipedia article"), "https://" + lang + ".wikipedia.org/wiki/" + valueMatcher.group("article"));
+ }
+ if (key.matches("(.*:)?wikidata")) {
+ OsmUtils.splitMultipleValues(value)
+ .forEach(q -> linkConsumer.acceptLink(tr("View Wikidata item {0}", q), "https://www.wikidata.org/wiki/" + q));
+ }
+ if (key.matches("(.*:)?species")) {
+ final String url = "https://species.wikimedia.org/wiki/" + value;
+ linkConsumer.acceptLink(getLinkName(url, key), url);
+ }
+ if (key.matches("wikimedia_commons|image") && value.matches("(?i:File):.*")) {
+ linkConsumer.acceptLink(tr("View image on Wikimedia Commons"), "https://commons.wikimedia.org/wiki/" + value);
+ }
+ if (key.matches("wikimedia_commons|image") && value.matches("(?i:Category):.*")) {
+ linkConsumer.acceptLink(tr("View category on Wikimedia Commons"), "https://commons.wikimedia.org/wiki/" + value);
+ }
+
+ wikidataRules.getValues(key).forEach(urlFormatter -> {
+ final String url = urlFormatter.replace("$1", value);
+ linkConsumer.acceptLink(getLinkName(url, key), url);
+ });
+ }
+
+ private static String getLinkName(String url, String fallback) {
+ try {
+ return tr("Open {0}", new URL(url).getHost());
+ } catch (MalformedURLException e) {
+ return tr("Open {0}", fallback);
+ }
+ }
+
+}
Index: unk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTest.java (revision 15701)
+++ (revision )
@@ -1,63 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test {@link Tag2Link}
- */
-public class Tag2LinkTest {
-
- List links = new ArrayList<>();
-
- void addLink(String name, String url) {
- links.add(name + " // " + url);
- }
-
- void checkLinks(String... expected) {
- Assert.assertEquals(Arrays.asList(expected), links);
- }
-
- /**
- * Unit test of function {@link Tag2Link#getLinksForTag}.
- */
- @Test
- public void testImageCommonsImage() {
- Tag2Link.getLinksForTag("image", "File:Witten Brücke Gasstraße.jpg", this::addLink);
- checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Witten Brücke Gasstraße.jpg");
- }
-
- /**
- * Unit test of function {@link Tag2Link#getLinksForTag}.
- */
- @Test
- public void testImageCommonsCategory() {
- Tag2Link.getLinksForTag("image", "category:JOSM", this::addLink);
- checkLinks("View category on Wikimedia Commons // https://commons.wikimedia.org/wiki/category:JOSM");
- }
-
- /**
- * Unit test of function {@link Tag2Link#getLinksForTag}.
- */
- @Test
- public void testBrandWikidata() {
- Tag2Link.getLinksForTag("brand:wikidata", "Q259340", this::addLink);
- checkLinks("View Wikidata item Q259340 // https://www.wikidata.org/wiki/Q259340");
- }
-
- /**
- * Unit test of function {@link Tag2Link#getLinksForTag}.
- */
- @Test
- public void testArchipelagoWikidata() {
- Tag2Link.getLinksForTag("archipelago:wikidata", "Q756987;Q756988", this::addLink);
- checkLinks("View Wikidata item Q756987 // https://www.wikidata.org/wiki/Q756987",
- "View Wikidata item Q756988 // https://www.wikidata.org/wiki/Q756988");
- }
-
-}
Index: unk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTestIT.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTestIT.java (revision 15701)
+++ (revision )
@@ -1,30 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-/**
- * Integration tests for the {@link Tag2Link}
- */
-public class Tag2LinkTestIT {
-
- /**
- * Setup rule
- */
- @ClassRule
- @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public static JOSMTestRules test = new JOSMTestRules();
-
- /**
- * Integration test of function {@link Tag2Link#initialize()}.
- */
- @Test
- public void testInitialize() {
- Tag2Link.initialize();
- Assert.assertTrue("obtails at least 40 rules", Tag2Link.wikidataRules.size() > 40);
- }
-}
Index: /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java (revision 15702)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java (revision 15702)
@@ -0,0 +1,63 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test {@link Tag2Link}
+ */
+public class Tag2LinkTest {
+
+ List links = new ArrayList<>();
+
+ void addLink(String name, String url) {
+ links.add(name + " // " + url);
+ }
+
+ void checkLinks(String... expected) {
+ Assert.assertEquals(Arrays.asList(expected), links);
+ }
+
+ /**
+ * Unit test of function {@link Tag2Link#getLinksForTag}.
+ */
+ @Test
+ public void testImageCommonsImage() {
+ Tag2Link.getLinksForTag("image", "File:Witten Brücke Gasstraße.jpg", this::addLink);
+ checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Witten Brücke Gasstraße.jpg");
+ }
+
+ /**
+ * Unit test of function {@link Tag2Link#getLinksForTag}.
+ */
+ @Test
+ public void testImageCommonsCategory() {
+ Tag2Link.getLinksForTag("image", "category:JOSM", this::addLink);
+ checkLinks("View category on Wikimedia Commons // https://commons.wikimedia.org/wiki/category:JOSM");
+ }
+
+ /**
+ * Unit test of function {@link Tag2Link#getLinksForTag}.
+ */
+ @Test
+ public void testBrandWikidata() {
+ Tag2Link.getLinksForTag("brand:wikidata", "Q259340", this::addLink);
+ checkLinks("View Wikidata item Q259340 // https://www.wikidata.org/wiki/Q259340");
+ }
+
+ /**
+ * Unit test of function {@link Tag2Link#getLinksForTag}.
+ */
+ @Test
+ public void testArchipelagoWikidata() {
+ Tag2Link.getLinksForTag("archipelago:wikidata", "Q756987;Q756988", this::addLink);
+ checkLinks("View Wikidata item Q756987 // https://www.wikidata.org/wiki/Q756987",
+ "View Wikidata item Q756988 // https://www.wikidata.org/wiki/Q756988");
+ }
+
+}
Index: /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java (revision 15702)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java (revision 15702)
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+/**
+ * Integration tests for the {@link Tag2Link}
+ */
+public class Tag2LinkTestIT {
+
+ /**
+ * Setup rule
+ */
+ @ClassRule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public static JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Integration test of function {@link org.openstreetmap.josm.tools.Tag2Link#initialize()}.
+ */
+ @Test
+ public void testInitialize() {
+ org.openstreetmap.josm.tools.Tag2Link.initialize();
+ Assert.assertTrue("obtails at least 40 rules", Tag2Link.wikidataRules.size() > 40);
+ }
+}