Merge pull request #2032 from loopmediagroup/dev

[Gally]: master <- dev
loopmediagroup · Oct 20, 2023 · ced94f2 · ced94f2
2 parents 69fd38f + 167d3f3
commit ced94f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/resources/field-definitions.js b/src/resources/field-definitions.js
@@ -46,10 +46,10 @@ export default {
     {
       marshall: (vs) => (
         Array.isArray(vs) && vs.length !== 0
-          ? vs.map((v) => ({ type: 'Polygon', coordinates: v }))
+          ? { type: 'Multipolygon', coordinates: vs }
           : null
       ),
-      unmarshall: (vs) => (vs !== null ? vs.map(({ coordinates }) => coordinates) : null)
+      unmarshall: (vs) => (vs !== null ? vs.coordinates : null)
     }
   ),
   datetime: mkFn({ type: 'date', format: "yyyy-MM-dd'T'HH:mm:ss.SSSX" }),

diff --git a/test/remaps/geo-types.json b/test/remaps/geo-types.json
@@ -196,10 +196,10 @@
           ]
         ]
       },
-      "polys": [
-        {
-          "type": "Polygon",
-          "coordinates": [
+      "polys": {
+        "type": "Multipolygon",
+        "coordinates": [
+          [
             [
               [
                 -119.4923403,
@@ -231,8 +231,8 @@
               ]
             ]
           ]
-        }
-      ],
+        ]
+      },
       "timezone": "America/Vancouver",
       "keywords": [
         "kw1",