@vertigis/arcgis-extensions 42.0.2 → 42.1.1

package/docs/html/variables/version.version.html

@@ -16,7 +16,7 @@
 <li><a href="../modules/version.html">version</a></li>
 <li><a href="version.version.html">version</a></li></ul>
 <h1>Variable version<code class="tsd-tag ts-flagConst">Const</code> </h1></div>
-<div class="tsd-signature"><span class="tsd-kind-variable">version</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;42.0.2&quot;</span><span class="tsd-signature-symbol"> = &quot;42.0.2&quot;</span></div>
+<div class="tsd-signature"><span class="tsd-kind-variable">version</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;42.1.1&quot;</span><span class="tsd-signature-symbol"> = &quot;42.1.1&quot;</span></div>
 <div class="tsd-comment tsd-typography"><p>The current version of the Geocortex ArcGIS Extensions API.</p>
 </div></div>
 <div class="col-sidebar">

package/mapping/SubtypeGroupLayerExtension.js

@@ -1 +1 @@
-import{__decorate as e}from"tslib";import t from"@arcgis/core/layers/support/FeatureTemplate.js";import r from"@arcgis/core/layers/support/FeatureType.js";import s from"@arcgis/core/rest/support/AttachmentQuery";import{toAttachment as a}from"../data/Attachment.js";import{FeatureSaveError as i}from"../data/FeatureSaveError.js";import{addAttachment as l,deleteAttachments as n,supportsAttachmentEditing as o}from"../data/support/attachments.js";import{applyJsonToLayer as u,layerToJson as p}from"../json/LayerJson.js";import{cancelify as y}from"../support/Cancellable.js";import{serializable as d}from"../support/Serializable.js";import{ArcGISRelationshipCollection as c}from"../support/_ArcGISRelationshipCollection.js";import{ReadOnlyCollection as h}from"../utilities/ReadOnlyCollection.js";import{isFeatureLayer as m,isSubtypeGroupLayer as f}from"../utilities/_layers.js";import{parse as b}from"../utilities/number.js";import{caseInsensitiveEquals as _}from"../utilities/string.js";import{onCollectionPropertyChange as g}from"../utilities/watch.js";import{SubtypeSublayerExtension as w}from"./SubtypeSublayerExtension.js";import{LayerExtension as S,LayerExtensionReadOnlySchema as F}from"./_LayerExtension.js";import{ArrayWrappedCollection as E}from"./support/ArrayWrappedCollection.js";import{addOutFields as C,getGlobalIdField as j,isGlobalIdUsed as x}from"./support/layers.js";let I=class extends S{get enableClientSideData(){return this._enableClientSideData}set enableClientSideData(e){this._enableClientSideData=e,this._updateClientSideFields()}get layer(){return super.layer}get sublayerExtensions(){return super.sublayerExtensions}get supportsSublayers(){return!0}get sublayersAreReadOnly(){return!1}get hasFeatures(){return!0}get canChangeDefinitionExpression(){return!0}get _layerView(){return this.layer&&this.mapExtension?._allLayerViews.find((e=>e.layer===this.layer))}constructor(e){super(e),this._onSubtypeSublayersChange=e=>{e.removed?.length&&(this.sublayerExtensions.removeMany(this.sublayerExtensions.filter((e=>!e.sublayer))),this._addTemplatesForSublayers())},g(this,"layer.sublayers",this._onSubtypeSublayersChange)}_getProjectWebmapJSON(){const e=super._getProjectWebmapJSON();if(!e||this.dynamicallyAddedLayer)return e;const t=p(this.layer);return e.layers&&(e.layers=t.layers.map((e=>{const{layerDefinition:t,visibility:r,subtypeCode:s,layerType:a}=e,i={layerType:a,visibility:r,subtypeCode:s};return t?.drawingInfo&&(i.layerDefinition={drawingInfo:t.drawingInfo}),i}))),e}_createRelationships(){return new SubtypeGroupLayerRelationshipCollection(this)}async _onInitialize(){await super._onInitialize(),await this.relationships.initialize();const e=this.layer.sourceJSON?.templates?.map((e=>t.fromJSON(e)));this.sublayerExtensions.forEach((r=>{const s=this.layer.sourceJSON?.types.filter((e=>e.name===r.title))[0]?.templates;R(r)&&s?r.sublayer.templates=s.map((e=>t.fromJSON(e))):1!==e.length||1===this.sublayerExtensions.length||r.sublayer.templates?R(r)&&(r.sublayer.templates[0].name=r.sublayer.title):r.sublayer.templates=e.map((e=>{const s=t.fromJSON(e.toJSON());s.name=r.title;const a=s.prototype?.attributes;return"number"==typeof a?.[this.layer.subtypeField]&&(a[this.layer.subtypeField]=r.sublayer.subtypeCode),s}))})),this._addTemplatesForSublayers()}async _postInitialize(){await super._postInitialize(),this._updateClientSideFields(),this._watchHandles.push(this.watch("layer",(()=>{this._updateClientSideFields()}),!0))}_capabilities(){const e=o(this.layer);return this.layer?.capabilities?.operations?{...this.layer.capabilities.operations,supportsAttachmentEditing:e,supportsStandardizedQueries:this.layer.capabilities?.query?.supportsStandardizedQueriesOnly}:{...super._capabilities(),supportsAttachmentEditing:e}}_createSublayerExtension(e){return new w(e)}_getSerializableProperties(){const e=super._getSerializableProperties();return{...e,layer:{...this._toPropertyDef(e.layer),default:{layerType:"SubtypeGroupLayer"}},enableClientSideData:{serializeModes:["initial"],default:!1},attachmentTypes:["initial"]}}_isSupportedLayer(e){return f(e)}_createSchema(){return new v(this)}async _getAttachments(e){if(!this.layer?.capabilities?.data?.supportsAttachment)return[];const t=+e.primaryKey,r=new s({objectIds:[t]}),i=await this.layer.queryAttachments(r);return i?.[t]?.length?i[t].map((e=>a(e,e.url))):[]}async _addAttachment(e,t){return l(e,this.layer,t,{attachmentTypes:this.attachmentTypes})}async _deleteAttachments(e,t){return n(e,this.layer,t)}async _applyPortalItemProperties(e){if("Feature Service"!==e.type)throw new Error(`Cannot create SubtypeGroupLayer from Portal item that has type: ${e.type}`);let{url:t}=e;t.match(".*MapServer/\\d{1,}/?$")||t.match(".*FeatureServer/\\d{1,}/?$")||(t=`${t}/0`),this.layer.url=t||this.layer.url;const r=await e.fetchData();r&&await u(r,this.layer)}async*_getFeatures(e,t){this.layer||(yield*super._getFeatures(e,t));const r=this.layer.createQuery();r.objectIds=e.map((e=>b(e))),r.where=void 0,r.outFields=t.outFields,r.returnGeometry=t.returnGeometry,yield*(await import("../support/_query.js")).executeQuery(r,this,this.layer,t.cancelToken)}async _addFeatures(e,t){const r=Array.from(e);if(0===r.length||!this.layer)return;const s=await this._applyEdits({addFeatures:r.map((e=>e.toGraphic()))},t);if(!s.addFeatureResults||s.addFeatureResults.length!==r.length)throw new i("Received malformed response from server while saving feature(s).");let a;if(s.addFeatureResults.forEach(((e,t)=>{const{objectId:s,globalId:l,error:n}=e,o=r[t];if(n){a=a||new i("Errors encountered when adding features.");const{title:r}=o;a.errors.set(`${r}-${t}`,new Error(`Failed to add feature '${r}'. ${e.error.name} : ${e.error.message}`))}else{const{primaryKeyField:e}=o.schema;o.attributes.set(e,s);const t=j(this.layer);t&&l&&o.attributes.set(t,l)}})),a)throw a}async _updateFeatures(e,t){const r=Array.from(e);if(0===r.length)return;const s=await this._applyEdits({updateFeatures:Array.from(e).map((e=>e.toGraphic()))},t);if(!s.updateFeatureResults||s.updateFeatureResults.length!==r.length)throw new i("Received malformed response from server while saving feature(s).");let a;if(s.updateFeatureResults.forEach(((e,t)=>{if(e.error){a=a||new i("Errors encountered when updating features.");const{primaryKey:s}=r[t];a.errors.set(s,new Error(`Failed to update feature with id ${s}. ${e.error.name} : ${e.error.message}`))}})),a)throw a}async _deleteFeatures(e,t){if(0===e.length)return;const r=await this._applyEdits({deleteFeatures:e.map((e=>({objectId:e})))},t);if(!r.deleteFeatureResults)throw new i("Received malformed response from server while saving feature(s).");let s;if(r.deleteFeatureResults.forEach(((t,r)=>{if(t.error){s=s||new i("Errors encountered when deleting features.");const a=e[r];s.errors.set(a,new Error(`Failed to delete feature with id ${a}. ${t.error.name} : ${t.error.message}`))}})),s)throw s}async _applyEdits(e,t={}){const r=x(this.layer,e),s=this.layer.applyEdits(e,{globalIdUsed:r}),a=await y(s,t.cancelToken);if(!a)throw new i("Received malformed response from server while saving feature(s).");return a}_updateClientSideFields(){this.layer&&this._enableClientSideData&&(C(this.layer,this.featureSettings.outFields),this.allSublayerExtensions.forEach((e=>C(this.layer,e.featureSettings.outFields))))}_addTemplatesForSublayers(){if(this.layer.subtypes){this._subtypes=this.layer.sublayers.toArray().map((e=>{const t=this.layer.subtypes.find((t=>t.code===e.subtypeCode));return t?new r({id:t.code,name:t.name,domains:t.domains??{},templates:e.templates}):void 0})).filter((e=>!!e));for(const e of this._subtypes)for(const[t,r]of Object.entries(e.domains)){const e=this.layer.fields.find((e=>_(e.name,t)));e&&!e.domain&&(e.domain=r)}}}};I=e([d],I);export{I as SubtypeGroupLayerExtension};let v=class extends F{constructor(e){super(e),this._fieldCollection=this._createFieldCollection(),this._typesCollection=this._createTypesCollection()}get types(){return this._typesCollection}get _types(){return this._typesCollection}get _fields(){return this._fieldCollection}_createFieldCollection(){return new h(new E({parent:this._layerExtension,targetProperty:"layer",arrayProperty:"fields"}))}_createTypesCollection(){return new h(new E({parent:this._layerExtension,arrayProperty:"_subtypes"}))}_getPropertyBindings(){return{primaryKeyField:"objectIdField",geometryType:"geometryType",spatialReference:"spatialReference",displayField:"displayField",typeIdField:"subtypeField"}}};v=e([d],v);export{v as SubtypeGroupLayerSchema};export class SubtypeGroupLayerRelationshipCollection extends c{get _sourceUrl(){const e=this._source.layer;if(e)return`${e.url}/${e.layerId}`}get _sourceLayerId(){const e=this._source.layer;return e?.layerId}_findRelatedSource(e){if(!this._source.mapExtension||!this._source.layer||!this._sourceUrl)return;const t=this._sourceUrl.slice(0,this._sourceUrl.length-`${this._sourceLayerId}`.length-1),r=this._source.mapExtension.allLayerExtensions.initializedItems.find((r=>(m(r.layer)||f(r.layer))&&r.layer.url===t&&r.layer.layerId===e));return r||this._source.mapExtension.tableExtensions.initializedItems.find((r=>m(r.table)&&r.table.url===t&&r.table.layerId===e))}}function R(e){return 1===e.sublayer?.templates?.length&&"New Feature"===e.sublayer.templates[0].name}
+import{__decorate as e}from"tslib";import t from"@arcgis/core/layers/support/FeatureTemplate.js";import r from"@arcgis/core/layers/support/FeatureType.js";import s from"@arcgis/core/rest/support/AttachmentQuery";import{toAttachment as a}from"../data/Attachment.js";import{FeatureSaveError as i}from"../data/FeatureSaveError.js";import{addAttachment as l,deleteAttachments as n,supportsAttachmentEditing as o}from"../data/support/attachments.js";import{applyJsonToLayer as u,layerToJson as p}from"../json/LayerJson.js";import{cancelify as y}from"../support/Cancellable.js";import{serializable as d}from"../support/Serializable.js";import{ArcGISRelationshipCollection as c}from"../support/_ArcGISRelationshipCollection.js";import{ReadOnlyCollection as h}from"../utilities/ReadOnlyCollection.js";import{isFeatureLayer as m,isSubtypeGroupLayer as f}from"../utilities/_layers.js";import{parse as b}from"../utilities/number.js";import{caseInsensitiveEquals as _}from"../utilities/string.js";import{onCollectionPropertyChange as g}from"../utilities/watch.js";import{SubtypeSublayerExtension as w}from"./SubtypeSublayerExtension.js";import{LayerExtension as S,LayerExtensionReadOnlySchema as F}from"./_LayerExtension.js";import{ArrayWrappedCollection as E}from"./support/ArrayWrappedCollection.js";import{addOutFields as C,getGlobalIdField as j,isGlobalIdUsed as x}from"./support/layers.js";let I=class extends S{get enableClientSideData(){return this._enableClientSideData}set enableClientSideData(e){this._enableClientSideData=e,this._updateClientSideFields()}get layer(){return super.layer}get sublayerExtensions(){return super.sublayerExtensions}get supportsSublayers(){return!0}get sublayersAreReadOnly(){return!1}get hasFeatures(){return!0}get canChangeDefinitionExpression(){return!0}get _layerView(){return this.layer&&this.mapExtension?._allLayerViews.find((e=>e.layer===this.layer))}constructor(e){super(e),this._onSubtypeSublayersChange=e=>{e.removed?.length&&(this.sublayerExtensions.removeMany(this.sublayerExtensions.filter((e=>!e.sublayer))),this._addTemplatesForSublayers())},g(this,"layer.sublayers",this._onSubtypeSublayersChange)}_getProjectWebmapJSON(){const e=super._getProjectWebmapJSON();if(!e||this.dynamicallyAddedLayer)return e;const t=p(this.layer);return e.layers&&(e.layers=t.layers.map((e=>{const{layerDefinition:t,visibility:r,subtypeCode:s,layerType:a}=e,i={layerType:a,visibility:r,subtypeCode:s};return t?.drawingInfo&&(i.layerDefinition={drawingInfo:t.drawingInfo}),i}))),e}_createRelationships(){return new SubtypeGroupLayerRelationshipCollection(this)}async _onInitialize(){await super._onInitialize(),await this.relationships.initialize();const e=this.layer.sourceJSON?.templates?.map((e=>t.fromJSON(e)));this.sublayerExtensions.forEach((r=>{if(null==r.sublayer)return;const s=this.layer.sourceJSON?.types.filter((e=>e.name===r.title))[0]?.templates;(null==r.sublayer.templates||0===r.sublayer.templates.length||R(r))&&s?r.sublayer.templates=s.map((e=>t.fromJSON(e))):1!==e.length||1===this.sublayerExtensions.length||r.sublayer.templates?R(r)&&(r.sublayer.templates[0].name=r.sublayer.title):r.sublayer.templates=e.map((e=>{const s=t.fromJSON(e.toJSON());s.name=r.title;const a=s.prototype?.attributes;return"number"==typeof a?.[this.layer.subtypeField]&&(a[this.layer.subtypeField]=r.sublayer.subtypeCode),s}))})),this._addTemplatesForSublayers()}async _postInitialize(){await super._postInitialize(),this._updateClientSideFields(),this._watchHandles.push(this.watch("layer",(()=>{this._updateClientSideFields()}),!0))}_capabilities(){const e=o(this.layer);return this.layer?.capabilities?.operations?{...this.layer.capabilities.operations,supportsAttachmentEditing:e,supportsStandardizedQueries:this.layer.capabilities?.query?.supportsStandardizedQueriesOnly}:{...super._capabilities(),supportsAttachmentEditing:e}}_createSublayerExtension(e){return new w(e)}_getSerializableProperties(){const e=super._getSerializableProperties();return{...e,layer:{...this._toPropertyDef(e.layer),default:{layerType:"SubtypeGroupLayer"}},enableClientSideData:{serializeModes:["initial"],default:!1},attachmentTypes:["initial"]}}_isSupportedLayer(e){return f(e)}_createSchema(){return new v(this)}async _getAttachments(e){if(!this.layer?.capabilities?.data?.supportsAttachment)return[];const t=+e.primaryKey,r=new s({objectIds:[t]}),i=await this.layer.queryAttachments(r);return i?.[t]?.length?i[t].map((e=>a(e,e.url))):[]}async _addAttachment(e,t){return l(e,this.layer,t,{attachmentTypes:this.attachmentTypes})}async _deleteAttachments(e,t){return n(e,this.layer,t)}async _applyPortalItemProperties(e){if("Feature Service"!==e.type)throw new Error(`Cannot create SubtypeGroupLayer from Portal item that has type: ${e.type}`);let{url:t}=e;t.match(".*MapServer/\\d{1,}/?$")||t.match(".*FeatureServer/\\d{1,}/?$")||(t=`${t}/0`),this.layer.url=t||this.layer.url;const r=await e.fetchData();r&&await u(r,this.layer)}async*_getFeatures(e,t){this.layer||(yield*super._getFeatures(e,t));const r=this.layer.createQuery();r.objectIds=e.map((e=>b(e))),r.where=void 0,r.outFields=t.outFields,r.returnGeometry=t.returnGeometry,yield*(await import("../support/_query.js")).executeQuery(r,this,this.layer,t.cancelToken)}async _addFeatures(e,t){const r=Array.from(e);if(0===r.length||!this.layer)return;const s=await this._applyEdits({addFeatures:r.map((e=>e.toGraphic()))},t);if(!s.addFeatureResults||s.addFeatureResults.length!==r.length)throw new i("Received malformed response from server while saving feature(s).");let a;if(s.addFeatureResults.forEach(((e,t)=>{const{objectId:s,globalId:l,error:n}=e,o=r[t];if(n){a=a||new i("Errors encountered when adding features.");const{title:r}=o;a.errors.set(`${r}-${t}`,new Error(`Failed to add feature '${r}'. ${e.error.name} : ${e.error.message}`))}else{const{primaryKeyField:e}=o.schema;o.attributes.set(e,s);const t=j(this.layer);t&&l&&o.attributes.set(t,l)}})),a)throw a}async _updateFeatures(e,t){const r=Array.from(e);if(0===r.length)return;const s=await this._applyEdits({updateFeatures:Array.from(e).map((e=>e.toGraphic()))},t);if(!s.updateFeatureResults||s.updateFeatureResults.length!==r.length)throw new i("Received malformed response from server while saving feature(s).");let a;if(s.updateFeatureResults.forEach(((e,t)=>{if(e.error){a=a||new i("Errors encountered when updating features.");const{primaryKey:s}=r[t];a.errors.set(s,new Error(`Failed to update feature with id ${s}. ${e.error.name} : ${e.error.message}`))}})),a)throw a}async _deleteFeatures(e,t){if(0===e.length)return;const r=await this._applyEdits({deleteFeatures:e.map((e=>({objectId:e})))},t);if(!r.deleteFeatureResults)throw new i("Received malformed response from server while saving feature(s).");let s;if(r.deleteFeatureResults.forEach(((t,r)=>{if(t.error){s=s||new i("Errors encountered when deleting features.");const a=e[r];s.errors.set(a,new Error(`Failed to delete feature with id ${a}. ${t.error.name} : ${t.error.message}`))}})),s)throw s}async _applyEdits(e,t={}){const r=x(this.layer,e),s=this.layer.applyEdits(e,{globalIdUsed:r}),a=await y(s,t.cancelToken);if(!a)throw new i("Received malformed response from server while saving feature(s).");return a}_updateClientSideFields(){this.layer&&this._enableClientSideData&&(C(this.layer,this.featureSettings.outFields),this.allSublayerExtensions.forEach((e=>C(this.layer,e.featureSettings.outFields))))}_addTemplatesForSublayers(){if(this.layer.subtypes){this._subtypes=this.layer.sublayers.toArray().map((e=>{const t=this.layer.subtypes.find((t=>t.code===e.subtypeCode));return t?new r({id:t.code,name:t.name,domains:t.domains??{},templates:e.templates}):void 0})).filter((e=>!!e));for(const e of this._subtypes)for(const[t,r]of Object.entries(e.domains)){const e=this.layer.fields.find((e=>_(e.name,t)));e&&!e.domain&&(e.domain=r)}}}};I=e([d],I);export{I as SubtypeGroupLayerExtension};let v=class extends F{constructor(e){super(e),this._fieldCollection=this._createFieldCollection(),this._typesCollection=this._createTypesCollection()}get types(){return this._typesCollection}get _types(){return this._typesCollection}get _fields(){return this._fieldCollection}_createFieldCollection(){return new h(new E({parent:this._layerExtension,targetProperty:"layer",arrayProperty:"fields"}))}_createTypesCollection(){return new h(new E({parent:this._layerExtension,arrayProperty:"_subtypes"}))}_getPropertyBindings(){return{primaryKeyField:"objectIdField",geometryType:"geometryType",spatialReference:"spatialReference",displayField:"displayField",typeIdField:"subtypeField"}}};v=e([d],v);export{v as SubtypeGroupLayerSchema};export class SubtypeGroupLayerRelationshipCollection extends c{get _sourceUrl(){const e=this._source.layer;if(e)return`${e.url}/${e.layerId}`}get _sourceLayerId(){const e=this._source.layer;return e?.layerId}_findRelatedSource(e){if(!this._source.mapExtension||!this._source.layer||!this._sourceUrl)return;const t=this._sourceUrl.slice(0,this._sourceUrl.length-`${this._sourceLayerId}`.length-1),r=this._source.mapExtension.allLayerExtensions.initializedItems.find((r=>(m(r.layer)||f(r.layer))&&r.layer.url===t&&r.layer.layerId===e));return r||this._source.mapExtension.tableExtensions.initializedItems.find((r=>m(r.table)&&r.table.url===t&&r.table.layerId===e))}}function R(e){return 1===e.sublayer?.templates?.length&&"New Feature"===e.sublayer.templates[0].name}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vertigis/arcgis-extensions",
   "license": "SEE LICENSE IN LICENSE",
