esri-gl 0.9.1 → 0.10.0

package/dist/{IdentifyImage-B1oeOjpm.js → IdentifyImage-DWBF8K_a.js}

@@ -55,7 +55,9 @@ function updateAttribution(newAttribution, sourceId, map) {
   if (!attributionController) return;
   const customAttribution = attributionController.options?.customAttribution;
   if (typeof customAttribution === 'string') {
-    attributionController.options.customAttribution = `${customAttribution} | ${POWERED_BY_ESRI_ATTRIBUTION_STRING}`;
+    if (!customAttribution.includes(POWERED_BY_ESRI_ATTRIBUTION_STRING)) {
+      attributionController.options.customAttribution = `${customAttribution} | ${POWERED_BY_ESRI_ATTRIBUTION_STRING}`;
+    }
   } else if (customAttribution === undefined) {
     if (attributionController.options) {
       attributionController.options.customAttribution = POWERED_BY_ESRI_ATTRIBUTION_STRING;
@@ -73,8 +75,9 @@ function updateAttribution(newAttribution, sourceId, map) {
   } else if (mapStyle?._otherSourceCaches?.[sourceId]?._source) {
     mapStyle._otherSourceCaches[sourceId]._source.attribution = newAttribution;
   } else {
-    console.warn(`Source ${sourceId} not found when trying to update attribution`);
-    return; // Don't try to update attributions if source doesn't exist
+    // Source may not be registered in style caches yet (async attribution fetch race).
+    // Silently skip — attribution will be set when the source is ready.
+    return;
   }
   // Call undocumented method to update attribution display
   if (attributionController._updateAttributions) {
@@ -1284,6 +1287,8 @@ class DynamicMapService {
       return;
     }
     try {
+      // Guard against map whose style has already been destroyed
+      if (!map.style) return;
       const mapWithStyle = map;
       const mapLayerApi = map;
       const mapSourceApi = map;
@@ -1428,6 +1433,8 @@ class TiledMapService {
       return;
     }
     try {
+      // Guard against map whose style has already been destroyed
+      if (!this._map.style) return;
       // First, remove any layers that are using this source
       const mapWithStyle = this._map;
       if (mapWithStyle.getStyle && typeof mapWithStyle.getLayer === 'function') {
@@ -1664,8 +1671,10 @@ class ImageService {
   remove() {
     if (this._map && typeof this._map.removeSource === 'function') {
       try {
-        // First, remove any layers that are using this source
+        // Guard against map whose style has already been destroyed
         const mapWithStyle = this._map;
+        if (!mapWithStyle.style) return;
+        // First, remove any layers that are using this source
         if (mapWithStyle.getStyle) {
           const style = mapWithStyle.getStyle();
           const layers = style?.layers || [];
@@ -2015,6 +2024,8 @@ class VectorTileService {
       return;
     }
     try {
+      // Guard against map whose style has already been destroyed
+      if (!map.style) return;
       const mapWithStyle = map;
       const mapLayerApi = map;
       const mapSourceApi = map;
@@ -2282,8 +2293,10 @@ class FeatureService {
     this.disableRequests();
     if (this._map && typeof this._map.removeSource === 'function') {
       try {
-        // First, remove any layers that are using this source
+        // Guard against map whose style has already been destroyed
         const mapWithStyle = this._map;
+        if (!mapWithStyle.style) return;
+        // First, remove any layers that are using this source
         if (mapWithStyle.getStyle) {
           const style = mapWithStyle.getStyle();
           const layers = style?.layers || [];
@@ -3831,6 +3844,8 @@ function find(options) {
  * IdentifyFeatures task for performing identify operations against ArcGIS Map Services
  * Similar to Esri Leaflet's identifyFeatures functionality
  */
+// Scale constant: at zoom 0 and 96 DPI, the Web Mercator scale denominator
+const SCALE_AT_ZOOM_0 = 559082264.028;
 class IdentifyFeatures extends Task {
   constructor(options) {
     // Handle different input types and convert to TaskOptions format
@@ -3876,6 +3891,18 @@ class IdentifyFeatures extends Task {
         f: 'json'
       }
     });
+    Object.defineProperty(this, "_map", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: null
+    });
+    Object.defineProperty(this, "_layerScaleRanges", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: {}
+    });
     this.path = '/identify';
     // Ensure dynamic setters are available even though subclass fields
     // are initialized after super() runs. This rebinds setter methods.
@@ -3929,9 +3956,11 @@ class IdentifyFeatures extends Task {
     return this;
   }
   /**
-   * Set the map extent and image display for the identify operation
+   * Set the map extent and image display for the identify operation.
+   * Also stores the map reference for zoom-based scale filtering.
    */
   on(map) {
+    this._map = map;
     try {
       const bounds = map.getBounds().toArray();
       this.params.mapExtent = [bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]].join(',');
@@ -3942,6 +3971,22 @@ class IdentifyFeatures extends Task {
     }
     return this;
   }
+  /**
+   * Set scale ranges for layers so the identify can skip layers not visible at the current zoom.
+   * ArcGIS uses minScale (zoomed out limit) and maxScale (zoomed in limit).
+   * A value of 0 means no limit.
+   *
+   * @example
+   * identify.layerScales({
+   *   0: { minScale: 1000000, maxScale: 0 },     // Cities: visible below 1:1M
+   *   1: { minScale: 5000000, maxScale: 500000 }, // Highways: visible between 1:5M and 1:500K
+   *   2: { minScale: 0, maxScale: 0 },            // States: always visible
+   * });
+   */
+  layerScales(scales) {
+    this._layerScaleRanges = scales;
+    return this;
+  }
   /**
    * Set layer definitions for filtering specific layers
    */
@@ -3960,9 +4005,67 @@ class IdentifyFeatures extends Task {
     return this;
   }
   /**
-   * Execute the identify operation
+   * Get the current map scale from zoom level.
+   * Uses the standard Web Mercator scale formula at 96 DPI.
+   */
+  _getMapScale() {
+    if (!this._map || typeof this._map.getZoom !== 'function') return null;
+    const zoom = this._map.getZoom();
+    return SCALE_AT_ZOOM_0 / Math.pow(2, zoom);
+  }
+  /**
+   * Check if a layer is visible at the given scale.
+   * ArcGIS convention: minScale = most zoomed out (largest number), maxScale = most zoomed in (smallest number).
+   * A value of 0 means no limit in that direction.
+   */
+  _isLayerVisibleAtScale(layerId, scale) {
+    const range = this._layerScaleRanges[layerId];
+    if (!range) return true; // No scale info means always visible
+    if (range.minScale && scale > range.minScale) return false; // Too zoomed out
+    if (range.maxScale && scale < range.maxScale) return false; // Too zoomed in
+    return true;
+  }
+  /**
+   * Filter the layers parameter to only include layers visible at the current scale.
+   * Returns false if no layers are visible (request should be skipped).
+   */
+  _filterLayersByScale() {
+    const scale = this._getMapScale();
+    if (scale === null || Object.keys(this._layerScaleRanges).length === 0) return true;
+    const layersParam = this.params.layers;
+    if (typeof layersParam !== 'string') return true;
+    // Parse layers string: "all", "visible:0,1,2", "top", "visible", "0,1,2"
+    const match = layersParam.match(/^(all|top|visible)(?::(.+))?$/);
+    if (!match) return true;
+    const prefix = match[1];
+    const idsPart = match[2];
+    // If no specific IDs, filter all known layer IDs from scale ranges
+    let layerIds;
+    if (idsPart) {
+      layerIds = idsPart.split(',').map(Number).filter(n => !isNaN(n));
+    } else {
+      layerIds = Object.keys(this._layerScaleRanges).map(Number);
+    }
+    const visibleIds = layerIds.filter(id => this._isLayerVisibleAtScale(id, scale));
+    if (visibleIds.length === 0) return false;
+    // Update layers param with only visible IDs
+    this.params.layers = `${prefix}:${visibleIds.join(',')}`;
+    return true;
+  }
+  /**
+   * Execute the identify operation.
+   * If layer scale ranges are set via `layerScales()` and a map is provided via `on()`,
+   * layers not visible at the current zoom level will be excluded. If no layers are visible,
+   * an empty FeatureCollection is returned without making a network request.
    */
   async run() {
+    // Skip request entirely if no layers are visible at the current scale
+    if (!this._filterLayersByScale()) {
+      return {
+        type: 'FeatureCollection',
+        features: []
+      };
+    }
     try {
       const response = await this.request();
       return this._convertToGeoJSON(response);
@@ -4171,4 +4274,4 @@ function identifyImage(options) {
 }
 
 export { DynamicMapService as D, FeatureService as F, IdentifyFeatures as I, Query as Q, Service as S, Task as T, VectorBasemapStyle as V, Find as a, IdentifyImage as b, ImageService as c, TiledMapService as d, VectorTileService as e, cleanTrailingSlash as f, find as g, getServiceDetails as h, identifyImage as i, query as q, updateAttribution as u };
-//# sourceMappingURL=IdentifyImage-B1oeOjpm.js.map
+//# sourceMappingURL=IdentifyImage-DWBF8K_a.js.map