Merge pull request #24 from magda-io/issue/23

Issue/23 GeoJson format string could sometimes be recognised as GEO+JSON

CHANGES.md

@@ -1,5 +1,9 @@
 > The repo was part of [magda main repo](https://github.com/magda-io/magda). For history before v1.0.0, please check [CHANGES.md of main repo](https://github.com/magda-io/magda/blob/master/CHANGES.md).
 
+# 2.0.1
+
+- #23 Add "GEO+JSON" to GEOJSON synonyms list
+
 # 2.0.0
 
 - Upgrade to node14

deploy/magda-minion-format/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: magda-minion-format
 description: A Helm chart for Magda Format Minion
-version: "2.0.0"
+version: "2.0.1"
 kubeVersion: ">= 1.14.0-0"
 home: "https://github.com/magda-io/magda-minion-format"
 sources: [ "https://github.com/magda-io/magda-minion-format" ]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magda/minion-format",
   "description": "MAGDA Layering Minion",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "scripts": {
     "prebuild": "rimraf dist tsconfig.tsbuildinfo",
     "build": "yarn run compile",

src/test/onRecordFound.spec.ts

@@ -179,6 +179,11 @@ describe("onRecordFound", async function(this) {
         "HTML"
     );
 
+    testDistFileReturnsFormat(
+        "./sampleDataFiles/issue-23-geojson.json",
+        "GEOJSON"
+    );
+
     /**
      * This test simply takes a bunch of formats that were previously causing the minion to use all its CPU and be
      * killed by a liveness check and ensures that they all are able to execute in less than 5 seconds.

src/test/sampleDataFiles/issue-23-geojson.json

@@ -0,0 +1,26 @@
+{
+    "aspects": {
+      "dcat-distribution-strings": {
+        "accessURL": "https://fed.dcceew.gov.au/datasets/erin::biologically-important-areas-of-regionally-significant-marine-species.geojson?outSR=%7B%22latestWkid%22%3A3857%2C%22wkid%22%3A102100%7D",
+        "format": "GeoJSON",
+        "license": "http://creativecommons.org/licenses/by/3.0",
+        "mediaType": "application/vnd.geo+json",
+        "title": "GeoJSON"
+      },
+      "project-open-data-distribution": {
+        "@type": "dcat:Distribution",
+        "accessURL": "https://fed.dcceew.gov.au/datasets/erin::biologically-important-areas-of-regionally-significant-marine-species.geojson?outSR=%7B%22latestWkid%22%3A3857%2C%22wkid%22%3A102100%7D",
+        "format": "GeoJSON",
+        "mediaType": "application/vnd.geo+json",
+        "title": "GeoJSON"
+      },
+      "source": {
+        "id": "dcceew",
+        "name": "Department of Climate Change, Energy, the Environment and Water",
+        "type": "project-open-data-distribution",
+        "url": "https://fed.dcceew.gov.au/api/feed/dcat-us/1.1.json"
+      }
+    },
+    "id": "dist-dcceew-https://www.arcgis.com/home/item.html?id=e8e7a7c233a44cf099817b2f4dff29c7&sublayer=0-3",
+    "name": "GeoJSON"
+  }

synonyms.json

@@ -60,5 +60,6 @@
             "type": "as-keyword"
         }
     ],
-    "spss": ["sav"]
+    "spss": ["sav"],
+    "GEOJSON": ["GEO+JSON", "GEOJSON+ZIP", "GEOJSON+ZIP+CSV"]
 }