@nextgis/ngw-map 1.10.0 → 1.11.0

package/lib/ngw-map.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.10.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.11.0; author: NextGIS */
 import { EventEmitter } from 'events';
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { deepmerge, deprecatedWarn, defined, isObject } from '@nextgis/utils';

package/lib/ngw-map.esm-bundler.prod.js

@@ -1,2 +1,2 @@
-import{EventEmitter as e}from"events";import t from"@nextgis/cancelable-promise";import{deepmerge as s,deprecatedWarn as r,defined as o,isObject as i}from"@nextgis/utils";import{WebMap as n}from"@nextgis/webmap";export*from"@nextgis/webmap";import{NgwKit as a,createNgwLayerAdapter as c,fetchNgwLayerItem as h,fetchNgwLayerItems as d,fetchNgwLayerFeature as l,fetchNgwLayerFeatureCollection as m,fetchIdentifyItem as u,fetchIdentifyGeoJson as y,fetchNgwResourceExtent as p,sendIdentifyRequest as f,getCompanyLogo as g,getIdentifyItems as w,createIdentifyItem as L}from"@nextgis/ngw-kit";import{getIcon as I}from"@nextgis/icons";import _ from"@nextgis/ngw-connector";import{QmsKit as b}from"@nextgis/qms-kit";function N(e,t,s,r){if("number"==typeof t||"string"==typeof t)t=Number(t),e.push({...s,resource:t});else if(Array.isArray(t)){const[o,i]=t;e.push({...s,resource:o,id:i,...r})}else"object"==typeof t&&e.push({...s,...t,...r})}const v={target:"map",baseUrl:"",whitlabel:!1,controls:["ZOOM","ATTRIBUTION"],controlsOptions:{ZOOM:{position:"top-left"},ATTRIBUTION:{position:"bottom-right",customAttribution:['<a href="https://nextgis.com" target="_blank">©NextGIS</a>']}},pixelRadius:10};class F extends n{constructor(t){super(function(e){const t=[new b];return e.starterKits&&e.starterKits.forEach((e=>{t.push(e)})),e.connector?e.connector&&(e.baseUrl=e.connector.options.baseUrl):e.connector=new _({baseUrl:e.baseUrl||"",auth:e.auth}),(e=s(v,e)).center||e.bounds||(e.bounds=[-179,-90,180,90]),e.connector&&t.push(new a({connector:e.connector,auth:e.auth})),{...e,starterKits:t,create:!1}}(t)),this.emitter=new e,this._ngwLayers={},this._promises={select:[],identify:[]},t.connector&&(this.connector=t.connector),this._createWebMap().then((()=>{const e=this.getContainer();e&&e.classList.add("ngw-map-container"),this.options.whitlabel&&this._whiteLabel()}))}async addControl(e,t,s){return await this.onLoad("controls:create"),super.addControl(e,t,s)}async addNgwLayer(e){await this.onMapLoad();const{keyname:t,resourceId:s}=e;(t||void 0!==s)&&r("set `resource` options instead of `keyname` or `resourceId`");const n=e.resource;if(!t&&!s&&!n)throw new Error("resource, resourceId or keyname is required parameter to add NGW layer");if(o(this.options.baseUrl))try{o(this.options.setViewDelay)&&(e.adapterOptions=e.adapterOptions||{},o(e.adapterOptions.setViewDelay)||(e.adapterOptions.setViewDelay=this.options.setViewDelay));const t=c(e,this,this.connector),s={visibility:!0,...e,...e.adapterOptions},r=await this.addLayer(t,s),i=r&&this.getLayerId(r);if(r&&i&&(this._ngwLayers[i]={layer:r,resourceId:r.resourceId},r.options.name=r.options.name||r.item&&r.item.resource.display_name,r.options.baselayer)){if(this.getActiveBaseLayer())return r}return r}catch(e){const r=i(n)&&"id"in n?n.id:t||s||n;console.error(`Can't add NGW layer ${r}.`,e)}}fit(){const{center:e,zoom:t,bounds:s}=this.options;e?(this.setCenter(e),t&&this.setZoom(t)):s&&this.fitBounds(s)}fetchNgwLayerItem(e){return h({connector:this.connector,...e})}fetchNgwLayerItems(e){return d({connector:this.connector,...e})}fetchNgwLayerFeature(e){return l({connector:this.connector,...e})}fetchNgwLayerFeatures(e){return m({connector:this.connector,...e})}fetchIdentifyItem(e,t){const s=u({identify:e,connector:this.connector,requestOptions:t});return this._addPromise("identify",s),s}fetchIdentifyGeoJson(e,s=!1){const r=y({identify:e,connector:this.connector,multiple:s});return r&&"then"in r?(this._addPromise("identify",r),r):t.resolve(r)}getIdentifyGeoJson(e,t=!1){return this.fetchIdentifyGeoJson(e,t)}async getNgwLayers(){return await this.onLoad(),this._ngwLayers}async getNgwLayerByResourceId(e){for(const t in this._ngwLayers){const s=this._ngwLayers[t];if(s.resourceId===e)return s&&s.layer;if(s.layer.getIdentificationIds){const t=await s.layer.getIdentificationIds();if(t&&t.some((t=>t===e)))return s.layer}if(s.layer.getDependLayers){const t=s.layer.getDependLayers().find((t=>t.item&&t.item.parentId===e));if(t)return t.layer}}}async fitLayer(e,t){let s;s="string"==typeof e||"number"==typeof e?String(s):e.id;const r=s&&this._ngwLayers[s];if(r)if(r.layer.getBounds){const e=await r.layer.getBounds();e&&this.fitBounds(e,t)}else{let e;if(r.layer.item)e=r.layer.item;else{const t=r.resourceId;e=await this.connector.getResource(t)}e&&p(e,this.connector).then((e=>{e&&this.fitBounds(e,t)}))}else super.fitLayer(e,t)}async zoomToLayer(e){return this.fitLayer(e)}onLoad(e="ngw-map:create"){return super.onLoad(e)}removeLayer(e){const t=this.getLayer(e);if(t){const e=this.getLayerId(t);e&&delete this._ngwLayers[e],super.removeLayer(t)}}enableSelection(){this.$$selectFromNgwRaster||(this.$$selectFromNgwRaster=e=>{this.emitter.listenerCount("ngw:select")&&this._selectFromNgwRaster(e)},this.$$selectFromNgwVector=e=>{this.emitter.listenerCount("ngw:select")&&this._selectFromNgwVector(e)},this.emitter.on("click",this.$$selectFromNgwRaster),this.emitter.on("layer:click",this.$$selectFromNgwVector))}disableSelection(){this.$$selectFromNgwRaster&&(this.emitter.removeListener("click",this.$$selectFromNgwRaster),this.emitter.removeListener("click",this._selectFromNgwVector),this.$$selectFromNgwRaster=void 0,this.$$selectFromNgwVector=void 0)}getNgwLayerItem(e){return this.fetchNgwLayerItem(e)}getNgwLayerItems(e){return this.fetchNgwLayerItems(e)}getNgwLayerFeature(e){return this.fetchNgwLayerFeature(e)}getNgwLayerFeatures(e){return this.fetchNgwLayerFeatures(e)}cancelPromise(...e){this.cancelPromises(...e)}cancelPromises(...e){e.length||(e=Object.keys(this._promises)),e.forEach((e=>{const t=this._promises[e];t&&(t.forEach((e=>e.cancel())),this._promises[e]=[])}))}_addPromise(e,t){const s=this._promises[e];if(s&&-1===s.indexOf(t)){const e=()=>{const e=s.indexOf(t);-1!==e&&s.splice(e,1)};t.then(e),t.catch(e),s.push(t)}}_isFitFromResource(){const e=this._initMapState;return!e.zoom||!e.center}async _createWebMap(){await this.create(),this.options.qmsId&&this._addQmsBaseLayer(),this.options.osm&&this._addOsmBaseLayer();const e=[],t=this._isFitFromResource();if(this.options.webmapId&&N(e,this.options.webmapId,{fit:t}),this.options.resources&&Array.isArray(this.options.resources))for(const s of this.options.resources){const r={};t||(r.fit=!1),N(e,s,{},r)}for(const t of e)try{await this.addNgwLayer(t)}catch(e){console.warn(e)}this._emitStatusEvent("ngw-map:create",this),this.enableSelection()}_addOsmBaseLayer(){this.addBaseLayer("OSM")}_addQmsBaseLayer(){let e,t;Array.isArray(this.options.qmsId)?(e=this.options.qmsId[0],t=this.options.qmsId[1]):e=Number(this.options.qmsId);const s={qmsId:e};t&&(s.id=t),this.addBaseLayer("QMS",s)}_selectFromNgwVector(e){const t=e.layer,s=t.item&&t.item.resource.id,r=e.feature;if(void 0!==s&&r){const e=r.id;if(e){const t={featureCount:1,[s]:{featureCount:1,features:[{id:Number(e),fields:r.properties||{},label:`#${s}`,layerId:Number(s),parent:"",geom:r.geometry}]}};return this._emitStatusEvent("ngw:select",this._prepareToIdentify({...t,resources:[s],sourceType:"vector"})),t}}}async _selectFromNgwRaster(e){this._emitStatusEvent("ngw:preselect");const t=[],s=Object.values(this._ngwLayers);s.sort(((e,t)=>e.layer.order&&t.layer.order?t.layer.order-e.layer.order:1)),s.forEach((e=>{const s=e.layer,r="function"==typeof s.getIdentificationIds&&s.getIdentificationIds;r&&s.options.selectable&&this.isLayerVisible(s)&&t.push(r.call(s))}));const r=Promise.all(t),o=await r,i=[];if(o.forEach((e=>{e&&e.forEach((e=>i.push(e)))})),!i.length)return void this._emitStatusEvent("ngw:select",null);const n=this.options.pixelRadius||10,a=this.getCenter();let c=this.getZoom();if(c=void 0!==c?c:20,!a||!c)return void this._emitStatusEvent("ngw:select",null);const h=function(e,t,s){return(s=null!=s?s:10)*(40075016.686*Math.abs(Math.cos(180*e[1]/Math.PI))/Math.pow(2,t+8))*5e-4}(a,c,n),d=f(e,{layers:i,connector:this.connector,radius:h}).then((t=>(this._emitStatusEvent("ngw:select",this._prepareToIdentify({...t,resources:i,sourceType:"raster",event:e})),t)));return this._addPromise("select",d),d}_prepareToIdentify(e){return{...e,getIdentifyItems:()=>w(e,!0).map((e=>L({feature:e.feature,connector:this.connector})))}}async _whiteLabel(){const e=this.getContainer();if(e){const t=await g(this.connector,this.options.companyLogoOptions);t&&e.appendChild(t)}}}async function O(e){return new F(e).onLoad()}F.getIcon=I;export{F as NgwMap,O as createNgwMap};
+import{EventEmitter as e}from"events";import t from"@nextgis/cancelable-promise";import{deepmerge as s,deprecatedWarn as r,defined as o,isObject as i}from"@nextgis/utils";import{WebMap as n}from"@nextgis/webmap";export*from"@nextgis/webmap";import{NgwKit as a,createNgwLayerAdapter as c,fetchNgwLayerItem as h,fetchNgwLayerItems as d,fetchNgwLayerFeature as l,fetchNgwLayerFeatureCollection as m,fetchIdentifyItem as u,fetchIdentifyGeoJson as y,fetchNgwResourceExtent as p,sendIdentifyRequest as f,getCompanyLogo as g,getIdentifyItems as w,createIdentifyItem as L}from"@nextgis/ngw-kit";import{getIcon as I}from"@nextgis/icons";import _ from"@nextgis/ngw-connector";import{QmsKit as b}from"@nextgis/qms-kit";function N(e,t,s,r){if("number"==typeof t||"string"==typeof t)t=Number(t),e.push({...s,resource:t});else if(Array.isArray(t)){const[o,i]=t;e.push({...s,resource:o,id:i,...r})}else"object"==typeof t&&e.push({...s,...t,...r})}const v={target:"map",baseUrl:"",whitlabel:!1,controls:["ZOOM","ATTRIBUTION"],controlsOptions:{ZOOM:{position:"top-left"},ATTRIBUTION:{position:"bottom-right",customAttribution:['<a href="https://nextgis.com" target="_blank">©NextGIS</a>']}},pixelRadius:10};class F extends n{constructor(t){super(function(e){const t=[new b];return e.starterKits&&e.starterKits.forEach((e=>{t.push(e)})),e.connector?e.connector&&(e.baseUrl=e.connector.options.baseUrl):e.connector=new _({baseUrl:e.baseUrl||"",auth:e.auth}),(e=s(v,e)).center||e.bounds||(e.bounds=[-179,-90,180,90]),e.connector&&t.push(new a({connector:e.connector,auth:e.auth})),{...e,starterKits:t,create:!1}}(t)),this.emitter=new e,this._ngwLayers={},this._promises={select:[],identify:[]},t.connector&&(this.connector=t.connector),this._createWebMap().then((()=>{const e=this.getContainer();e&&e.classList.add("ngw-map-container"),this.options.whitlabel&&this._whiteLabel()}))}async addControl(e,t,s){return await this.onLoad("controls:create"),super.addControl(e,t,s)}async addNgwLayer(e){await this.onMapLoad();const{keyname:t,resourceId:s}=e;(t||void 0!==s)&&r("set `resource` options instead of `keyname` or `resourceId`");const n=e.resource;if(!t&&!s&&!n)throw new Error("resource, resourceId or keyname is required parameter to add NGW layer");if(o(this.options.baseUrl))try{o(this.options.setViewDelay)&&(e.adapterOptions=e.adapterOptions||{},o(e.adapterOptions.setViewDelay)||(e.adapterOptions.setViewDelay=this.options.setViewDelay));const t=c(e,this,this.connector),s={visibility:!0,...e,...e.adapterOptions},r=await this.addLayer(t,s),i=r&&this.getLayerId(r);if(r&&i&&(this._ngwLayers[i]={layer:r,resourceId:r.resourceId},r.options.name=r.options.name||r.item&&r.item.resource.display_name,r.options.baselayer)){if(this.getActiveBaseLayer())return r}return r}catch(a){const e=i(n)&&"id"in n?n.id:t||s||n;console.error(`Can't add NGW layer ${e}.`,a)}}fit(){const{center:e,zoom:t,bounds:s}=this.options;e?(this.setCenter(e),t&&this.setZoom(t)):s&&this.fitBounds(s)}fetchNgwLayerItem(e){return h({connector:this.connector,...e})}fetchNgwLayerItems(e){return d({connector:this.connector,...e})}fetchNgwLayerFeature(e){return l({connector:this.connector,...e})}fetchNgwLayerFeatures(e){return m({connector:this.connector,...e})}fetchIdentifyItem(e,t){const s=u({identify:e,connector:this.connector,requestOptions:t});return this._addPromise("identify",s),s}fetchIdentifyGeoJson(e,s=!1){const r=y({identify:e,connector:this.connector,multiple:s});return r&&"then"in r?(this._addPromise("identify",r),r):t.resolve(r)}getIdentifyGeoJson(e,t=!1){return this.fetchIdentifyGeoJson(e,t)}async getNgwLayers(){return await this.onLoad(),this._ngwLayers}async getNgwLayerByResourceId(e){for(const t in this._ngwLayers){const s=this._ngwLayers[t];if(s.resourceId===e)return s&&s.layer;if(s.layer.getIdentificationIds){const t=await s.layer.getIdentificationIds();if(t&&t.some((t=>t===e)))return s.layer}if(s.layer.getDependLayers){const t=s.layer.getDependLayers().find((t=>t.item&&t.item.parentId===e));if(t)return t.layer}}}async fitLayer(e,t){let s;s="string"==typeof e||"number"==typeof e?String(s):e.id;const r=s&&this._ngwLayers[s];if(r)if(r.layer.getBounds){const e=await r.layer.getBounds();e&&this.fitBounds(e,t)}else{let e;if(r.layer.item)e=r.layer.item;else{const t=r.resourceId;e=await this.connector.getResource(t)}e&&p(e,this.connector).then((e=>{e&&this.fitBounds(e,t)}))}else super.fitLayer(e,t)}async zoomToLayer(e){return this.fitLayer(e)}onLoad(e="ngw-map:create"){return super.onLoad(e)}removeLayer(e){const t=this.getLayer(e);if(t){const e=this.getLayerId(t);e&&delete this._ngwLayers[e],super.removeLayer(t)}}enableSelection(){this.$$selectFromNgwRaster||(this.$$selectFromNgwRaster=e=>{this.emitter.listenerCount("ngw:select")&&this._selectFromNgwRaster(e)},this.$$selectFromNgwVector=e=>{this.emitter.listenerCount("ngw:select")&&this._selectFromNgwVector(e)},this.emitter.on("click",this.$$selectFromNgwRaster),this.emitter.on("layer:click",this.$$selectFromNgwVector))}disableSelection(){this.$$selectFromNgwRaster&&(this.emitter.removeListener("click",this.$$selectFromNgwRaster),this.emitter.removeListener("click",this._selectFromNgwVector),this.$$selectFromNgwRaster=void 0,this.$$selectFromNgwVector=void 0)}getNgwLayerItem(e){return this.fetchNgwLayerItem(e)}getNgwLayerItems(e){return this.fetchNgwLayerItems(e)}getNgwLayerFeature(e){return this.fetchNgwLayerFeature(e)}getNgwLayerFeatures(e){return this.fetchNgwLayerFeatures(e)}cancelPromise(...e){this.cancelPromises(...e)}cancelPromises(...e){e.length||(e=Object.keys(this._promises)),e.forEach((e=>{const t=this._promises[e];t&&(t.forEach((e=>e.cancel())),this._promises[e]=[])}))}_addPromise(e,t){const s=this._promises[e];if(s&&-1===s.indexOf(t)){const e=()=>{const e=s.indexOf(t);-1!==e&&s.splice(e,1)};t.then(e),t.catch(e),s.push(t)}}_isFitFromResource(){const e=this._initMapState;return!e.zoom||!e.center}async _createWebMap(){await this.create(),this.options.qmsId&&this._addQmsBaseLayer(),this.options.osm&&this._addOsmBaseLayer();const e=[],t=this._isFitFromResource();if(this.options.webmapId&&N(e,this.options.webmapId,{fit:t}),this.options.resources&&Array.isArray(this.options.resources))for(const r of this.options.resources){const s={};t||(s.fit=!1),N(e,r,{},s)}for(const r of e)try{await this.addNgwLayer(r)}catch(s){console.warn(s)}this._emitStatusEvent("ngw-map:create",this),this.enableSelection()}_addOsmBaseLayer(){this.addBaseLayer("OSM")}_addQmsBaseLayer(){let e,t;Array.isArray(this.options.qmsId)?(e=this.options.qmsId[0],t=this.options.qmsId[1]):e=Number(this.options.qmsId);const s={qmsId:e};t&&(s.id=t),this.addBaseLayer("QMS",s)}_selectFromNgwVector(e){const t=e.layer,s=t.item&&t.item.resource.id,r=e.feature;if(void 0!==s&&r){const e=r.id;if(e){const t={featureCount:1,[s]:{featureCount:1,features:[{id:Number(e),fields:r.properties||{},label:`#${s}`,layerId:Number(s),parent:"",geom:r.geometry}]}};return this._emitStatusEvent("ngw:select",this._prepareToIdentify({...t,resources:[s],sourceType:"vector"})),t}}}async _selectFromNgwRaster(e){this._emitStatusEvent("ngw:preselect");const t=[],s=Object.values(this._ngwLayers);s.sort(((e,t)=>e.layer.order&&t.layer.order?t.layer.order-e.layer.order:1)),s.forEach((e=>{const s=e.layer,r="function"==typeof s.getIdentificationIds&&s.getIdentificationIds;r&&s.options.selectable&&this.isLayerVisible(s)&&t.push(r.call(s))}));const r=Promise.all(t),o=await r,i=[];if(o.forEach((e=>{e&&e.forEach((e=>i.push(e)))})),!i.length)return void this._emitStatusEvent("ngw:select",null);const n=this.options.pixelRadius||10,a=this.getCenter();let c=this.getZoom();if(c=void 0!==c?c:20,!a||!c)return void this._emitStatusEvent("ngw:select",null);const h=function(e,t,s){return(s=null!=s?s:10)*(40075016.686*Math.abs(Math.cos(180*e[1]/Math.PI))/Math.pow(2,t+8))*5e-4}(a,c,n),d=f(e,{layers:i,connector:this.connector,radius:h}).then((t=>(this._emitStatusEvent("ngw:select",this._prepareToIdentify({...t,resources:i,sourceType:"raster",event:e})),t)));return this._addPromise("select",d),d}_prepareToIdentify(e){return{...e,getIdentifyItems:()=>w(e,!0).map((e=>L({feature:e.feature,connector:this.connector})))}}async _whiteLabel(){const e=this.getContainer();if(e){const t=await g(this.connector,this.options.companyLogoOptions);t&&e.appendChild(t)}}}async function O(e){return new F(e).onLoad()}F.getIcon=I;export{F as NgwMap,O as createNgwMap};
 //# sourceMappingURL=ngw-map.esm-bundler.prod.js.map

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.10.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.11.0; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -106,10 +106,14 @@ var NgwMap = (function (exports) {
         throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
     }
 
-    function __spreadArray(to, from) {
-        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-            to[j] = from[i];
-        return to;
+    function __spreadArray(to, from, pack) {
+        if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+            if (ar || !(i in from)) {
+                if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+                ar[i] = from[i];
+            }
+        }
+        return to.concat(ar || Array.prototype.slice.call(from));
     }
 
     function __asyncValues(o) {
@@ -1113,7 +1117,7 @@ var NgwMap = (function (exports) {
 
     /** @internal */
     function deprecatedWarn(message) {
-        console.warn("DEPRECATED WARN: " + message);
+        console.warn("DEPRECATED WARN: ".concat(message));
     }
 
     // based on https://github.com/bvaughn/debounce-decorator
@@ -1409,7 +1413,7 @@ var NgwMap = (function (exports) {
             return true;
         if (iLike && a.toUpperCase() === b.toUpperCase())
             return true;
-        var re = ("^" + reEscape(a) + "$").replace(/%/g, '.*').replace('_', '.');
+        var re = "^".concat(reEscape(a), "$").replace(/%/g, '.*').replace('_', '.');
         return new RegExp(re, iLike ? 'i' : '').exec(b) !== null;
     }
     var operationsAliases = {
@@ -2649,7 +2653,7 @@ var NgwMap = (function (exports) {
                             }
                             layerId = String(_adapter.id);
                             if (this._layers[layerId]) {
-                                throw Error("layer with id '" + layerId + "' already exist");
+                                throw Error("layer with id '".concat(layerId, "' already exist"));
                             }
                             if (!layerId) return [3 /*break*/, 8];
                             this._layers[layerId] = _adapter;
@@ -4050,12 +4054,16 @@ var NgwMap = (function (exports) {
             var _this = _super.call(this) || this;
             _this.name = 'NetworkError';
             Object.setPrototypeOf(_this, NetworkError.prototype);
-            _this.message = "Unable to request " + url + ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from " + location.origin; // /control-panel/cors
+            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
             return _this;
         }
         return NetworkError;
     }(Error));
 
+    function isObject(val) {
+        return Object.prototype.toString.call(val) === '[object Object]';
+    }
+
     var loadData;
     // @ts-ignore
     {
@@ -4091,7 +4099,7 @@ var NgwMap = (function (exports) {
                 }
             };
             xhr.onload = function () {
-                if ([401, 403, 404, 500].indexOf(xhr.status) !== -1) {
+                if ([401, 403, 404, 422, 500].indexOf(xhr.status) !== -1) {
                     error(new NgwError(getResponseText()));
                 }
                 processingResponse();
@@ -4146,7 +4154,7 @@ var NgwMap = (function (exports) {
                 data = new FormData();
                 data.append('file', options.file);
                 if (options.data) {
-                    for (var d in data) {
+                    for (var d in options.data) {
                         data.append(d, data[d]);
                     }
                 }
@@ -4238,10 +4246,6 @@ var NgwMap = (function (exports) {
         }
     }
 
-    function isObject(val) {
-        return Object.prototype.toString.call(val) === '[object Object]';
-    }
-
     var exclude = ['description'];
     /**
      * @remarks
@@ -4492,7 +4496,7 @@ var NgwMap = (function (exports) {
         ResourcesControl.prototype._fetchResourceById = function (id, requestOptions) {
             var _this = this;
             var promise = function () {
-                return _this.connector.get('resource.item', requestOptions, { id: id }).catch();
+                return _this.connector.get('resource.item', requestOptions, { id: id });
             };
             return this.cache
                 .add('resource.item', promise, {
@@ -4539,7 +4543,7 @@ var NgwMap = (function (exports) {
                 .then(function (apiItems) {
                 var apiItem = apiItems && apiItems[opt.name];
                 if (apiItem) {
-                    apiItem = __spreadArray([], apiItem);
+                    apiItem = __spreadArray([], apiItem, true);
                     var url = apiItem.shift();
                     if (apiItem.length) {
                         var replaceParams = {};
@@ -4561,12 +4565,12 @@ var NgwMap = (function (exports) {
                         if (Array.isArray(paramList)) {
                             delete params.paramList;
                             paramList.forEach(function (x) {
-                                paramArray_1.push(x[0] + "=" + x[1]);
+                                paramArray_1.push("".concat(x[0], "=").concat(x[1]));
                             });
                         }
                         for (var p in params) {
                             if (apiItem.indexOf(p) === -1) {
-                                paramArray_1.push(p + "=" + params[p]);
+                                paramArray_1.push("".concat(p, "=").concat(params[p]));
                             }
                         }
                         if (paramArray_1.length) {
@@ -4700,7 +4704,7 @@ var NgwMap = (function (exports) {
                 headers: this.getAuthorizationHeaders(credentials),
                 // withCredentials: true
             };
-            // Do not use request('auth.current_user') to avoid circular-references
+            // Do not use apiRequest('auth.current_user') to avoid circular-references
             return this.makeQuery('/api/component/auth/current_user', {}, options)
                 .then(function (data) {
                 _this.user = data;
@@ -4727,7 +4731,7 @@ var NgwMap = (function (exports) {
             credentials = credentials || this.options.auth;
             if (credentials) {
                 var login = credentials.login, password = credentials.password;
-                var str = unescape(encodeURIComponent(login + ":" + password));
+                var str = unescape(encodeURIComponent("".concat(login, ":").concat(password)));
                 // @ts-ignore
                 {
                     return window.btoa(str);
@@ -5012,7 +5016,7 @@ var NgwMap = (function (exports) {
                         if (value) {
                             var propElem = document.createElement('div');
                             element_1.appendChild(propElem);
-                            propElem.innerHTML = "<span>" + x.display_name + "</span>: " + value + "<span></span>";
+                            propElem.innerHTML = "<span>".concat(x.display_name, "</span>: ").concat(value, "<span></span>");
                         }
                     }
                 });
@@ -5021,7 +5025,7 @@ var NgwMap = (function (exports) {
                 for (var p in feature.properties) {
                     var propElem = document.createElement('div');
                     element_1.appendChild(propElem);
-                    propElem.innerHTML = "<span>" + p + "</span>: " + feature.properties[p] + "<span></span>";
+                    propElem.innerHTML = "<span>".concat(p, "</span>: ").concat(feature.properties[p], "<span></span>");
                 }
             }
             return element_1;
@@ -5204,15 +5208,15 @@ var NgwMap = (function (exports) {
                 return b;
             });
             var v = vStart + value + vEnd;
-            return ["" + isFldStr + field_ + "__" + operation, v];
+            return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
         };
         if (logic === 'any') {
             filters_.forEach(function (f) {
                 if (isPropertyFilter(f)) {
-                    _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)]) })));
+                    _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)], false) })));
                 }
                 else {
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams));
+                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
                 }
             });
         }
@@ -5231,11 +5235,11 @@ var NgwMap = (function (exports) {
             if (propertiesFilterList.length) {
                 for (var _a = 0, propertiesFilterList_1 = propertiesFilterList; _a < propertiesFilterList_1.length; _a++) {
                     var x = propertiesFilterList_1[_a];
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_2));
+                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true));
                 }
             }
             else {
-                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_2) })));
+                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true) })));
             }
         }
         return CancelablePromise.all(_queries).then(function (itemsParts) {
@@ -5254,7 +5258,7 @@ var NgwMap = (function (exports) {
             var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
             return x + ' ' + y;
         });
-        return "POLYGON((" + polygon.join(', ') + "))";
+        return "POLYGON((".concat(polygon.join(', '), "))");
     }
     function fetchNgwLayerItemsRequest(options) {
         var params = __assign({}, FEATURE_REQUEST_PARAMS);
@@ -5309,7 +5313,7 @@ var NgwMap = (function (exports) {
                             dt_1.push(x);
                         });
                     }
-                    fields[f] = new (Date.bind.apply(Date, __spreadArray([void 0], dt_1)))().toISOString();
+                    fields[f] = new (Date.bind.apply(Date, __spreadArray([void 0], dt_1, false)))().toISOString();
                 }
             }
         };
@@ -5714,7 +5718,7 @@ var NgwMap = (function (exports) {
                 }
             }
             if (adapter === 'WMS') {
-                url = baseUrl + "/api/resource/" + resourceId + "/wms";
+                url = "".concat(baseUrl, "/api/resource/").concat(resourceId, "/wms");
                 var adapterOptions = options.adapterOptions;
                 return {
                     url: url,
@@ -5738,12 +5742,12 @@ var NgwMap = (function (exports) {
                 };
             }
             if (adapter === 'TERRAIN') {
-                url = baseUrl + ("/api/resource/" + resourceId + "/terrain_provider");
+                url = baseUrl + "/api/resource/".concat(resourceId, "/terrain_provider");
                 // `/api/resource/${resourceId}/terrain_provider/{z}/{x}/{y}.terrain`;
                 return { url: url, adapter: adapter };
             }
             if (adapter === 'MODEL_3D') {
-                url = baseUrl + ("/api/component/model_3d/" + resourceId + "/data.glb");
+                url = baseUrl + "/api/component/model_3d/".concat(resourceId, "/data.glb");
                 return { url: url };
             }
             if (adapter === 'TILE') {
@@ -6029,7 +6033,7 @@ var NgwMap = (function (exports) {
             });
         };
         TreeHelper.prototype.getChildren = function () {
-            return __spreadArray([], this._children);
+            return __spreadArray([], this._children, true);
         };
         return TreeHelper;
     }());
@@ -6551,7 +6555,7 @@ var NgwMap = (function (exports) {
             return options;
         };
         NgwWebmapItem.prototype.getChildren = function (item) {
-            return __spreadArray([], item.children).reverse();
+            return __spreadArray([], item.children, true).reverse();
         };
         NgwWebmapItem.prototype._mapScaleToZoomLevel = function (scale) {
             return setScaleRatio(scale);
@@ -6871,16 +6875,25 @@ var NgwMap = (function (exports) {
             }
         }
         NgwWebmapLayerAdapter.prototype.addLayer = function (options) {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var _c, extentConstrained;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             this.options = __assign(__assign({}, this.options), options);
-                            _a = this;
+                            _c = this;
                             return [4 /*yield*/, this._getWebMapLayerItem()];
                         case 1:
-                            _a.layer = _b.sent();
+                            _c.layer = _d.sent();
+                            extentConstrained = (_b = (_a = this.response) === null || _a === void 0 ? void 0 : _a.webmap) === null || _b === void 0 ? void 0 : _b.extent_constrained;
+                            if (this.options.useExtentConstrained &&
+                                this._extent &&
+                                extentConstrained) {
+                                this.options.webMap.setView({ maxBounds: this._extent });
+                                // @ts-ignore
+                                window.webmap = this.options.webMap;
+                            }
                             return [2 /*return*/, this.layer];
                     }
                 });
@@ -6903,6 +6916,9 @@ var NgwMap = (function (exports) {
                     this.options.webMap.showLayer(this._lastActiveBaselayer);
                 }
             }
+            if (this.options.useExtentConstrained && this._extent) {
+                this.options.webMap.setView({ maxBounds: null });
+            }
             delete this.layer;
             delete this.response;
             delete this._webmapLayersIds;
@@ -7585,7 +7601,7 @@ var NgwMap = (function (exports) {
                             }
                         }
                         else {
-                            throw "Resource class '" + cls + "' not yet supported.";
+                            throw "Resource class '".concat(cls, "' not yet supported.");
                         }
                         _a.label = 13;
                     case 13: return [3 /*break*/, 15];
@@ -7946,7 +7962,7 @@ var NgwMap = (function (exports) {
             var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
             polygon.push(x + ' ' + y);
         });
-        var wkt = "POLYGON((" + polygon.join(', ') + "))";
+        var wkt = "POLYGON((".concat(polygon.join(', '), "))");
         var layers = options.layers;
         var data = {
             geom: wkt,
@@ -8036,7 +8052,7 @@ var NgwMap = (function (exports) {
     function insertSvg(width, height, stroke, content) {
         if (stroke === void 0) { stroke = 0; }
         var s = stroke / 2;
-        var svg = "<svg\n    version=\"1.1\"\n    xmlns=\"http://www.w3.org/2000/svg\"\n    width=\"" + width + "\"\n    height=\"" + height + "\"\n    viewBox=\"-" + s + " -" + s + " " + (width + stroke) + " " + (height + stroke) + "\"\n  >" + content + "</svg>";
+        var svg = "<svg\n    version=\"1.1\"\n    xmlns=\"http://www.w3.org/2000/svg\"\n    width=\"".concat(width, "\"\n    height=\"").concat(height, "\"\n    viewBox=\"-").concat(s, " -").concat(s, " ").concat(width + stroke, " ").concat(height + stroke, "\"\n  >").concat(content, "</svg>");
         var oParser = new DOMParser();
         var oDOM = oParser.parseFromString(svg, 'image/svg+xml');
         return oDOM.documentElement;
@@ -8056,7 +8072,7 @@ var NgwMap = (function (exports) {
         var path = typeof pathAlias === 'string' ? pathAlias : pathAlias(opt);
         var svg = insertSvg(size, size, stroke * scale, path);
         var fistChild = svg.firstChild;
-        var transform = "scale(" + scale + ")";
+        var transform = "scale(".concat(scale, ")");
         fistChild.setAttribute('fill', color);
         if (stroke) {
             fistChild.setAttribute('stroke', strokeColor);
@@ -8277,7 +8293,7 @@ var NgwMap = (function (exports) {
                             resId = isObject$1(resource) && 'id' in resource
                                 ? resource.id
                                 : keyname || resourceId || resource;
-                            console.error("Can't add NGW layer " + resId + ".", er_1);
+                            console.error("Can't add NGW layer ".concat(resId, "."), er_1);
                             return [3 /*break*/, 5];
                         case 5: return [2 /*return*/];
                     }
@@ -8671,7 +8687,7 @@ var NgwMap = (function (exports) {
                     var identifyFeature = {
                         id: Number(featureId),
                         fields: feature.properties || {},
-                        label: "#" + id,
+                        label: "#".concat(id),
                         layerId: Number(id),
                         parent: '',
                         geom: feature.geometry,