-  "version": "42.0.2",
+  "version": "42.1.1",
   "repository": {
     "type": "git",
     "url": "https://dev.azure.com/vertigis/Studio/_git/arcgis-extensions-ts"
@@ -71,7 +71,7 @@
     "@typescript-eslint/eslint-plugin": "5.59.2",
     "@typescript-eslint/parser": "5.59.2",
     "canvas": "2.11.2",
-    "chai": "4.3.7",
+    "chai": "4.3.10",
     "chai-as-promised": "7.1.1",
     "cpx2": "4.2.3",
     "cross-env": "7.0.3",

package/tasks/identify/ArcGISSublayerQueryIdentifyProvider.js

@@ -1 +1 @@
-import{executeQuery as e,executeCountByQuery as t}from"../../support/_query.js";import{empty as r}from"../../utilities/asyncIterable.js";import{isMapImageSublayer as s}from"../../utilities/layers.js";import{IdentifyProviderBase as u}from"./IdentifyProviderBase.js";export class ArcGISSublayerQueryIdentifyProvider extends u{isSupported(e,t,r){return s(e.sublayer)&&e.capabilities.supportsQuery}_identify(t,s,u){const o=t,i=o.sublayer.createQuery();return o.capabilities.supportsQuery?(i.geometry=s,i.outFields=u.outFields??t.featureSettings.outFields,i.returnGeometry=u.returnGeometry,i.outSpatialReference=u.outSpatialReference,i.maxAllowableOffset=u.maxAllowableOffset,t.supportsPagination&&(i.num=u.maxResults),e(i,o,o.sublayer,u.cancelToken)):r()}async _count(e,r,s){const u=e;if(!u.capabilities.supportsQuery)return{source:e,count:0};const o=u.sublayer.createQuery();return o.geometry=r,o.num=s.maxResults,o.returnGeometry=s.returnGeometry,o.outFields=s.outFields??e.featureSettings.outFields,t(o,u,u.sublayer,s.cancelToken)}}
+import{executeQuery as e,executeCountByQuery as r}from"../../support/_query.js";import{empty as t}from"../../utilities/asyncIterable.js";import{isMapImageSublayer as s}from"../../utilities/layers.js";import{IdentifyProviderBase as u}from"./IdentifyProviderBase.js";export class ArcGISSublayerQueryIdentifyProvider extends u{isSupported(e,r,t){return s(e.sublayer)&&e.capabilities.supportsQuery}_identify(r,s,u){const o=r,a=o.sublayer.createQuery();return o.capabilities.supportsQuery?(a.geometry=s,a.outFields=u.outFields??r.featureSettings.outFields,a.returnGeometry=u.returnGeometry,a.outSpatialReference=u.outSpatialReference,a.maxAllowableOffset=u.maxAllowableOffset,a.returnZ=o.sublayer.layer.sourceJSON?.hasZ,r.supportsPagination&&(a.num=u.maxResults),e(a,o,o.sublayer,u.cancelToken)):t()}async _count(e,t,s){const u=e;if(!u.capabilities.supportsQuery)return{source:e,count:0};const o=u.sublayer.createQuery();return o.geometry=t,o.num=s.maxResults,o.returnGeometry=s.returnGeometry,o.outFields=s.outFields??e.featureSettings.outFields,r(o,u,u.sublayer,s.cancelToken)}}

package/tasks/identify/FeatureLayerQueryIdentifyProvider.js

@@ -1 +1 @@
-import{executeQuery as e,executeCount as t}from"../../support/_query.js";import{isFeatureCollectionLayerExtension as r,isFeatureLayerExtension as a}from"../../utilities/extensions.js";import{removeZValues as o}from"../../utilities/geometry.js";import{isFeatureLayer as s}from"../../utilities/layers.js";import{IdentifyProviderBase as i}from"./IdentifyProviderBase.js";export class FeatureLayerQueryIdentifyProvider extends i{isSupported(e,t,o){return(a(e)||r(e))&&s(e.layer)}_identify(t,r,a){const s=t,i=s.layer.createQuery();let l=r;return!l||s.layer.hasZ&&s.layer.capabilities?.data?.supportsZ||(l=o(l.clone())),i.geometry=l,i.outFields=a.outFields??t.featureSettings.outFields,i.returnGeometry=a.returnGeometry,i.outSpatialReference=a.outSpatialReference,i.maxAllowableOffset=a.maxAllowableOffset,s.layer.capabilities.query.supportsPagination&&(i.num=a.maxResults),i.returnZ="scene"===t.mapExtension?.viewMode,e(i,s,s.layer,a.cancelToken)}_count(e,r,a){const s=e,i=s.layer.createQuery();let l=r;return!l||s.layer.hasZ&&s.layer.capabilities?.data?.supportsZ||(l=o(l.clone())),i.geometry=l,i.num=a.maxResults,i.returnGeometry=a.returnGeometry,i.outFields=a.outFields??e.featureSettings.outFields,t(i,s,s.layer,a.cancelToken)}}
+import{executeQuery as e,executeCount as t}from"../../support/_query.js";import{isFeatureCollectionLayerExtension as r,isFeatureLayerExtension as o}from"../../utilities/extensions.js";import{removeZValues as s}from"../../utilities/geometry.js";import{isFeatureLayer as a}from"../../utilities/layers.js";import{IdentifyProviderBase as i}from"./IdentifyProviderBase.js";export class FeatureLayerQueryIdentifyProvider extends i{isSupported(e,t,s){return(o(e)||r(e))&&a(e.layer)}_identify(t,r,o){const s=t,a=s.layer.createQuery(),i=r;return a.geometry=i,a.outFields=o.outFields??t.featureSettings.outFields,a.returnGeometry=o.returnGeometry,a.outSpatialReference=o.outSpatialReference,a.maxAllowableOffset=o.maxAllowableOffset,s.layer.capabilities.query.supportsPagination&&(a.num=o.maxResults),a.returnZ=s.layer.hasZ,e(a,s,s.layer,o.cancelToken)}_count(e,r,o){const a=e,i=a.layer.createQuery();let l=r;return!l||a.layer.hasZ&&a.layer.capabilities?.data?.supportsZ||(l=s(l.clone())),i.geometry=l,i.num=o.maxResults,i.returnGeometry=o.returnGeometry,i.outFields=o.outFields??e.featureSettings.outFields,t(i,a,a.layer,o.cancelToken)}}

package/tasks/identify/GeoJSONLayerClientSideQueryIdentifyProvider.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{isGeoJSONLayerExtension 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()));const n=await t((t=>e._layerView.queryFeatures(i,{signal:t})),a.cancelToken);return n?.features}export class GeoJSONLayerClientSideQueryIdentifyProvider 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=i.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=r.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)}}
+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{isGeoJSONLayerExtension 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()));const n=await t((t=>e._layerView.queryFeatures(i,{signal:t})),a.cancelToken);return n?.features}export class GeoJSONLayerClientSideQueryIdentifyProvider 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=i.outFields??t.featureSettings.outFields,l.returnGeometry=i.returnGeometry,l.outSpatialReference=i.outSpatialReference,l.maxAllowableOffset=i.maxAllowableOffset,l.num=i.maxResults,l.returnZ=s.layer.hasZ,"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=r.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)}}

