vis-chronicle 0.0.2 → 0.0.3

package/src/wikidata.js

@@ -88,6 +88,18 @@ const wikidata = module.exports = {
 			const contents = await fs.promises.readFile(path)
 			this.inputSpec = JSON.parse(contents)
 		}
+
+		// assign default values
+		if (!this.inputSpec.chronicle)
+			this.inputSpec.chronicle = {}
+
+		const chronicleOptions = this.inputSpec.chronicle
+		if (chronicleOptions.defaultLabel === undefined)
+			chronicleOptions.defaultLabel = '<a target="_blank" href="https://www.wikidata.org/wiki/{_QID}">{_LABEL}</a>'
+		if (chronicleOptions.maxUncertainTimePrecision === undefined)
+			chronicleOptions.maxUncertainTimePrecision = 10
+		if (chronicleOptions.shareSuccessiveUncertainty === undefined)
+			chronicleOptions.shareSuccessiveUncertainty = true
 	},
 
 	readCache: async function()
@@ -279,20 +291,29 @@ const wikidata = module.exports = {
 	// runs a SPARQL query for time values on an item or set of items
 	runTimeQueryTerm: async function (queryTermStr, items)
 	{
+		// keys that may appear on the query term that provide terms
+		const termTimeKeys = [
+			"general",
+			"start", "start_min", "start_max",
+			"end", "end_min", "end_max",
+			"value", "min", "max"
+		]
+		const termOtherKeys = [ "previous", "next" ]
+
 		const entityVarName = '_entity'
 		const entityVar = `?${entityVarName}`
 		const propVar = '?_prop'
 		const rankVar = '?_rank'
 
-		const queryBuilder = new SparqlBuilder()
-		queryBuilder.addCacheBuster(this.cacheBuster)
-
 		// create a dummy item representing the collective items
 		//TODO: validate that they match
 		item = { ...items[0] }
 		item.entity = entityVar
 		item.id = "DUMMY"
 
+		const queryBuilder = new SparqlBuilder()
+		queryBuilder.addCacheBuster(item.cacheBuster ? item.cacheBuster : this.cacheBuster)
+
 		queryTerm = this.getValueQueryTerm(queryTermStr, item)
 		
 		// assembly query targets
@@ -302,21 +323,32 @@ const wikidata = module.exports = {
 			targetEntities.add(`wd:${item.entity}`)
 		}
 		queryBuilder.addQueryTerm(`VALUES ${entityVar}{${[...targetEntities].join(' ')}}`)
-		queryBuilder.addOutParam(entityVar)
+		queryBuilder.addOutParam(entityVar, { groupBy: true })
 
-		queryBuilder.addOutParam(rankVar)
+		// Group by prop object so that multiple prev/next values on the same property are grouped,
+		// but different properties with different prev/next values are separate.
+		queryBuilder.addGroupParam(propVar)
+
+		queryBuilder.addOutParam(rankVar, { groupBy: true })
 		if (queryTerm.general)
 		{
 			queryBuilder.addQueryTerm(queryTerm.general)
 		}
 		if (queryTerm.value) //TODO: could unify better with loop below?
 		{
-			queryBuilder.addTimeTerm(queryTerm.value, "?_value", "?_value_ti", "?_value_pr")
+			queryBuilder.addTimeTerm(queryTerm.value, "?_value", "?_value_ti", "?_value_pr", { groupBy: true })
 		}
-		for (const termKey in queryTerm) //TODO: only pass recognized terms
+		for (const termKey of termTimeKeys)
 		{
+			if (!queryTerm[termKey]) continue
 			if (termKey == "general" || termKey == "value") continue
-			queryBuilder.addOptionalTimeTerm(queryTerm[termKey], `?_${termKey}_value`, `?_${termKey}_ti`, `?_${termKey}_pr`)
+			queryBuilder.addOptionalTimeTerm(queryTerm[termKey], `?_${termKey}_value`, `?_${termKey}_ti`, `?_${termKey}_pr`, { groupBy: true })
+		}
+		for (const termKey of termOtherKeys)
+		{
+			if (!queryTerm[termKey]) continue
+			queryBuilder.addOutParam(`(GROUP_CONCAT(DISTINCT ?_${termKey}_value; SEPARATOR=";") AS ?_${termKey}_out)`)
+			queryBuilder.addOptionalQueryTerm(queryTerm[termKey])
 		}
 		queryBuilder.addOptionalQueryTerm(`${propVar} wikibase:rank ${rankVar}.`)
 
@@ -335,7 +367,7 @@ const wikidata = module.exports = {
 		const readBinding = function(binding)
 		{
 			const result = {}
-			for (const termKey in queryTerm) //TODO: only use recognized terms
+			for (const termKey of termTimeKeys)
 			{
 				if (binding[`_${termKey}_ti`])
 				{
@@ -345,6 +377,15 @@ const wikidata = module.exports = {
 					}
 				}
 			}
+			for (const termKey of termOtherKeys)
+			{
+				const termOtherVar = `_${termKey}_out`
+				if (binding[termOtherVar])
+				{
+					const valueSplit = binding[termOtherVar].value.split(';')
+					result[termKey] = wikidata.extractQidFromUrl(valueSplit[0]) //HACK: does not support multiple values
+				}
+			}
 			return result
 		}
 
@@ -353,7 +394,18 @@ const wikidata = module.exports = {
 			const results = []
 			for (const binding of bindings)
 			{
-				results.push(readBinding(binding))
+				const newBinding = readBinding(binding)
+				const newBindingSerialized = JSON.stringify(newBinding) //HACK: serialization for comparison
+
+				//HACK: omit perfect duplicates. This can happen with overlapping statements for same position (e.g. Q8423 "position held" for subclass:king)
+				var isDupe = false
+				for (const result of results)
+				{
+					isDupe = (JSON.stringify(result) == newBindingSerialized)
+					if (isDupe) break
+				}
+				
+				if (!isDupe) results.push(readBinding(binding))
 			}
 			return results
 		}
@@ -428,6 +480,7 @@ const wikidata = module.exports = {
 		}
 
 		const queryBuilder = new SparqlBuilder()
+		queryBuilder.distinct = true
 		queryBuilder.addCacheBuster(this.cacheBuster)
 		queryBuilder.addOutParam(itemVar)
 		queryBuilder.addOutParam(itemVar + "Label")
@@ -449,9 +502,10 @@ const wikidata = module.exports = {
 			newItem.entity = this.extractQidFromUrl(binding[itemVarName].value)
 			newItem.generated = true
 			const wikidataLabel = binding[itemVarName + "Label"].value
-			newItem.label = templateItem.label
-				? templateItem.label.replaceAll("{_LABEL}", wikidataLabel).replaceAll("{_QID}", newItem.entity)
-				: `<a target="_blank" href="https://www.wikidata.org/wiki/${newItem.entity}">${wikidataLabel}</a>`
+
+			const labelFomat = templateItem.label ? templateItem.label : this.inputSpec.chronicle.defaultLabel
+			newItem.label = labelFomat.replaceAll("{_LABEL}", wikidataLabel).replaceAll("{_QID}", newItem.entity)
+				
 			newItems.push(newItem)
 		}
 

package/styles/style.css

@@ -1,18 +1,35 @@
-.vis-item.vis-range.visc-open-right
+.vis-item.vis-range.visc-open-right, .vis-item.vis-background.visc-open-right
 {
 	mask-image: linear-gradient(to right, rgba(0, 0, 0, 1) 50%, rgba(0, 0, 0, 0));
 }
-.vis-item.vis-range.visc-open-left
+.vis-item.vis-range.visc-open-left, .vis-item.vis-background.visc-open-left
 {
 	mask-image: linear-gradient(to right, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1) 50%);
 }
-.vis-item.vis-range.visc-open-both
+.vis-item.vis-range.visc-open-left, .vis-item.vis-background.visc-open-left
 {
 	mask-image: linear-gradient(to right, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1) 50%, rgba(0, 0, 0, 0));
 }
-.visc-uncertain
+.vis-item.vis-range.visc-uncertain
 {
-	background: repeating-linear-gradient(45deg, #00000060, #00000060 8px, transparent 8px, transparent 16px)
+	background: repeating-linear-gradient(45deg, #404040, #404040 8px, rgba(213, 221, 246, 0.4) 8px, rgba(213, 221, 246, 0.4) 16px);
+	border-style: dashed;
+}
+.vis-item.vis-background.visc-uncertain
+{
+	mask-image: repeating-linear-gradient(45deg, black, black 8px, transparent 8px, transparent 16px);
+	border: none;
+}
+.visc-range-overlay
+{
+	z-index: 2;
+}
+.vis-item.visc-toplabel
+{
+	z-index: 3;
+	background: none !important;
+	background-color: transparent !important;
+	border: 0;
 }
 .vis-item.vis-range.visc-right-connection, .vis-item.vis-range.visc-left-tail
 {