@vertigis/arcgis-extensions 38.2.0 → 39.0.1

package/portal/GeoJSONLayer.d.ts

@@ -0,0 +1,84 @@
+import type EsriGeoJSONLayer from "@arcgis/core/layers/GeoJSONLayer";
+import { LayerDefinition } from "./LayerDefinition.js";
+import type { OperationalLayerBase } from "./OperationalLayer.js";
+import { PopupInfo } from "./PopupInfo.js";
+export declare namespace GeoJSONLayer {
+    /**
+     * Default values from Esri JavaScript API documentation.
+     */
+    const esriGeoJSONLayerDefaults: {
+        labelsVisible: boolean;
+        legendEnabled: boolean;
+        popupEnabled: boolean;
+        visible: boolean;
+        minScale: number;
+        maxScale: number;
+        screenSizePerspective: boolean;
+    };
+    /**
+     * Converts an ArcGIS Portal JSON representation of a GeoJSON layer to its
+     * Esri JavaScript API representation.
+     *
+     * @param layerJson The layer JSON to convert.
+     */
+    function toEsriApiLayer(layerJson: GeoJSONLayer): Promise<EsriGeoJSONLayer>;
+    /**
+     * Applies an ArcGIS Portal JSON representation of a GeoJSON layer to its
+     * Esri JavaScript API representation.
+     *
+     * @param layerJson The layer JSON to apply.
+     * @param layer The layer object to apply it to.
+     */
+    function applyToEsriApiLayer(layerJson: GeoJSONLayer, layer: EsriGeoJSONLayer): Promise<void>;
+    /**
+     * Converts an Esri JavaScript API GeoJSONLayer object to its ArcGIS Portal
+     * JSON representation.
+     *
+     * @param layer The layer object to convert.
+     */
+    function fromEsriApiGeoJSONLayer(layer: EsriGeoJSONLayer): GeoJSONLayer;
+}
+/**
+ * The GeoJSON layer type references a GeoJSON or TXT file from a
+ * publicly-accessible web server. It then dynamically loads into the map at run
+ * time. The GeoJSON layer will maintain a reference to the GeoJSON resource.
+ *
+ * Web map spec:
+ * {@link https://developers.arcgis.com/web-map-specification/objects/geoJsonLayer/}.
+ * Web scene spec:
+ * {@link https://developers.arcgis.com/web-scene-specification/objects/geoJsonLayer/}.
+ */
+export interface GeoJSONLayer extends OperationalLayerBase {
+    /**
+     * Indicates whether to allow a client to ignore popups defined by the
+     * service item.
+     */
+    disablePopup?: boolean;
+    /**
+     * A layerDefinition object defining the attribute schema and drawing
+     * information for the layer.
+     */
+    layerDefinition?: LayerDefinition;
+    /**
+     * The type of layer.
+     */
+    layerType: "GeoJSON";
+    /**
+     * A PopupInfo object defining the content of pop-up windows when you click
+     * or query a feature.
+     */
+    popupInfo?: PopupInfo;
+    /**
+     * Apply perspective scaling to screen-size symbols.
+     */
+    screenSizePerspective?: boolean;
+    /**
+     * Indicates whether to display labels for this layer. If true, labels will
+     * appear as defined in the labelingInfo property.
+     */
+    showLabels?: boolean;
+    /**
+     * The URL to the GeoJSON file that backs the layer.
+     */
+    url?: string;
+}

package/portal/GeoJSONLayer.js

@@ -0,0 +1 @@
+import{isGeoJSONLayer as e}from"../utilities/_layers.js";import{checkArg as i}from"../utilities/checkArg.js";import{LayerDefinition as r}from"./LayerDefinition.js";import{PopupInfo as s}from"./PopupInfo.js";import{defaultPointRenderer as a}from"./Renderer.js";import{ERR_LAYER_TYPE_MISMATCH as o,applyLayerBaseToEsriApiLayer as n,applyOperationalLayerToEsriApiLayer as l,fromEsriApiLayerToLayerBase as p,fromEsriApiLayerToOperationalLayer as t}from"./_layerHelper.js";export var GeoJSONLayer;!function(y){async function f(a,p){i("layerJson",a).isNotMissing(),i("layerJson.layerType",a.layerType).satisfies((e=>!e||"GeoJSON"===e),o),i("layer",p).isNotMissing().satisfies(e,o),n(a,p),l(a,p),a.hasOwnProperty("popupInfo")&&(p.popupTemplate=s.toEsriApiPopupTemplate(a.popupInfo)),a.hasOwnProperty("screenSizePerspective")&&(p.screenSizePerspectiveEnabled=a.screenSizePerspective),a.hasOwnProperty("showLabels")&&(p.labelsVisible=a.showLabels),a.hasOwnProperty("url")&&(p.url=a.url),a.hasOwnProperty("layerDefinition")&&await r.applyToEsriApiLayer(a.layerDefinition,p)}y.esriGeoJSONLayerDefaults={labelsVisible:!0,legendEnabled:!0,popupEnabled:!0,visible:!0,minScale:0,maxScale:0,screenSizePerspective:!0},y.toEsriApiLayer=async function(e){i("layerJson",e).isNotMissing(),i("layerJson.layerType",e.layerType).satisfies((e=>!e||"GeoJSON"===e),o);const r=new((await import("@arcgis/core/layers/GeoJSONLayer")).default);return function(e){e.layerDefinition=e.layerDefinition||{},e.layerDefinition.drawingInfo=e.layerDefinition.drawingInfo||{},e.layerDefinition.drawingInfo.renderer=e.layerDefinition.drawingInfo.renderer||a}(e),await f(e,r),r},y.applyToEsriApiLayer=f,y.fromEsriApiGeoJSONLayer=function(e){i("layer",e).isNotMissing();const a={...p(e,y.esriGeoJSONLayerDefaults),...t(e),layerType:"GeoJSON",layerDefinition:r.fromEsriApiLayer(e,y.esriGeoJSONLayerDefaults),url:e.url};return e.popupTemplate&&(a.popupInfo=s.fromEsriApiPopupTemplate(e.popupTemplate)),e.screenSizePerspectiveEnabled!==y.esriGeoJSONLayerDefaults.screenSizePerspective&&(a.screenSizePerspective=e.screenSizePerspectiveEnabled),e.labelsVisible!==y.esriGeoJSONLayerDefaults.labelsVisible&&(a.showLabels=e.labelsVisible),a}}(GeoJSONLayer||(GeoJSONLayer={}));

package/portal/LayerBase.d.ts

@@ -1 +1,2 @@
-export { LayerBase, LayerType } from "./_LayerBase.js";
+export { LayerBase } from "./_LayerBase.js";
+export type { LayerType } from "./_LayerBase.js";

package/portal/LayerBase.js