package/tasks/identify/SubtypeSublayerQueryIdentifyProvider.js

@@ -1 +1 @@
-import{executeQuery as e,executeCount as t,constrainQueryTimeExtentToView as s}from"../../support/_query.js";import{AsyncQueue as r}from"../../utilities/asyncIterable.js";import{isSubtypeSublayerExtension as i}from"../../utilities/extensions.js";import{removeZValues as o}from"../../utilities/geometry.js";import{isSubtypeSublayer as u}from"../../utilities/layers.js";import{caseInsensitiveEquals as n}from"../../utilities/string.js";import{IdentifyOptions as l}from"./IdentifyOptions.js";import{IdentifyProviderBase as a}from"./IdentifyProviderBase.js";export class SubtypeSublayerQueryIdentifyProvider extends a{isSupported(e,t,s){return i(e)&&u(e.sublayer)&&!!e.sublayer.layer}_identify(t,s,r){const i=t,{layer:o}=i.sublayer,u=this._createIdentifyQuery(o,s,r,r.outFields??t.featureSettings.outFields);return u.where=`${o.subtypeField}=${i.sublayer.subtypeCode}`,e(u,i,o,r.cancelToken)}_identifyMany(t,i,o){if(1===t.length){const e={...l.DEFAULTS,...l.fromFeatureSource(t[0]),...o};return this._identify(t[0],i,e)}const u=new r,a=t.length;let y=0;const f=t.reduce(((e,t)=>{const s=t,r={...l.DEFAULTS,...l.fromFeatureSource(s),...o},i=r.outFields??s.featureSettings.outFields;if(e.has(s.sublayer.layer)){const t=e.get(s.sublayer.layer);let o=!1;for(const{sources:e,identifyOptions:l,outFields:y}of t)if(a=r,(u=l).returnGeometry===a.returnGeometry&&(u.outSpatialReference===a.outSpatialReference||u.outSpatialReference?.equals(a.outSpatialReference))&&u.maxAllowableOffset===a.maxAllowableOffset&&u.maxResults===a.maxResults&&i.length===y.length&&i.every((e=>y.some((t=>n(e,t)))))){e.push(s),o=!0;break}o||t.push({sources:[s],identifyOptions:r,outFields:i})}else e.set(s.sublayer.layer,[{sources:[s],identifyOptions:r,outFields:i}]);var u,a;return e}),new Map);for(const[t,r]of f)for(const{sources:o,identifyOptions:l,outFields:f}of r)(async()=>{if(u.isDone)return;const r=new Map,c=[];for(const e of o)r.set(e.sublayer.subtypeCode,e),c.push(e.sublayer.subtypeCode);const d=this._createIdentifyQuery(t,i,l,f);let p=!1;d.outFields.some((e=>"*"===e||n(e,t.subtypeField)))||(p=!0,d.outFields=[...d.outFields,t.subtypeField]),d.where=`${t.subtypeField} IN (${c.join(",")})`,s(d,o[0]);try{for await(const s of e(d,(e=>{if(null!=e.attributes){const s=e.attributes;let i=s[t.subtypeField];if(void 0===i){i=s[Object.keys(s).find((e=>n(e,t.subtypeField)))]}return r.get(i)}}),t,l.cancelToken)){if(u.isDone)return;p&&s.attributes.delete(t.subtypeField),u.add(s)}}catch(e){u.reject(e)}finally{y+=o.length,y===a&&u.done()}})();return u}_count(e,s,r){const i=e,{layer:o}=i.sublayer,u=this._createBasicQuery(o,s,r,r.outFields??e.featureSettings.outFields);return u.num=r.maxResults,u.where=`${o.subtypeField}=${i.sublayer.subtypeCode}`,t(u,i,o,r.cancelToken)}_createIdentifyQuery(e,t,s,r){const i=this._createBasicQuery(e,t,s,r);return i.outSpatialReference=s.outSpatialReference,i.maxAllowableOffset=s.maxAllowableOffset,e.capabilities.query.supportsPagination&&(i.num=s.maxResults),i}_createBasicQuery(e,t,s,r){const i=e.createQuery();return i.geometry=t,i.geometry&&(e.hasZ||e.capabilities?.data?.supportsZ)&&(i.geometry=o(t.clone())),i.outFields=r,i.returnGeometry=s.returnGeometry,i}}
+import{executeQuery as e,executeCount as t,constrainQueryTimeExtentToView as r}from"../../support/_query.js";import{AsyncQueue as s}from"../../utilities/asyncIterable.js";import{isSubtypeSublayerExtension as i}from"../../utilities/extensions.js";import{removeZValues as o}from"../../utilities/geometry.js";import{isSubtypeSublayer as u}from"../../utilities/layers.js";import{caseInsensitiveEquals as n}from"../../utilities/string.js";import{IdentifyOptions as l}from"./IdentifyOptions.js";import{IdentifyProviderBase as a}from"./IdentifyProviderBase.js";export class SubtypeSublayerQueryIdentifyProvider extends a{isSupported(e,t,r){return i(e)&&u(e.sublayer)&&!!e.sublayer.layer}_identify(t,r,s){const i=t,{layer:o}=i.sublayer,u=this._createIdentifyQuery(o,r,s,s.outFields??t.featureSettings.outFields);return u.where=`${o.subtypeField}=${i.sublayer.subtypeCode}`,u.returnZ=o.hasZ,e(u,i,o,s.cancelToken)}_identifyMany(t,i,o){if(1===t.length){const e={...l.DEFAULTS,...l.fromFeatureSource(t[0]),...o};return this._identify(t[0],i,e)}const u=new s,a=t.length;let y=0;const f=t.reduce(((e,t)=>{const r=t,s={...l.DEFAULTS,...l.fromFeatureSource(r),...o},i=s.outFields??r.featureSettings.outFields;if(e.has(r.sublayer.layer)){const t=e.get(r.sublayer.layer);let o=!1;for(const{sources:e,identifyOptions:l,outFields:y}of t)if(a=s,(u=l).returnGeometry===a.returnGeometry&&(u.outSpatialReference===a.outSpatialReference||u.outSpatialReference?.equals(a.outSpatialReference))&&u.maxAllowableOffset===a.maxAllowableOffset&&u.maxResults===a.maxResults&&i.length===y.length&&i.every((e=>y.some((t=>n(e,t)))))){e.push(r),o=!0;break}o||t.push({sources:[r],identifyOptions:s,outFields:i})}else e.set(r.sublayer.layer,[{sources:[r],identifyOptions:s,outFields:i}]);var u,a;return e}),new Map);for(const[t,s]of f)for(const{sources:o,identifyOptions:l,outFields:f}of s)(async()=>{if(u.isDone)return;const s=new Map,c=[];for(const e of o)s.set(e.sublayer.subtypeCode,e),c.push(e.sublayer.subtypeCode);const d=this._createIdentifyQuery(t,i,l,f);let p=!1;d.outFields.some((e=>"*"===e||n(e,t.subtypeField)))||(p=!0,d.outFields=[...d.outFields,t.subtypeField]),d.where=`${t.subtypeField} IN (${c.join(",")})`,r(d,o[0]);try{for await(const r of e(d,(e=>{if(null!=e.attributes){const r=e.attributes;let i=r[t.subtypeField];if(void 0===i){i=r[Object.keys(r).find((e=>n(e,t.subtypeField)))]}return s.get(i)}}),t,l.cancelToken)){if(u.isDone)return;p&&r.attributes.delete(t.subtypeField),u.add(r)}}catch(e){u.reject(e)}finally{y+=o.length,y===a&&u.done()}})();return u}_count(e,r,s){const i=e,{layer:o}=i.sublayer,u=this._createBasicQuery(o,r,s,s.outFields??e.featureSettings.outFields);return u.num=s.maxResults,u.where=`${o.subtypeField}=${i.sublayer.subtypeCode}`,t(u,i,o,s.cancelToken)}_createIdentifyQuery(e,t,r,s){const i=this._createBasicQuery(e,t,r,s);return i.outSpatialReference=r.outSpatialReference,i.maxAllowableOffset=r.maxAllowableOffset,e.capabilities.query.supportsPagination&&(i.num=r.maxResults),i}_createBasicQuery(e,t,r,s){const i=e.createQuery();return i.geometry=t,i.geometry&&(e.hasZ||e.capabilities?.data?.supportsZ)&&(i.geometry=o(t.clone())),i.outFields=s,i.returnGeometry=r.returnGeometry,i}}

