Changeset 15679 in josm for trunk

Timestamp:

2020-01-10T23:35:22+01:00 (5 years ago)

Author:

simon04

Message:

see #13901 see #18542 - Obtain tag2link rules from OSM Sophox

Location:

trunk

Files:

• data/tag2link.sophox.sparql (added)
• data/tag2link.wikidata.sparql (moved) (moved from trunk/data/tag2link.sparql ) (1 diff)
• src/org/openstreetmap/josm/gui/util/Tag2Link.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTestIT.java (added)

trunk/data/tag2link.wikidata.sparql

@@ -9 +9 @@
   }
 }
-ORDER BY LCASE(?OSM_tag_or_key)

trunk/src/org/openstreetmap/josm/gui/util/Tag2Link.java

@@ -26 +26 @@
 /**
  * Extracts web links from OSM tags.
+ * <p></p>
+ * The following rules are used:
+ * <ul>
+ * <li>internal rules for basic tags</li>
+ * <li>rules from Wikidata based on OSM tag or key (P1282); formatter URL (P1630); third-party formatter URL (P3303)</li>
+ * <li>rules from OSM Sophox based on permanent key ID (P16); formatter URL (P8)</li>
+ * </ul>
  *
  * @since 15673
@@ -35 +42 @@
 
     /**
-     * Maps OSM keys to formatter URLs from Wikidata where {@code "$1"} has to be replaced by a value.
+     * Maps OSM keys to formatter URLs from Wikidata and OSM Sophox where {@code "$1"} has to be replaced by a value.
      */
     protected static MultiMap<String, String> wikidataRules = new MultiMap<>();
@@ -53 +60 @@
     public static void initialize() {
         try {
-            fetchRulesFromWikidata();
+            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");
@@ -63 +72 @@
      * 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 fetchRulesFromWikidata() throws IOException {
-        final String sparql = new String(new CachedFile("resource://data/tag2link.sparql").getByteContent(), Charsets.UTF_8);
-        final CachedFile sparqlFile = new CachedFile("https://query.wikidata.org/sparql?query=" + Utils.encodeUrl(sparql))
+    private static void fetchRulesViaSPARQL(final String query, final String server) throws IOException {
+        final int initialSize = wikidataRules.size();
+        final String sparql = new String(new CachedFile(query).getByteContent(), Charsets.UTF_8);
+        final CachedFile sparqlFile = new CachedFile(server + "?query=" + Utils.encodeUrl(sparql))
                 .setHttpAccept("application/json");
 
@@ -86 +98 @@
                 .forEach(wikidataRules::remove);
 
+        final int size = wikidataRules.size() - initialSize;
         Logging.info(trn(
                 "Obtained {0} Tag2Link rule from {1}",
                 "Obtained {0} Tag2Link rules from {1}",
-                wikidataRules.size(), wikidataRules.size(), "Wikidata"));
+                size, size, server));
     }