Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove dataAccessPath from initial layer configs #2583

Merged
merged 1 commit into from
Nov 20, 2024
Merged

refactor: remove dataAccessPath from initial layer configs #2583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
816 changes: 443 additions & 373 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/geoview-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -verbose",
"test": "jest",
"update_test": "jest --updateSnapshot",
"format": "npm run format --prefix ../",
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/OSDP/function-event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/my-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"geoviewLayerId": "geojsonLYR4",
"geoviewLayerName": "GeoJSON Line",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/navigator/05-zoom-layer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/navigator/06-basic-footer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/navigator/07-basic-appbar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/navigator/12-package-geochart.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
{
"geoviewLayerId": "geojsonLYR5",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
24 changes: 10 additions & 14 deletions packages/geoview-core/public/configs/navigator/13-all-layers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down Expand Up @@ -114,7 +114,7 @@
"geoviewLayerType": "imageStatic",
"listOfLayerEntryConfig": [
{
"layerId": "thumbnail",
"layerId": "napl-ring-of-fire-1954",
"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",
Expand Down Expand Up @@ -165,29 +165,28 @@
{
"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 }
}
]
},
Expand All @@ -198,12 +197,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 }
}
]
}
Expand Down
8 changes: 3 additions & 5 deletions packages/geoview-core/public/configs/navigator/15-xyz-tile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
]
}
Expand Down
5 changes: 1 addition & 4 deletions packages/geoview-core/public/configs/navigator/18-esri-image.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@
"listOfLayerEntryConfig": [
{
"layerId": "0",
"layerName": "Cities",
"source": {
"dataAccessPath": "https://sampleserver6.arcgisonline.com/ArcGIS/rest/services/USA/MapServer"
}
"layerName": "Cities"
},
{
"layerId": "1",
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/navigator/19-geojson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
4 changes: 2 additions & 2 deletions packages/geoview-core/public/configs/navigator/22-static-image.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/navigator/23-csv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": ","
}
}
Expand Down
7 changes: 2 additions & 5 deletions packages/geoview-core/public/configs/navigator/24-vector-tile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions packages/geoview-core/public/configs/navigator/25-geojson-multi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata1.json",
"metadataAccessPath": "./datasets/geojson/metadata1.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand All @@ -25,7 +25,7 @@
{
"geoviewLayerId": "geojsonLYR2",
"geoviewLayerName": "MultiPolygon Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/geoview-core/public/configs/package-swiper3-config-swiper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 3 additions & 5 deletions packages/geoview-core/public/configs/package-swiper3-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{
"geoviewLayerId": "swipe4",
"geoviewLayerName": "GeoJSON Sample",
"metadataAccessPath": "./datasets/geojson/metadata.json",
"metadataAccessPath": "./datasets/geojson/metadata.meta",
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
Expand Down Expand Up @@ -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}"
}
}
]
Expand Down
1 change: 0 additions & 1 deletion ...blic/datasets/geojson/hydro-metadata.json → ...blic/datasets/geojson/hydro-metadata.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...blic/datasets/geojson/metadata-blank.json → ...blic/datasets/geojson/metadata-blank.meta
View file
Open in desktop
File renamed without changes.
Loading
Loading