@esri/solutions-components 0.4.0 → 0.4.2

package/dist/components/index.es.js

@@ -4,7 +4,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 import { a as commonjsGlobal, c as createCommonjsModule, g as getDefaultExportFromCjs } from './_commonjsHelpers.js';
-import { _ as _typeof_1 } from './pdf-download2.js';
+import { _ as _typeof_1 } from './downloadUtils.js';
 
 var check = function (it) {
   return it && it.Math == Math && it;

package/dist/components/layer-table.js

@@ -6,8 +6,8 @@
 import { proxyCustomElement, HTMLElement, h, Host } from '@stencil/core/internal/client';
 import { g as getLocaleComponentStrings } from './locale.js';
 import { g as goToSelection, a as getMapLayerView, d as defineCustomElement$2 } from './map-layer-picker2.js';
-import { q as queryFeaturesByID, a as queryAllFeatures } from './queryUtils.js';
-import { e as exportCSV } from './csvUtils.js';
+import { q as queryAllFeatures } from './queryUtils.js';
+import { d as downloadCSV } from './downloadUtils.js';
 import { d as defineCustomElement$l } from './button.js';
 import { d as defineCustomElement$k } from './checkbox.js';
 import { d as defineCustomElement$j } from './chip.js';
@@ -237,20 +237,9 @@ const LayerTable$1 = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement
    * @returns a promise that will resolve when the operation is complete
    */
   async _exportToCSV() {
-    // Get the attributes of the features to export
-    const ids = this._getSelectedIds();
-    const featureSet = await queryFeaturesByID(ids, this._layerView.layer);
-    const attributes = featureSet.features.map(f => f.attributes);
-    // Get the column headings from the first record and add to front of list of attributes
-    const columnNames = [];
-    const entry = attributes[0];
-    Object.keys(entry).forEach(k => {
-      if (entry.hasOwnProperty(k)) {
-        columnNames.push(k);
-      }
-    });
-    attributes.unshift(columnNames);
-    return exportCSV(attributes);
+    return downloadCSV([], this._layerView.layer, this._getSelectedIds(), false, // formatUsingLayerPopup
+    false, // removeDuplicates
+    true);
   }
   /**
    * Zoom to all selected features

package/dist/components/map-layer-picker2.js

@@ -4,7 +4,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 import { proxyCustomElement, HTMLElement, createEvent, h, Host } from '@stencil/core/internal/client';
-import { b as queryExtent } from './queryUtils.js';
+import { a as queryExtent } from './queryUtils.js';
 import { s as state } from './publicNotificationStore.js';
 import { d as defineCustomElement$6 } from './chip.js';
 import { d as defineCustomElement$5 } from './combobox.js';

package/dist/components/map-search.js

@@ -169,7 +169,7 @@ const MapSearch$1 = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement {
   static get style() { return mapSearchCss; }
 }, [0, "map-search", {
     "mapView": [16],
-    "searchConfiguration": [16],
+    "searchConfiguration": [1040],
     "_searchTerm": [32],
     "_translations": [32],
     "clear": [64]

package/dist/components/map-select-tools2.js

@@ -5,8 +5,8 @@
  */
 import { proxyCustomElement, HTMLElement, createEvent, h, Host } from '@stencil/core/internal/client';
 import { l as loadModules } from './loadModules.js';
-import { h as highlightFeatures, g as goToSelection, d as defineCustomElement$2 } from './map-layer-picker2.js';
-import { c as queryObjectIds, d as getQueryGeoms } from './queryUtils.js';
+import { g as goToSelection, h as highlightFeatures, d as defineCustomElement$2 } from './map-layer-picker2.js';
+import { b as queryObjectIds, c as getQueryGeoms } from './queryUtils.js';
 import { c as EWorkflowType, e as ESelectionMode, f as ERefineMode, b as ESketchType } from './interfaces3.js';
 import { s as state } from './publicNotificationStore.js';
 import { g as getLocaleComponentStrings } from './locale.js';
@@ -47,12 +47,6 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
      * string: A label to help uniquely identify the selection set
      */
     this._selectionLabel = "";
-    /**
-     * boolean: When false the geometries will be used for selection
-     *          When true a list of OIDs will be used
-     *          see https://github.com/Esri/solutions-components/issues/148
-     */
-    this._skipGeomQuery = false;
     this.bufferColor = [227, 139, 79, 0.8];
     this.bufferOutlineColor = [255, 255, 255];
     this.enabledLayerIds = [];
@@ -83,12 +77,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
   async watchGeometriesHandler(newValue, oldValue) {
     if (newValue !== oldValue) {
       if (newValue.length > 0) {
-        if (this._skipGeomQuery) {
-          void highlightFeatures(this._selectedIds, this.selectLayerView, this.mapView);
-        }
-        else {
-          return this._geomQuery(this.geometries);
-        }
+        return this._highlightWithOIDsOrGeoms();
       }
       else if (newValue.length === 0) {
         return this._clearResults(true, true);
@@ -117,7 +106,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    */
   async workflowTypeHandler(newValue, oldValue) {
     if (newValue !== oldValue) {
-      this.mapView.popup.autoOpenEnabled = ["SELECT", "SKETCH", "REFINE"].indexOf(newValue) < 0;
+      this.mapView.popup.autoOpenEnabled = ["SELECT", "SKETCH", "REFINE", "SEARCH"].indexOf(newValue) < 0;
       this.workflowTypeChange.emit(newValue);
     }
   }
@@ -159,7 +148,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
       layerView: this.selectLayerView,
       geometries: this.geometries,
       refineSelectLayers: this._refineTools.layerViews,
-      skipGeomQuery: this._skipGeomQuery
+      skipGeomOIDs: this._skipGeomOIDs
     };
   }
   /**
@@ -172,6 +161,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * Handle changes to the search configuration
    */
   searchConfigurationChangeChanged(event) {
+    console.log("searchConfigurationChange listener");
     this.searchConfiguration = event.detail;
   }
   /**
@@ -179,7 +169,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    *
    */
   sketchGraphicsChange(event) {
-    this._updateSelection(EWorkflowType.SKETCH, event.detail, this._selectionLabel || this._translations.sketch, true);
+    this._updateSelection(EWorkflowType.SKETCH, event.detail, this._selectionLabel || this._translations.sketch, false);
   }
   /**
    * Listen to changes in the refine graphics
@@ -187,9 +177,8 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    */
   refineSelectionGraphicsChange(event) {
     const graphics = event.detail.graphics;
-    this._skipGeomQuery = event.detail.useOIDs;
     const oids = Array.isArray(graphics) ? graphics.map(g => g.attributes[g.layer.objectIdField]) : [];
-    this._updateSelection(EWorkflowType.SELECT, graphics, this._selectionLabel || this._translations.select, !event.detail.useOIDs, oids);
+    this._updateSelection(EWorkflowType.SELECT, graphics, this._selectionLabel || this._translations.select, event.detail.useOIDs, oids);
     return this._highlightFeatures(oids);
   }
   //--------------------------------------------------------------------------
@@ -214,7 +203,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * Renders the component.
    */
   render() {
-    var _a, _b, _c;
+    var _a, _b;
     const searchEnabled = this._workflowType === EWorkflowType.SEARCH;
     const showSearchClass = searchEnabled ? " div-visible-search" : " div-not-visible";
     const drawEnabled = this._workflowType === EWorkflowType.SKETCH || this._workflowType === EWorkflowType.SELECT;
@@ -222,7 +211,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
     const useSelectClass = this._layerSelectChecked && !searchEnabled ? " div-visible" : " div-not-visible";
     const useDrawClass = !this._layerSelectChecked && !searchEnabled ? " div-visible" : " div-not-visible";
     const showLayerChoiceClass = searchEnabled ? "div-not-visible" : "div-visible";
-    return (h(Host, null, h("div", { class: "padding-bottom-1" }, h("calcite-radio-group", { class: "w-100", onCalciteRadioGroupChange: (evt) => this._workflowChange(evt) }, h("calcite-radio-group-item", { checked: searchEnabled, class: "w-50 end-border", value: EWorkflowType.SEARCH }, this._translations.search), h("calcite-radio-group-item", { checked: drawEnabled, class: "w-50", value: EWorkflowType.SKETCH }, this._translations.sketch))), h("div", { class: showSearchClass }, h("div", { class: "search-widget", ref: (el) => { this._searchElement = el; } })), h("div", { class: showLayerChoiceClass }, h("calcite-label", { layout: "inline" }, h("calcite-checkbox", { checked: ((_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.workflowType) === EWorkflowType.SELECT, onCalciteCheckboxChange: () => this._layerSelectChanged(), ref: (el) => this._selectFromLayerElement = el }), "Use layer features")), h("div", { class: useDrawClass }, h("map-draw-tools", { active: true, border: true, mapView: this.mapView, ref: (el) => { this._drawTools = el; } })), h("div", { class: useSelectClass }, h("refine-selection-tools", { active: true, border: true, enabledLayerIds: this.enabledLayerIds, layerView: this.selectLayerView, layerViews: this._refineSelectLayers, mapView: this.mapView, mode: ESelectionMode.ADD, ref: (el) => { this._refineTools = el; }, refineMode: ERefineMode.SUBSET })), h("calcite-label", { class: showBufferToolsClass }, this._translations.searchDistance, h("buffer-tools", { distance: ((_b = this.selectionSet) === null || _b === void 0 ? void 0 : _b.distance) || this.defaultBufferDistance, geometries: this.geometries, onBufferComplete: (evt) => this._bufferComplete(evt), ref: (el) => this._bufferTools = el, unit: ((_c = this.selectionSet) === null || _c === void 0 ? void 0 : _c.unit) || this.defaultBufferUnit })), h("slot", null)));
+    return (h(Host, null, h("div", { class: "padding-bottom-1" }, h("calcite-radio-group", { class: "w-100", onCalciteRadioGroupChange: (evt) => this._workflowChange(evt) }, h("calcite-radio-group-item", { checked: searchEnabled, class: "w-50 end-border", value: EWorkflowType.SEARCH }, this._translations.search), h("calcite-radio-group-item", { checked: drawEnabled, class: "w-50", value: EWorkflowType.SKETCH }, this._translations.sketch))), h("div", { class: showSearchClass }, h("div", { class: "search-widget", ref: (el) => { this._searchElement = el; } })), h("div", { class: showLayerChoiceClass }, h("calcite-label", { layout: "inline" }, h("calcite-checkbox", { checked: this._layerSelectChecked, onCalciteCheckboxChange: () => this._layerSelectChanged(), ref: (el) => this._selectFromLayerElement = el }), "Use layer features")), h("div", { class: useDrawClass }, h("map-draw-tools", { active: true, border: true, mapView: this.mapView, ref: (el) => { this._drawTools = el; } })), h("div", { class: useSelectClass }, h("refine-selection-tools", { active: true, border: true, enabledLayerIds: this.enabledLayerIds, layerView: this.selectLayerView, layerViews: this._refineSelectLayers, mapView: this.mapView, mode: ESelectionMode.ADD, ref: (el) => { this._refineTools = el; }, refineMode: ERefineMode.SUBSET })), h("calcite-label", { class: showBufferToolsClass }, this._translations.searchDistance, h("buffer-tools", { distance: ((_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.distance) || this.defaultBufferDistance, geometries: this.geometries, onBufferComplete: (evt) => this._bufferComplete(evt), ref: (el) => this._bufferTools = el, unit: ((_b = this.selectionSet) === null || _b === void 0 ? void 0 : _b.unit) || this.defaultBufferUnit })), h("slot", null)));
   }
   //--------------------------------------------------------------------------
   //
@@ -266,23 +255,25 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * @protected
    */
   _initSelectionSet() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     if (this.selectionSet) {
       this._searchTerm = (_b = (_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.searchResult) === null || _b === void 0 ? void 0 : _b.name;
       this._workflowType = (_c = this.selectionSet) === null || _c === void 0 ? void 0 : _c.workflowType;
       this._searchResult = (_d = this.selectionSet) === null || _d === void 0 ? void 0 : _d.searchResult;
       this._refineSelectLayers = (_e = this.selectionSet) === null || _e === void 0 ? void 0 : _e.refineSelectLayers;
       this._selectedIds = (_f = this.selectionSet) === null || _f === void 0 ? void 0 : _f.selectedIds;
-      this._skipGeomQuery = (_g = this.selectionSet) === null || _g === void 0 ? void 0 : _g.skipGeomQuery;
+      this._skipGeomOIDs = (_g = this.selectionSet) === null || _g === void 0 ? void 0 : _g.skipGeomOIDs;
+      this._layerSelectChecked = ((_h = this.selectionSet) === null || _h === void 0 ? void 0 : _h.workflowType) === EWorkflowType.SELECT;
       this.geometries = [
-        ...((_h = this.selectionSet) === null || _h === void 0 ? void 0 : _h.geometries) || []
+        ...((_j = this.selectionSet) === null || _j === void 0 ? void 0 : _j.geometries) || []
       ];
       // reset selection label base
-      this._selectionLabel = ((_j = this.selectionSet) === null || _j === void 0 ? void 0 : _j.label) || this._getSelectionBaseLabel();
+      this._selectionLabel = ((_k = this.selectionSet) === null || _k === void 0 ? void 0 : _k.label) || this._getSelectionBaseLabel();
       void goToSelection(this.selectionSet.selectedIds, this.selectionSet.layerView, this.mapView, false);
     }
     else {
       this._workflowType = EWorkflowType.SEARCH;
+      this.mapView.popup.autoOpenEnabled = false;
     }
   }
   /**
@@ -315,15 +306,18 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
       console.log(searchConfiguration);
       const searchOptions = Object.assign({ view: this.mapView, container: this._searchElement, searchTerm: this._searchTerm }, searchConfiguration);
       this._searchWidget = new this.Search(searchOptions);
+      this._searchWidget.popupEnabled = false;
       this._searchWidget.on("search-clear", () => {
         void this._clearResults(false);
       });
       this._searchWidget.on("select-result", (searchResults) => {
-        var _a;
+        var _a, _b;
         void this._clearResults(false);
         if (searchResults.result) {
           this._searchResult = searchResults.result;
-          this._updateSelection(EWorkflowType.SEARCH, [searchResults.result.feature], (_a = searchResults === null || searchResults === void 0 ? void 0 : searchResults.result) === null || _a === void 0 ? void 0 : _a.name, true);
+          const useOIDs = ((_a = searchResults.source) === null || _a === void 0 ? void 0 : _a.layer.id) === this.selectLayerView.layer.id;
+          const oids = useOIDs ? [searchResults.result.feature.getObjectId()] : undefined;
+          this._updateSelection(EWorkflowType.SEARCH, [searchResults.result.feature], (_b = searchResults === null || searchResults === void 0 ? void 0 : searchResults.result) === null || _b === void 0 ? void 0 : _b.name, useOIDs, oids);
         }
       });
       console.log("END search widget init");
@@ -350,9 +344,11 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
             ? view.map.findLayerById(layerSource.layer.id)
             : null;
           if (layerFromMap) {
+            console.log("layerFromMap");
             layerSource.layer = layerFromMap;
           }
           else if ((_b = layerSource === null || layerSource === void 0 ? void 0 : layerSource.layer) === null || _b === void 0 ? void 0 : _b.url) {
+            console.log("create new");
             layerSource.layer = new this.FeatureLayer((_c = layerSource === null || layerSource === void 0 ? void 0 : layerSource.layer) === null || _c === void 0 ? void 0 : _c.url);
           }
         }
@@ -408,6 +404,21 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
   _workflowChange(evt) {
     this._workflowType = evt.detail;
   }
+  /**
+   * Highlight the features in the map based on OIDs when skipOIDs have been defined
+   *
+   * @protected
+   */
+  async _highlightWithOIDsOrGeoms() {
+    var _a;
+    if (((_a = this._skipGeomOIDs) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+      this._selectedIds = this._skipGeomOIDs;
+      return this._highlightFeatures(this._selectedIds);
+    }
+    else {
+      return this._geomQuery(this.geometries);
+    }
+  }
   /**
    * Highlight the features in the map
    *
@@ -452,7 +463,6 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * @protected
    */
   async _bufferComplete(evt) {
-    var _a, _b;
     this._bufferGeometry = Array.isArray(evt.detail) ?
       evt.detail[0] : evt.detail;
     if (this._bufferGeometry) {
@@ -479,13 +489,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
       if (this._bufferGraphicsLayer) {
         this._bufferGraphicsLayer.removeAll();
       }
-      if (this._skipGeomQuery || ((_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.skipGeomQuery)) {
-        this._selectedIds = (_b = this.selectionSet) === null || _b === void 0 ? void 0 : _b.selectedIds;
-        void this._highlightFeatures(this._selectedIds);
-      }
-      else {
-        void this._geomQuery(this.geometries);
-      }
+      return this._highlightWithOIDsOrGeoms();
     }
   }
   /**
@@ -533,15 +537,15 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * @param type worflow type
    * @param graphics graphics to be used for selection
    * @param label selection label
-   * @param useGeoms indicates if the geometries should be used directly for selections
-   * @param oids list of IDs to select when useGeoms is false
+   * @param useOIDs indicates if the OIDs should override the geometry for selection
+   * @param oids list of IDs to select when useOIDs is true
    *
    * @protected
    */
-  _updateSelection(type, graphics, label, useGeoms, oids) {
-    this._selectedIds = oids ? oids : this._selectedIds;
+  _updateSelection(type, graphics, label, useOIDs, oids) {
+    this._selectedIds = useOIDs && oids ? oids : this._selectedIds;
     // see https://github.com/Esri/solutions-components/issues/148
-    this._skipGeomQuery = !useGeoms;
+    this._skipGeomOIDs = useOIDs ? oids : undefined;
     this.geometries = Array.isArray(graphics) ? graphics.map(g => g.geometry) : this.geometries;
     this._workflowType = type;
     this._selectionLabel = label;
@@ -571,7 +575,7 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
     "geometries": [16],
     "isUpdate": [4, "is-update"],
     "mapView": [16],
-    "searchConfiguration": [16],
+    "searchConfiguration": [1040],
     "selectionSet": [16],
     "selectLayerView": [16],
     "showBufferTools": [4, "show-buffer-tools"],