vis-chronicle 1.2.2 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-chronicle",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Generates JSON for populating a vis.js timeline from Wikidata queries.",
   "keywords": [
     "wikidata",

package/src/relativeDates.js

@@ -56,6 +56,23 @@ module.exports = function flattenRelativeDate(wikidataCache, dateString)
 		const cacheEntry = wikidataCache[relSplit[0]]
 		if (relSplit.length > 1)
 		{
+			// break up operators
+			const dateOperators = []
+			var opStartIndex = 0
+			const operatorString = relSplit[1]
+			if (operatorString.length > 0)
+			{
+				for (var i = 1; i < operatorString.length; i++)
+				{
+					if (operatorString[i] == '+' || operatorString[i] == '>')
+					{
+						dateOperators.push(operatorString.substring(opStartIndex, i))
+						opStartIndex = i
+					}
+				}
+				dateOperators.push(operatorString.substring(opStartIndex, i))
+			}
+
 			// handle relative segments of date
 			// About precision:
 			// - The actual value is assumed to lie in a range the size of the precision
@@ -64,9 +81,8 @@ module.exports = function flattenRelativeDate(wikidataCache, dateString)
 			var momentDate = moment(cacheEntry.value, 'YYYYYY-MM-DDThh:mm:ss')
 			var precision = cacheEntry.precision
 			//console.log(momentDate)
-			for (var i = 1; i < relSplit.length; i++)
+			for (const component of dateOperators)
 			{
-				const component = relSplit[i]
 				if (!component)
 				{
 					// empty group from regex

package/src/render.js

@@ -35,6 +35,18 @@ function momentSafeMax(a, b)
 	return a ? (b ? moment.max(a, b) : a) : b
 }
 
+// Copies properties that should be untouched by the renderer from 'from' to 'to'
+function copyItemUntouchedProps(from, to)
+{
+	to.align = from.align
+	to.selectable = from.selectable
+	to.style = from.style
+	to.title = from.title
+	to.limitSize = from.limitSize
+	to.editable = from.editable
+	to.wikidata = from.entity
+}
+
 const renderer = {}
 
 renderer.getExpectation = function(item)
@@ -197,9 +209,9 @@ renderer.produceOutput = function(inputSpec, items)
 			content: item.label,
 			className: item.className,
 			comment: item.comment,
-			type: item.type,
-			wikidata: item.entity
+			type: item.type
 		}
+		copyItemUntouchedProps(item, outputItem)
 		if (item.group)
 		{
 			outputItem.group = item.group
@@ -287,9 +299,9 @@ renderer.produceOutput = function(inputSpec, items)
 					start: uncertainMin,
 					end: item.end_max,
 					group: item.group,
-					subgroup: outputItem.subgroup,
-					wikidata: item.entity
+					subgroup: outputItem.subgroup
 				}
+				copyItemUntouchedProps(item, uncertainElement)
 				outputObject.items.push(uncertainElement)
 
 				if (permitBgOverlay)
@@ -344,9 +356,9 @@ renderer.produceOutput = function(inputSpec, items)
 				start: outputItem.end,
 				end: tailEnd,
 				group: item.group,
-				subgroup: outputItem.subgroup,
-				wikidata: item.entity
+				subgroup: outputItem.subgroup
 			})
+			copyItemUntouchedProps(item, outputObject)
 
 			outputItem.className = [ outputItem.className, 'visc-right-connection' ].join(' ')
 		}
@@ -367,9 +379,9 @@ renderer.produceOutput = function(inputSpec, items)
 					start: outputItem.end,
 					end: tailEnd,
 					group: item.group,
-					subgroup: outputItem.subgroup,
-					wikidata: item.entity
+					subgroup: outputItem.subgroup
 				})
+				copyItemUntouchedProps(item, outputObject)
 
 				outputItem.className = [ outputItem.className, 'visc-right-connection' ].join(' ')
 			}
@@ -410,9 +422,9 @@ renderer.produceOutput = function(inputSpec, items)
 					start: item.start_min,
 					end: uncertainMax,
 					group: item.group,
-					subgroup: outputItem.subgroup,
-					wikidata: item.entity
+					subgroup: outputItem.subgroup
 				}
+				copyItemUntouchedProps(item, uncertainElement)
 				outputObject.items.push(uncertainElement)
 
 				if (permitBgOverlay)

package/src/wikidata.js

@@ -41,7 +41,7 @@ const wikidata = module.exports = {
 	rankNormal: "http://wikiba.se/ontology#NormalRank",
 	rankPreferred: "http://wikiba.se/ontology#PreferredRank",
 
-	pathQueryRegex: /^(Q[0-9]+(?::P[0-9]+)?(?::Q[0-9]+:P[0-9]+)?)([\+>](?:[A-Za-z]+(?:![0-9]+)?|P\-?[0-9A-Z]+)+)*$/,
+	pathQueryRegex: /^(Q[0-9]+(?::P[0-9]+)?(?::Q[0-9]+:P[0-9]+)?)((?:[\+>](?:[A-Za-z]+(?:![0-9]+)?|P\-?[0-9A-Z]+)+)*)$/,
 
 	initialize: function()
 	{