Merge branch 'fixKreisGrevenbroich' of https://github.com/hbz/nwbib

Resolves #545 See https://nwbib.de/spatial#Q1110953
hbz · Apr 29, 2020 · 8247096 · 8247096
2 parents 43dca07 + 5990301
commit 8247096
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/app/controllers/nwbib/Classification.java b/app/controllers/nwbib/Classification.java
@@ -137,9 +137,17 @@ private static void addFromWikidata(
 				String key = e.getKey();
 				List<JsonNode> list = subClasses.containsKey(key) ? subClasses.get(key)
 						: new ArrayList<>();
-				list.addAll(e.getValue());
-				if (!e.getValue().stream().anyMatch(n -> subClasses.values().stream()
-						.flatMap(List::stream).collect(Collectors.toList()).contains(n))) {
+				List<JsonNode> additionalSubclasses = e.getValue();
+				for (JsonNode candidate : additionalSubclasses) {
+					// Don't replace an existing entry with a Wikidata entry, see
+					// https://github.com/hbz/nwbib/pull/546#issuecomment-618610540
+					if (list.stream().noneMatch(existing -> existing.get("value")
+							.textValue().equals(candidate.get("value").textValue())))
+						list.add(candidate);
+				}
+				if (!additionalSubclasses.stream()
+						.anyMatch(n -> subClasses.values().stream().flatMap(List::stream)
+								.collect(Collectors.toList()).contains(n))) {
 					subClasses.put(key, list);
 				}
 			}

diff --git a/conf/nwbib-spatial-conf.ttl b/conf/nwbib-spatial-conf.ttl
@@ -459,3 +459,10 @@ nwbib-spatial:Q313969
         skos:inScheme   <https://nwbib.de/spatial> ;
         skos:prefLabel  "Regierungsbezirk Minden (bis 1947)"@de ;
         foaf:focus      wd:Q313969 .
+
+nwbib-spatial:Q1110953
+        a               skos:Concept ;
+        skos:broader    nwbib-spatial:Q7926 ;
+        skos:inScheme   <https://nwbib.de/spatial> ;
+        skos:prefLabel  "Landkreis Grevenbroich-Neuß (1929 bis 1946)"@de ;
+        foaf:focus      wd:Q1110953 .
diff --git a/conf/nwbib.conf b/conf/nwbib.conf
@@ -15,6 +15,8 @@ index {
 	# nwbibspatial.enrich=false
 	# Setup for tests and to regenerate full SKOS file from base SKOS file and Wikidata:
 	# (rm -rf ./data/ ; rm conf/wikidata.json ; sbt "runMain SpatialToSkos" ; cp conf/nwbib-spatial.ttl ../lobid-vocabs/nwbib/)
+	# When testing local changes to nwbib-spatial-conf.ttl, point to it like this:
+	# data.nwbibspatial="file:///<absolute-path-to>/git/nwbib/conf/nwbib-spatial-conf.ttl"
 	data.nwbibspatial="https://raw.githubusercontent.com/hbz/nwbib/master/conf/nwbib-spatial-conf.ttl"
 	nwbibspatial.enrich=true
 }