feat(initialView): empty layerIds array defaults to all layers

Closes Canadian-Geospatial-Platform#2370
DamonU2 · Jul 18, 2024 · 2718c1d · 2718c1d
1 parent e4a8e73
commit 2718c1d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/packages/geoview-core/public/configs/navigator/12-a-package-swiper.json b/packages/geoview-core/public/configs/navigator/12-a-package-swiper.json
@@ -2,6 +2,9 @@
  "map": {
  "interaction": "dynamic",
  "viewSettings": {
+ "initialView": {
+ "layerIds": []
+ },
  "projection": 3978
  },
  "basemapOptions": {

diff --git a/packages/geoview-core/public/templates/layers/esri-dynamic.html b/packages/geoview-core/public/templates/layers/esri-dynamic.html
@@ -64,6 +64,9 @@ <h4 id="HLYR1">1. Many ESRI Dynamic Layers with legend settings in the config</h
  'map': {
  'interaction': 'dynamic',
  'viewSettings': {
+ 'initialView': {
+ 'layerIds': []
+ },
  'projection': 3857
  },
  'basemapOptions': {

diff --git a/packages/geoview-core/public/templates/layers/geocore.html b/packages/geoview-core/public/templates/layers/geocore.html
@@ -62,6 +62,9 @@ <h4 id="HLYR1">1. Many GeoCore Layers</h4>
  'map': {
  'interaction': 'dynamic',
  'viewSettings': {
+ 'initialView': {
+ 'layerIds': []
+ },
  'projection': 3978
  },
  'basemapOptions': {

diff --git a/packages/geoview-core/schema.json b/packages/geoview-core/schema.json
@@ -1562,11 +1562,10 @@
  },
  "layerIds": {
  "type": "array",
- "minItems": 1,
  "items": {
  "type": "string"
  },
- "description": "Geoview layer ID(s) or layer path(s) of layer(s) to use as initial map focus."
+ "description": "Geoview layer ID(s) or layer path(s) of layer(s) to use as initial map focus. If empty, will use all layers."
  }
  }
  },

diff --git a/packages/geoview-core/src/api/config/types/config-validation-schema.json b/packages/geoview-core/src/api/config/types/config-validation-schema.json
@@ -668,9 +668,8 @@
  }
  },
  "layerIds": {
- "description": "ID(s) of layer(s) to use as initial map focus.",
+ "description": "Geoview layer ID(s) or layer path(s) of layer(s) to use as initial map focus. If empty, will use all layers.",
  "type": "array",
- "minItems": 1,
  "items": {
  "type": "string"
  }

diff --git a/packages/geoview-core/src/api/config/types/map-schema-types.ts b/packages/geoview-core/src/api/config/types/map-schema-types.ts
@@ -207,7 +207,7 @@ export type TypeMapViewSettings = {
  * Option to set initial view by extent.
  * Called with [minX, minY, maxX, maxY] extent coordinates. */
  extent?: Extent;
- /** Geoview layer ID(s) or layer path(s) of layer(s) to use as initial map focus. */
+ /** Geoview layer ID(s) or layer path(s) of layer(s) to use as initial map focus. If empty, will use all layers. */
  layerIds?: string[];
 };
 

diff --git a/packages/geoview-core/src/geo/map/map-viewer.ts b/packages/geoview-core/src/geo/map/map-viewer.ts
@@ -614,7 +614,12 @@ export class MapViewer {
 
  // Zoom to extents of layers selected in config, if provided.
  if (this.mapFeaturesConfig.map.viewSettings.initialView?.layerIds) {
- let layerExtents = this.layer.getExtentOfMultipleLayers(this.mapFeaturesConfig.map.viewSettings.initialView.layerIds);
+ // If the layerIds array is empty, use all layers
+ const layerIdsToZoomTo = this.mapFeaturesConfig.map.viewSettings.initialView.layerIds.length
+ ? this.mapFeaturesConfig.map.viewSettings.initialView.layerIds
+ : this.layer.getGeoviewLayerIds();
+
+ let layerExtents = this.layer.getExtentOfMultipleLayers(layerIdsToZoomTo);
 
  // If extents have infinity, use default instead
  if (layerExtents.includes(Infinity))