package/tasks/query/ArcGISSublayerQueryProvider.js

@@ -1 +1 @@
-import{executeQuery as e,executeCountByQuery as t}from"../../support/_query.js";import{isMapImageSublayerExtension as r}from"../../utilities/extensions.js";import{QueryProviderBase as s}from"./QueryProviderBase.js";export class ArcGISSublayerQueryProvider extends s{isSupported(e){return r(e)&&e.capabilities.supportsQuery}_query(t,r,s){const{sublayer:a}=t,i=a.createQuery();return i.where=r,i.outFields=s.outFields,i.returnGeometry=s.returnGeometry,i.outSpatialReference=s.outSpatialReference,i.maxAllowableOffset=s.maxAllowableOffset,s.spatialFilter&&(i.spatialRelationship="intersects",i.geometry=s.spatialFilter),t.supportsPagination&&(i.num=s.maxResults),e(i,t,a,s.cancelToken)}_count(e,r,s){const{sublayer:a}=e,i=a.createQuery();return i.where=r,i.returnGeometry=s.returnGeometry,i.outFields=s.outFields,s.spatialFilter&&(i.spatialRelationship="intersects",i.geometry=s.spatialFilter),i.num=s.maxResults,t(i,e,a,s.cancelToken)}}
+import{executeQuery as e,executeCountByQuery as r}from"../../support/_query.js";import{isMapImageSublayerExtension as t}from"../../utilities/extensions.js";import{QueryProviderBase as s}from"./QueryProviderBase.js";export class ArcGISSublayerQueryProvider extends s{isSupported(e){return t(e)&&e.capabilities.supportsQuery}_query(r,t,s){const{sublayer:a}=r,i=a.createQuery();return i.where=t,i.outFields=s.outFields,i.returnGeometry=s.returnGeometry,i.outSpatialReference=s.outSpatialReference,i.maxAllowableOffset=s.maxAllowableOffset,i.returnZ=a.layer.sourceJSON?.hasZ,s.spatialFilter&&(i.spatialRelationship="intersects",i.geometry=s.spatialFilter),r.supportsPagination&&(i.num=s.maxResults),e(i,r,a,s.cancelToken)}_count(e,t,s){const{sublayer:a}=e,i=a.createQuery();return i.where=t,i.returnGeometry=s.returnGeometry,i.outFields=s.outFields,s.spatialFilter&&(i.spatialRelationship="intersects",i.geometry=s.spatialFilter),i.num=s.maxResults,r(i,e,a,s.cancelToken)}}

