Add default world geography, eez specific geography, add support for …

…geography groups, and default to "planning boundary" group
seasketch · Sep 27, 2023 · a998fcb · a998fcb
1 parent b94fa67
commit a998fcb
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 8 deletions.
diff --git a/packages/base-project/data/default/world.json b/packages/base-project/data/default/world.json
@@ -0,0 +1,39 @@
+{
+    "type": "FeatureCollection",
+    "features": [
+      {
+        "type": "Feature",
+        "properties": {
+          "name": "World boundary",
+          "description": "World"
+        },
+        "geometry": {
+          "coordinates": [
+            [
+              [
+                -180,
+                90
+              ],
+              [
+                -180,
+                -90
+              ],
+              [
+                180,
+                -90
+              ],
+              [
+                180,
+                90
+              ],
+              [
+                -180,
+                90
+              ]
+            ]
+          ],
+          "type": "Polygon"
+        }
+      }
+    ]
+  }
diff --git a/packages/base-project/project/datasources.json b/packages/base-project/project/datasources.json
@@ -18,5 +18,16 @@
     "classKeys": [],
     "propertiesToKeep": ["UNION"],
     "url": "https://d3muy0hbwp5qkl.cloudfront.net"
+  },
+  {
+    "datasourceId": "world",
+    "geo_type": "vector",
+    "formats": [
+      "json"
+    ],
+    "layerName": "world",
+    "classKeys": [],
+    "src": "data/default/world.json",
+    "propertiesToKeep": []
   }
 ]
diff --git a/packages/base-project/project/geographies.json b/packages/base-project/project/geographies.json
@@ -1 +1,6 @@
-[]
+[{
+  "geographyId": "world",
+  "datasourceId": "world",
+  "display": "World",
+  "groups": ["project boundary"]
+}]
diff --git a/packages/geoprocessing/scripts/base/geographies/geographies.ts b/packages/geoprocessing/scripts/base/geographies/geographies.ts
@@ -12,8 +12,6 @@ import { geographyConfig } from "../../../src/geographies/config";
  * If geographies file not exist then start a new one and ensure directory exists
  */
 export function readGeographies(filePath?: string) {
-  // Start with default
-  // if planningAreaType is EEZ, then default to external geography for it
   let geos: Geographies = [];
 
   // Optional override

diff --git a/packages/geoprocessing/scripts/init/createProject.ts b/packages/geoprocessing/scripts/init/createProject.ts
@@ -241,7 +241,7 @@ export async function createProject(
             : metadata.planningAreaId,
           geographyProperty: eezDs.idProperty,
           propertyValue: metadata.planningAreaId,
-          groupId: "eez",
+          groups: ["project boundary"],
         },
       ];
 

diff --git a/packages/geoprocessing/src/types/geographies.ts b/packages/geoprocessing/src/types/geographies.ts
@@ -17,8 +17,8 @@ export const geographySchema = z.object({
   /** Optional, defines external layer for visualizing the geography */
   layerId: z.string().optional(),
   /** Optional, sub-geography identifier. Useful when you have multiple groupings/levels of geographies and want to select for a specific group */
-  groupId: z.string().optional(),
-  /** Optional, whether or not precalc should be run for this geography, defaults to true */
+  groups: z.array(z.string()).optional(),
+  /** Optional, whether or not precalc should be run for this geography, defaults to true if not present */
   precalc: z.boolean().optional(),
 });
 

diff --git a/packages/geoprocessing/src/types/geojson.ts b/packages/geoprocessing/src/types/geojson.ts
@@ -39,3 +39,17 @@ export const multipolygonSchema = z.object({
   type: z.literal('MultiPolygon'),
   coordinates: z.array(z.array(z.array(z.array(z.number()))))
 }) satisfies z.ZodType<MultiPolygon>
+
+/** Zod schema for Feature containing Polygon or MultiPolygon */
+export const featureSchema = z.object({
+  type: z.literal('Feature'),
+  geometry: polygonSchema.or(multipolygonSchema),
+  id: z.string().or(z.number()).optional(),
+  properties: z.record(z.any()).or(z.null())
+})
+
+/** Zod schema for FeatureCollection containing polygons or multipolygons */
+export const fcSchema = z.object({
+  type: z.literal('FeatureCollection'),
+  features: z.array(featureSchema)
+}) satisfies z.ZodType<FeatureCollection<Polygon | MultiPolygon>>
diff --git a/packages/template-blank-project/project/geographies.json b/packages/template-blank-project/project/geographies.json
@@ -1 +1,6 @@
-[]
+[{
+  "geographyId": "world",
+  "datasourceId": "world",
+  "display": "World",
+  "groups": ["project boundary"]
+}]
diff --git a/packages/template-ocean-eez/project/geographies.json b/packages/template-ocean-eez/project/geographies.json
@@ -1 +1,8 @@
-[]
+[{
+  "geographyId": "eez",
+  "datasourceId": "eez_mr_osm",
+  "geographyProperty": "GEONAME",
+  "propertyValue": "Micronesian Exclusive Economic Zone",
+  "display": "Micronesia",
+  "groups": ["project boundary"]
+}]