Merge branch 'develop' into add-modal-to-legend-images

Canadian-Geospatial-Platform · Jul 16, 2024 · 63c4c8c · 63c4c8c
2 parents 34de7c5 + 5a2880b
commit 63c4c8c
Show file tree

Hide file tree

Showing 55 changed files with 1,877 additions and 666 deletions.
diff --git a/.github/workflows/type-build.yml b/.github/workflows/type-build.yml
@@ -5,7 +5,6 @@ on:
     - cron: "42 21 * * 5"
 
 env:
-  NODE_VERSION: "20.11.0"
   PNPM_VERSION: "8.15.0"
 
 jobs:
@@ -15,10 +14,14 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.11.0
+
       - name: Build geoview-core to update types
         run: |
           npm install -g @microsoft/rush

diff --git a/packages/geoview-aoi-panel/default-config-aoi-panel.json b/packages/geoview-aoi-panel/default-config-aoi-panel.json
@@ -0,0 +1,7 @@
+{
+  "isOpen": false,
+  "aoiList": [
+  ],
+  "version": "1.0"
+}
+
diff --git a/packages/geoview-aoi-panel/default-config-area-of-interest.json b/packages/geoview-aoi-panel/default-config-area-of-interest.json
diff --git a/packages/geoview-aoi-panel/schema.json b/packages/geoview-aoi-panel/schema.json
@@ -2,25 +2,61 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "GeoView Area of Interest Panel Schema",
   "type": "object",
-  "version": 1.0,
+  "version": "1.0",
   "comments": "Configuration for GeoView Area of interest package.",
   "additionalProperties": false,
   "properties": {
     "isOpen": {
-      "type": "boolean",
       "description": "Specifies whether the area of interest panel is initially open or closed",
+      "type": "boolean",
       "default": false
     },
+    "aoiList": {
+      "description": "Area of Interest list from which we can select.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "imageUrl": {
+            "type": "string"
+          },
+          "aoiTitle": {
+            "type": "string"
+          },
+          "extent": {
+            "type": "array",
+            "items": [
+              {
+                "type": "number",
+                "minimum": -180,
+                "maximum": 180
+              },
+              {
+                "type": "number",
+                "minimum": -90,
+                "maximum": 90
+              },
+              {
+                "type": "number",
+                "minimum": -180,
+                "maximum": 180
+              },
+              {
+                "type": "number",
+                "minimum": -90,
+                "maximum": 90
+              }
+            ]
+          }
+        },
+        "required": ["aoiTitle", "extent"]
+      }
+    },
     "version": {
       "type": "string",
-      "enum": [
-        "1.0"
-      ],
+      "enum": ["1.0"],
       "description": "The schema version used to validate the configuration file. The schema should enumerate the list of versions accepted by this version of the viewer."
     }
-  },
-  "required": [
-    "isOpen"
-  ]
+  }
 }
-
diff --git a/packages/geoview-aoi-panel/src/aoi-panel.tsx b/packages/geoview-aoi-panel/src/aoi-panel.tsx
@@ -15,6 +15,7 @@ interface AoiPanelProps {
 */
 
 export function AoiPanel(/* props: AoiPanelProps */): JSX.Element {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   // const { mapId, config } = props;
 
   // const { cgpv } = window;

diff --git a/packages/geoview-aoi-panel/src/index.tsx b/packages/geoview-aoi-panel/src/index.tsx
@@ -5,7 +5,7 @@ import { TypeIconButtonProps } from 'geoview-core/src/ui/icon-button/icon-button
 import { TypePanelProps } from 'geoview-core/src/ui/panel/panel-types';
 import { AoiPanel } from './aoi-panel';
 import schema from '../schema.json';
-import defaultConfig from '../default-config-area-of-interest.json';
+import defaultConfig from '../default-config-aoi-panel.json';
 
 /**
  * Create a class for the plugin instance

diff --git a/packages/geoview-basemap-panel/default-config-basemap-panel.json b/packages/geoview-basemap-panel/default-config-basemap-panel.json
@@ -15,6 +15,11 @@
           "shaded": true,
           "labeled": false
         },
+        {
+          "basemapId": "imagery",
+          "shaded": false,
+          "labeled": false
+        },
         {
           "basemapId": "osm",
           "shaded": true,
@@ -51,6 +56,11 @@
           "shaded": true,
           "labeled": false
         },
+        {
+          "basemapId": "imagery",
+          "shaded": false,
+          "labeled": false
+        },
         {
           "basemapId": "osm",
           "shaded": true,

diff --git a/packages/geoview-basemap-panel/schema.json b/packages/geoview-basemap-panel/schema.json
@@ -95,7 +95,7 @@
         "basemapId": {
           "type": "string",
           "description": "the basemap id",
-          "enum": ["transport", "simple", "shaded", "osm", "nogeom"]
+          "enum": ["transport", "simple", "shaded", "osm", "nogeom", "imagery"]
         },
         "shaded": {
           "type": "boolean",

diff --git a/packages/geoview-basemap-panel/src/basemap-panel-style.ts b/packages/geoview-basemap-panel/src/basemap-panel-style.ts
@@ -58,7 +58,7 @@ export const getSxClasses = (theme): any => ({
         height: '100%',
         width: '100%',
         position: 'absolute',
-        backgroundColor: theme.palette.geoViewColor.grey.lighten(0.5, 0.85),
+        backgroundColor: theme.palette.geoViewColor.grey.lighten(0.5, 0.6),
         transition: 'all 0.3s ease-in-out',
       },
     },