@@ -1 +1 @@
-import{isBuildingSceneLayer as e,isCSVLayer as r,isElevationLayer as i,isFeatureLayer as a,isGeoRssLayer as t,isGraphicsLayer as p,isGroupLayer as o,isImageryLayer as y,isImageryTileLayer as s,isIntegratedMeshLayer as n,isKMLLayer as c,isMapImageLayer as L,isOpenStreetMapLayer as l,isPointCloudLayer as u,isSceneLayer as m,isStreamLayer as A,isSubtypeGroupLayer as E,isTiledImageServiceLayer as S,isTiledMapServiceLayer as f,isTileLayer as T,isVectorTileLayer as F,isWebTileLayer as d,isWMSLayer as I,isWMTSLayer as g,layersAreEquivalent as G}from"../utilities/_layers.js";import{checkArg as M}from"../utilities/checkArg.js";import{compareAsync as v}from"../utilities/collection.js";import{BuildingSceneLayer as j}from"./BuildingSceneLayer.js";import{CSVLayer as h}from"./CSVLayer.js";import{ElevationLayer as C}from"./ElevationLayer.js";import{FeatureLayer as V}from"./FeatureLayer.js";import{GeoRSSLayer as b}from"./GeoRSSLayer.js";import{GroupLayer as w}from"./GroupLayer.js";import{ImageServiceLayer as B}from"./ImageServiceLayer.js";import{IntegratedMeshLayer as W}from"./IntegratedMeshLayer.js";import{KMLLayer as J}from"./KMLLayer.js";import{MapServiceLayer as K}from"./MapServiceLayer.js";import{OpenStreetMapLayer as N}from"./OpenStreetMapLayer.js";import{PointCloudLayer as O}from"./PointCloudLayer.js";import{SceneLayer as P}from"./SceneLayer.js";import{StreamLayer as H}from"./StreamLayer.js";import{SubtypeGroupLayer as R}from"./SubtypeGroupLayer.js";import{TiledImageServiceLayer as _}from"./TiledImageServiceLayer.js";import{TiledMapServiceLayer as D}from"./TiledMapServiceLayer.js";import{VectorTileLayer as $}from"./VectorTileLayer.js";import{WMSLayer as k}from"./WMSLayer.js";import{WebTileLayer as q}from"./WebTileLayer.js";import{LayerBase as x}from"./_LayerBase.js";export{LayerBase}from"./_LayerBase.js";const U=new Map;async function z(e){return new((await import("@arcgis/core/layers/UnsupportedLayer")).default)}async function Q(e,r){console.warn(`Layer type: '${e.layerType||e.type}' is unsupported.`)}function X(e){console.warn(`Layer type: '${e?e.declaredClass:""}' is unsupported.`)}x.toEsriApiLayer=async(e,r)=>{M("layerJson",e).isNotMissing();const i=e.layerType||e.type;M("layerJson",e).satisfies((()=>!!i),"Layer JSON must have a valid 'layerType' property.");const a=function(e){const r=U.get(e);return r?r.createFunction:z}(i);return a(e,r)},x.applyToEsriApiLayer=async(e,r,i)=>{M("layerJson",e).isNotMissing(),M("layer",r).isNotMissing();const a=e.layerType||e.type;let t=x.getLayerType(r);"ArcGISTiledImageServiceLayer"===a&&(t=a),M("layerJson",e).satisfies((()=>!a||a===t),"The layer's type must match the 'layerType' property in the layer JSON.");return function(e){const r=U.get(e);return r?r.applyFunction:Q}(t)(e,r,i)},x.applyToEsriApiLayers=async(e,r,i)=>v(e,r,{onNew:async(r,a)=>{e.add(await x.toEsriApiLayer(r,i),a)},onMatch:async(r,a,t,p)=>{t!==p&&e.reorder(r,p),await x.applyToEsriApiLayer(a,r,i)},onMissing:r=>{e.remove(r)},equals:(e,r)=>G(e,r)}),x.getLayerType=f=>r(f)?"CSV":A(f)?"ArcGISStreamLayer":a(f)||p(f)?"ArcGISFeatureLayer":t(f)?"GeoRSS":y(f)?"ArcGISImageServiceLayer":s(f)?"ArcGISTiledImageServiceLayer":c(f)?"KML":L(f)?"ArcGISMapServiceLayer":l(f)?"OpenStreetMap":d(f)?"WebTiledLayer":F(f)?"VectorTileLayer":S(f)?"ArcGISTiledImageServiceLayer":T(f)?"ArcGISTiledMapServiceLayer":i(f)?"ArcGISTiledElevationServiceLayer":m(f)?"ArcGISSceneServiceLayer":u(f)?"PointCloudLayer":n(f)?"IntegratedMeshLayer":o(f)?"GroupLayer":I(f)?"WMS":g(f)?"WebTiledLayer":e(f)?"BuildingSceneLayer":E(f)?"SubtypeGroupLayer":void 0,x.fromEsriApiLayer=T=>{const G=function(T){return r(T)?h.fromEsriApiCSVLayer:A(T)?H.fromEsriApiStreamLayer:a(T)?V.fromEsriApiFeatureLayer:t(T)?b.fromEsriApiLayer:p(T)?V.fromEsriApiGraphicsLayer:y(T)?B.fromEsriApiImageryLayer:s(T)?_.fromEsriApiTileLayer:c(T)?J.fromEsriApiKMLLayer:L(T)?K.fromEsriApiMapImageLayer:l(T)?N.fromEsriApiOpenStreetMapLayer:d(T)?q.fromEsriApiLayer:F(T)?$.fromEsriApiVectorTileLayer:S(T)?_.fromEsriApiTileLayer:f(T)?D.fromEsriApiTileLayer:i(T)?C.fromEsriApiElevationLayer:m(T)?P.fromEsriApiSceneLayer:u(T)?O.fromEsriApiPointCloudLayer:n(T)?W.fromEsriApiIntegratedMeshLayer:o(T)?w.fromEsriApiGroupLayer:I(T)?k.fromEsriApiLayer:g(T)?q.fromEsriApiLayer:e(T)?j.fromEsriApiBuildingSceneLayer:E(T)?R.fromEsriApiSubtypeGroupLayer:X}(T);return G(T)},x.registerDefaultClassHandlers=()=>{U.clear(),U.set("ArcGISFeatureLayer",{createFunction:V.toEsriApiLayer,applyFunction:V.applyToEsriApiLayer}),U.set("ArcGISImageServiceLayer",{createFunction:B.toEsriApiLayer,applyFunction:B.applyToEsriApiLayer}),U.set("ArcGISImageServiceVectorLayer",{createFunction:B.toEsriApiLayer,applyFunction:B.applyToEsriApiLayer}),U.set("ArcGISMapServiceLayer",{createFunction:K.toEsriApiLayer,applyFunction:K.applyToEsriApiLayer}),U.set("ArcGISStreamLayer",{createFunction:H.toEsriApiLayer,applyFunction:H.applyToEsriApiLayer}),U.set("ArcGISTiledElevationServiceLayer",{createFunction:C.toEsriApiLayer,applyFunction:C.applyToEsriApiLayer}),U.set("ArcGISTiledImageServiceLayer",{createFunction:_.toEsriApiLayer,applyFunction:_.applyToEsriApiLayer}),U.set("ArcGISTiledMapServiceLayer",{createFunction:D.toEsriApiLayer,applyFunction:D.applyToEsriApiLayer}),U.set("OpenStreetMap",{createFunction:N.toEsriApiLayer,applyFunction:N.applyToEsriApiLayer}),U.set("VectorTileLayer",{createFunction:$.toEsriApiLayer,applyFunction:$.applyToEsriApiLayer}),U.set("CSV",{createFunction:h.toEsriApiLayer,applyFunction:h.applyToEsriApiLayer}),U.set("GeoRSS",{createFunction:b.toEsriApiLayer,applyFunction:b.applyToEsriApiLayer}),U.set("WMS",{createFunction:k.toEsriApiLayer,applyFunction:k.applyToEsriApiLayer}),U.set("KML",{createFunction:J.toEsriApiKMLLayer,applyFunction:J.applyToEsriApiKMLLayer}),U.set("WebTiledLayer",{createFunction:q.toEsriApiLayer,applyFunction:q.applyToEsriApiLayer}),U.set("IntegratedMeshLayer",{createFunction:W.toEsriApiLayer,applyFunction:W.applyToEsriApiLayer}),U.set("GroupLayer",{createFunction:w.toEsriApiLayer,applyFunction:w.applyToEsriApiLayer}),U.set("ArcGISSceneServiceLayer",{createFunction:P.toEsriApiLayer,applyFunction:P.applyToEsriApiLayer}),U.set("PointCloudLayer",{createFunction:O.toEsriApiLayer,applyFunction:O.applyToEsriApiLayer}),U.set("BuildingSceneLayer",{createFunction:j.toEsriApiLayer,applyFunction:j.applyToEsriApiLayer}),U.set("SubtypeGroupLayer",{createFunction:R.toEsriApiLayer,applyFunction:R.applyToEsriApiLayer})},x.registerLayerClassHandler=(e,r,i)=>{U.set(e,{createFunction:r,applyFunction:i})},x.registerDefaultClassHandlers();
+import{isBuildingSceneLayer as e,isCSVLayer as r,isElevationLayer as i,isFeatureLayer as a,isGeoJSONLayer as p,isGeoRssLayer as t,isGraphicsLayer as o,isGroupLayer as y,isImageryLayer as s,isImageryTileLayer as n,isIntegratedMeshLayer as c,isKMLLayer as L,isMapImageLayer as l,isOpenStreetMapLayer as u,isPointCloudLayer as m,isSceneLayer as A,isStreamLayer as E,isSubtypeGroupLayer as S,isTiledImageServiceLayer as f,isTiledMapServiceLayer as T,isTileLayer as F,isVectorTileLayer as d,isWebTileLayer as G,isWMSLayer as I,isWMTSLayer as g,layersAreEquivalent as M}from"../utilities/_layers.js";import{checkArg as v}from"../utilities/checkArg.js";import{compareAsync as j}from"../utilities/collection.js";import{BuildingSceneLayer as h}from"./BuildingSceneLayer.js";import{CSVLayer as C}from"./CSVLayer.js";import{ElevationLayer as J}from"./ElevationLayer.js";import{FeatureLayer as N}from"./FeatureLayer.js";import{GeoJSONLayer as O}from"./GeoJSONLayer.js";import{GeoRSSLayer as V}from"./GeoRSSLayer.js";import{GroupLayer as b}from"./GroupLayer.js";import{ImageServiceLayer as w}from"./ImageServiceLayer.js";import{IntegratedMeshLayer as B}from"./IntegratedMeshLayer.js";import{KMLLayer as W}from"./KMLLayer.js";import{MapServiceLayer as K}from"./MapServiceLayer.js";import{OpenStreetMapLayer as P}from"./OpenStreetMapLayer.js";import{PointCloudLayer as H}from"./PointCloudLayer.js";import{SceneLayer as R}from"./SceneLayer.js";import{StreamLayer as _}from"./StreamLayer.js";import{SubtypeGroupLayer as D}from"./SubtypeGroupLayer.js";import{TiledImageServiceLayer as $}from"./TiledImageServiceLayer.js";import{TiledMapServiceLayer as k}from"./TiledMapServiceLayer.js";import{VectorTileLayer as q}from"./VectorTileLayer.js";import{WMSLayer as x}from"./WMSLayer.js";import{WebTileLayer as U}from"./WebTileLayer.js";import{LayerBase as z}from"./_LayerBase.js";export{LayerBase}from"./_LayerBase.js";const Q=new Map;async function X(e){return new((await import("@arcgis/core/layers/UnsupportedLayer")).default)}async function Y(e,r){console.warn(`Layer type: '${e.layerType||e.type}' is unsupported.`)}function Z(e){console.warn(`Layer type: '${e?e.declaredClass:""}' is unsupported.`)}z.toEsriApiLayer=async(e,r)=>{v("layerJson",e).isNotMissing();const i=e.layerType||e.type;v("layerJson",e).satisfies((()=>!!i),"Layer JSON must have a valid 'layerType' property.");const a=function(e){const r=Q.get(e);return r?r.createFunction:X}(i);return a(e,r)},z.applyToEsriApiLayer=async(e,r,i)=>{v("layerJson",e).isNotMissing(),v("layer",r).isNotMissing();const a=e.layerType||e.type;let p=z.getLayerType(r);"ArcGISTiledImageServiceLayer"===a&&(p=a),v("layerJson",e).satisfies((()=>!a||a===p),"The layer's type must match the 'layerType' property in the layer JSON.");return function(e){const r=Q.get(e);return r?r.applyFunction:Y}(p)(e,r,i)},z.applyToEsriApiLayers=async(e,r,i)=>j(e,r,{onNew:async(r,a)=>{e.add(await z.toEsriApiLayer(r,i),a)},onMatch:async(r,a,p,t)=>{p!==t&&e.reorder(r,t),await z.applyToEsriApiLayer(a,r,i)},onMissing:r=>{e.remove(r)},equals:(e,r)=>M(e,r)}),z.getLayerType=T=>r(T)?"CSV":E(T)?"ArcGISStreamLayer":a(T)||o(T)?"ArcGISFeatureLayer":p(T)?"GeoJSON":t(T)?"GeoRSS":s(T)?"ArcGISImageServiceLayer":n(T)?"ArcGISTiledImageServiceLayer":L(T)?"KML":l(T)?"ArcGISMapServiceLayer":u(T)?"OpenStreetMap":G(T)?"WebTiledLayer":d(T)?"VectorTileLayer":f(T)?"ArcGISTiledImageServiceLayer":F(T)?"ArcGISTiledMapServiceLayer":i(T)?"ArcGISTiledElevationServiceLayer":A(T)?"ArcGISSceneServiceLayer":m(T)?"PointCloudLayer":c(T)?"IntegratedMeshLayer":y(T)?"GroupLayer":I(T)?"WMS":g(T)?"WebTiledLayer":e(T)?"BuildingSceneLayer":S(T)?"SubtypeGroupLayer":void 0,z.fromEsriApiLayer=F=>{const M=function(F){return r(F)?C.fromEsriApiCSVLayer:E(F)?_.fromEsriApiStreamLayer:a(F)?N.fromEsriApiFeatureLayer:p(F)?O.fromEsriApiGeoJSONLayer:t(F)?V.fromEsriApiLayer:o(F)?N.fromEsriApiGraphicsLayer:s(F)?w.fromEsriApiImageryLayer:n(F)?$.fromEsriApiTileLayer:L(F)?W.fromEsriApiKMLLayer:l(F)?K.fromEsriApiMapImageLayer:u(F)?P.fromEsriApiOpenStreetMapLayer:G(F)?U.fromEsriApiLayer:d(F)?q.fromEsriApiVectorTileLayer:f(F)?$.fromEsriApiTileLayer:T(F)?k.fromEsriApiTileLayer:i(F)?J.fromEsriApiElevationLayer:A(F)?R.fromEsriApiSceneLayer:m(F)?H.fromEsriApiPointCloudLayer:c(F)?B.fromEsriApiIntegratedMeshLayer:y(F)?b.fromEsriApiGroupLayer:I(F)?x.fromEsriApiLayer:g(F)?U.fromEsriApiLayer:e(F)?h.fromEsriApiBuildingSceneLayer:S(F)?D.fromEsriApiSubtypeGroupLayer:Z}(F);return M(F)},z.registerDefaultClassHandlers=()=>{Q.clear(),Q.set("ArcGISFeatureLayer",{createFunction:N.toEsriApiLayer,applyFunction:N.applyToEsriApiLayer}),Q.set("ArcGISImageServiceLayer",{createFunction:w.toEsriApiLayer,applyFunction:w.applyToEsriApiLayer}),Q.set("ArcGISImageServiceVectorLayer",{createFunction:w.toEsriApiLayer,applyFunction:w.applyToEsriApiLayer}),Q.set("ArcGISMapServiceLayer",{createFunction:K.toEsriApiLayer,applyFunction:K.applyToEsriApiLayer}),Q.set("ArcGISStreamLayer",{createFunction:_.toEsriApiLayer,applyFunction:_.applyToEsriApiLayer}),Q.set("ArcGISTiledElevationServiceLayer",{createFunction:J.toEsriApiLayer,applyFunction:J.applyToEsriApiLayer}),Q.set("ArcGISTiledImageServiceLayer",{createFunction:$.toEsriApiLayer,applyFunction:$.applyToEsriApiLayer}),Q.set("ArcGISTiledMapServiceLayer",{createFunction:k.toEsriApiLayer,applyFunction:k.applyToEsriApiLayer}),Q.set("OpenStreetMap",{createFunction:P.toEsriApiLayer,applyFunction:P.applyToEsriApiLayer}),Q.set("VectorTileLayer",{createFunction:q.toEsriApiLayer,applyFunction:q.applyToEsriApiLayer}),Q.set("CSV",{createFunction:C.toEsriApiLayer,applyFunction:C.applyToEsriApiLayer}),Q.set("GeoRSS",{createFunction:V.toEsriApiLayer,applyFunction:V.applyToEsriApiLayer}),Q.set("GeoJSON",{createFunction:O.toEsriApiLayer,applyFunction:O.applyToEsriApiLayer}),Q.set("WMS",{createFunction:x.toEsriApiLayer,applyFunction:x.applyToEsriApiLayer}),Q.set("KML",{createFunction:W.toEsriApiKMLLayer,applyFunction:W.applyToEsriApiKMLLayer}),Q.set("WebTiledLayer",{createFunction:U.toEsriApiLayer,applyFunction:U.applyToEsriApiLayer}),Q.set("IntegratedMeshLayer",{createFunction:B.toEsriApiLayer,applyFunction:B.applyToEsriApiLayer}),Q.set("GroupLayer",{createFunction:b.toEsriApiLayer,applyFunction:b.applyToEsriApiLayer}),Q.set("ArcGISSceneServiceLayer",{createFunction:R.toEsriApiLayer,applyFunction:R.applyToEsriApiLayer}),Q.set("PointCloudLayer",{createFunction:H.toEsriApiLayer,applyFunction:H.applyToEsriApiLayer}),Q.set("BuildingSceneLayer",{createFunction:h.toEsriApiLayer,applyFunction:h.applyToEsriApiLayer}),Q.set("SubtypeGroupLayer",{createFunction:D.toEsriApiLayer,applyFunction:D.applyToEsriApiLayer})},z.registerLayerClassHandler=(e,r,i)=>{Q.set(e,{createFunction:r,applyFunction:i})},z.registerDefaultClassHandlers();

package/portal/LayerDefinition.d.ts

@@ -2,6 +2,7 @@ import EsriExtent from "@arcgis/core/geometry/Extent";
 import type EsriBuildingSceneLayer from "@arcgis/core/layers/BuildingSceneLayer";
 import type EsriCSVLayer from "@arcgis/core/layers/CSVLayer";
 import type EsriFeatureLayer from "@arcgis/core/layers/FeatureLayer";
+import type EsriGeoJSONLayer from "@arcgis/core/layers/GeoJSONLayer";
 import type EsriImageryLayer from "@arcgis/core/layers/ImageryLayer";
 import type EsriImageryTileLayer from "@arcgis/core/layers/ImageryTileLayer";
 import type EsriLayer from "@arcgis/core/layers/Layer";
