refactor: remove dataAccessPath from initial layer configs

Closes #2537
Canadian-Geospatial-Platform · Nov 13, 2024 · 432620e · 432620e
1 parent a03c902
commit 432620e
Show file tree

Hide file tree

Showing 62 changed files with 7,323 additions and 4,119 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/docs/app/geoview-layer/add-layer-type.md b/docs/app/geoview-layer/add-layer-type.md
@@ -156,10 +156,6 @@ Add the TypeSourceImageStaticInitialConfig section. This the expected configurat
   "additionalProperties": false,
   "type": "object",
   "properties": {
-    "dataAccessPath": {
-      "type": "string",
-      "description": "The path to reach the data to display. If not specified, metadatAccessPath will be assigne to it."
-    },
     "crossOrigin": {
       "type": "string",
       "description": "The crossOrigin attribute for loaded images. Note that you must provide a crossOrigin value if you want to access pixel data with the Canvas renderer."

diff --git a/packages/geoview-core/package.json b/packages/geoview-core/package.json
@@ -32,7 +32,7 @@
     "serve": "npm run format && npm run fix && webpack serve --progress --color --config webpack.dev.js",
     "build": "npm run format && npm run fix && npm run doc && webpack --progress --color --config webpack.prod.js && npm run generate.d.ts",
     "doc": "typedoc src/app.tsx --logLevel Error --out public/docs",
-    "deploy": "gh-pages -d dist",
+    "deploy": "gh-pages -d dist -test",
     "test": "jest",
     "update_test": "jest --updateSnapshot",
     "format": "npm run format --prefix ../",

diff --git a/packages/geoview-core/public/configs/OSDP/function-event.json b/packages/geoview-core/public/configs/OSDP/function-event.json
@@ -77,7 +77,7 @@
       {
         "geoviewLayerId": "geojsonLYR1",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/my-config.json b/packages/geoview-core/public/configs/my-config.json
@@ -24,7 +24,7 @@
       {
         "geoviewLayerId": "geojsonLYR4",
         "geoviewLayerName": "GeoJSON Line",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/navigator/05-zoom-layer.json b/packages/geoview-core/public/configs/navigator/05-zoom-layer.json
@@ -17,7 +17,7 @@
       {
         "geoviewLayerId": "geojsonLYR1",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/navigator/06-basic-footer.json b/packages/geoview-core/public/configs/navigator/06-basic-footer.json
@@ -91,7 +91,7 @@
       {
         "geoviewLayerId": "geojsonLYR1",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/navigator/07-basic-appbar.json b/packages/geoview-core/public/configs/navigator/07-basic-appbar.json
@@ -35,7 +35,7 @@
       {
         "geoviewLayerId": "geojsonLYR1",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/navigator/12-package-geochart.json b/packages/geoview-core/public/configs/navigator/12-package-geochart.json
@@ -70,7 +70,7 @@
       {
         "geoviewLayerId": "geojsonLYR5",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/navigator/13-all-layers.json b/packages/geoview-core/public/configs/navigator/13-all-layers.json
@@ -13,7 +13,7 @@
       {
         "geoviewLayerId": "geojsonLYR1",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {
@@ -45,13 +45,13 @@
       {
         "geoviewLayerId": "csvLYR1",
         "geoviewLayerName": "NPRI",
+        "metadataAccessPath": "./datasets/csv-files/",
         "geoviewLayerType": "CSV",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "NPRI-INRP_WaterEau_MediaGroupMilieu_2022",
+            "layerId": "NPRI-INRP_WaterEau_MediaGroupMilieu_2022.csv",
             "layerName": "NPRI Water Media Group 2022",
             "source": {
-              "dataAccessPath": "./datasets/csv-files/NPRI-INRP_WaterEau_MediaGroupMilieu_2022.csv",
               "separator": ","
             }
           }
@@ -111,13 +111,13 @@
       {
         "geoviewLayerId": "staticLYR10",
         "geoviewLayerName": "Static Image",
+        "metadataAccessPath": "https://datacube-prod-data-public.s3.ca-central-1.amazonaws.com/store/imagery/aerial/napl/napl-ring-of-fire/",
         "geoviewLayerType": "imageStatic",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "thumbnail",
+            "layerId": "napl-ring-of-fire-1954-08-07-60k-thumbnail.png",
             "layerName": "Static Image",
             "source": {
-              "dataAccessPath": "https://datacube-prod-data-public.s3.ca-central-1.amazonaws.com/store/imagery/aerial/napl/napl-ring-of-fire/napl-ring-of-fire-1954-08-07-60k-thumbnail.png",
               "extent": [-87.77486341686723, 51.62285357468582, -84.57727128084842, 53.833354975551075],
               "projection": 4326
             }
@@ -165,29 +165,25 @@
       {
         "geoviewLayerId": "GeoPackageLYR1",
         "geoviewLayerName": "Natural Earth",
+        "metadataAccessPath": "./datasets/geopackages/",
         "geoviewLayerType": "GeoPackage",
         "listOfLayerEntryConfig": [
           {
             "layerId": "Natural_Earth_QGIS_layers_and_styles.gpkg",
-            "layerName": "Natural Earth",
-            "source": {
-              "dataAccessPath": "./datasets/geopackages"
-            }
+            "layerName": "Natural Earth"
           }
         ]
       },
       {
         "geoviewLayerId": "xyzTilesLYR1",
         "geoviewLayerName": "World_Topo_Map",
+        "metadataAccessPath": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/",
         "geoviewLayerType": "xyzTiles",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "topo",
+            "layerId": "0",
             "layerName": "World Topo Map",
-            "initialSettings": { "minZoom": 3, "maxZoom": 8 },
-            "source": {
-              "dataAccessPath": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}"
-            }
+            "initialSettings": { "minZoom": 3, "maxZoom": 8 }
           }
         ]
       },
@@ -198,12 +194,9 @@
         "metadataAccessPath": "https://tiles.arcgis.com/tiles/HsjBaDykC1mjhXz9/arcgis/rest/services/CBMT_CBCT_3978_V_OSM/VectorTileServer/",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "toner",
+            "layerId": "CBMT_CBCT_3978_V_OSM",
             "layerName": "Tile basemap",
-            "initialSettings": { "minZoom": 3, "maxZoom": 18 },
-            "source": {
-              "dataAccessPath": "https://tiles.arcgis.com/tiles/HsjBaDykC1mjhXz9/arcgis/rest/services/CBMT_CBCT_3978_V_OSM/VectorTileServer/tile/{z}/{y}/{x}.pbf"
-            }
+            "initialSettings": { "minZoom": 3, "maxZoom": 18 }
           }
         ]
       }

diff --git a/packages/geoview-core/public/configs/navigator/15-xyz-tile.json b/packages/geoview-core/public/configs/navigator/15-xyz-tile.json
@@ -13,15 +13,13 @@
       {
         "geoviewLayerId": "xyzTilesLYR1",
         "geoviewLayerName": "World_Topo_Map",
+        "metadataAccessPath": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/",
         "geoviewLayerType": "xyzTiles",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "topo",
+            "layerId": "0",
             "layerName": "World Topo Map",
-            "initialSettings": { "minZoom": 3, "maxZoom": 8 },
-            "source": {
-              "dataAccessPath": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}"
-            }
+            "initialSettings": { "minZoom": 3, "maxZoom": 8 }
           }
         ]
       }

diff --git a/packages/geoview-core/public/configs/navigator/18-esri-image.json b/packages/geoview-core/public/configs/navigator/18-esri-image.json
@@ -42,10 +42,7 @@
         "listOfLayerEntryConfig": [
           {
             "layerId": "0",
-            "layerName": "Cities",
-            "source": {
-              "dataAccessPath": "https://sampleserver6.arcgisonline.com/ArcGIS/rest/services/USA/MapServer"
-            }
+            "layerName": "Cities"
           },
           {
             "layerId": "1",

diff --git a/packages/geoview-core/public/configs/navigator/19-geojson.json b/packages/geoview-core/public/configs/navigator/19-geojson.json
@@ -13,7 +13,7 @@
       {
         "geoviewLayerId": "geojsonLYR1",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/navigator/22-static-image.json b/packages/geoview-core/public/configs/navigator/22-static-image.json
@@ -14,13 +14,13 @@
       {
         "geoviewLayerId": "staticLYR10",
         "geoviewLayerName": "Static Image",
+        "metadataAccessPath": "https://datacube-prod-data-public.s3.ca-central-1.amazonaws.com/store/imagery/aerial/napl/napl-ring-of-fire/",
         "geoviewLayerType": "imageStatic",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "thumbnail",
+            "layerId": "napl-ring-of-fire-1954-08-07-60k-thumbnail.png",
             "layerName": "Static Image",
             "source": {
-              "dataAccessPath": "https://datacube-prod-data-public.s3.ca-central-1.amazonaws.com/store/imagery/aerial/napl/napl-ring-of-fire/napl-ring-of-fire-1954-08-07-60k-thumbnail.png",
               "extent": [-87.77486341686723, 51.62285357468582, -84.57727128084842, 53.833354975551075],
               "projection": 4326
             }

diff --git a/packages/geoview-core/public/configs/navigator/23-csv.json b/packages/geoview-core/public/configs/navigator/23-csv.json
@@ -13,13 +13,13 @@
       {
         "geoviewLayerId": "csvLYR1",
         "geoviewLayerName": "NPRI",
+        "metadataAccessPath": "./datasets/csv-files/",
         "geoviewLayerType": "CSV",
         "listOfLayerEntryConfig": [
           {
             "layerId": "NPRI-INRP_WaterEau_MediaGroupMilieu_2022",
             "layerName": "NPRI Water Media Group 2022",
             "source": {
-              "dataAccessPath": "./datasets/csv-files/NPRI-INRP_WaterEau_MediaGroupMilieu_2022.csv",
               "separator": ","
             }
           }
@@ -28,14 +28,12 @@
       {
         "geoviewLayerId": "csvLYR2",
         "geoviewLayerName": "Station List MELCC",
+        "metadataAccessPath": "./datasets/csv-files/",
         "geoviewLayerType": "CSV",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "Station_List_Minus_HQ-MELCC",
-            "layerName": "Station List",
-            "source": {
-              "dataAccessPath": "./datasets/csv-files/Station_List_Minus_HQ-MELCC.csv"
-            }
+            "layerId": "Station_List_Minus_HQ-MELCC.csv",
+            "layerName": "Station List"
           }
         ]
       }

diff --git a/packages/geoview-core/public/configs/navigator/24-vector-tile.json b/packages/geoview-core/public/configs/navigator/24-vector-tile.json
@@ -17,11 +17,8 @@
         "metadataAccessPath": "https://tiles.arcgis.com/tiles/HsjBaDykC1mjhXz9/arcgis/rest/services/CBMT_CBCT_3978_V_OSM/VectorTileServer/",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "toner",
-            "initialSettings": { "minZoom": 3, "maxZoom": 18 },
-            "source": {
-              "dataAccessPath": "https://tiles.arcgis.com/tiles/HsjBaDykC1mjhXz9/arcgis/rest/services/CBMT_CBCT_3978_V_OSM/VectorTileServer/tile/{z}/{y}/{x}.pbf"
-            }
+            "layerId": "CBMT_CBCT_3978_V_OSM",
+            "initialSettings": { "minZoom": 3, "maxZoom": 18 }
           }
         ]
       }

diff --git a/packages/geoview-core/public/configs/navigator/25-geojson-multi.json b/packages/geoview-core/public/configs/navigator/25-geojson-multi.json
@@ -13,7 +13,7 @@
       {
         "geoviewLayerId": "geojsonLYR1",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata1.json",
+        "metadataAccessPath": "./datasets/geojson/metadata1.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {
@@ -25,7 +25,7 @@
       {
         "geoviewLayerId": "geojsonLYR2",
         "geoviewLayerName": "MultiPolygon Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {

diff --git a/packages/geoview-core/public/configs/package-swiper3-config-swiper.json b/packages/geoview-core/public/configs/package-swiper3-config-swiper.json
@@ -2,7 +2,7 @@
   "orientation": "vertical",
   "keyboardOffset": 10,
   "layers": [
-    "swipe0/toner",
+    "swipe0/0",
     "swipe1/msi-94-or-more",
     "swipe4/polygons.json",
     "swipe5/ec-msc:CURRENT_CONDITIONS",

diff --git a/packages/geoview-core/public/configs/package-swiper3-config.json b/packages/geoview-core/public/configs/package-swiper3-config.json
@@ -38,7 +38,7 @@
       {
         "geoviewLayerId": "swipe4",
         "geoviewLayerName": "GeoJSON Sample",
-        "metadataAccessPath": "./datasets/geojson/metadata.json",
+        "metadataAccessPath": "./datasets/geojson/metadata.meta",
         "geoviewLayerType": "GeoJSON",
         "listOfLayerEntryConfig": [
           {
@@ -75,16 +75,14 @@
       {
         "geoviewLayerId": "swipe0",
         "geoviewLayerName": "statmen toner",
+        "metadataAccessPath": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/",
         "geoviewLayerType": "xyzTiles",
         "listOfLayerEntryConfig": [
           {
-            "layerId": "toner",
+            "layerId": "0",
             "initialSettings": {
               "minZoom": 3,
               "maxZoom": 8
-            },
-            "source": {
-              "dataAccessPath": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}"
             }
           }
         ]

diff --git a/...blic/datasets/geojson/hydro-metadata.json → ...blic/datasets/geojson/hydro-metadata.meta b/...blic/datasets/geojson/hydro-metadata.json → ...blic/datasets/geojson/hydro-metadata.meta
@@ -5,7 +5,6 @@
       "layerId": "execution",
       "layerName": "Downstream Analysis",
       "source": {
-        "dataAccessPath": "https://app.chn-rhc.geogc.ca/api/processes/downstream-analysis/execution",
         "postSettings": {
           "header": {
             "accept": "application/json",

diff --git a/...blic/datasets/geojson/metadata-blank.json → ...blic/datasets/geojson/metadata-blank.meta b/...blic/datasets/geojson/metadata-blank.json → ...blic/datasets/geojson/metadata-blank.meta