Stub of random datacrate generator

lib/catalog.js

@@ -60,6 +60,10 @@ const DEFAULT_IRI_PREFS = {
 };
 
 
+// TODO - a general function for minting new internal IRIs given one 
+// of the above prefixes ()
+
+
 	// dataset -> about -> subjects
 	// dataset -> spatialCoverage -> place
 	// dataset -> temporalCoverage -> time
@@ -181,17 +185,15 @@ async function datapub2catalog(options) {
     // this isn't working with trim_context, which is clobbering the
     // geojson types for reasons I don't understand - see PT
 
-	// if( datapub['geospatial'] ) {
-	// 	console.log("datapub has geospatial");
-	// 	const geocontext = await fs.readJson(GEOCONTEXT);
-	// 	Object.keys(geocontext['@context']).map((k) => {
-	// 		if( context[k] ) {
-	// 			console.error("Duplicate geocontext for " + k);
-	// 		}
-	// 		context[k] = geocontext[k];
-	// 	})
-	// 	console.log(JSON.stringify(context, null, 2));
-	// }
+	if( datapub['geospatial'] ) {
+		const geocontext = await fs.readJson(GEOCONTEXT);
+		Object.keys(geocontext['@context']).map((k) => {
+			if( context[k] ) {
+				console.error("Duplicate geocontext for " + k);
+			}
+			context[k] = geocontext[k];
+		})
+	}
 
 	const catalog = {
 		'@context': context,
@@ -222,6 +224,7 @@ function link_id(item) {
 	return { '@id': item['@id'] };
 }
 
+
 // TODO: isBasedOn the data record
 
 function make_dataset(id, datapub, organisation, dates, files) {
@@ -452,7 +455,8 @@ function make_spatial(datapub, prefix) {
 	var items = [];
 	var i = 1;
 	if( datapub['geolocations'] ) {
-		items = datapub['geolocations'].map((gl) => {
+		const geols = datapub['geolocations'].filter((g) => !_.isEmpty(g));
+		items = geols.map((gl) => {
 			const id = prefix + String(i);
 			i += 1;
 			return {
@@ -468,7 +472,7 @@ function make_spatial(datapub, prefix) {
 			}
 		});
 	}
-	if( datapub['geospatial'] ) {
+	if( datapub['geospatial'] && datapub['geospatial']['type'] ) {
 		// these are GeoJSON, for which there is a JSON-LD context
 		// defined here: http://geojson.org/geojson-ld/
 		// Upstairs, the code that calls this checks for a geospatial
@@ -523,19 +527,29 @@ function make_temporal(datapub) {
 
 
 function make_license(datapub, prefix) {
-	if( datapub['license_other_url'] ) {
-		return [{
-			'@id': datapub['license_other_url'],
-			'type': 'CreativeWork',
-			'name': datapub['license_notes']
-		}];
+	const license = [];
+	if( datapub['license_other_url'] || datapub['license_notes'] ) {
+		if( datapub['license_other_url'] );
+			licenses.push({
+				'@id': datapub['license_other_url'],
+				'@type': 'CreativeWork',
+				'url': datapub['license_other_url'],
+				'name': ( datapub['license_notes'] || datapub['license_other_url'])
+			});
+		} else {
+			licenses.push({
+				'@id': DEFAULT_IRI_PREFS['licenses'] + 'other',
+				'@type': 'CreativeWork',
+				'name': datapub['license_notes']
+			});
+		}
 	}
-	if( datapub['license_statement'] ) {
-		return [{
+	if( datapub['license_identifier'] ) {
+		licenses.push({
 			'@id': datapub['license_identifier'],
-			'type': 'CreativeWork',
-			'name': datapub['license_statement'],
-			'url': datapub['license_statement_url']
+			'@type': 'CreativeWork',
+			'name': datapub['license_identifier'],
+			'url': datapub['license_identifier']
 		}];
 	}
 	return [];

lib/random.js

+// Module to generate a bunch of CATALOG.json files which 
+// have arbitrary but realistic data
+

test/catalog.spec.js

@@ -53,7 +53,7 @@ const ORG = {
 	'name': 'University of Technology Sydney'
 };
 
-const ALLOW_BAD_TYPES = { 'FeatureCollection': true };
+const ALLOW_BAD_TYPES = {}; // { 'FeatureCollection': true };
 
 // defining these here so that the tests know what to 
 // look up in the results @graph