@esri/solutions-components 0.7.4 → 0.7.6

package/dist/collection/components/crowdsource-manager/crowdsource-manager.js

@@ -29,8 +29,10 @@ export class CrowdsourceManager {
          */
         this._shouldSetMapView = false;
         this.classicGrid = false;
+        this.defaultCenter = "";
         this.defaultGlobalId = "";
         this.defaultLayer = "";
+        this.defaultLevel = "";
         this.defaultOid = "";
         this.defaultWebmap = "";
         this.enableAutoRefresh = false;
@@ -51,6 +53,8 @@ export class CrowdsourceManager {
         this.mapInfos = [];
         this.onlyShowUpdatableLayers = true;
         this.searchConfiguration = undefined;
+        this.shareIncludeEmbed = undefined;
+        this.shareIncludeSocial = undefined;
         this.theme = "light";
         this.zoomAndScrollToSelected = false;
         this._expandPopup = false;
@@ -64,6 +68,13 @@ export class CrowdsourceManager {
     //  Watch handlers
     //
     //--------------------------------------------------------------------------
+    /**
+     * Watch for center url param to be set
+     */
+    defaultCenterWatchHandler() {
+        this._defaultCenter = !this.defaultCenter ? undefined :
+            this.defaultCenter.split(";").map(v => parseFloat(v));
+    }
     /**
      * Watch for globalid url param to be set
      */
@@ -78,6 +89,12 @@ export class CrowdsourceManager {
         this._defaultOid = !this.defaultOid ? undefined :
             this.defaultOid.indexOf(",") > -1 ? this.defaultOid.split(",").map(o => parseInt(o, 10)) : [parseInt(this.defaultOid, 10)];
     }
+    /**
+     * Watch for zoom level param to be set
+     */
+    defaultLevelWatchHandler() {
+        this._defaultLevel = !this.defaultLevel ? undefined : parseInt(this.defaultLevel, 10);
+    }
     /**
      * When true the map zoom tools will be available
      */
@@ -105,8 +122,8 @@ export class CrowdsourceManager {
      */
     async mapChanged(evt) {
         this._mapChange = evt.detail;
-        await this._mapChange.mapView.when(() => {
-            this._setMapView();
+        await this._mapChange.mapView.when(async () => {
+            await this._setMapView();
         });
     }
     /**
@@ -141,10 +158,10 @@ export class CrowdsourceManager {
      * Called after each render
      * Used to delay the setting of the mapView when the popup is expaneded and obstructs the view
      */
-    componentDidRender() {
+    async componentDidRender() {
         if (this._shouldSetMapView) {
             this._shouldSetMapView = false;
-            this._setMapView();
+            await this._setMapView();
         }
     }
     //--------------------------------------------------------------------------
@@ -333,7 +350,7 @@ export class CrowdsourceManager {
             this.classicGrid && layoutMode === ELayoutMode.VERTICAL ? "panel-end" :
                 layoutMode === ELayoutMode.HORIZONTAL ? "header" : "panel-start";
         const hasMapAndLayer = this.defaultWebmap && this.defaultLayer;
-        return (h("calcite-shell", { class: tableSizeClass + " border-bottom" }, h("calcite-action-bar", { class: "border-sides", expandDisabled: true, layout: toggleLayout, slot: toggleSlot }, h("calcite-action", { class: "toggle-node", icon: icon, id: id, onClick: () => this._toggleLayout(), text: "" }), h("calcite-tooltip", { label: tooltip, placement: "bottom", "reference-element": id }, h("span", null, tooltip))), h("div", { class: "width-full height-full position-relative" }, h("layer-table", { defaultGlobalId: hasMapAndLayer ? this._defaultGlobalId : undefined, defaultLayerId: hasMapAndLayer ? this.defaultLayer : "", defaultOid: hasMapAndLayer && !this.defaultGlobalId ? this._defaultOid : undefined, enableAutoRefresh: this.enableAutoRefresh, enableCSV: this.enableCSV, enableColumnReorder: this.enableColumnReorder, enableInlineEdit: this.enableInlineEdit, enableShare: this.enableShare, enableZoom: this.enableZoom, mapInfo: this._mapInfo, mapView: this === null || this === void 0 ? void 0 : this._mapView, onlyShowUpdatableLayers: this.onlyShowUpdatableLayers, showNewestFirst: this.showNewestFirst, zoomAndScrollToSelected: this.zoomAndScrollToSelected }))));
+        return (h("calcite-shell", { class: tableSizeClass + " border-bottom" }, h("calcite-action-bar", { class: "border-sides", expandDisabled: true, layout: toggleLayout, slot: toggleSlot }, h("calcite-action", { class: "toggle-node", icon: icon, id: id, onClick: () => this._toggleLayout(), text: "" }), h("calcite-tooltip", { label: tooltip, placement: "bottom", "reference-element": id }, h("span", null, tooltip))), h("div", { class: "width-full height-full position-relative" }, h("layer-table", { defaultGlobalId: hasMapAndLayer ? this._defaultGlobalId : undefined, defaultLayerId: hasMapAndLayer ? this.defaultLayer : "", defaultOid: hasMapAndLayer && !this.defaultGlobalId ? this._defaultOid : undefined, enableAutoRefresh: this.enableAutoRefresh, enableCSV: this.enableCSV, enableColumnReorder: this.enableColumnReorder, enableInlineEdit: this.enableInlineEdit, enableShare: this.enableShare, enableZoom: this.enableZoom, mapInfo: this._mapInfo, mapView: this === null || this === void 0 ? void 0 : this._mapView, onlyShowUpdatableLayers: this.onlyShowUpdatableLayers, shareIncludeEmbed: this.shareIncludeEmbed, shareIncludeSocial: this.shareIncludeSocial, showNewestFirst: this.showNewestFirst, zoomAndScrollToSelected: this.zoomAndScrollToSelected }))));
     }
     /**
      * Open/Close the appropriate panel.
@@ -366,11 +383,19 @@ export class CrowdsourceManager {
      *
      * @protected
      */
-    _setMapView() {
+    async _setMapView() {
         this._mapInfo = this._getMapInfo(this._mapChange.id);
         this._mapView = this._mapChange.mapView;
         this._initMapZoom();
         this._mapView.popupEnabled = false;
+        if (this._defaultCenter && this._defaultLevel) {
+            await this._mapView.goTo({
+                center: this._defaultCenter,
+                zoom: this._defaultLevel
+            });
+            this._defaultCenter = undefined;
+            this._defaultLevel = undefined;
+        }
     }
     /**
      * Add/remove zoom tools based on enableZoom prop
@@ -430,6 +455,24 @@ export class CrowdsourceManager {
                 "reflect": false,
                 "defaultValue": "false"
             },
+            "defaultCenter": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "string: default center point values for the map\r\n; delimited x;y pair"
+                },
+                "attribute": "default-center",
+                "reflect": false,
+                "defaultValue": "\"\""
+            },
             "defaultGlobalId": {
                 "type": "string",
                 "mutable": false,
@@ -466,6 +509,24 @@ export class CrowdsourceManager {
                 "reflect": false,
                 "defaultValue": "\"\""
             },
+            "defaultLevel": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "string: default zoom level"
+                },
+                "attribute": "default-level",
+                "reflect": false,
+                "defaultValue": "\"\""
+            },
             "defaultOid": {
                 "type": "string",
                 "mutable": false,
@@ -836,6 +897,40 @@ export class CrowdsourceManager {
                     "text": "ISearchConfiguration: Configuration details for the Search widget"
                 }
             },
+            "shareIncludeEmbed": {
+                "type": "boolean",
+                "mutable": false,
+                "complexType": {
+                    "original": "boolean",
+                    "resolved": "boolean",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "boolean: When true the share options will include embed option"
+                },
+                "attribute": "share-include-embed",
+                "reflect": false
+            },
+            "shareIncludeSocial": {
+                "type": "boolean",
+                "mutable": false,
+                "complexType": {
+                    "original": "boolean",
+                    "resolved": "boolean",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "boolean: When true the share options will include social media sharing"
+                },
+                "attribute": "share-include-social",
+                "reflect": false
+            },
             "theme": {
                 "type": "string",
                 "mutable": false,
@@ -892,11 +987,17 @@ export class CrowdsourceManager {
     static get elementRef() { return "el"; }
     static get watchers() {
         return [{
+                "propName": "defaultCenter",
+                "methodName": "defaultCenterWatchHandler"
+            }, {
                 "propName": "defaultGlobalId",
                 "methodName": "defaultGlobalIdWatchHandler"
             }, {
                 "propName": "defaultOid",
                 "methodName": "defaultOidWatchHandler"
+            }, {
+                "propName": "defaultLevel",
+                "methodName": "defaultLevelWatchHandler"
             }, {
                 "propName": "enableZoom",
                 "methodName": "enableZoomWatchHandler"

package/dist/collection/components/edit-card/edit-card.js

@@ -94,7 +94,7 @@ export class EditCard {
             }
             this._layerEditHandle = this._layer.on("edits", () => {
                 this.editsComplete.emit();
-                void this._closeEdit();
+                this.open = false;
             });
         }
     }
@@ -157,8 +157,7 @@ export class EditCard {
                 },
                 container
             });
-            if (this._editHandle && this._attachmentHandle && this._activeWorkflowHandle) {
-                this._editHandle.remove();
+            if (this._attachmentHandle && this._activeWorkflowHandle) {
                 this._attachmentHandle.remove();
                 this._activeWorkflowHandle.remove();
             }
@@ -167,18 +166,13 @@ export class EditCard {
                 this._editor.viewModel.state === "creating-features", () => {
                 this._shouldClose = false;
             });
-            this._editHandle = this.reactiveUtils.when(() => this._editor.viewModel.state === "ready", () => {
-                if (this._shouldClose) {
-                    void this._closeEdit();
-                }
-                else if (this.graphicIndex > -1 && this.graphics.length > 0 && this.open && !this._shouldClose) {
-                    void this._startUpdate();
-                }
-            });
             this._activeWorkflowHandle = this.reactiveUtils.watch(() => { var _a; return (_a = this._editor.viewModel.activeWorkflow) === null || _a === void 0 ? void 0 : _a.activeWorkflow; }, (activeWorkflow) => {
                 if ((activeWorkflow === null || activeWorkflow === void 0 ? void 0 : activeWorkflow.type) === "update-table-record" || (activeWorkflow === null || activeWorkflow === void 0 ? void 0 : activeWorkflow.type) === "create-features") {
                     this._shouldClose = false;
                 }
+                if (!(activeWorkflow === null || activeWorkflow === void 0 ? void 0 : activeWorkflow.type) && !(activeWorkflow === null || activeWorkflow === void 0 ? void 0 : activeWorkflow.hasPendingEdits)) {
+                    this.open = false;
+                }
             });
             // had issues with destroy before adding like this
             this._editContainer.appendChild(container);
@@ -190,12 +184,15 @@ export class EditCard {
      * @returns void
      */
     async _closeEdit() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this._shouldClose = true;
         if ((_a = this._editor) === null || _a === void 0 ? void 0 : _a.activeWorkflow) {
             await ((_b = this._editor) === null || _b === void 0 ? void 0 : _b.cancelWorkflow());
         }
-        (_c = this._editor) === null || _c === void 0 ? void 0 : _c.destroy();
+        if (this.graphicIndex > -1 && ((_c = this.graphics) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+            this.refreshGraphics.emit(this.graphics);
+        }
+        (_d = this._editor) === null || _d === void 0 ? void 0 : _d.destroy();
         this._shouldClose = false;
         this.closeEdit.emit();
     }
@@ -345,6 +342,26 @@ export class EditCard {
                     "resolved": "void",
                     "references": {}
                 }
+            }, {
+                "method": "refreshGraphics",
+                "name": "refreshGraphics",
+                "bubbles": true,
+                "cancelable": true,
+                "composed": true,
+                "docs": {
+                    "tags": [],
+                    "text": "Emitted on demand when the editor is closed to handle\r\nthings like attachment updates that don't fire the standard edit update event when complete"
+                },
+                "complexType": {
+                    "original": "__esri.Graphic[]",
+                    "resolved": "Graphic[]",
+                    "references": {
+                        "___esri": {
+                            "location": "global",
+                            "id": "global::___esri"
+                        }
+                    }
+                }
             }];
     }
     static get elementRef() { return "el"; }

package/dist/collection/components/info-card/info-card.js

@@ -85,6 +85,12 @@ export class InfoCard {
     async closeEdit() {
         this._editRecordOpen = false;
     }
+    /**
+     * Refresh the info-card graphics
+     */
+    async refreshGraphics(evt) {
+        this.graphics = [...evt.detail];
+    }
     //--------------------------------------------------------------------------
     //
     //  Functions (lifecycle)
@@ -413,6 +419,12 @@ export class InfoCard {
                 "target": "window",
                 "capture": false,
                 "passive": false
+            }, {
+                "name": "refreshGraphics",
+                "method": "refreshGraphics",
+                "target": "window",
+                "capture": false,
+                "passive": false
             }];
     }
 }

package/dist/collection/components/layer-table/layer-table.css

@@ -108,8 +108,9 @@ vaadin-grid-cell-content {
 .share-action {
   position: absolute;
   right: 0;
-  margin-top: 9px;
+  margin-top: 4px;
   margin-inline-end: 4px;
+  margin-bottom: 4px;
 }
 
 html[dir="rtl"] .share-action {
@@ -124,3 +125,8 @@ html[dir="rtl"] .share-action {
   opacity: var(--calcite-ui-opacity-disabled);
   pointer-events: none;
 }
+
+.instant-app-share {
+  height: 42px !important;
+  display: inline-flex;
+}

package/dist/collection/components/layer-table/layer-table.js

@@ -66,6 +66,8 @@ export class LayerTable {
         this.mapInfo = undefined;
         this.mapView = undefined;
         this.onlyShowUpdatableLayers = undefined;
+        this.shareIncludeEmbed = undefined;
+        this.shareIncludeSocial = undefined;
         this.showNewestFirst = undefined;
         this.zoomAndScrollToSelected = undefined;
         this._confirmDelete = false;
@@ -613,7 +615,7 @@ export class LayerTable {
      * @returns VNode The node representing the DOM element that will contain the action
      */
     _getShare(icon) {
-        return (h("div", { class: "share-action", id: this._getId(icon) }, h("instant-apps-social-share", { autoUpdateShareUrl: false, popoverButtonIconScale: "s", ref: el => this._shareNode = el, scale: "m", shareButtonColor: "neutral", socialMedia: true, view: this.mapView }), this._getToolTip("bottom", icon, this._translations.share)));
+        return (h("div", { class: "share-action", id: this._getId(icon) }, h("instant-apps-social-share", { autoUpdateShareUrl: false, class: "instant-app-share", embed: this.shareIncludeEmbed, popoverButtonIconScale: "s", ref: el => this._shareNode = el, scale: "m", shareButtonColor: "neutral", socialMedia: this.shareIncludeSocial, view: this.mapView }), this._getToolTip("bottom", icon, this._translations.share)));
     }
     /**
      * Called each time the values that are used for custom url params change
@@ -732,11 +734,11 @@ export class LayerTable {
      * @returns void
      */
     async _resetTable() {
-        var _a, _b;
+        var _a;
         this._clearSelection();
         this._allIds = [];
         this.featureSelectionChange.emit(this._selectedIndexes);
-        const columnTemplates = this._getColumnTemplates(this._layer.id, (_b = (_a = this._layer) === null || _a === void 0 ? void 0 : _a.popupTemplate) === null || _b === void 0 ? void 0 : _b.fieldInfos);
+        const columnTemplates = this._getColumnTemplates(this._layer.id, (_a = this._layer) === null || _a === void 0 ? void 0 : _a.fields);
         this._allIds = await queryAllIds(this._layer);
         if (!this._table) {
             await this._getTable(this._tableNode, columnTemplates);
@@ -1067,8 +1069,8 @@ export class LayerTable {
         if (fieldInfos) {
             columnTemplates = columnTemplates ? columnTemplates.map(columnTemplate => {
                 fieldInfos.some(fieldInfo => {
-                    if (fieldInfo.fieldName === columnTemplate.fieldName) {
-                        columnTemplate.label = fieldInfo.label;
+                    if (fieldInfo.name === columnTemplate.fieldName) {
+                        columnTemplate.label = fieldInfo.alias;
                         return true;
                     }
                 });
@@ -1076,8 +1078,8 @@ export class LayerTable {
             }) : fieldInfos.map(fieldInfo => {
                 return {
                     type: "field",
-                    fieldName: fieldInfo.fieldName,
-                    label: fieldInfo.label
+                    fieldName: fieldInfo.name,
+                    label: fieldInfo.alias
                 };
             });
         }
@@ -1314,6 +1316,40 @@ export class LayerTable {
                 "attribute": "only-show-updatable-layers",
                 "reflect": false
             },
+            "shareIncludeEmbed": {
+                "type": "boolean",
+                "mutable": false,
+                "complexType": {
+                    "original": "boolean",
+                    "resolved": "boolean",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "boolean: When true the share options will include embed option"
+                },
+                "attribute": "share-include-embed",
+                "reflect": false
+            },
+            "shareIncludeSocial": {
+                "type": "boolean",
+                "mutable": false,
+                "complexType": {
+                    "original": "boolean",
+                    "resolved": "boolean",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "boolean: When true the share options will include social media sharing"
+                },
+                "attribute": "share-include-social",
+                "reflect": false
+            },
             "showNewestFirst": {
                 "type": "boolean",
                 "mutable": false,

package/dist/collection/components/map-card/map-card.js

@@ -134,7 +134,7 @@ export class MapCard {
             this.mapView = new this.MapView({
                 container: this._mapDiv,
                 map: webMap,
-                resizeAlign: "top-left"
+                resizeAlign: "center"
             });
             this._loadedId = id;
             this._searchConfiguration = this._webMapInfo.searchConfiguration;

package/dist/collection/components/map-fullscreen/map-fullscreen.js

@@ -36,22 +36,12 @@ export class MapFullscreen {
      * @returns Promise when complete
      */
     async mapViewWatchHandler() {
-        await this.mapView.when(() => {
-            this._initFullscreenWidget();
+        await this.mapView.when(async () => {
+            await this._initFullscreenWidget();
         });
     }
     //--------------------------------------------------------------------------
     //
-    //  Methods (public)
-    //
-    //--------------------------------------------------------------------------
-    //--------------------------------------------------------------------------
-    //
-    //  Events (public)
-    //
-    //--------------------------------------------------------------------------
-    //--------------------------------------------------------------------------
-    //
     //  Functions (lifecycle)
     //
     //--------------------------------------------------------------------------
@@ -72,13 +62,13 @@ export class MapFullscreen {
      * It's never called during the first render().
      */
     async componentDidUpdate() {
-        this._initFullscreenWidget();
+        await this._initFullscreenWidget();
     }
     /**
      * StencilJS: Called once just after the component is fully loaded and the first render() occurs.
      */
     async componentDidLoad() {
-        this._initFullscreenWidget();
+        await this._initFullscreenWidget();
     }
     //--------------------------------------------------------------------------
     //
@@ -93,21 +83,29 @@ export class MapFullscreen {
      * @protected
      */
     async _initModules() {
-        const [Fullscreen] = await loadModules([
-            "esri/widgets/Fullscreen"
+        const [Fullscreen, reactiveUtils] = await loadModules([
+            "esri/widgets/Fullscreen",
+            "esri/core/reactiveUtils"
         ]);
         this.Fullscreen = Fullscreen;
+        this.reactiveUtils = reactiveUtils;
     }
     /**
      * Initialize the search widget
      *
      * @protected
      */
-    _initFullscreenWidget() {
+    async _initFullscreenWidget() {
         if (this.mapView && this._fullscreenElement && !this.fullscreenWidget) {
             this.fullscreenWidget = new this.Fullscreen({
                 view: this.mapView
             });
+            await this.fullscreenWidget.when(() => {
+                if (this._fullscreenStateChangeHandle) {
+                    this._fullscreenStateChangeHandle.remove();
+                }
+                this._fullscreenStateChangeHandle = this.reactiveUtils.watch(() => this.fullscreenWidget.viewModel.state, (state) => this.fullscreenStateChange.emit(state));
+            });
         }
         else if (this.fullscreenWidget) {
             this.fullscreenWidget.view = this.mapView;
@@ -169,6 +167,24 @@ export class MapFullscreen {
             }
         };
     }
+    static get events() {
+        return [{
+                "method": "fullscreenStateChange",
+                "name": "fullscreenStateChange",
+                "bubbles": true,
+                "cancelable": true,
+                "composed": true,
+                "docs": {
+                    "tags": [],
+                    "text": "Emitted on demand when the fullscreen widget state has changed"
+                },
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string",
+                    "references": {}
+                }
+            }];
+    }
     static get watchers() {
         return [{
                 "propName": "mapView",

package/dist/collection/components/map-tools/map-tools.js

@@ -89,10 +89,14 @@ export class MapTools {
     async _showFullscreenWatchHandler(v) {
         const fs = this._fullscreenElement.fullscreenWidget;
         if (v) {
-            fs.viewModel.enter();
+            if (fs.viewModel.state === "ready") {
+                fs.viewModel.enter();
+            }
         }
         else {
-            fs.viewModel.exit();
+            if (fs.viewModel.state === "active") {
+                fs.viewModel.exit();
+            }
         }
     }
     /**
@@ -169,7 +173,22 @@ export class MapTools {
             this._getActionGroup("basemap", false, this._translations.basemap, () => this._toggleBasemapPicker()) :
             undefined, this.enableFloorFilter && this._hasFloorInfo ?
             this._getActionGroup("urban-model", false, this._translations.floorFilter, () => this._toggleFloorFilter()) :
-            undefined)), h("basemap-gallery", { basemapConfig: this.basemapConfig, class: basemapClass, mapView: this.mapView, ref: (el) => { this._basemapElement = el; } }), h("map-search", { class: searchClass, mapView: this.mapView, ref: (el) => { this._searchElement = el; }, resultGraphicEnabled: true, searchConfiguration: this.searchConfiguration }), h("map-legend", { class: legendClass, mapView: this.mapView, ref: (el) => { this._legendElement = el; } }), h("map-fullscreen", { class: fullscreenClass, mapView: this.mapView, ref: (el) => { this._fullscreenElement = el; } }), h("floor-filter", { class: floorFilterClass, enabled: this.enableFloorFilter, mapView: this.mapView, ref: (el) => { this._floorFilterElement = el; } })));
+            undefined)), h("basemap-gallery", { basemapConfig: this.basemapConfig, class: basemapClass, mapView: this.mapView, ref: (el) => { this._basemapElement = el; } }), h("map-search", { class: searchClass, mapView: this.mapView, ref: (el) => { this._searchElement = el; }, resultGraphicEnabled: true, searchConfiguration: this.searchConfiguration }), h("map-legend", { class: legendClass, mapView: this.mapView, ref: (el) => { this._legendElement = el; } }), h("map-fullscreen", { class: fullscreenClass, mapView: this.mapView, onFullscreenStateChange: (evt) => this._fullscreenStateChange(evt.detail), ref: (el) => { this._fullscreenElement = el; } }), h("floor-filter", { class: floorFilterClass, enabled: this.enableFloorFilter, mapView: this.mapView, ref: (el) => { this._floorFilterElement = el; } })));
+    }
+    /**
+     * Respond to fullscreen state change and ensure our state var is in sync
+     *
+     * @param state The fullscreen view model's state.
+     *
+     * @protected
+     */
+    _fullscreenStateChange(state) {
+        if (state === "ready" && this._showFullscreen) {
+            this._showFullscreen = false;
+        }
+        else if (state === "active" && !this._showFullscreen) {
+            this._showFullscreen = true;
+        }
     }
     //--------------------------------------------------------------------------
     //