@hestia-earth/schema-convert 20.1.0 → 20.2.0

package/json.js

@@ -242,19 +242,22 @@ var validateGeoJSONFormat = function (value) {
     return (!allowedGeoJSONTypes.includes(value.type)
         ? throwError("Invalid GeoJSON \"type\". Allowed values are: ".concat(allowedGeoJSONTypes.join(', ')))
         : 'geometries' in value
-            ? (value.geometries || []).every(validateGeoJSONGeometryType)
+            ? !value.geometries.length
+                ? throwError('This GeoJSON appears to be empty. Please either add coordinates or remove the field.')
+                : (value.geometries || []).every(validateGeoJSONGeometryType)
             : 'geometry' in value
                 ? validateGeoJSONGeometryType(value.geometry)
                 : 'features' in value
-                    ? (value.features || []).every(validateGeoJSONFormat)
+                    ? !value.features.length
+                        ? throwError('This GeoJSON appears to be empty. Please either add coordinates or remove the field.')
+                        : (value.features || []).every(validateGeoJSONFormat)
                     : true)
         ? value
         : null;
 };
-var parseGeoJSONValue = function (value) {
-    var result;
+var parseWtkValue = function (value) {
     try {
-        result = {
+        return {
             type: 'FeatureCollection',
             features: [{
                     type: 'Feature',
@@ -263,30 +266,36 @@ var parseGeoJSONValue = function (value) {
                 }]
         };
     }
-    catch (e1) {
-        try {
-            var data = JSON.parse(value);
-            return result = ['Polygon', 'MultiPolygon'].includes(data.type)
+    catch (error) {
+        return null;
+    }
+};
+var parseJsonValue = function (value) {
+    try {
+        var data = JSON.parse(value);
+        return ['Polygon', 'MultiPolygon'].includes(data.type)
+            ? {
+                type: 'FeatureCollection',
+                features: [{
+                        type: 'Feature',
+                        properties: {},
+                        geometry: data
+                    }]
+            }
+            : ['Feature'].includes(data.type)
                 ? {
                     type: 'FeatureCollection',
-                    features: [{
-                            type: 'Feature',
-                            properties: {},
-                            geometry: data
-                        }]
+                    features: [__assign(__assign({}, data), { properties: {} // make sure they are set or it is invalid
+                         })]
                 }
-                : ['Feature'].includes(data.type)
-                    ? {
-                        type: 'FeatureCollection',
-                        features: [__assign(__assign({}, data), { properties: {} // make sure they are set or it is invalid
-                             })]
-                    }
-                    : data;
-        }
-        catch (e2) {
-            return throwError('Unable to parse GeoJSON value. Please make sure the formatting is correct.');
-        }
+                : data;
     }
+    catch (error) {
+        return throwError('Unable to parse GeoJSON value. Please make sure the formatting is correct.');
+    }
+};
+var parseGeoJSONValue = function (value) {
+    var result = parseWtkValue(value) || parseJsonValue(value);
     return result ? validateGeoJSONFormat(result) : value;
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/schema-convert",
-  "version": "20.1.0",
+  "version": "20.2.0",
   "description": "Hestia Schema Converters",
   "main": "index.js",
   "typings": "index.d.ts",