package/tasks/query/FeatureLayerQueryProvider.js

@@ -1 +1 @@
-import{executeQuery as e,executeCount as t}from"../../support/_query.js";import{isFeatureLayer as r}from"../../utilities/_layers.js";import{removeZValues as s}from"../../utilities/geometry.js";import{QueryProviderBase as a}from"./QueryProviderBase.js";export class FeatureLayerQueryProvider extends a{isSupported(e){const{layer:t}=e;return r(t)&&e.capabilities.supportsQuery}_query(t,r,a){const{layer:i}=t,o=i.createQuery();o.where=r,o.outFields=a.outFields,o.returnGeometry=a.returnGeometry,o.outSpatialReference=a.outSpatialReference,o.maxAllowableOffset=a.maxAllowableOffset,o.returnZ="scene"===t.mapExtension?.viewMode;let l=a.spatialFilter;return l&&(o.spatialRelationship="intersects",!l||i.hasZ&&i.capabilities?.data?.supportsZ||(l=s(l.clone())),o.geometry=l),i.capabilities.query.supportsPagination&&(o.num=a.maxResults),e(o,t,i,a.cancelToken)}_count(e,r,a){const{layer:i}=e,o=i.createQuery();o.where=r,o.outFields=a.outFields,o.returnGeometry=a.returnGeometry;let l=a.spatialFilter;return l&&(o.spatialRelationship="intersects",!l||i.hasZ&&i.capabilities?.data?.supportsZ||(l=s(l.clone())),o.geometry=l),o.num=a.maxResults,t(o,e,i,a.cancelToken)}}
+import{executeQuery as e,executeCount as t}from"../../support/_query.js";import{isFeatureLayer as r}from"../../utilities/_layers.js";import{removeZValues as s}from"../../utilities/geometry.js";import{QueryProviderBase as a}from"./QueryProviderBase.js";export class FeatureLayerQueryProvider extends a{isSupported(e){const{layer:t}=e;return r(t)&&e.capabilities.supportsQuery}_query(t,r,a){const{layer:i}=t,o=i.createQuery();o.where=r,o.outFields=a.outFields,o.returnGeometry=a.returnGeometry,o.outSpatialReference=a.outSpatialReference,o.maxAllowableOffset=a.maxAllowableOffset,o.returnZ=i.hasZ;let l=a.spatialFilter;return l&&(o.spatialRelationship="intersects",!l||i.hasZ&&i.capabilities?.data?.supportsZ||(l=s(l.clone())),o.geometry=l),i.capabilities.query.supportsPagination&&(o.num=a.maxResults),e(o,t,i,a.cancelToken)}_count(e,r,a){const{layer:i}=e,o=i.createQuery();o.where=r,o.outFields=a.outFields,o.returnGeometry=a.returnGeometry;let l=a.spatialFilter;return l&&(o.spatialRelationship="intersects",!l||i.hasZ&&i.capabilities?.data?.supportsZ||(l=s(l.clone())),o.geometry=l),o.num=a.maxResults,t(o,e,i,a.cancelToken)}}

