Add urban areas and principal place to geo core

Author: niklasl

Makefile

@@ -10,7 +10,9 @@ source/sab.ttl: scripts/extract_sab_data_from_docx.py cache/esab-2015_1.docx
 	# TODO 2: In XL, add precomposed usages (extract from usage in records)? See:
 	# ../librisxl/marc_export/src/main/resources/se/kb/libris/export/sabrub.txt # precomposed
 
-cache/geocore.ttl: source/geo/construct-geocore.rq
-	scripts/rq.sh https://query.wikidata.org/sparql $^ | scripts/fmt.sh > $@
-	#scripts/construct.py source/geo/modify-geocore.rq cache/wd-geocore.ttl  > $@
+cache/geocore.ttl: cache/remote-geocore.ttl
+	cat $^ | scripts/fmt.sh > $@
+	#scripts/construct.py source/geo/modify-geocore.rq $^ > $@
 
+cache/remote-geocore.ttl: source/geo/construct-geocore.rq
+	scripts/rq.sh https://query.wikidata.org/sparql $^ > $@

scripts/fmt.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-trld -ittl -e -f -c context.jsonld -B -ottl | sed 's/rdf:type/a/'
+trld -ittl -e -f -c $(dirname $0)/../build/sys/context/kbv.jsonld -B -ottl | sed 's/rdf:type/a/'

source/geo/construct-geocore.rq

@@ -19,6 +19,7 @@ CONSTRUCT {
         :code ?swedishMunicipalityCode ;
         :geo ?geo ;
         :locatedIn ?locatedIn ;
+        :principalPlace ?capital ;
         :country <https://id.kb.se/country/sw> ;
         :startDate ?foundingDate ;
         :image ?image .
@@ -33,14 +34,13 @@ CONSTRUCT {
     ?wdplace a|wdt:P31 ?type ;
         wdt:P17 wd:Q34 .  # :country Sweden
 
-    FILTER EXISTS { ?type wdt:P279* wd:Q914262 } # administrative territorial entity of Sweden
-    #FILTER EXISTS {
-    #    {
-    #        ?type wdt:P279* wd:Q914262 # administrative territorial entity of Sweden
-    #    } UNION {
-    #        ?wdplace wdt:P1376 [] .  # :capital :label "centralort"@sv
-    #    }
-    #}
+    FILTER EXISTS {
+      {
+        ?type wdt:P279* wd:Q914262  # administrative territorial entity of Sweden
+      } UNION {
+        ?type wdt:P279* wd:Q12813115  # urban area of Sweden
+      }
+    }
 
     ?wdplace rdfs:label ?label .
 
@@ -73,6 +73,12 @@ CONSTRUCT {
       BIND(?wdplace AS ?sameAs)
     }
 
+    OPTIONAL {
+      ?wdplace wdt:P36 ?capital .
+      # :capital :label "centralort"@sv
+      # (Cf. wdt:P1376 == huvudstad.)
+    }
+
     BIND(IF(?wdLocatedIn = wd:Q34, idkbse:country\/sw, ?wdLocatedIn) AS ?locatedIn)
     BIND(IF(BOUND(?dsId), ?dsId, ?wdplace) AS ?place)