diff --git a/bin/tag2link-converter b/bin/tag2link-converter index 401c56d8..684f8f84 100755 --- a/bin/tag2link-converter +++ b/bin/tag2link-converter @@ -20,6 +20,7 @@ foreach ($files as $file) { } else { $tag2link[$key] = array( + 'label' => $entry['itemLabel']['value'], 'formatter' => array(), ); } diff --git a/lib/tag2link-sophox.qry b/lib/tag2link-sophox.qry index 56304f8f..1e1c4ca4 100644 --- a/lib/tag2link-sophox.qry +++ b/lib/tag2link-sophox.qry @@ -1,6 +1,7 @@ -SELECT ?item (CONCAT("Key:", ?permanent_key_ID) as ?OSM_key) ?formatter_URL WHERE { +SELECT ?item ?itemLabel (CONCAT("Key:", ?permanent_key_ID) as ?OSM_key) ?formatter_URL WHERE { FILTER(?permanent_key_ID NOT IN ('image', 'url', 'website', 'wikidata', 'wikimedia_commons')). ?item osmdt:P2 osmd:Q7. + SERVICE wikibase:label { bd:serviceParam wikibase:language "en". } ?item osmdt:P16 ?permanent_key_ID. ?item osmdt:P8 ?formatter_URL. } diff --git a/lib/tag2link-wikidata.qry b/lib/tag2link-wikidata.qry index 313d2443..4aa83f89 100644 --- a/lib/tag2link-wikidata.qry +++ b/lib/tag2link-wikidata.qry @@ -1,7 +1,8 @@ -SELECT ?item ?OSM_key ?formatter_URL WHERE { +SELECT ?item ?itemLabel ?OSM_key ?formatter_URL WHERE { { ?item wdt:P1282 ?OSM_key. } FILTER(STRSTARTS(?OSM_key, 'Key:')) . FILTER(?OSM_key NOT IN ('Key:image', 'Key:url', 'Key:website', 'Key:wikidata', 'Key:wikimedia_commons')) . + SERVICE wikibase:label { bd:serviceParam wikibase:language "en". } { { ?item wdt:P1630 ?formatter_URL. }