package/tasks/query/GeoJSONLayerClientSideQueryProvider.js

@@ -1 +1 @@
-import{executeQuery as e,executeCount as t}from"../../support/_query.js";import{isGeoJSONLayer as r}from"../../utilities/_layers.js";import{removeZValues as s}from"../../utilities/geometry.js";import{QueryProviderBase as i}from"./QueryProviderBase.js";export class GeoJSONLayerClientSideQueryProvider extends i{isSupported(e){const{layer:t}=e;return r(t)}_query(t,r,i){const{layer:a}=t,o=a.createQuery();o.where=r,o.outFields=i.outFields,o.returnGeometry=i.returnGeometry,o.outSpatialReference=i.outSpatialReference,o.maxAllowableOffset=i.maxAllowableOffset,o.returnZ="scene"===t.mapExtension?.viewMode;let l=i.spatialFilter;return l&&(o.spatialRelationship="intersects",a.capabilities?.data?.supportsZ||(l=s(l.clone())),o.geometry=l),a.capabilities.query.supportsPagination&&(o.num=i.maxResults),e(o,t,a,i.cancelToken)}async _count(e,r,i){const{layer:a}=e,o=a.createQuery();o.where=r,o.outFields=i.outFields,o.returnGeometry=i.returnGeometry;let l=i.spatialFilter;return l&&(o.spatialRelationship="intersects",l&&!a.capabilities?.data?.supportsZ&&(l=s(l.clone())),o.geometry=l),o.num=i.maxResults,t(o,e,a,i.cancelToken)}}
+import{executeQuery as e,executeCount as t}from"../../support/_query.js";import{isGeoJSONLayer as r}from"../../utilities/_layers.js";import{removeZValues as s}from"../../utilities/geometry.js";import{QueryProviderBase as a}from"./QueryProviderBase.js";export class GeoJSONLayerClientSideQueryProvider extends a{isSupported(e){const{layer:t}=e;return r(t)}_query(t,r,a){const{layer:i}=t,o=i.createQuery();o.where=r,o.outFields=a.outFields,o.returnGeometry=a.returnGeometry,o.outSpatialReference=a.outSpatialReference,o.maxAllowableOffset=a.maxAllowableOffset,o.returnZ=i.hasZ;let l=a.spatialFilter;return l&&(o.spatialRelationship="intersects",i.capabilities?.data?.supportsZ||(l=s(l.clone())),o.geometry=l),i.capabilities.query.supportsPagination&&(o.num=a.maxResults),e(o,t,i,a.cancelToken)}async _count(e,r,a){const{layer:i}=e,o=i.createQuery();o.where=r,o.outFields=a.outFields,o.returnGeometry=a.returnGeometry;let l=a.spatialFilter;return l&&(o.spatialRelationship="intersects",l&&!i.capabilities?.data?.supportsZ&&(l=s(l.clone())),o.geometry=l),o.num=a.maxResults,t(o,e,i,a.cancelToken)}}

