Added a test to make sure that every @type has an entry in the @context,

which turned up some dumb typos

defaults/geojson-context.json

+{
+  "@context": {
+    "geojson": "https://purl.org/geojson/vocab#",
+    "Feature": "geojson:Feature",
+    "FeatureCollection": "geojson:FeatureCollection",
+    "GeometryCollection": "geojson:GeometryCollection",
+    "LineString": "geojson:LineString",
+    "MultiLineString": "geojson:MultiLineString",
+    "MultiPoint": "geojson:MultiPoint",
+    "MultiPolygon": "geojson:MultiPolygon",
+    "Point": "geojson:Point",
+    "Polygon": "geojson:Polygon",
+    "bbox": {
+      "@container": "@list",
+      "@id": "geojson:bbox"
+    },
+    "coordinates": {
+      "@container": "@list",
+      "@id": "geojson:coordinates"
+    },
+    "features": {
+      "@container": "@set",
+      "@id": "geojson:features"
+    },
+    "geometry": "geojson:geometry",
+    "id": "@id",
+    "properties": "geojson:properties",
+    "type": "@type"
+  }
+}

lib/catalog.js

@@ -27,7 +27,8 @@ const calcyte = require('calcyte');
 
 
 const DEFAULTS = path.join(__dirname, "../defaults");
-const CONTEXT = path.join(DEFAULTS, 'context.json');
+//const CONTEXT = path.join(DEFAULTS, 'context.json');
+const GEOCONTEXT = path.join(DEFAULTS, 'geojson-context.json');
 
 const RELATED = [ 'publications', 'websites', 'metadata', 'data', 'services' ];
 
@@ -35,7 +36,7 @@ const RELATED_TYPES = {
 	'publications': 'ScholarlyArticle',
 	'websites': 'WebSite',
 	'metadata': 'CreativeWork',  // schema.org hasn't got a dedicated type
-	'data': 'DataSet',
+	'data': 'Dataset',
 	'services': 'CreativeWork' // I'm not sure about this?
 };
 
@@ -174,7 +175,23 @@ async function datapub2catalog(options) {
 		}
 	});
 
-	const context = await fs.readJson(CONTEXT);
+	const context = calcyte.defaults.context;
+
+
+    // 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));
+	// }
 
 	const catalog = {
 		'@context': context,
@@ -454,9 +471,9 @@ function make_spatial(datapub, prefix) {
 	if( datapub['geospatial'] ) {
 		// 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
+		// Upstairs, the code that calls this checks for a geospatial
+		// item in the datapub and adds the GeoJSON context to the
+		// document before trimming it - see l 177
 		const id = prefix + String(i);
 		items.push({
 			'@id': id,

test/catalog.spec.js

@@ -53,6 +53,8 @@ const ORG = {
 	'name': 'University of Technology Sydney'
 };
 
+const ALLOW_BAD_TYPES = { 'FeatureCollection': true };
+
 // defining these here so that the tests know what to 
 // look up in the results @graph
 
@@ -227,6 +229,12 @@ describe("Convert a ReDBox 2.0 DataPub to CATALOG.json", () => {
   		expect(cjds).to.be.a('object');
 	});
 
+	it("has no empty properties on the root dataset", () => {
+		_.forOwn(cjds, (prop, values, o) => {
+			expect(values).to.not.be.empty;
+		});
+	});
+
 
 	it("has string @id values for every graph item", () => {
 		cj['@graph'].map((i) => {
@@ -250,7 +258,9 @@ describe("Convert a ReDBox 2.0 DataPub to CATALOG.json", () => {
 		cj['@graph'].map((i) => {
 			expect(i).to.have.property('@type');
 			const type = i['@type'];
-			expect(cj['@context']).to.have.property(type);
+			if( ! ALLOW_BAD_TYPES[type] ) {
+				expect(cj['@context']).to.have.property(type);
+			} 
 		})
 	});
 
@@ -423,7 +433,7 @@ describe("Convert a ReDBox 2.0 DataPub to CATALOG.json", () => {
 			'publications': 'ScholarlyArticle',
 			'websites': 'WebSite',
 			'metadata': 'CreativeWork',
-			'data': 'DataSet',
+			'data': 'Dataset',
 			'services': 'CreativeWork'
 		}
 		REL_FIELDS.map((f) => {