Spatials are passing, though the geospatial stuff needs work

lib/catalog.js

@@ -436,13 +436,30 @@ function make_spatial(datapub, prefix) {
 			return {
 				'@id': id,
 				'identifier': id,
-				'description': gl 
+				'@type': 'Place',
+				'name': gl['basic_name'],
+				'geo': {
+					'@type': "GeoCoordinates",
+					'latitude': gl['latitude'],
+					'longitude': gl['longitude'] 
+				}
 			}
 		});
 	}
 	if( datapub['geospatial'] ) {
-		// FIXME - need to see what this looks like in a real record
-		
+		// these are GeoJSON, for which there is a JSON-LD context
+		// defined here: http://geojson.org/geojson-ld/
+		// TODO: append it to the context.
+		// for now I'm just passing it through to an item with the
+		// @type from the GeoJSON type
+		const id = prefix + String(i);
+		items.push({
+			'@id': id,
+			'identifier': id,
+			'@type': datapub['geospatial']['type'],
+			'name': id,
+			'features': datapub['geospatial']['features']
+		})
 	}
 	return items;
 }

test/catalog.spec.js

@@ -33,6 +33,21 @@ const ORG = {
 	'name': 'University of Technology Sydney'
 };
 
+// defining these here so that the tests know what to 
+// look up in the results @graph
+
+const IRI_PREFIXES = {
+	'about': {
+	    'dc:subject_anzsrc:for': '_:FOR/',
+    	'dc:subject_anzsrc:seo': '_:SEO/'
+	},
+	'spatialCoverage': '_:spatial/',
+	'funder': '_:funder/',
+	'licence': '_:licence/',
+	'citation': '_:citation/'
+};
+
+
 const OWNER = 'https://orcid.org/0000-0001-5152-5307';
 const APPROVER = 'admin';
 
@@ -55,6 +70,14 @@ function get_id(c, id) {
 	}
 }
 
+
+// this is for fetching all of the items with the prefix for
+// spatialCoverage items, say.
+
+function get_id_prefix(c, prefix) {
+	return c['@graph'].filter((item) => item['@id'].startsWith(prefix));
+}
+
 // this one returns an array of items with the requested type
 
 function get_type(c, t) {
@@ -62,6 +85,8 @@ function get_type(c, t) {
 }
 
 
+
+
 var mdp, dp, cj, cjds;
 
 
@@ -79,7 +104,8 @@ describe("Convert a ReDBox 2.0 DataPub to CATALOG.json", () => {
 			'datapub': dp,
 			'organisation': ORG,
 			'owner': OWNER,
-			'approver': APPROVER
+			'approver': APPROVER,
+			'prefixes': IRI_PREFIXES
 		});
 		const roots = cj['@graph'].filter((item) => {return item['path'] === 'data/'});
 		cjds = roots[0];
@@ -138,16 +164,12 @@ describe("Convert a ReDBox 2.0 DataPub to CATALOG.json", () => {
 	it("has subjects", () => {
 		// FORs and SEOs
 		const fields = [ 'dc:subject_anzsrc:for', 'dc:subject_anzsrc:seo'];
-		const SUBJECT_IRI_PREFIX = {
-    	'dc:subject_anzsrc:for': '_:FOR/',
-    	'dc:subject_anzsrc:seo': '_:SEO/'
-		};
+
 		const about = cjds['about'].map((i) => i['@id']);
 		_.forEach(fields, (field) => {
-			const pref = SUBJECT_IRI_PREFIX[field];
-			const expectsubs = dp[field].map((f) => { return f['name'] });
-			const subjects = cj['@graph'].filter((i) => { return i['@id'].startsWith(pref) });
-			const gotsubs = subjects.map((f) => { return f['name']} );
+			const pref = IRI_PREFIXES['about'][field];
+			const expectsubs = dp[field].map((f) => f['name']);
+			const gotsubs = get_id_prefix(cj, pref).map((f) => f['name']);
 			if( dp[field] && dp[field].length > 0 ) {
 				expect(gotsubs.sort()).to.eql(expectsubs.sort());
 			} else {
@@ -156,10 +178,33 @@ describe("Convert a ReDBox 2.0 DataPub to CATALOG.json", () => {
 		})
 	});
 
+	// geolocations - basic_name / latitude / longitude
+
+	// this test assumes that each geolocation's name is unique in the
+	// datapub
+
+	// and that geospatial is always a FeatureCollection 
+
 	it("has spatial coverage", () => {
-		assert(false);
+		const spatials = get_id_prefix(cj, IRI_PREFIXES['spatialCoverage']);
+		if( dp['geoLocations'] ) {
+			dp['geoLocations'].map((gl) => {
+				const name = gl['basic_name'];
+				const matches = spatials.filter((s) => s['name'] === name );
+				expect(matches).to.have.lengthOf(1);
+				expect(matches[0]['latitude']).to.equal(gl['latitude']);
+				expect(matches[0]['longitude']).to.equal(gl['longitude']);
+			});
+		}
+		if( dp['geospatial']) {
+			const matches = spatials.filter((s) => s['@type'] === 'FeatureCollection' );
+			expect(matches).to.have.lengthOf(1);
+			expect(matches[0]['features']).to.eql(dp['geospatial']['features']);			
+		}
 	});
 
+
+
 	it("has temporal coverage", () => {
 		var tc = '';
 		if( dp['startDate'] ) {