package/tasks/query/SubtypeSublayerQueryProvider.js

@@ -1 +1 @@
-import{executeQuery as e,executeCount as r,concatenateWhereClauses as t}from"../../support/_query.js";import{isSubtypeSublayer as a}from"../../utilities/_layers.js";import{removeZValues as s}from"../../utilities/geometry.js";import{QueryProviderBase as l}from"./QueryProviderBase.js";export class SubtypeSublayerQueryProvider extends l{isSupported(e){const{sublayer:r}=e;return a(r)&&r.layer&&e.layerExtension?.capabilities.supportsQuery}_query(r,a,l){const{sublayer:i}=r,o=i.layer.createQuery();o.where=t(`${i.layer.subtypeField}=${i.subtypeCode}`,a),o.outFields=l.outFields,o.returnGeometry=l.returnGeometry,o.outSpatialReference=l.outSpatialReference,o.maxAllowableOffset=l.maxAllowableOffset;let u=l.spatialFilter;return u&&(o.spatialRelationship="intersects",!u||i.layer.hasZ&&i.layer.capabilities?.data?.supportsZ||(u=s(u.clone())),o.geometry=u),i.layer.capabilities.query.supportsPagination&&(o.num=l.maxResults),e(o,r,i.layer,l.cancelToken)}_count(e,a,l){const{sublayer:i}=e,o=i.layer.createQuery();o.where=t(`${i.layer.subtypeField}=${i.subtypeCode}`,a),o.outFields=l.outFields,o.returnGeometry=l.returnGeometry;let u=l.spatialFilter;return u&&(o.spatialRelationship="intersects",!u||i.layer.hasZ&&i.layer.capabilities?.data?.supportsZ||(u=s(u.clone())),o.geometry=u),o.num=l.maxResults,r(o,e,i.layer,l.cancelToken)}}
+import{executeQuery as e,executeCount as r,concatenateWhereClauses as t}from"../../support/_query.js";import{isSubtypeSublayer as a}from"../../utilities/_layers.js";import{removeZValues as s}from"../../utilities/geometry.js";import{QueryProviderBase as l}from"./QueryProviderBase.js";export class SubtypeSublayerQueryProvider extends l{isSupported(e){const{sublayer:r}=e;return a(r)&&r.layer&&e.layerExtension?.capabilities.supportsQuery}_query(r,a,l){const{sublayer:i}=r,o=i.layer.createQuery();o.where=t(`${i.layer.subtypeField}=${i.subtypeCode}`,a),o.outFields=l.outFields,o.returnGeometry=l.returnGeometry,o.outSpatialReference=l.outSpatialReference,o.maxAllowableOffset=l.maxAllowableOffset,o.returnZ=i.layer.hasZ;let u=l.spatialFilter;return u&&(o.spatialRelationship="intersects",!u||i.layer.hasZ&&i.layer.capabilities?.data?.supportsZ||(u=s(u.clone())),o.geometry=u),i.layer.capabilities.query.supportsPagination&&(o.num=l.maxResults),e(o,r,i.layer,l.cancelToken)}_count(e,a,l){const{sublayer:i}=e,o=i.layer.createQuery();o.where=t(`${i.layer.subtypeField}=${i.subtypeCode}`,a),o.outFields=l.outFields,o.returnGeometry=l.returnGeometry;let u=l.spatialFilter;return u&&(o.spatialRelationship="intersects",!u||i.layer.hasZ&&i.layer.capabilities?.data?.supportsZ||(u=s(u.clone())),o.geometry=u),o.num=l.maxResults,r(o,e,i.layer,l.cancelToken)}}

package/version.d.ts

@@ -1,4 +1,4 @@
 /**
  * The current version of the Geocortex ArcGIS Extensions API.
  */
-export declare const version = "42.0.2";
+export declare const version = "42.1.1";

package/version.js

@@ -1 +1 @@
-export const version="42.0.2";
+export const version="42.1.1";