@@ -33,7 +34,7 @@ export declare namespace LayerDefinition {
      * @param json The layer definition JSON to apply.
      * @param layer The Layer object to apply it to.
      */
-    function applyToEsriApiLayer(json: LayerDefinition, layer: EsriFeatureLayer | EsriStreamLayer | EsriImageryLayer | EsriImageryTileLayer | EsriCSVLayer | EsriSceneLayer | EsriBuildingSceneLayer | EsriPointCloudLayer | EsriSublayer | EsriBuildingComponentSublayer | EsriSubtypeGroupLayer | EsriSubtypeSublayer): Promise<void>;
+    function applyToEsriApiLayer(json: LayerDefinition, layer: EsriFeatureLayer | EsriStreamLayer | EsriImageryLayer | EsriImageryTileLayer | EsriCSVLayer | EsriSceneLayer | EsriBuildingSceneLayer | EsriPointCloudLayer | EsriSublayer | EsriBuildingComponentSublayer | EsriSubtypeGroupLayer | EsriSubtypeSublayer | EsriGeoJSONLayer): Promise<void>;
     /**
      * Creates ArcGIS Portal layer definition JSON from a Layer object.
      *

package/portal/LayerDefinition.js

@@ -1 +1 @@
-import e from"@arcgis/core/geometry/Extent";import i from"@arcgis/core/layers/support/TimeInfo";import{DataLayerSource as t,MapLayerSource as r}from"../support/_esriInternal.js";import{isBuildingSceneLayer as a,isCSVLayer as o,isFeatureLayer as s,isFeatureLayerBase as n,isGeoJSONLayer as p,isMapImageSublayer as l,isSceneLayer as c,isStreamLayer as f,isTimeAwareLayer as m}from"../utilities/_layers.js";import{checkArg as d}from"../utilities/checkArg.js";import{isBuildingComponentSublayer as y,isGraphicsLayer as u,isLayer as h,isPointCloudLayer as E}from"../utilities/layers.js";import{isEmpty as x}from"../utilities/object.js";import{DrawingInfo as I}from"./DrawingInfo.js";import{ElevationInfo as b}from"./ElevationInfo.js";import{FeatureReduction as g}from"./FeatureReduction.js";import{Field as w}from"./Field.js";import{GeometryType as A}from"./Geometry.js";import{SpatialReference as R}from"./SpatialReference.js";import{Template as O}from"./Template.js";export var LayerDefinition;!function(P){P.applyToEsriApiLayer=async function(a,p){d("json",a).isNotMissing(),d("layer",p).isNotMissing();const c=p,y=p;if(n(c)&&(a.hasOwnProperty("objectIdField")&&(f(c)?c.objectIdField="__esri_stream_id__":c.objectIdField=a.objectIdField),a.hasOwnProperty("geometryType")&&(c.geometryType=A.toEsriApiGeometryType(a.geometryType)),a.hasOwnProperty("hasAttachments")&&y._set("capabilities.data.supportsAttachment",a.hasAttachments),a.hasOwnProperty("maxRecordCount")&&(y.maxRecordCount=a.maxRecordCount),a.hasOwnProperty("hasM")&&y._set("hasM",a.hasM),a.hasOwnProperty("hasZ")&&y._set("hasZ",a.hasZ),a.hasOwnProperty("templates")&&(c.templates=a.templates.map((e=>O.toEsriApiFeatureTemplate(e))))),a.hasOwnProperty("orderBy")&&(s(c)||o(c))&&(a.orderBy?c.orderBy=a.orderBy.map((e=>({field:e.field,order:"desc"===e.order?"descending":"ascending"}))):c.orderBy=void 0),a.hasOwnProperty("source")&&l(p)&&!p.layer?.loaded){const{type:e,...i}=a.source;"dataLayer"===e?y._set("source",new t(i)):"mapLayer"===e&&y._set("source",new r(i))}if(a.hasOwnProperty("copyrightText")&&(p.copyright=a.copyrightText),a.hasOwnProperty("defaultVisibility")&&(p.visible=a.defaultVisibility),a.hasOwnProperty("definitionExpression")&&(p.definitionExpression=a.definitionExpression),a.hasOwnProperty("elevationInfo")&&a.elevationInfo&&(p.elevationInfo=b.toEsriApiElevationInfo(a.elevationInfo)),a.hasOwnProperty("extent")&&(p.fullExtent=a.extent?e.fromJSON(a.extent):void 0),a.hasOwnProperty("fields")){const e=[];a.fields.forEach((i=>{e.push(w.toEsriApiField(i))})),y._set("fields",e)}a.hasOwnProperty("maxScale")&&(p.maxScale=a.maxScale),a.hasOwnProperty("minScale")&&(p.minScale=a.minScale),a.hasOwnProperty("name")&&!p.title&&(p.title=a.name);try{a.hasOwnProperty("spatialReference")?p.spatialReference=R.toEsriApiSpatialReference(a.spatialReference):p.fullExtent?.spatialReference&&p.spatialReference&&(p.spatialReference=p.fullExtent.spatialReference.clone())}catch{}a.hasOwnProperty("timeInfo")&&m(p)&&(p.timeInfo=i.fromJSON(a.timeInfo)),a.hasOwnProperty("featureReduction")&&a.featureReduction&&await g.applyToEsriApiLayer(a.featureReduction,p),a.hasOwnProperty("drawingInfo")&&await I.applyToEsriApiLayer(a.drawingInfo,p)},P.fromEsriApiLayer=function(e,i={}){d("layer",e).isNotMissing();const t={},r=e,P=e;if(n(r)){const a=e;r.objectIdField&&(t.objectIdField=r.objectIdField),a.geometryType&&(t.geometryType=A.fromEsriApiGeometryType(a.geometryType)),r.capabilities&&r.capabilities.data.supportsAttachment!==i.hasAttachments&&(t.hasAttachments=r.capabilities.data.supportsAttachment),isNaN(P.maxRecordCount)||null==P.maxRecordCount||(t.maxRecordCount=P.maxRecordCount),r.capabilities&&(t.capabilities=LayerDefinitionCapabilities.fromEsriApiFeatureLayerCapabilities(r.capabilities),r.capabilities.query&&(t.supportsAdvancedQueries=r.capabilities.query.supportsOrderBy||r.capabilities.query.supportsDistinct,t.supportsStatistics=r.capabilities.query.supportsStatistics)),r.hasM!==i.hasM&&(t.hasM=r.hasM),r.hasZ!==i.hasZ&&(t.hasZ=r.hasZ),r.templates&&r.templates.length>0&&(t.templates=r.templates.map((e=>O.fromEsriApiFeatureTemplate(e))))}if(e.featureReduction&&(t.featureReduction=g.fromEsriApiLayer(e)),l(e)&&e.source&&("data-layer"===e.source.type||"map-layer"===e.source.type)&&(t.source=e.source.toJSON()),e.copyright&&(t.copyrightText=e.copyright),e.visible===i.visible||l(e)||(t.defaultVisibility=e.visible),e.definitionExpression&&(t.definitionExpression=e.definitionExpression),t.drawingInfo=I.fromEsriApiLayer(e),x(t.drawingInfo)&&delete t.drawingInfo,(y(e)?!!e.layer?.elevationInfo:!!e.elevationInfo)&&(t.elevationInfo=b.fromEsriApiElevationInfo(e.elevationInfo)),(s(e)&&e.source||o(e)||u(e)||p(e)||f(e))&&(e.fullExtent&&!e.fullExtent.equals(i.fullExtent)&&(t.extent=e.fullExtent.toJSON()),e.fields&&e.fields.length>0)){const i=[];e.fields.forEach((e=>{i.push(w.fromEsriApiField(e))})),t.fields=i}if((s(r)||o(r))&&r.orderBy&&(t.orderBy=r.orderBy.map((e=>({field:e.field,order:"descending"===e.order?"desc":"asc"})))),s(r)||o(r)||f(r)||c(r)||a(r)||E(r)){const{maxScale:e}=r,{minScale:a}=r;isNaN(e)||null===e||e===i.maxScale&&e===a||(t.maxScale=e),isNaN(a)||null===a||a===i.minScale&&a===e||(t.minScale=a)}return m(r)&&(t.timeInfo=r.timeInfo?.toJSON()),t.name=e.title,h(e)&&e.spatialReference&&e.spatialReference.wkid!==i.wkid&&(t.spatialReference=R.fromEsriApiSpatialReference(e.spatialReference)),t}}(LayerDefinition||(LayerDefinition={}));export var LayerDefinitionCapabilities;!function(e){e.ADD="Add",e.DELETE="Delete",e.EDITING="Editing",e.QUERY="Query",e.UPDATE="Update",e.fromEsriApiFeatureLayerCapabilities=function(i){d("capabilities",i).isNotMissing();const t=[];return i.operations.supportsAdd&&t.push(e.ADD),i.operations.supportsDelete&&t.push(e.DELETE),i.operations.supportsEditing&&t.push(e.EDITING),i.operations.supportsQuery&&t.push(e.QUERY),i.operations.supportsUpdate&&t.push(e.UPDATE),t.join(",")}}(LayerDefinitionCapabilities||(LayerDefinitionCapabilities={}));
+import e from"@arcgis/core/geometry/Extent";import i from"@arcgis/core/layers/support/TimeInfo";import{DataLayerSource as t,MapLayerSource as r}from"../support/_esriInternal.js";import{isBuildingSceneLayer as a,isCSVLayer as o,isFeatureLayer as s,isFeatureLayerBase as n,isGeoJSONLayer as p,isMapImageSublayer as l,isSceneLayer as c,isStreamLayer as f,isTimeAwareLayer as m}from"../utilities/_layers.js";import{checkArg as d}from"../utilities/checkArg.js";import{isBuildingComponentSublayer as y,isGraphicsLayer as u,isLayer as h,isPointCloudLayer as E}from"../utilities/layers.js";import{isEmpty as x}from"../utilities/object.js";import{DrawingInfo as I}from"./DrawingInfo.js";import{ElevationInfo as b}from"./ElevationInfo.js";import{FeatureReduction as g}from"./FeatureReduction.js";import{Field as w}from"./Field.js";import{GeometryType as A}from"./Geometry.js";import{SpatialReference as R}from"./SpatialReference.js";import{Template as O}from"./Template.js";export var LayerDefinition;!function(P){P.applyToEsriApiLayer=async function(a,c){d("json",a).isNotMissing(),d("layer",c).isNotMissing();const y=c,u=c;if(n(y)&&(a.hasOwnProperty("objectIdField")&&(f(y)?y.objectIdField="__esri_stream_id__":y.objectIdField=a.objectIdField),a.hasOwnProperty("geometryType")&&(y.geometryType=A.toEsriApiGeometryType(a.geometryType)),a.hasOwnProperty("hasAttachments")&&u._set("capabilities.data.supportsAttachment",a.hasAttachments),a.hasOwnProperty("maxRecordCount")&&(u.maxRecordCount=a.maxRecordCount),a.hasOwnProperty("hasM")&&u._set("hasM",a.hasM),a.hasOwnProperty("hasZ")&&u._set("hasZ",a.hasZ),a.hasOwnProperty("templates")&&(y.templates=a.templates.map((e=>O.toEsriApiFeatureTemplate(e))))),(a.hasOwnProperty("orderBy")&&(s(y)||o(y))||p(y))&&(a.orderBy?y.orderBy=a.orderBy.map((e=>({field:e.field,order:"desc"===e.order?"descending":"ascending"}))):y.orderBy=void 0),a.hasOwnProperty("source")&&l(c)&&!c.layer?.loaded){const{type:e,...i}=a.source;"dataLayer"===e?u._set("source",new t(i)):"mapLayer"===e&&u._set("source",new r(i))}if(a.hasOwnProperty("copyrightText")&&(c.copyright=a.copyrightText),a.hasOwnProperty("defaultVisibility")&&(c.visible=a.defaultVisibility),a.hasOwnProperty("definitionExpression")&&(c.definitionExpression=a.definitionExpression),a.hasOwnProperty("elevationInfo")&&a.elevationInfo&&(c.elevationInfo=b.toEsriApiElevationInfo(a.elevationInfo)),a.hasOwnProperty("extent")&&(c.fullExtent=a.extent?e.fromJSON(a.extent):void 0),a.hasOwnProperty("fields")){const e=[];a.fields.forEach((i=>{e.push(w.toEsriApiField(i))})),u._set("fields",e)}a.hasOwnProperty("maxScale")&&(c.maxScale=a.maxScale),a.hasOwnProperty("minScale")&&(c.minScale=a.minScale),a.hasOwnProperty("name")&&!c.title&&(c.title=a.name);try{a.hasOwnProperty("spatialReference")?c.spatialReference=R.toEsriApiSpatialReference(a.spatialReference):c.fullExtent?.spatialReference&&c.spatialReference&&(c.spatialReference=c.fullExtent.spatialReference.clone())}catch{}a.hasOwnProperty("timeInfo")&&m(c)&&(c.timeInfo=i.fromJSON(a.timeInfo)),a.hasOwnProperty("featureReduction")&&a.featureReduction&&await g.applyToEsriApiLayer(a.featureReduction,c),a.hasOwnProperty("drawingInfo")&&await I.applyToEsriApiLayer(a.drawingInfo,c)},P.fromEsriApiLayer=function(e,i={}){d("layer",e).isNotMissing();const t={},r=e,P=e;if(n(r)){const a=e;r.objectIdField&&(t.objectIdField=r.objectIdField),a.geometryType&&(t.geometryType=A.fromEsriApiGeometryType(a.geometryType)),r.capabilities&&r.capabilities.data.supportsAttachment!==i.hasAttachments&&(t.hasAttachments=r.capabilities.data.supportsAttachment),isNaN(P.maxRecordCount)||null==P.maxRecordCount||(t.maxRecordCount=P.maxRecordCount),r.capabilities&&(t.capabilities=LayerDefinitionCapabilities.fromEsriApiFeatureLayerCapabilities(r.capabilities),r.capabilities.query&&(t.supportsAdvancedQueries=r.capabilities.query.supportsOrderBy||r.capabilities.query.supportsDistinct,t.supportsStatistics=r.capabilities.query.supportsStatistics)),r.hasM!==i.hasM&&(t.hasM=r.hasM),r.hasZ!==i.hasZ&&(t.hasZ=r.hasZ),r.templates&&r.templates.length>0&&(t.templates=r.templates.map((e=>O.fromEsriApiFeatureTemplate(e))))}if(e.featureReduction&&(t.featureReduction=g.fromEsriApiLayer(e)),l(e)&&e.source&&("data-layer"===e.source.type||"map-layer"===e.source.type)&&(t.source=e.source.toJSON()),e.copyright&&(t.copyrightText=e.copyright),e.visible===i.visible||l(e)||(t.defaultVisibility=e.visible),e.definitionExpression&&(t.definitionExpression=e.definitionExpression),t.drawingInfo=I.fromEsriApiLayer(e),x(t.drawingInfo)&&delete t.drawingInfo,(y(e)?!!e.layer?.elevationInfo:!!e.elevationInfo)&&(t.elevationInfo=b.fromEsriApiElevationInfo(e.elevationInfo)),(s(e)&&e.source||o(e)||u(e)||p(e)||f(e))&&(e.fullExtent&&!e.fullExtent.equals(i.fullExtent)&&(t.extent=e.fullExtent.toJSON()),e.fields&&e.fields.length>0)){const i=[];e.fields.forEach((e=>{i.push(w.fromEsriApiField(e))})),t.fields=i}if((s(r)||o(r)||p(r))&&r.orderBy&&(t.orderBy=r.orderBy.map((e=>({field:e.field,order:"descending"===e.order?"desc":"asc"})))),s(r)||o(r)||f(r)||c(r)||a(r)||E(r)){const{maxScale:e}=r,{minScale:a}=r;isNaN(e)||null===e||e===i.maxScale&&e===a||(t.maxScale=e),isNaN(a)||null===a||a===i.minScale&&a===e||(t.minScale=a)}return m(r)&&(t.timeInfo=r.timeInfo?.toJSON()),t.name=e.title,h(e)&&e.spatialReference&&e.spatialReference.wkid!==i.wkid&&(t.spatialReference=R.fromEsriApiSpatialReference(e.spatialReference)),t}}(LayerDefinition||(LayerDefinition={}));export var LayerDefinitionCapabilities;!function(e){e.ADD="Add",e.DELETE="Delete",e.EDITING="Editing",e.QUERY="Query",e.UPDATE="Update",e.fromEsriApiFeatureLayerCapabilities=function(i){d("capabilities",i).isNotMissing();const t=[];return i.operations.supportsAdd&&t.push(e.ADD),i.operations.supportsDelete&&t.push(e.DELETE),i.operations.supportsEditing&&t.push(e.EDITING),i.operations.supportsQuery&&t.push(e.QUERY),i.operations.supportsUpdate&&t.push(e.UPDATE),t.join(",")}}(LayerDefinitionCapabilities||(LayerDefinitionCapabilities={}));

package/portal/OperationalLayer.d.ts

@@ -3,6 +3,7 @@ import type { BuildingSceneLayer } from "./BuildingSceneLayer.js";
 import type { CSVLayer } from "./CSVLayer.js";
 import type { ElevationLayer } from "./ElevationLayer.js";
 import type { FeatureLayer } from "./FeatureLayer.js";
+import type { GeoJSONLayer } from "./GeoJSONLayer.js";
 import type { GeoRSSLayer } from "./GeoRSSLayer.js";
 import type { GroupLayer } from "./GroupLayer.js";
 import type { ImageServiceLayer } from "./ImageServiceLayer.js";
@@ -48,7 +49,7 @@ export interface OperationalLayerBase extends LayerBase {
 /**
  * An operational layer in a web map/scene.
  */
-export type OperationalLayer = BuildingSceneLayer | CSVLayer | ElevationLayer | FeatureLayer | GeoRSSLayer | GroupLayer | ImageServiceLayer | ImageServiceVectorLayer | IntegratedMeshLayer | KMLLayer | MapServiceLayer | PointCloudLayer | SceneLayer | StreamLayer | SubtypeGroupLayer | TiledImageServiceLayer | TiledMapServiceLayer | VectorTileLayer | WebTileLayer | WMSLayer;
+export type OperationalLayer = BuildingSceneLayer | CSVLayer | ElevationLayer | FeatureLayer | GeoJSONLayer | GeoRSSLayer | GroupLayer | ImageServiceLayer | ImageServiceVectorLayer | IntegratedMeshLayer | KMLLayer | MapServiceLayer | PointCloudLayer | SceneLayer | StreamLayer | SubtypeGroupLayer | TiledImageServiceLayer | TiledMapServiceLayer | VectorTileLayer | WebTileLayer | WMSLayer;
 /**
  * Used in legacy "type" attribute. Deprecated.
  */

package/portal/WebMap.d.ts

@@ -14,7 +14,7 @@ import { SpatialReference } from "./SpatialReference.js";
 import type { Table } from "./Table.js";
 import { UtilityNetwork } from "./UtilityNetwork.js";
 import { Viewpoint as PortalViewpoint } from "./Viewpoint.js";
-import { Widgets } from "./Widgets.js";
+import type { Widgets } from "./Widgets.js";
 export declare namespace WebMap {
     /**
      * Converts an ArcGIS Portal JSON representation of a web map to its Esri

package/portal/WebMap.js

@@ -1 +1 @@
-import i from"@arcgis/core/Viewpoint";import e from"@arcgis/core/WebMap";import r from"@arcgis/core/geometry/SpatialReference";import{geographicToWebMercator as t}from"@arcgis/core/geometry/support/webMercatorUtils";import o from"@arcgis/core/webmap/Bookmark";import a from"@arcgis/core/webmap/InitialViewProperties";import{applyToEsriTable as s,toEsriApiTable as n}from"../data/Table.js";import{WellKnownBasemap as p}from"../support/esri.js";import{basemapsAreEquivalent as l,standardBasemaps as m}from"../utilities/_layers.js";import{checkArg as w}from"../utilities/checkArg.js";import{Collection as f,compareAsync as c}from"../utilities/collection.js";import{isPortalItem as u}from"../utilities/esri.js";import{isWebMap as y}from"../utilities/mapping.js";import{BaseMap as b}from"./BaseMap.js";import{toEsriApiGeometry as g}from"./Geometry.js";import{Item as h}from"./Item.js";import{LayerBase as A}from"./LayerBase.js";import{MapFloorInfo as P}from"./MapFloorInfo.js";import{SpatialReference as V}from"./SpatialReference.js";import{UtilityNetwork as M}from"./UtilityNetwork.js";import{Viewpoint as v}from"./Viewpoint.js";import{applyToEsriApiWidgetsObject as k,fromEsriApiWidgetsObject as d}from"./Widgets.js";export var WebMap;!function(O){async function j(e,p,m){if(w("json",e).isNotMissing(),w("map",p).isNotMissing(),y(p)){const l=p;if(e.hasOwnProperty("authoringApp")&&(l.authoringApp=e.authoringApp),e.hasOwnProperty("authoringAppVersion")&&(l.authoringAppVersion=e.authoringAppVersion),e.hasOwnProperty("bookmarks")&&(l.bookmarks.removeAll(),l.bookmarks.addMany((e.bookmarks??[]).map((e=>new o({name:e.name,thumbnail:e.thumbnail,viewpoint:(e.viewpoint&&i.fromJSON(e.viewpoint))??new i({targetGeometry:g(e.extent)})}))))),e.hasOwnProperty("presentation"),p.initialViewProperties||(p.initialViewProperties=new a),e.hasOwnProperty("spatialReference")?p.initialViewProperties.spatialReference=V.toEsriApiSpatialReference(e.spatialReference):null===p.initialViewProperties.spatialReference&&(p.initialViewProperties.spatialReference=r.WebMercator),e.initialState?.viewpoint)p.initialViewProperties.viewpoint=v.toEsriApiViewpoint(e.initialState.viewpoint);else if(e.hasOwnProperty("$initialViewpoint"))console.warn("The '$initialViewpoint' property has been deprecated as of August 2020 and will be removed in a future release. Use WebMap.initialState.viewpoint"),p.initialViewProperties.viewpoint=v.toEsriApiViewpoint(e.$initialViewpoint);else{const e=function(i,e){let r;const o=i.initialViewProperties?.spatialReference,a=e?.extent||i.portalItem?.extent;o&&a&&(r=r=o.isWebMercator?t(a):a.clone());return r}(l,m);e&&(p.initialViewProperties.viewpoint=new i({targetGeometry:e}))}e.hasOwnProperty("mapFloorInfo")&&e.mapFloorInfo&&(p.floorInfo=P.toEsriApiFloorInfo(e.mapFloorInfo)),e.hasOwnProperty("tables")&&e.tables&&await c(p.tables,e.tables,{onNew:async(i,e)=>{p.tables.add(await n(i),e)},onMatch:async(i,e,r,t)=>{r!==t&&p.tables.reorder(i,t),await s(e,i)},onMissing:i=>{p.tables.remove(i)},equals:(i,e)=>i.id===e.id||i.title===e.title}),e.hasOwnProperty("version")&&l._set("sourceVersion",function(i){const e=i.split("."),r=e[1];return{major:parseInt(e[0],10),minor:parseInt(r,10)}}(e.version)),e.hasOwnProperty("widgets")&&(l.widgets=k(e.widgets,l.widgets)),e.hasOwnProperty("utilityNetworks")&&(l.utilityNetworks=l.utilityNetworks??new f,l.utilityNetworks.addMany(await Promise.all(e.utilityNetworks.map(M.toEsriApiUtilityNetwork))))}const u=m?m.portal:void 0;e.hasOwnProperty("baseMap")&&(p.basemap&&l(p.basemap,e.baseMap)?await b.applyToEsriApiBasemap(e.baseMap,p.basemap,u):p.basemap=await b.toEsriApiBasemap(e.baseMap,u)),e.hasOwnProperty("operationalLayers")&&await A.applyToEsriApiLayers(p.layers,e.operationalLayers,u)}O.toEsriApiWebMap=async function(i,r){w("json",i).isNotMissing();const t=new e,o={...i},a=[];let s;return o.version||(a.push("'version' -- assuming '2.8'"),o.version="2.8"),o.baseMap||(a.push("'baseMap' -- assuming 'topo-vector'"),o.baseMap=m[p.TOPO_VECTOR]),o.spatialReference||a.push("'spatialReference' -- assuming 'Web Mercator'"),a.length&&console.warn(`WebMap JSON is missing the following required properties: ${a.join(", ")}`),r&&(s=u(r)?r:h.toEsriApiPortalItem(r),await s.load()),await j(o,t,s),t},O.applyToEsriApiMap=j,O.fromEsriApiMap=function(i){w("map",i).isNotMissing();const e={};if(y(i)){const r=i;r.hasOwnProperty("authoringApp")&&(e.authoringApp=r.authoringApp),r.hasOwnProperty("authoringAppVersion")&&(e.authoringAppVersion=r.authoringAppVersion),f.isCollection(r.bookmarks)&&(e.bookmarks=r.bookmarks.toArray().map((i=>({name:i.name,viewpoint:i.viewpoint?.toJSON(),thumbnail:i.thumbnail})))),r.hasOwnProperty("sourceVersion")&&r.sourceVersion&&(e.version=`${r.sourceVersion.major}.${r.sourceVersion.minor}`),r.initialViewProperties?.spatialReference&&(e.spatialReference=V.fromEsriApiSpatialReference(r.initialViewProperties.spatialReference)),r.initialViewProperties?.viewpoint&&(e.initialState={viewpoint:v.fromEsriApiViewpoint(r.initialViewProperties.viewpoint)}),r.hasOwnProperty("floorInfo")&&r.floorInfo&&(e.mapFloorInfo=P.fromEsriApiFloorInfo(r.floorInfo)),r.hasOwnProperty("tables")&&r.tables&&(e.tables=r.tables.toArray().map((i=>{const e=A.fromEsriApiLayer(i);return delete e.layerType,e}))),r.hasOwnProperty("widgets")&&(e.widgets=d(r.widgets,e.widgets)),f.isCollection(r.utilityNetworks)&&(e.utilityNetworks=r.utilityNetworks.map(M.fromEsriApiUtilityNetwork).toArray()),e.version=isNaN(r.version)?"2.6":r.version}return i.hasOwnProperty("basemap")&&i.basemap&&(e.baseMap=b.fromEsriApiBasemap(i.basemap)),function(i,e){e.operationalLayers=[];for(let r=0;r<i.length;r++)e.operationalLayers.push(A.fromEsriApiLayer(i.getItemAt(r)))}(i.layers,e),e}}(WebMap||(WebMap={}));
+import i from"@arcgis/core/Viewpoint";import e from"@arcgis/core/WebMap";import r from"@arcgis/core/core/Collection";import o from"@arcgis/core/geometry/SpatialReference";import{geographicToWebMercator as t}from"@arcgis/core/geometry/support/webMercatorUtils";import a from"@arcgis/core/webmap/Bookmark";import s from"@arcgis/core/webmap/InitialViewProperties";import{applyToEsriTable as n,toEsriApiTable as p}from"../data/Table.js";import{WellKnownBasemap as l}from"../support/esri.js";import{basemapsAreEquivalent as m,standardBasemaps as w}from"../utilities/_layers.js";import{checkArg as f}from"../utilities/checkArg.js";import{compareAsync as c}from"../utilities/collection.js";import{isPortalItem as u}from"../utilities/esri.js";import{isWebMap as y}from"../utilities/mapping.js";import{BaseMap as b}from"./BaseMap.js";import{toEsriApiGeometry as g}from"./Geometry.js";import{Item as h}from"./Item.js";import{LayerBase as A}from"./LayerBase.js";import{MapFloorInfo as P}from"./MapFloorInfo.js";import{SpatialReference as V}from"./SpatialReference.js";import{UtilityNetwork as M}from"./UtilityNetwork.js";import{Viewpoint as v}from"./Viewpoint.js";import{applyToEsriApiWidgetsObject as k,fromEsriApiWidgetsObject as d}from"./Widgets.js";export var WebMap;!function(O){async function j(e,l,w){if(f("json",e).isNotMissing(),f("map",l).isNotMissing(),y(l)){const m=l;if(e.hasOwnProperty("authoringApp")&&(m.authoringApp=e.authoringApp),e.hasOwnProperty("authoringAppVersion")&&(m.authoringAppVersion=e.authoringAppVersion),e.hasOwnProperty("bookmarks")&&(m.bookmarks.removeAll(),m.bookmarks.addMany((e.bookmarks??[]).map((e=>new a({name:e.name,thumbnail:e.thumbnail,viewpoint:(e.viewpoint&&i.fromJSON(e.viewpoint))??new i({targetGeometry:g(e.extent)})}))))),e.hasOwnProperty("presentation"),l.initialViewProperties||(l.initialViewProperties=new s),e.hasOwnProperty("spatialReference")?l.initialViewProperties.spatialReference=V.toEsriApiSpatialReference(e.spatialReference):null===l.initialViewProperties.spatialReference&&(l.initialViewProperties.spatialReference=o.WebMercator),e.initialState?.viewpoint)l.initialViewProperties.viewpoint=v.toEsriApiViewpoint(e.initialState.viewpoint);else if(e.hasOwnProperty("$initialViewpoint"))console.warn("The '$initialViewpoint' property has been deprecated as of August 2020 and will be removed in a future release. Use WebMap.initialState.viewpoint"),l.initialViewProperties.viewpoint=v.toEsriApiViewpoint(e.$initialViewpoint);else{const e=function(i,e){let r;const o=i.initialViewProperties?.spatialReference,a=e?.extent||i.portalItem?.extent;o&&a&&(r=r=o.isWebMercator?t(a):a.clone());return r}(m,w);e&&(l.initialViewProperties.viewpoint=new i({targetGeometry:e}))}e.hasOwnProperty("mapFloorInfo")&&e.mapFloorInfo&&(l.floorInfo=P.toEsriApiFloorInfo(e.mapFloorInfo)),e.hasOwnProperty("tables")&&e.tables&&await c(l.tables,e.tables,{onNew:async(i,e)=>{l.tables.add(await p(i),e)},onMatch:async(i,e,r,o)=>{r!==o&&l.tables.reorder(i,o),await n(e,i)},onMissing:i=>{l.tables.remove(i)},equals:(i,e)=>i.id===e.id||i.title===e.title}),e.hasOwnProperty("version")&&m._set("sourceVersion",function(i){const e=i.split("."),r=e[1];return{major:parseInt(e[0],10),minor:parseInt(r,10)}}(e.version)),e.hasOwnProperty("widgets")&&(m.widgets=k(e.widgets,m.widgets)),e.hasOwnProperty("utilityNetworks")&&(m.utilityNetworks=m.utilityNetworks??new r,m.utilityNetworks.addMany(await Promise.all(e.utilityNetworks.map(M.toEsriApiUtilityNetwork))))}const u=w?w.portal:void 0;e.hasOwnProperty("baseMap")&&(l.basemap&&m(l.basemap,e.baseMap)?await b.applyToEsriApiBasemap(e.baseMap,l.basemap,u):l.basemap=await b.toEsriApiBasemap(e.baseMap,u)),e.hasOwnProperty("operationalLayers")&&await A.applyToEsriApiLayers(l.layers,e.operationalLayers,u)}O.toEsriApiWebMap=async function(i,r){f("json",i).isNotMissing();const o=new e,t={...i},a=[];let s;return t.version||(a.push("'version' -- assuming '2.8'"),t.version="2.8"),t.baseMap||(a.push("'baseMap' -- assuming 'topo-vector'"),t.baseMap=w[l.TOPO_VECTOR]),t.spatialReference||a.push("'spatialReference' -- assuming 'Web Mercator'"),a.length&&console.warn(`WebMap JSON is missing the following required properties: ${a.join(", ")}`),r&&(s=u(r)?r:h.toEsriApiPortalItem(r),await s.load()),await j(t,o,s),o},O.applyToEsriApiMap=j,O.fromEsriApiMap=function(i){f("map",i).isNotMissing();const e={};if(y(i)){const o=i;o.hasOwnProperty("authoringApp")&&(e.authoringApp=o.authoringApp),o.hasOwnProperty("authoringAppVersion")&&(e.authoringAppVersion=o.authoringAppVersion),r.isCollection(o.bookmarks)&&(e.bookmarks=o.bookmarks.toArray().map((i=>({name:i.name,viewpoint:i.viewpoint?.toJSON(),thumbnail:i.thumbnail})))),o.hasOwnProperty("sourceVersion")&&o.sourceVersion&&(e.version=`${o.sourceVersion.major}.${o.sourceVersion.minor}`),o.initialViewProperties?.spatialReference&&(e.spatialReference=V.fromEsriApiSpatialReference(o.initialViewProperties.spatialReference)),o.initialViewProperties?.viewpoint&&(e.initialState={viewpoint:v.fromEsriApiViewpoint(o.initialViewProperties.viewpoint)}),o.hasOwnProperty("floorInfo")&&o.floorInfo&&(e.mapFloorInfo=P.fromEsriApiFloorInfo(o.floorInfo)),o.hasOwnProperty("tables")&&o.tables&&(e.tables=o.tables.toArray().map((i=>{const e=A.fromEsriApiLayer(i);return delete e.layerType,e}))),o.hasOwnProperty("widgets")&&(e.widgets=d(o.widgets,e.widgets)),r.isCollection(o.utilityNetworks)&&(e.utilityNetworks=o.utilityNetworks.map(M.fromEsriApiUtilityNetwork).toArray()),e.version=isNaN(o.version)?"2.6":o.version}return i.hasOwnProperty("basemap")&&i.basemap&&(e.baseMap=b.fromEsriApiBasemap(i.basemap)),function(i,e){e.operationalLayers=[];for(let r=0;r<i.length;r++)e.operationalLayers.push(A.fromEsriApiLayer(i.getItemAt(r)))}(i.layers,e),e}}(WebMap||(WebMap={}));

package/portal/_LayerBase.d.ts

@@ -1,6 +1,6 @@
+import type Collection from "@arcgis/core/core/Collection";
 import type EsriLayer from "@arcgis/core/layers/Layer";
 import type Portal from "@arcgis/core/portal/Portal";
-import type { Collection } from "../utilities/collection.js";
 import type { LegacyBaseMapLayerType } from "./BaseMapLayer.js";
 import type { Effect } from "./Effect.js";
 import type { LegacyOperationalLayerType } from "./OperationalLayer.js";
@@ -73,7 +73,7 @@ export interface LayerBase {
  * possible values isn't officially documented by esri, however it's used in
  * ArcGIS online web maps.
  */
-export type LayerType = "ArcGISAnnotationLayer" | "ArcGISFeatureLayer" | "ArcGISMapServiceLayer" | "ArcGISTiledMapServiceLayer" | "ArcGISTiledElevationServiceLayer" | "ArcGISImageServiceLayer" | "ArcGISImageServiceVectorLayer" | "ArcGISTiledImageServiceLayer" | "VectorTileLayer" | "ArcGISSceneServiceLayer" | "ArcGISStreamLayer" | "BingMapsAerial" | "BingMapsHybrid" | "BingMapsRoad" | "OpenStreetMap" | "WebTiledLayer" | "KML" | "WMS" | "CSV" | "GeoRSS" | "IntegratedMeshLayer" | "GroupLayer" | "PointCloudLayer" | "BuildingSceneLayer" | "SubtypeGroupLayer";
+export type LayerType = "ArcGISAnnotationLayer" | "ArcGISFeatureLayer" | "ArcGISMapServiceLayer" | "ArcGISTiledMapServiceLayer" | "ArcGISTiledElevationServiceLayer" | "ArcGISImageServiceLayer" | "ArcGISImageServiceVectorLayer" | "ArcGISTiledImageServiceLayer" | "VectorTileLayer" | "ArcGISSceneServiceLayer" | "ArcGISStreamLayer" | "BingMapsAerial" | "BingMapsHybrid" | "BingMapsRoad" | "OpenStreetMap" | "WebTiledLayer" | "KML" | "WMS" | "CSV" | "GeoRSS" | "GeoJSON" | "IntegratedMeshLayer" | "GroupLayer" | "PointCloudLayer" | "BuildingSceneLayer" | "SubtypeGroupLayer";
 export declare namespace LayerBase {
     /**
      * Creates an Esri Layer object from the given Portal layer JSON.

package/support/FormatSettings.d.ts

@@ -1,4 +1,4 @@
-import { PropertyDefs } from "./Serializable.js";
+import type { PropertyDefs } from "./Serializable.js";
 import { Settings } from "./Settings.js";
 /**
  * Properties that can be passed into the constructor for {@link FormatSettings}.

package/support/InitializableBase.d.ts

@@ -1,8 +1,9 @@
+import type Collection from "@arcgis/core/core/Collection";
 import type { FailureMode } from "../FailureMode.js";
 import type { EventCallback } from "../support/esri.js";
-import type { Collection } from "../utilities/collection.js";
 import { InitializeError } from "./InitializeError.js";
-import { PropertyDefs, SerializableBase } from "./Serializable.js";
+import type { PropertyDefs } from "./Serializable.js";
+import { SerializableBase } from "./Serializable.js";
 /**
  * Represents an item that can be initialized.
  */

package/support/InitializableCollectionProxy.d.ts

@@ -1,6 +1,6 @@
+import type Collection from "@arcgis/core/core/Collection";
 import { CollectionProxy } from "../utilities/CollectionProxy.js";
 import { ReadOnlyCollection } from "../utilities/ReadOnlyCollection.js";
-import type { Collection } from "../utilities/collection.js";
 import type { InitializableBase, InitializableBaseProperties } from "./InitializableBase.js";
 /**
  * A collection of initializable items.

package/support/Observable.d.ts

@@ -1,4 +1,5 @@
-import { AccessorLike, Evented, WatchCallback } from "./esri.js";
+import Evented from "@arcgis/core/core/Evented";
+import type { AccessorLike, WatchCallback } from "./esri.js";
 /**
  * An object whose properties can be observed for changes.
  */
@@ -52,7 +53,7 @@ export declare class Observable extends Evented implements AccessorLike {
      * instead of watch(), which will automatically take care of handling
      * multiple properties and nesting.
      *
-     * @param property The root of the property path, e.g. "foo" in
+     * @param propertyKey The root of the property path, e.g. "foo" in
      *   "foo.bar.baz" or "foo".
      * @param subpath The remainder of the property path, e.g. "bar.baz" in
      *   "foo.bar.baz" or "" in "foo". The implementation of watch() takes care
@@ -62,7 +63,7 @@ export declare class Observable extends Evented implements AccessorLike {
      *   same tick that the property changed. Otherwise, it will be invoked in a
      *   future tick.
      */
-    protected _watchProperty(property: string, subpath: string, callback: WatchCallback, sync: boolean): IHandle;
+    protected _watchProperty(propertyKey: string, subpath: string, callback: WatchCallback, sync: boolean): IHandle;
     /**
      * Indicates that the given property has changed, causing observers to be
      * notified.

package/support/Observable.js

@@ -1 +1 @@
-import{Property as t}from"@arcgis/core/core/accessorSupport/Property";import{trackAccess as e}from"@arcgis/core/core/accessorSupport/tracking";import{Evented as o}from"./esri.js";const s=new WeakMap;function r(e,o){s.has(e)||s.set(e,new Map);const r=s.get(e),n=String(o);if(!r.has(n)){const o=new t({host:e},n,{});r.set(n,o)}return r.get(n)}const n={get:(t,o,s)=>(e(r(s,o)),Reflect.get(t,o,s)),set:(t,e,o,s)=>(Reflect.set(t,e,o,s),s.notifyChange(String(e)),!0)};export class Observable extends o{constructor(){return super(),new Proxy(this,n)}watch(t,e,o=!1){const s=[].concat(t),r=[];for(const t of s){const[s,n]=t.split(/\.(.*)/);if(n?.length){let i;const c=this[s];c&&"function"==typeof c.watch&&(i=c.watch(n,((o,s)=>{e(o,s,t,this)}),o));const h=this._watchProperty(s,n,((s,r)=>{i&&i.remove(),s&&"function"==typeof s.watch&&(i=s.watch(n,((o,s)=>{e(o,s,t,this)}),o));const c="function"==typeof r?.get?r.get(n):void 0,h=this.get(t);e(h,c,t,this)}),o);r.push({remove:()=>{h.remove(),i&&i.remove()}})}else r.push(this._watchProperty(s,"",e,o))}return 1===r.length?r[0]:{remove:()=>r.forEach((t=>t.remove()))}}get(t){if(!t)return;const e=t.split(".");let o=this;for(;o&&"object"==typeof o&&e.length;)o=o[e.shift()];return e.length?void 0:o}set(t,e){if(!t)return this;if("string"==typeof t){const o=t.split(".");let s=this;for(;s&&"object"==typeof s&&o.length>1;)s=s[o.shift()];s&&"object"==typeof s&&(s[o[0]]=e)}else for(const e of Object.keys(t))this.set(e,t[e]);return this}notifyChange(t){const e=r(this,t);e.invalidate(),e.commit()}_watchProperty(t,e,o,s){const n=s?new i:new c;return n.callback=o,n.oldValue=this[t],n.property=r(this,t),n.property.observe(n)}_notifyChange(t,e=!1){console.warn("Observable._notifyChange() is deprecated and will be removed in a future update. Use notifyChange() instead."),this.notifyChange(t)}}class i{onInvalidated(){}onCommitted(){const t=this.property.properties.host,{propertyName:e}=this.property,o=t[e];this.oldValue!==o&&(this.callback(o,this.oldValue,e,t),this.oldValue=o)}}class c{constructor(){this._notifyPending=!1}onInvalidated(){}onCommitted(){this._notifyPending||(this._notifyPending=!0,setTimeout((()=>{this._notifyPending=!1;const t=this.property.properties.host,{propertyName:e}=this.property,o=t[e];this.oldValue!==o&&(this.callback(o,this.oldValue,e,t),this.oldValue=o)}),0))}}
+import t from"@arcgis/core/core/Evented";import{Property as e}from"@arcgis/core/core/accessorSupport/Property";import{trackAccess as o}from"@arcgis/core/core/accessorSupport/tracking";const s=new WeakMap;export class Observable extends t{constructor(){super();const t=new Map,r=new Proxy(this,{get(s,r,i){let n=t.get(r);return n||(n=new e({host:i},String(r),{}),t.set(r,n)),o(n),Reflect.get(s,r,i)},set(e,o,s,r){Reflect.set(e,o,s,r);const i=t.get(o);return i&&(i.invalidate(),i.commit()),!0}});return s.set(r,t),r}watch(t,e,o=!1){const s=[].concat(t),r=[];for(const t of s){const[s,i]=t.split(/\.(.*)/);if(i?.length){let n;const c=this[s];c&&"function"==typeof c.watch&&(n=c.watch(i,((o,s)=>{e(o,s,t,this)}),o));const h=this._watchProperty(s,i,((s,r)=>{n&&n.remove(),s&&"function"==typeof s.watch&&(n=s.watch(i,((o,s)=>{e(o,s,t,this)}),o));const c="function"==typeof r?.get?r.get(i):void 0,h=this.get(t);e(h,c,t,this)}),o);r.push({remove:()=>{h.remove(),n&&n.remove()}})}else r.push(this._watchProperty(s,"",e,o))}return 1===r.length?r[0]:{remove:()=>r.forEach((t=>t.remove()))}}get(t){if(!t)return;const e=t.split(".");let o=this;for(;o&&"object"==typeof o&&e.length;)o=o[e.shift()];return e.length?void 0:o}set(t,e){if(!t)return this;if("string"==typeof t){const o=t.split(".");let s=this;for(;s&&"object"==typeof s&&o.length>1;)s=s[o.shift()];s&&"object"==typeof s&&(s[o[0]]=e)}else for(const e of Object.keys(t))this.set(e,t[e]);return this}notifyChange(t){const e=s.get(this).get(t);e&&(e.invalidate(),e.commit())}_watchProperty(t,o,n,c){const h=c?new r:new i;h.callback=n,h.oldValue=this[t];const a=s.get(this);let l=a.get(t);return l||(l=new e({host:this},String(t),{}),a.set(t,l)),h.property=l,l.observe(h)}_notifyChange(t,e=!1){console.warn("Observable._notifyChange() is deprecated and will be removed in a future update. Use notifyChange() instead."),this.notifyChange(t)}}class r{onInvalidated(){}onCommitted(){const t=this.property.properties.host,{propertyName:e}=this.property,o=t[e];this.oldValue!==o&&(this.callback(o,this.oldValue,e,t),this.oldValue=o)}}class i{constructor(){this._notifyPending=!1}onInvalidated(){}onCommitted(){this._notifyPending||(this._notifyPending=!0,setTimeout((()=>{this._notifyPending=!1;const t=this.property.properties.host,{propertyName:e}=this.property,o=t[e];this.oldValue!==o&&(this.callback(o,this.oldValue,e,t),this.oldValue=o)}),0))}}

package/support/Settings.d.ts

@@ -1,5 +1,7 @@
-import { SerializableBase, SerializeMode } from "./Serializable.js";
-import { Collection, WatchCallback } from "./esri.js";
+import Collection from "@arcgis/core/core/Collection";
+import type { SerializeMode } from "./Serializable.js";
+import { SerializableBase } from "./Serializable.js";
+import type { WatchCallback } from "./esri.js";
 /**
  * Helper class for implementing a collection of settings that can be inherited
  * at runtime from a parent collection of settings. Setting a value locally will

package/support/Settings.js

@@ -1 +1 @@
-import{CopyOnWriteCollection as e}from"../utilities/CopyOnWriteCollection.js";import{every as t}from"../utilities/iterable.js";import{isDefault as s,SerializableBase as i,shouldExcludeDefaults as r}from"./Serializable.js";import{Collection as n}from"./esri.js";export class Settings extends i{get parent(){return this._parent}set parent(e){this._setParent(e)}reset(e){if(this._overrides)if(e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this._overrides.delete(e),this.notifyChange(e);else{const e=[...this._overrides.keys()];this._overrides.clear();for(const t of e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this.notifyChange(t)}}isModified(s){if(!this._overrides)return!1;if(s){if(!this._overrides.has(s))return!1;const t=this._overrides.get(s);return t instanceof e?t.isModified:!(t instanceof Settings)||t.isModified()}return!t(this._overrides.values(),(t=>t instanceof e&&!t.isModified||t instanceof Settings&&!t.isModified()))}toJSON(e="all"){if(!this._overrides?.size)return r(e)?void 0:{};const t=super.toJSON(e);if(t)for(const e of Object.keys(t))this.isModified(e)||delete t[e];return r(e)&&s(t)?void 0:t}getDefaults(){return{}}_watchProperty(e,t,s,i){const r={path:`${e}${t?`.${t}`:""}`,handle:super._watchProperty(e,t,s,i),callback:s,remove:()=>{r.handle.remove(),r.parentHandle&&r.parentHandle.remove(),this._settingObservers.delete(r)}};return!this.isModified(e)&&this.parent&&this._watchParent(r),this._settingObservers=this._settingObservers||new Set,this._settingObservers.add(r),r}_getSetting(e,t){return this._overrides?.has(e)?this._overrides.get(e):this.parent?this.parent[e]:t}_getCollectionSetting(t){if(!this._overrides?.has(t)){const s=this.parent?this.parent[t]:new n;this._overrides=this._overrides||new Map,this._overrides.set(t,new e(s))}return this._overrides.get(t)}_getNestedSettings(e,t){if(!this._overrides?.has(e)){const s=t();this.parent&&(s.parent=this.parent[e]),this._overrides=this._overrides||new Map,this._overrides.set(e,s)}return this._overrides.get(e)}_setSetting(e,t){!this.isModified(e)&&this.parent&&this._settingObservers&&this._settingObservers.forEach((t=>{t.path===e&&this._unwatchParent(t)})),this._overrides=this._overrides||new Map,this._overrides.set(e,t)}_setParent(t){this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{e.parentHandle&&e.parentHandle.remove(),e.parentHandle=void 0})),t&&this._settingObservers&&this._settingObservers.forEach((e=>{this.isModified(e.path)||(e.parentHandle=t.watch(e.path,((t,s,i)=>{e.callback(t,s,i,this)})))})),this._parent=t,this._settingObservers&&this._settingObservers.forEach((e=>{this.notifyChange(e.path)})),this._overrides&&this._overrides.forEach(((s,i)=>{s instanceof e?s.originalCollection=t?t.get(i):new n:s instanceof Settings&&(s.parent=t?t.get(i):void 0)}))}_watchParent(e){e.parentHandle||(e.parentHandle=this.parent.watch(e.path,((t,s,i)=>{e.callback(t,s,i,this)})))}_unwatchParent(e){e.parentHandle&&(e.parentHandle.remove(),e.parentHandle=void 0)}}
+import e from"@arcgis/core/core/Collection";import{CopyOnWriteCollection as t}from"../utilities/CopyOnWriteCollection.js";import{every as s}from"../utilities/iterable.js";import{isDefault as i,SerializableBase as r,shouldExcludeDefaults as n}from"./Serializable.js";export class Settings extends r{get parent(){return this._parent}set parent(e){this._setParent(e)}reset(e){if(this._overrides)if(e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this._overrides.delete(e),this.notifyChange(e);else{const e=[...this._overrides.keys()];this._overrides.clear();for(const t of e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this.notifyChange(t)}}isModified(e){if(!this._overrides)return!1;if(e){if(!this._overrides.has(e))return!1;const s=this._overrides.get(e);return s instanceof t?s.isModified:!(s instanceof Settings)||s.isModified()}return!s(this._overrides.values(),(e=>e instanceof t&&!e.isModified||e instanceof Settings&&!e.isModified()))}toJSON(e="all"){if(!this._overrides?.size)return n(e)?void 0:{};const t=super.toJSON(e);if(t)for(const e of Object.keys(t))this.isModified(e)||delete t[e];return n(e)&&i(t)?void 0:t}getDefaults(){return{}}_watchProperty(e,t,s,i){const r={path:`${e}${t?`.${t}`:""}`,handle:super._watchProperty(e,t,s,i),callback:s,remove:()=>{r.handle.remove(),r.parentHandle&&r.parentHandle.remove(),this._settingObservers.delete(r)}};return!this.isModified(e)&&this.parent&&this._watchParent(r),this._settingObservers=this._settingObservers||new Set,this._settingObservers.add(r),r}_getSetting(e,t){return this._overrides?.has(e)?this._overrides.get(e):this.parent?this.parent[e]:t}_getCollectionSetting(s){if(!this._overrides?.has(s)){const i=this.parent?this.parent[s]:new e;this._overrides=this._overrides||new Map,this._overrides.set(s,new t(i))}return this._overrides.get(s)}_getNestedSettings(e,t){if(!this._overrides?.has(e)){const s=t();this.parent&&(s.parent=this.parent[e]),this._overrides=this._overrides||new Map,this._overrides.set(e,s)}return this._overrides.get(e)}_setSetting(e,t){!this.isModified(e)&&this.parent&&this._settingObservers&&this._settingObservers.forEach((t=>{t.path===e&&this._unwatchParent(t)})),this._overrides=this._overrides||new Map,this._overrides.set(e,t)}_setParent(s){this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{e.parentHandle&&e.parentHandle.remove(),e.parentHandle=void 0})),s&&this._settingObservers&&this._settingObservers.forEach((e=>{this.isModified(e.path)||(e.parentHandle=s.watch(e.path,((t,s,i)=>{e.callback(t,s,i,this)})))})),this._parent=s,this._settingObservers&&this._settingObservers.forEach((e=>{this.notifyChange(e.path)})),this._overrides&&this._overrides.forEach(((i,r)=>{i instanceof t?i.originalCollection=s?s.get(r):new e:i instanceof Settings&&(i.parent=s?s.get(r):void 0)}))}_watchParent(e){e.parentHandle||(e.parentHandle=this.parent.watch(e.path,((t,s,i)=>{e.callback(t,s,i,this)})))}_unwatchParent(e){e.parentHandle&&(e.parentHandle.remove(),e.parentHandle=void 0)}}

package/support/_ArcGISRelationshipCollection.d.ts

@@ -1,8 +1,8 @@
+import Collection from "@arcgis/core/core/Collection";
 import type { FeatureSource } from "../data/FeatureSource.js";
 import { RelationshipCollection } from "../data/FeatureSourceBase.js";
 import type { Relationship } from "../data/_Relationship.js";
-import { Collection } from "../utilities/collection.js";
-import { ArcGISRequestHelper } from "./ArcGISRequestHelper.js";
+import type { ArcGISRequestHelper } from "./ArcGISRequestHelper.js";
 /**
  * Implements relationships for an ArcGIS server layer/sublayer/table. Calling
  * initialize() will automatically load relationship data from ArcGIS server.

package/support/_ArcGISRelationshipCollection.js

@@ -1 +1 @@
-import{RelationshipCollection as e}from"../data/FeatureSourceBase.js";import{ArcGISRelationship as i}from"../tasks/query/ArcGISRelationship.js";import{Collection as t}from"../utilities/collection.js";import{map as r}from"../utilities/promise.js";import{DefaultArcGISRequestHelper as s}from"./ArcGISRequestHelper.js";export class ArcGISRelationshipCollection extends e{constructor(){super(...arguments),this._unresolvedRelationships=new t}get requestHelper(){return this._requestHelper||(this._requestHelper=this._source.requestHelper??new s),this._requestHelper}set requestHelper(e){this._requestHelper=e}async initialize(){return void 0===this._initializePromise&&(this._initializePromise=(async()=>{if(!this._sourceUrl)return;const e=await this.requestHelper.request(this._sourceUrl,{query:{f:"json"}});e?.data?.relationships&&await r(e.data.relationships,(async e=>{const i=`${this._sourceUrl.slice(0,this._sourceUrl.length-`${this._sourceLayerId}`.length-1)}/${e.relatedTableId}`,t=await this.requestHelper.request(i,{query:{f:"json"}});if(!t?.data||!Array.isArray(t?.data.relationships))return;const r=t.data.relationships.find((e=>e.relatedTableId===this._sourceLayerId));if(!r)return;let s="many-to-many";switch(e.cardinality){case"esriRelCardinalityOneToOne":s="one-to-one";break;case"esriRelCardinalityOneToMany":s="esriRelRoleOrigin"===e.role?"one-to-many":"many-to-one";break;case"esriRelCardinalityManyToMany":s="many-to-many";break;default:throw new Error(`Unknown cardinality value "${e.cardinality}".`)}this._unresolvedRelationships.add({$relationshipType:"ArcGISRelationship",id:`${e.id}`,title:e.name,keyField:e.keyField,relatedKeyField:r.keyField,relatedSource:void 0,relatedLayerId:e.relatedTableId,cardinality:s,relationshipTableId:e.relationshipTableId,originForeignKey:e.keyFieldInRelationshipTable,destinationForeignKey:r.keyFieldInRelationshipTable})}))})()),this._initializePromise}get _collection(){const e=this._unresolvedRelationships.toArray();this._unresolvedRelationships.removeAll();for(const i of e)this._resolveRelationship(i)||this._unresolvedRelationships.add(i);return this._collectionField}_resolveRelationship(e){const t=this._findRelatedSource(e.relatedLayerId);return!!t&&(e.relatedSource=t,this.add(new i(e)),!0)}}
+import e from"@arcgis/core/core/Collection";import{RelationshipCollection as i}from"../data/FeatureSourceBase.js";import{ArcGISRelationship as r}from"../tasks/query/ArcGISRelationship.js";import{map as t}from"../utilities/promise.js";import{DefaultArcGISRequestHelper as s}from"./ArcGISRequestHelper.js";export class ArcGISRelationshipCollection extends i{constructor(){super(...arguments),this._unresolvedRelationships=new e}get requestHelper(){return this._requestHelper||(this._requestHelper=this._source.requestHelper??new s),this._requestHelper}set requestHelper(e){this._requestHelper=e}async initialize(){return void 0===this._initializePromise&&(this._initializePromise=(async()=>{if(!this._sourceUrl)return;const e=await this.requestHelper.request(this._sourceUrl,{query:{f:"json"}});e?.data?.relationships&&await t(e.data.relationships,(async e=>{const i=`${this._sourceUrl.slice(0,this._sourceUrl.length-`${this._sourceLayerId}`.length-1)}/${e.relatedTableId}`,r=await this.requestHelper.request(i,{query:{f:"json"}});if(!r?.data||!Array.isArray(r?.data.relationships))return;const t=r.data.relationships.find((e=>e.relatedTableId===this._sourceLayerId));if(!t)return;let s="many-to-many";switch(e.cardinality){case"esriRelCardinalityOneToOne":s="one-to-one";break;case"esriRelCardinalityOneToMany":s="esriRelRoleOrigin"===e.role?"one-to-many":"many-to-one";break;case"esriRelCardinalityManyToMany":s="many-to-many";break;default:throw new Error(`Unknown cardinality value "${e.cardinality}".`)}this._unresolvedRelationships.add({$relationshipType:"ArcGISRelationship",id:`${e.id}`,title:e.name,keyField:e.keyField,relatedKeyField:t.keyField,relatedSource:void 0,relatedLayerId:e.relatedTableId,cardinality:s,relationshipTableId:e.relationshipTableId,originForeignKey:e.keyFieldInRelationshipTable,destinationForeignKey:t.keyFieldInRelationshipTable})}))})()),this._initializePromise}get _collection(){const e=this._unresolvedRelationships.toArray();this._unresolvedRelationships.removeAll();for(const i of e)this._resolveRelationship(i)||this._unresolvedRelationships.add(i);return this._collectionField}_resolveRelationship(e){const i=this._findRelatedSource(e.relatedLayerId);return!!i&&(e.relatedSource=i,this.add(new r(e)),!0)}}

package/support/_graphicsQuery.js

@@ -1 +1 @@
-import{QueryOptions as e}from"../tasks/query/QueryOptions.js";import{checkArg as s}from"../utilities/checkArg.js";import{Collection as i}from"../utilities/collection.js";import{count as t,query as o}from"../utilities/query.js";import{cancelify as r}from"./Cancellable.js";export function executeQuery(t,l,a,n){s("where",t).isNotMissing(),s("source",l).isNotMissing(),s("queryable",a).isNotMissing();const c={...e.DEFAULTS,...e.fromFeatureSource(l),...n};return s("options.maxResults",c.maxResults).satisfies((e=>null==e||e>0)),async function*(){let e;if(i.isCollection(a)||Array.isArray(a))e=i.isCollection(a)?a.toArray():a.slice();else{e=(await a).features,e.forEach((e=>e.popupTemplate=e.getEffectivePopupTemplate())),e=e.slice()}const s=r(o(t,l,e,c),c.cancelToken);let n=await s;n=n.slice(0,c.maxResults||n.length),yield*n}()}export async function executeCount(o,l,a,n){s("where",o).isNotMissing(),s("source",l).isNotMissing(),s("queryable",a).isNotMissing();const c={...e.DEFAULTS,...e.fromFeatureSource(l),...n},{maxResults:u,cancelToken:f}=c;let m;if(s("options.maxResults",u).satisfies((e=>null==e||e>0)),i.isCollection(a)||Array.isArray(a))m=i.isCollection(a)?a.toArray():a.slice();else{m=(await a).features.slice()}let p=await r(t(o,m,c),f);return u>0&&p>u&&(p=u),{source:l,count:p}}
+import e from"@arcgis/core/core/Collection";import{QueryOptions as s}from"../tasks/query/QueryOptions.js";import{checkArg as i}from"../utilities/checkArg.js";import{count as t,query as o}from"../utilities/query.js";import{cancelify as r}from"./Cancellable.js";export function executeQuery(t,l,a,c){i("where",t).isNotMissing(),i("source",l).isNotMissing(),i("queryable",a).isNotMissing();const n={...s.DEFAULTS,...s.fromFeatureSource(l),...c};return i("options.maxResults",n.maxResults).satisfies((e=>null==e||e>0)),async function*(){let s;if(e.isCollection(a)||Array.isArray(a))s=e.isCollection(a)?a.toArray():a.slice();else{s=(await a).features,s.forEach((e=>e.popupTemplate=e.getEffectivePopupTemplate())),s=s.slice()}const i=r(o(t,l,s,n),n.cancelToken);let c=await i;c=c.slice(0,n.maxResults||c.length),yield*c}()}export async function executeCount(o,l,a,c){i("where",o).isNotMissing(),i("source",l).isNotMissing(),i("queryable",a).isNotMissing();const n={...s.DEFAULTS,...s.fromFeatureSource(l),...c},{maxResults:u,cancelToken:f}=n;let m;if(i("options.maxResults",u).satisfies((e=>null==e||e>0)),e.isCollection(a)||Array.isArray(a))m=e.isCollection(a)?a.toArray():a.slice();else{m=(await a).features.slice()}let p=await r(t(o,m,n),f);return u>0&&p>u&&(p=u),{source:l,count:p}}

package/support/esri.d.ts

@@ -6,7 +6,15 @@ import type BarChartMediaInfo from "@arcgis/core/popup/content/BarChartMediaInfo
 import type ColumnChartMediaInfo from "@arcgis/core/popup/content/ColumnChartMediaInfo";
 import type LineCharMediaInfo from "@arcgis/core/popup/content/LineChartMediaInfo";
 import type PieChartMediaInfo from "@arcgis/core/popup/content/PieChartMediaInfo";
-export { Collection, Evented };
+/**
+ * @deprecated Use "@arcgis/core/core/Collection" instead.
+ */
+declare const DeprecatedCollection: typeof Collection;
+/**
+ * @deprecated Use "@arcgis/core/core/Evented" instead.
+ */
+declare const DeprecatedEvented: typeof Evented;
+export { DeprecatedCollection as Collection, DeprecatedEvented as Evented };
 export type EsriError = __esri.Error;
 export type EsriErrorDetails = __esri.EsriErrorDetails;
 export type EventHandler = __esri.EventHandler;

package/support/esri.js

@@ -1 +1 @@
-import e from"@arcgis/core/core/Collection";import a from"@arcgis/core/core/Evented";export{e as Collection,a as Evented};export var WellKnownBasemap;!function(e){e.SATELLITE="satellite",e.HYBRID="hybrid",e.HYBRID_VECTOR="hybrid-vector",e.STREETS="streets",e.STREETS_VECTOR="streets-vector",e.TOPO="topo",e.TOPO_VECTOR="topo-vector",e.STREETS_NAVIGATION_VECTOR="streets-navigation-vector",e.STREETS_NIGHT_VECTOR="streets-night-vector",e.TERRAIN="terrain",e.TERRAIN_VECTOR="terrain-vector",e.DARK_GRAY="dark-gray",e.DARK_GRAY_VECTOR="dark-gray-vector",e.GRAY="gray",e.GRAY_VECTOR="gray-vector",e.NATIONAL_GEOGRAPHIC="national-geographic",e.OCEANS="oceans",e.OCEANS_VECTOR="oceans-vector",e.OPEN_STREET_MAP="osm",e.OPEN_STREET_MAP_VECTOR="osm-vector",e.STREETS_RELIEF_VECTOR="streets-relief-vector"}(WellKnownBasemap||(WellKnownBasemap={}));export const wellKnownBasemapTitles={[WellKnownBasemap.SATELLITE]:"Imagery",[WellKnownBasemap.HYBRID]:"Imagery with Labels",[WellKnownBasemap.HYBRID_VECTOR]:"Imagery with Labels",[WellKnownBasemap.STREETS]:"Streets",[WellKnownBasemap.STREETS_VECTOR]:"Streets",[WellKnownBasemap.TOPO]:"Topographic",[WellKnownBasemap.TOPO_VECTOR]:"Topographic",[WellKnownBasemap.STREETS_NAVIGATION_VECTOR]:"World Navigation Map",[WellKnownBasemap.STREETS_NIGHT_VECTOR]:"World Street Map (Night)",[WellKnownBasemap.TERRAIN]:"Terrain with Labels",[WellKnownBasemap.TERRAIN_VECTOR]:"Terrain with Labels",[WellKnownBasemap.DARK_GRAY]:"Dark Gray Canvas",[WellKnownBasemap.DARK_GRAY_VECTOR]:"Dark Gray Canvas",[WellKnownBasemap.GRAY]:"Light Gray Canvas",[WellKnownBasemap.GRAY_VECTOR]:"Light Gray Canvas",[WellKnownBasemap.NATIONAL_GEOGRAPHIC]:"National Geographic",[WellKnownBasemap.OCEANS]:"Oceans",[WellKnownBasemap.OCEANS_VECTOR]:"Oceans",[WellKnownBasemap.OPEN_STREET_MAP]:"OpenStreetMap",[WellKnownBasemap.OPEN_STREET_MAP_VECTOR]:"OpenStreetMap",[WellKnownBasemap.STREETS_RELIEF_VECTOR]:"World Street Map (with Relief)"};
+import e from"@arcgis/core/core/Collection";import a from"@arcgis/core/core/Evented";const n=e,o=a;export{n as Collection,o as Evented};export var WellKnownBasemap;!function(e){e.SATELLITE="satellite",e.HYBRID="hybrid",e.HYBRID_VECTOR="hybrid-vector",e.STREETS="streets",e.STREETS_VECTOR="streets-vector",e.TOPO="topo",e.TOPO_VECTOR="topo-vector",e.STREETS_NAVIGATION_VECTOR="streets-navigation-vector",e.STREETS_NIGHT_VECTOR="streets-night-vector",e.TERRAIN="terrain",e.TERRAIN_VECTOR="terrain-vector",e.DARK_GRAY="dark-gray",e.DARK_GRAY_VECTOR="dark-gray-vector",e.GRAY="gray",e.GRAY_VECTOR="gray-vector",e.NATIONAL_GEOGRAPHIC="national-geographic",e.OCEANS="oceans",e.OCEANS_VECTOR="oceans-vector",e.OPEN_STREET_MAP="osm",e.OPEN_STREET_MAP_VECTOR="osm-vector",e.STREETS_RELIEF_VECTOR="streets-relief-vector"}(WellKnownBasemap||(WellKnownBasemap={}));export const wellKnownBasemapTitles={[WellKnownBasemap.SATELLITE]:"Imagery",[WellKnownBasemap.HYBRID]:"Imagery with Labels",[WellKnownBasemap.HYBRID_VECTOR]:"Imagery with Labels",[WellKnownBasemap.STREETS]:"Streets",[WellKnownBasemap.STREETS_VECTOR]:"Streets",[WellKnownBasemap.TOPO]:"Topographic",[WellKnownBasemap.TOPO_VECTOR]:"Topographic",[WellKnownBasemap.STREETS_NAVIGATION_VECTOR]:"World Navigation Map",[WellKnownBasemap.STREETS_NIGHT_VECTOR]:"World Street Map (Night)",[WellKnownBasemap.TERRAIN]:"Terrain with Labels",[WellKnownBasemap.TERRAIN_VECTOR]:"Terrain with Labels",[WellKnownBasemap.DARK_GRAY]:"Dark Gray Canvas",[WellKnownBasemap.DARK_GRAY_VECTOR]:"Dark Gray Canvas",[WellKnownBasemap.GRAY]:"Light Gray Canvas",[WellKnownBasemap.GRAY_VECTOR]:"Light Gray Canvas",[WellKnownBasemap.NATIONAL_GEOGRAPHIC]:"National Geographic",[WellKnownBasemap.OCEANS]:"Oceans",[WellKnownBasemap.OCEANS_VECTOR]:"Oceans",[WellKnownBasemap.OPEN_STREET_MAP]:"OpenStreetMap",[WellKnownBasemap.OPEN_STREET_MAP_VECTOR]:"OpenStreetMap",[WellKnownBasemap.STREETS_RELIEF_VECTOR]:"World Street Map (with Relief)"};

package/tasks/geocoding/ArcGISGeocoder.d.ts

@@ -1,12 +1,13 @@
+import Collection from "@arcgis/core/core/Collection";
 import type Point from "@arcgis/core/geometry/Point";
 import { Feature, SCORE_FIELD } from "../../data/Feature.js";
 import { Schema } from "../../data/Schema.js";
-import { ArcGISRequestHelper } from "../../support/ArcGISRequestHelper.js";
-import { PropertyDefs } from "../../support/Serializable.js";
-import { Collection } from "../../utilities/collection.js";
-import { PortalItemLike } from "../../utilities/portal.js";
+import type { ArcGISRequestHelper } from "../../support/ArcGISRequestHelper.js";
+import type { PropertyDefs } from "../../support/Serializable.js";
+import type { PortalItemLike } from "../../utilities/portal.js";
 import type { CountResult } from "../CountResult.js";
-import { ADDRESS_FIELD, AddressLike, GeocodeOptions, Geocoder, GeocoderProperties } from "./Geocoder.js";
+import type { AddressLike, GeocoderProperties } from "./Geocoder.js";
+import { ADDRESS_FIELD, GeocodeOptions, Geocoder } from "./Geocoder.js";
 export { ADDRESS_FIELD, SCORE_FIELD };
 /**
  * Properties that can be passed into the constructor for {@link ArcGISGeocoder}.

package/tasks/geocoding/ArcGISGeocoder.js

@@ -1 +1 @@
-var e;import{__decorate as t}from"tslib";import{addressToLocations as s,addressesToLocations as i,locationToAddress as r,suggestLocations as a}from"@arcgis/core/rest/locator";import{InvalidOperationError as o}from"../../InvalidOperationError.js";import{isFeature as n}from"../../ItemType.js";import{Feature as c,SCORE_FIELD as l,SCORE_FIELD_ORIGINAL as d,toGraphic as u}from"../../data/Feature.js";import{Schema as p}from"../../data/Schema.js";import{Field as h}from"../../portal/Field.js";import{SpatialReference as f}from"../../portal/SpatialReference.js";import{DefaultArcGISRequestHelper as m}from"../../support/ArcGISRequestHelper.js";import{cancelify as g}from"../../support/Cancellable.js";import{serializable as y}from"../../support/Serializable.js";import{ReadOnlyCollection as _}from"../../utilities/ReadOnlyCollection.js";import{checkArg as S}from"../../utilities/checkArg.js";import{Collection as w}from"../../utilities/collection.js";import{load as A}from"../../utilities/esri.js";import{toPortalItem as b}from"../../utilities/portal.js";import{ADDRESS_FIELD as R,GeocodeOptions as F,Geocoder as v}from"./Geocoder.js";export{R as ADDRESS_FIELD,l as SCORE_FIELD};const x="This schema property is read-only.",j="Match_addr";let z=e=class extends v{constructor(){super(...arguments),this._magicKeyAddressMap=new Map}get requestHelper(){return this._requestHelper||(this._requestHelper=new m),this._requestHelper}set requestHelper(e){this._requestHelper=e}get categories(){return this._categories||(this._categories=new w),this._categories}get url(){return this._url}set url(e){this.updateUrl(e)}static async fromPortalItem(t,s){S("portalItem",t).isNotMissing();const i=b(t);await A(i);const r={...s};return void 0!==r.title&&null!==r.title||(r.title=i.title),r.url=i.url,new e(r)}updateUrl(e){return this._url===e?Promise.resolve():(this._url=e,this.isInitialized?(async()=>{const e=await this._getGeocodeService(this.url);this._updateGeocodeProperties(e)})():Promise.resolve())}async*geocode(e,t){S("address",e).isNotMissing(),await this.initialize();const i={...F.DEFAULTS,...F.fromFeatureSource(this),...t},r="string"==typeof e?this._magicKeyAddressMap?.get(e):void 0,{outFields:a,outSpatialReference:o,maxResults:n,searchArea:c}=i,l={address:this._addressToAttributes(e),categories:this.categories.toArray(),countryCode:this.countryCode,outFields:a,outSpatialReference:o,maxLocations:n,searchExtent:c?.extent,forStorage:void 0,magicKey:r,location:t?.searchPoint},d=s(this.url,l),u=await g(d,t?.cancelToken);yield*u.map((e=>this._candidateToFeature(e,i)))}async count(e,t){S("address",e).isNotMissing(),await this.initialize();const i={...F.DEFAULTS,...F.fromFeatureSource(this),...t},{outFields:r,outSpatialReference:a,maxResults:o,searchArea:n}=i,c={address:this._addressToAttributes(e),categories:this.categories.toArray(),countryCode:this.countryCode,outFields:r,outSpatialReference:a,maxLocations:o,searchExtent:n?n.extent:void 0,forStorage:void 0,magicKey:void 0,location:t?.searchPoint},l=s(this.url,c);return{source:this,count:(await g(l,t?.cancelToken)).length}}async*batchGeocode(e,t){S("addresses",e).isNotMissing(),await this.initialize();const s={...F.DEFAULTS,...F.fromFeatureSource(this),...t};if(!this.capabilities.supportsBatch)throw new o("Batch geocoding is not supported.");if(this._maxBatchSize&&e.length>this._maxBatchSize)throw new o(`Batch geocoding is limited to ${this._maxBatchSize} addresses at a time.`);let r=0;const a={addresses:e.map((e=>this._addressToAttributes(e,r++))),categories:this.categories.toArray(),countryCode:this.countryCode,outSpatialReference:s.outSpatialReference},n=i(this.url,a),c=(await g(n,t?.cancelToken)).map((e=>this._candidateToFeature(e,s)));for(const t of c){const s=t.attributes.get("ResultID");void 0!==s&&s>=0&&t.attributes.set(R,e[s]),t.attributes.delete("ResultID")}yield*c}async suggest(e,t){if(S("searchText",e).isNotMissing(),await this.initialize(),!this.capabilities.supportsSuggest)throw new o("Suggestions are not supported.");const s={text:e,categories:this.categories.toArray(),searchExtent:t?.searchArea?.extent,maxSuggestions:t?.maxResults,countryCode:this.countryCode,location:t?.searchPoint},i=a(this.url,s),r=await g(i,t?.cancelToken);return r.forEach((e=>this._magicKeyAddressMap.set(e.text,e.magicKey))),r.map((e=>e.text))}async reverseGeocode(e,t){S("location",e).isNotMissing(),await this.initialize();const s={...F.DEFAULTS,...F.fromFeatureSource(this),...t};if(!this.capabilities.supportsReverse)throw new o("Reverse geocoding is not supported.");let i;try{const a=r(this.url,{location:e,outSpatialReference:s.outSpatialReference});i=await g(a,t?.cancelToken)}catch(e){if(400===e.details?.httpStatus)return;throw e}const a=this._candidateToFeature(i,s);return a.settings.parent=this.featureSettings,a.schema.parent=this.addressSchema,a}_getSerializableProperties(){return{...super._getSerializableProperties(),url:"initial",categories:{serializeModes:["initial"],deserialize:e=>{this.categories.removeAll(),this.categories.addMany(e)}},countryCode:"initial",requestHelper:{serialize:!1}}}_createSchema(){return new T}_createAddressSchema(){return new T}async _onInitialize(){if(await super._onInitialize(),!this.url)throw new Error("ArcGISGeocoder must be created with a url.");const e=await this._getGeocodeService(this.url);this._updateGeocodeProperties(e),this.assignProperties({});const t=f.toEsriApiSpatialReference(e.spatialReference);this.schema.initialize({fields:e.candidateFields,spatialReference:t}),this.addressSchema.initialize({fields:e.addressFields,spatialReference:t})}async _getGeocodeService(e){const{data:t}=await this.requestHelper.request(e,{query:{f:"json"}});if(!t)throw new Error(`Response to request for url ${e} was invalid.`);return t}_updateGeocodeProperties(e){if(e.singleLineAddressField&&(this._singleLineAddressField=e.singleLineAddressField.name),e.locatorProperties&&(this._maxBatchSize=e.locatorProperties.MaxBatchSize),e.capabilities){const t=e.capabilities.split(",").map((e=>e.trim()));this._capabilitiesInternal=Object.freeze({supportsAdd:!1,supportsUpdate:!1,supportsDelete:!1,supportsEditing:!1,supportsBatch:t.includes("Geocode"),supportsReverse:t.includes("ReverseGeocode"),supportsSuggest:t.includes("Suggest"),maxResults:void 0,supportsAttachmentEditing:!1})}else this._capabilitiesInternal=Object.freeze({supportsAdd:!1,supportsUpdate:!1,supportsDelete:!1,supportsEditing:!1,supportsBatch:e.currentVersion>=10.1,supportsReverse:!0,supportsSuggest:!1,maxResults:void 0,supportsAttachmentEditing:!1})}_addressToAttributes(e,t){const s={};if("string"==typeof e)if(this._singleLineAddressField)s[this._singleLineAddressField]=e,[...this.defaultAddressValues.entries()].forEach((([e,t])=>{s[e]=t}));else{const t=this.addressSchema.fields.map((e=>e.name)).filter((e=>!this.defaultAddressValues.has(e))).toArray();if(1!==t.length)throw new o("Single line geocoding is not supported.");s[t[0]]=e}else{const t=n(e)?u(e).attributes:e;for(const e of this.addressSchema.fields.map((e=>e.name)).toArray())e in t?s[e]=t[e]:this.defaultAddressValues.has(e)&&(s[e]=this.defaultAddressValues.get(e));if(0===Object.keys(s).length)throw new o("At least one valid address field is required.")}return void 0!==t&&(s.OBJECTID=t),s}_candidateToFeature(e,t){const s=new c({source:this});if(e.attributes)for(const t of Object.keys(e.attributes))s.attributes.set(t,e.attributes[t]);const{address:i}=e;if("string"!=typeof i||s.attributes.has(j)&&s.attributes.get(j)){if("object"==typeof i&&i)for(const e of Object.keys(i))s.attributes.set(e,i[e])}else i?s.attributes.set(j,i):s.attributes.set(j,Object.values(e.attributes).join(", "));return e.score&&(s.attributes.set(l,e.score),s.attributes.set(d,e.score)),s.geometry=e.location,t.outSpatialReference&&(s.schema.spatialReference=t.outSpatialReference),s}};z=e=t([y],z);export{z as ArcGISGeocoder};let T=class extends p{constructor(){super(),this._fieldBackingCollection=new w,this._fieldCollection=new _(this._fieldBackingCollection)}get _fields(){return this._fieldCollection}get spatialReference(){return this._spatialReference}set spatialReference(e){throw new o(x)}get geometryType(){return"esriGeometryPoint"}set geometryType(e){throw new o(x)}initialize(e){if(e.fields&&(this._fieldBackingCollection.removeAll(),this._fieldBackingCollection.addMany(e.fields.map((e=>h.toEsriApiField(e))))),e.spatialReference&&(this._spatialReference=e.spatialReference,this.notifyChange("spatialReference")),!this.isModified("displayField")){let e=this.fields.find((e=>"match_addr"===e.name.toLowerCase()));e||(e=this.fields.find((e=>"address"===e.name.toLowerCase()))),e&&(this.displayField=e.name,this.notifyChange("displayField"))}}};T=t([y],T);
+var e;import{__decorate as t}from"tslib";import s from"@arcgis/core/core/Collection";import{addressToLocations as i,addressesToLocations as r,locationToAddress as a,suggestLocations as o}from"@arcgis/core/rest/locator";import{InvalidOperationError as n}from"../../InvalidOperationError.js";import{isFeature as c}from"../../ItemType.js";import{Feature as l,SCORE_FIELD as d,SCORE_FIELD_ORIGINAL as u,toGraphic as p}from"../../data/Feature.js";import{Schema as h}from"../../data/Schema.js";import{Field as f}from"../../portal/Field.js";import{SpatialReference as m}from"../../portal/SpatialReference.js";import{DefaultArcGISRequestHelper as g}from"../../support/ArcGISRequestHelper.js";import{cancelify as y}from"../../support/Cancellable.js";import{serializable as _}from"../../support/Serializable.js";import{ReadOnlyCollection as S}from"../../utilities/ReadOnlyCollection.js";import{checkArg as w}from"../../utilities/checkArg.js";import{load as A}from"../../utilities/esri.js";import{toPortalItem as b}from"../../utilities/portal.js";import{ADDRESS_FIELD as R,GeocodeOptions as F,Geocoder as v}from"./Geocoder.js";export{R as ADDRESS_FIELD,d as SCORE_FIELD};const x="This schema property is read-only.",z="Match_addr";let j=e=class extends v{constructor(){super(...arguments),this._magicKeyAddressMap=new Map}get requestHelper(){return this._requestHelper||(this._requestHelper=new g),this._requestHelper}set requestHelper(e){this._requestHelper=e}get categories(){return this._categories||(this._categories=new s),this._categories}get url(){return this._url}set url(e){this.updateUrl(e)}static async fromPortalItem(t,s){w("portalItem",t).isNotMissing();const i=b(t);await A(i);const r={...s};return void 0!==r.title&&null!==r.title||(r.title=i.title),r.url=i.url,new e(r)}updateUrl(e){return this._url===e?Promise.resolve():(this._url=e,this.isInitialized?(async()=>{const e=await this._getGeocodeService(this.url);this._updateGeocodeProperties(e)})():Promise.resolve())}async*geocode(e,t){w("address",e).isNotMissing(),await this.initialize();const s={...F.DEFAULTS,...F.fromFeatureSource(this),...t},r="string"==typeof e?this._magicKeyAddressMap?.get(e):void 0,{outFields:a,outSpatialReference:o,maxResults:n,searchArea:c}=s,l={address:this._addressToAttributes(e),categories:this.categories.toArray(),countryCode:this.countryCode,outFields:a,outSpatialReference:o,maxLocations:n,searchExtent:c?.extent,forStorage:void 0,magicKey:r,location:t?.searchPoint},d=i(this.url,l),u=await y(d,t?.cancelToken);yield*u.map((e=>this._candidateToFeature(e,s)))}async count(e,t){w("address",e).isNotMissing(),await this.initialize();const s={...F.DEFAULTS,...F.fromFeatureSource(this),...t},{outFields:r,outSpatialReference:a,maxResults:o,searchArea:n}=s,c={address:this._addressToAttributes(e),categories:this.categories.toArray(),countryCode:this.countryCode,outFields:r,outSpatialReference:a,maxLocations:o,searchExtent:n?n.extent:void 0,forStorage:void 0,magicKey:void 0,location:t?.searchPoint},l=i(this.url,c);return{source:this,count:(await y(l,t?.cancelToken)).length}}async*batchGeocode(e,t){w("addresses",e).isNotMissing(),await this.initialize();const s={...F.DEFAULTS,...F.fromFeatureSource(this),...t};if(!this.capabilities.supportsBatch)throw new n("Batch geocoding is not supported.");if(this._maxBatchSize&&e.length>this._maxBatchSize)throw new n(`Batch geocoding is limited to ${this._maxBatchSize} addresses at a time.`);let i=0;const a={addresses:e.map((e=>this._addressToAttributes(e,i++))),categories:this.categories.toArray(),countryCode:this.countryCode,outSpatialReference:s.outSpatialReference},o=r(this.url,a),c=(await y(o,t?.cancelToken)).map((e=>this._candidateToFeature(e,s)));for(const t of c){const s=t.attributes.get("ResultID");void 0!==s&&s>=0&&t.attributes.set(R,e[s]),t.attributes.delete("ResultID")}yield*c}async suggest(e,t){if(w("searchText",e).isNotMissing(),await this.initialize(),!this.capabilities.supportsSuggest)throw new n("Suggestions are not supported.");const s={text:e,categories:this.categories.toArray(),searchExtent:t?.searchArea?.extent,maxSuggestions:t?.maxResults,countryCode:this.countryCode,location:t?.searchPoint},i=o(this.url,s),r=await y(i,t?.cancelToken);return r.forEach((e=>this._magicKeyAddressMap.set(e.text,e.magicKey))),r.map((e=>e.text))}async reverseGeocode(e,t){w("location",e).isNotMissing(),await this.initialize();const s={...F.DEFAULTS,...F.fromFeatureSource(this),...t};if(!this.capabilities.supportsReverse)throw new n("Reverse geocoding is not supported.");let i;try{const r=a(this.url,{location:e,outSpatialReference:s.outSpatialReference});i=await y(r,t?.cancelToken)}catch(e){if(400===e.details?.httpStatus)return;throw e}const r=this._candidateToFeature(i,s);return r.settings.parent=this.featureSettings,r.schema.parent=this.addressSchema,r}_getSerializableProperties(){return{...super._getSerializableProperties(),url:"initial",categories:{serializeModes:["initial"],deserialize:e=>{this.categories.removeAll(),this.categories.addMany(e)}},countryCode:"initial",requestHelper:{serialize:!1}}}_createSchema(){return new C}_createAddressSchema(){return new C}async _onInitialize(){if(await super._onInitialize(),!this.url)throw new Error("ArcGISGeocoder must be created with a url.");const e=await this._getGeocodeService(this.url);this._updateGeocodeProperties(e),this.assignProperties({});const t=m.toEsriApiSpatialReference(e.spatialReference);this.schema.initialize({fields:e.candidateFields,spatialReference:t}),this.addressSchema.initialize({fields:e.addressFields,spatialReference:t})}async _getGeocodeService(e){const{data:t}=await this.requestHelper.request(e,{query:{f:"json"}});if(!t)throw new Error(`Response to request for url ${e} was invalid.`);return t}_updateGeocodeProperties(e){if(e.singleLineAddressField&&(this._singleLineAddressField=e.singleLineAddressField.name),e.locatorProperties&&(this._maxBatchSize=e.locatorProperties.MaxBatchSize),e.capabilities){const t=e.capabilities.split(",").map((e=>e.trim()));this._capabilitiesInternal=Object.freeze({supportsAdd:!1,supportsUpdate:!1,supportsDelete:!1,supportsEditing:!1,supportsBatch:t.includes("Geocode"),supportsReverse:t.includes("ReverseGeocode"),supportsSuggest:t.includes("Suggest"),maxResults:void 0,supportsAttachmentEditing:!1})}else this._capabilitiesInternal=Object.freeze({supportsAdd:!1,supportsUpdate:!1,supportsDelete:!1,supportsEditing:!1,supportsBatch:e.currentVersion>=10.1,supportsReverse:!0,supportsSuggest:!1,maxResults:void 0,supportsAttachmentEditing:!1})}_addressToAttributes(e,t){const s={};if("string"==typeof e)if(this._singleLineAddressField)s[this._singleLineAddressField]=e,[...this.defaultAddressValues.entries()].forEach((([e,t])=>{s[e]=t}));else{const t=this.addressSchema.fields.map((e=>e.name)).filter((e=>!this.defaultAddressValues.has(e))).toArray();if(1!==t.length)throw new n("Single line geocoding is not supported.");s[t[0]]=e}else{const t=c(e)?p(e).attributes:e;for(const e of this.addressSchema.fields.map((e=>e.name)).toArray())e in t?s[e]=t[e]:this.defaultAddressValues.has(e)&&(s[e]=this.defaultAddressValues.get(e));if(0===Object.keys(s).length)throw new n("At least one valid address field is required.")}return void 0!==t&&(s.OBJECTID=t),s}_candidateToFeature(e,t){const s=new l({source:this});if(e.attributes)for(const t of Object.keys(e.attributes))s.attributes.set(t,e.attributes[t]);const{address:i}=e;if("string"!=typeof i||s.attributes.has(z)&&s.attributes.get(z)){if("object"==typeof i&&i)for(const e of Object.keys(i))s.attributes.set(e,i[e])}else i?s.attributes.set(z,i):s.attributes.set(z,Object.values(e.attributes).join(", "));return e.score&&(s.attributes.set(d,e.score),s.attributes.set(u,e.score)),s.geometry=e.location,t.outSpatialReference&&(s.schema.spatialReference=t.outSpatialReference),s}};j=e=t([_],j);export{j as ArcGISGeocoder};let C=class extends h{constructor(){super(),this._fieldBackingCollection=new s,this._fieldCollection=new S(this._fieldBackingCollection)}get _fields(){return this._fieldCollection}get spatialReference(){return this._spatialReference}set spatialReference(e){throw new n(x)}get geometryType(){return"esriGeometryPoint"}set geometryType(e){throw new n(x)}initialize(e){if(e.fields&&(this._fieldBackingCollection.removeAll(),this._fieldBackingCollection.addMany(e.fields.map((e=>f.toEsriApiField(e))))),e.spatialReference&&(this._spatialReference=e.spatialReference,this.notifyChange("spatialReference")),!this.isModified("displayField")){let e=this.fields.find((e=>"match_addr"===e.name.toLowerCase()));e||(e=this.fields.find((e=>"address"===e.name.toLowerCase()))),e&&(this.displayField=e.name,this.notifyChange("displayField"))}}};C=t([_],C);

package/tasks/geocoding/Geocoder.d.ts

@@ -5,8 +5,10 @@ import type { Capabilities } from "../../data/Capabilities.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSet } from "../../data/FeatureSet.js";
 import type { FeatureReadOptions, FeatureSource, FeatureWriteOptions } from "../../data/FeatureSource.js";
-import { FeatureSourceBase, FeatureSourceBaseProperties } from "../../data/FeatureSourceBase.js";
-import { Schema, SchemaProperties } from "../../data/Schema.js";
+import type { FeatureSourceBaseProperties } from "../../data/FeatureSourceBase.js";
+import { FeatureSourceBase } from "../../data/FeatureSourceBase.js";
+import type { SchemaProperties } from "../../data/Schema.js";
+import { Schema } from "../../data/Schema.js";
 import type { CancelToken } from "../../support/Cancellable.js";
 import type { PropertyDefs } from "../../support/Serializable.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/geocoding/utilities.js

@@ -1 +1 @@
-import{ItemType as e}from"../../ItemType.js";import{Collection as o}from"../../utilities/collection.js";export function isArcGISGeocoder(i){return i?.itemType===e.GEOCODER&&o.isCollection(i.categories)}
+import o from"@arcgis/core/core/Collection";import{ItemType as e}from"../../ItemType.js";export function isArcGISGeocoder(r){return r?.itemType===e.GEOCODER&&o.isCollection(r.categories)}

package/tasks/identify/CSVLayerClientSideQueryIdentifyProvider.d.ts

@@ -1,5 +1,5 @@
 import type Geometry from "@arcgis/core/geometry/Geometry";
-import { Feature } from "../../data/Feature.js";
+import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";
 import type { IdentifyOptions } from "./IdentifyOptions.js";

package/tasks/identify/CSVLayerClientSideQueryIdentifyProvider.js

@@ -1 +1 @@
-import{toFeature as e}from"../../data/Feature.js";import{cancelifyWithAbortSignal as t}from"../../support/Cancellable.js";import{executeQuery as r,executeCount as a}from"../../support/_query.js";import{isCSVLayerExtension as i,isFeatureCollectionLayerExtension as o}from"../../utilities/extensions.js";import{removeZValues as n}from"../../utilities/geometry.js";import{IdentifyProviderBase as s}from"./IdentifyProviderBase.js";import{hitTestForClusterFeatures as u}from"./_utilities.js";async function l(e,r,a,i){const o=await u(e,r);if(0===o.length)return[];i.aggregateIds=o.map((e=>e.getObjectId()));return(await t((t=>e._layerView.queryFeatures(i,{signal:t})),a.cancelToken))?.features}export class CSVLayerClientSideQueryIdentifyProvider extends s{isSupported(e,t,r){return(i(e)||o(e))&&!!e.layer}_identify(t,a,i,o){return async function*(){const s=t,u=s.layer.createQuery();if(u.outFields=t.featureSettings.outFields,u.returnGeometry=i.returnGeometry,u.outSpatialReference=i.outSpatialReference,u.maxAllowableOffset=i.maxAllowableOffset,u.num=i.maxResults,u.returnZ="scene"===s.mapExtension?.viewMode,"cluster"===s?.layer?.featureReduction?.type&&"point"===o){const r=await l(s,a,i,u);if(r?.length>0)return void(yield*r.map((r=>e(r,{source:t}))))}let c=a;c&&!s.layer.capabilities?.data?.supportsZ&&(c=n(c.clone())),u.geometry=c,yield*r(u,s,s.layer,i.cancelToken)}()}async _count(e,t,r,i){const o=e,s=o.layer.createQuery();if(s.num=r.maxResults,s.returnGeometry=r.returnGeometry,s.outFields=e.featureSettings.outFields,"cluster"===o?.layer?.featureReduction?.type&&"point"===i){const e=await l(o,t,r,s);if(e?.length>0)return{source:o,count:e.length}}if(!s.aggregateIds){let e=t;e&&!o.layer.capabilities?.data?.supportsZ&&(e=n(e.clone())),s.geometry=e}return a(s,o,o.layer,r.cancelToken)}}
+import{toFeature as e}from"../../data/Feature.js";import{cancelifyWithAbortSignal as t}from"../../support/Cancellable.js";import{executeQuery as r,executeCount as a}from"../../support/_query.js";import{isCSVLayerExtension as i}from"../../utilities/extensions.js";import{removeZValues as o}from"../../utilities/geometry.js";import{IdentifyProviderBase as n}from"./IdentifyProviderBase.js";import{hitTestForClusterFeatures as s}from"./_utilities.js";async function u(e,r,a,i){const o=await s(e,r);if(0===o.length)return[];i.aggregateIds=o.map((e=>e.getObjectId()));return(await t((t=>e._layerView.queryFeatures(i,{signal:t})),a.cancelToken))?.features}export class CSVLayerClientSideQueryIdentifyProvider extends n{isSupported(e,t,r){return i(e)&&!!e.layer}_identify(t,a,i,n){return async function*(){const s=t,l=s.layer.createQuery();if(l.outFields=t.featureSettings.outFields,l.returnGeometry=i.returnGeometry,l.outSpatialReference=i.outSpatialReference,l.maxAllowableOffset=i.maxAllowableOffset,l.num=i.maxResults,l.returnZ="scene"===s.mapExtension?.viewMode,"cluster"===s?.layer?.featureReduction?.type&&"point"===n){const r=await u(s,a,i,l);if(r?.length>0)return void(yield*r.map((r=>e(r,{source:t}))))}let c=a;c&&!s.layer.capabilities?.data?.supportsZ&&(c=o(c.clone())),l.geometry=c,yield*r(l,s,s.layer,i.cancelToken)}()}async _count(e,t,r,i){const n=e,s=n.layer.createQuery();if(s.num=r.maxResults,s.returnGeometry=r.returnGeometry,s.outFields=e.featureSettings.outFields,"cluster"===n?.layer?.featureReduction?.type&&"point"===i){const e=await u(n,t,r,s);if(e?.length>0)return{source:n,count:e.length}}if(!s.aggregateIds){let e=t;e&&!n.layer.capabilities?.data?.supportsZ&&(e=o(e.clone())),s.geometry=e}return a(s,n,n.layer,r.cancelToken)}}