arcgis-map-ipywidget - npm Package Compare versions

Comparing version 1.5.0-beta.23 to 1.5.0-beta.24

dist/extension.js

@@ -1,2 +0,2 @@
-define(function(){return function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=0)}([function(e,r,t){var n=t(1),o=t(4)(n);t.p=document.querySelector("body").getAttribute("data-base-url")+"nbextensions/arcgis-map-ipywidget";window.require&&function(e){return new Promise((r,t)=>{fetch(e,{mode:"cors"}).then(n=>{n.status>=200&&n.status<300?n.text().then(e=>{r(e)}).catch(e=>{t(e)}):t("HTTP request on "+e+" returned code "+status)})})}(n.CdnUrl).then(e=>{o.setRequireJSConfig(n.BaseRequireJSConfig),console.log("Initializing esriLoader for quicker load times..."),o.loadModules(["esri/Map","esri/views/MapView","esri/views/SceneView","esri/layers/Layer"],n.EsriLoaderOptions).then(([e,r,t,n])=>{console.log("esriLoader initialization completed successfully!")}).catch(e=>{console.log("esriLoader initialization ran into an error:"),console.log(e)})}).catch(e=>{console.log("Cannot reach "+n.CdnUrl+": Not pre-loading, waiting for user to specify the proper CDN path")}),e.exports={load_ipython_extension:function(){}}},function(e,r,t){var n=t(2),o=t(3);n.JupyterTarget="notebook",n.BaseRequireJSConfig={map:{"*":{"arcgis-map-ipywidget":"/nbextensions/arcgis/arcgis-map-ipywidget.js","legacy-mapview":"/nbextensions/arcgis/legacy-mapview.js"}},config:{geotext:{useXhr:function(e){return!0},openXhr:!1,onXhr:function(e,r){var t="undefined"!=typeof XMLHttpRequest&&"withCredentials"in new XMLHttpRequest;e.open("GET",t?r:proxyUrl+"?"+r,!0)}}}},o(n,n.CdnUrl),e.exports=n},function(e,r){var t="//js.arcgis.com/4.8/",n={CdnUrl:t,CdnMainCssUrl:"https://js.arcgis.com/4.8/esri/css/main.css",EsriLoaderOptions:{url:t},minJSAPIVersion:"4.8"};e.exports=n},function(e,r){e.exports=function(e,r){if(e.CdnUrl=r,e.EsriLoaderOptions.url=e.CdnUrl,"notebook"===e.JupyterTarget)e.BaseRequireJSConfig.packages=[{name:"esri",location:e.CdnUrl+"esri"},{name:"dojo",location:e.CdnUrl+"dojo"},{name:"dojox",location:e.CdnUrl+"dojox"},{name:"dijit",location:e.CdnUrl+"dijit"},{name:"dstore",location:e.CdnUrl+"dstore"},{name:"moment",location:e.CdnUrl+"moment"},{name:"@dojo",location:e.CdnUrl+"@dojo"},{name:"cldrjs",location:e.CdnUrl+"cldrjs",main:"dist/cldr"},{name:"globalize",location:e.CdnUrl+"globalize",main:"dist/globalize"},{name:"maquette",location:e.CdnUrl+"maquette",main:"dist/maquette.umd"},{name:"maquette-css-transitions",location:e.CdnUrl+"maquette-css-transitions",main:"dist/maquette-css-transitions.umd"},{name:"maquette-jsx",location:e.CdnUrl+"maquette-jsx",main:"dist/maquette-jsx.umd"},{name:"tslib",location:e.CdnUrl+"tslib",main:"tslib"}],window.require&&(window.customRequire=window.require.config(e.BaseRequireJSConfig));else if("lab"===e.JupyterTarget){var t=document.querySelector("script[data-esri-loader]");null!=t&&t.parentNode.removeChild(t)}}},function(e,r,t){var n=t(5),o=t(6);e.exports=function(e){if(e.JupyterTarget){if("lab"===e.JupyterTarget)return n;if("notebook"===e.JupyterTarget)return o;throw"Misconfigured config file! Failing"}throw"config does not specify 'JupyterTarget'! Failing"}},function(e,r,t){!function(e){"use strict";function r(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}var t,n="https://js.arcgis.com/4.8/";function o(e,r,t){var n;t&&(n=function(e,r){var t=function(n){r(n.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",t,!1)};return e.addEventListener("error",t,!1),t}(e,t));var o=function(){r(e),e.removeEventListener("load",o,!1),n&&e.removeEventListener("error",n,!1)};e.addEventListener("load",o,!1)}var i={Promise:"undefined"!=typeof window?window.Promise:void 0};function a(){return document.querySelector("script[data-esri-loader]")}function u(){var e=window.require;return e&&e.on}function s(e){return void 0===e&&(e={}),e.url||(e.url=n),new i.Promise(function(n,i){var s=a();if(s){var d=s.getAttribute("src");d!==e.url?i(new Error("The ArcGIS API for JavaScript is already loaded ("+d+").")):u()?n(s):o(s,n,i)}else u()?i(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&r(e.css),e.dojoConfig&&(window.dojoConfig=e.dojoConfig),s=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),t=e.url,o(s,function(){s.setAttribute("data-esri-loader","loaded"),n(s)},i),document.body.appendChild(s))})}function d(e){return new i.Promise(function(r,t){var n=window.require.on("error",t);window.require(e,function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.remove(),r(e)})})}function c(e,r){return void 0===r&&(r={}),u()?d(e):(!r.url&&t&&(r.url=t),s(r).then(function(){return d(e)}))}var l={getScript:a,isLoaded:u,loadModules:c,loadScript:s,loadCss:r,utils:i};e.utils=i,e.getScript=a,e.isLoaded=u,e.loadScript=s,e.loadModules=c,e.default=l,e.loadCss=r,Object.defineProperty(e,"__esModule",{value:!0})}(r)},function(e,r,t){"use strict";r.__esModule=!0;function n(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}r.loadCss=n;var o="undefined"!=typeof window,i="https://js.arcgis.com/4.7/";function a(e,r,t){var n;t&&(n=function(e,r){var t=function(n){r(n.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",t,!1)};return e.addEventListener("error",t,!1),t}(e,t));var o=function(){r(e),e.removeEventListener("load",o,!1),n&&e.removeEventListener("error",n,!1)};e.addEventListener("load",o,!1)}function u(){return document.querySelector("script[data-esri-loader]")}function s(){return window.require&&window.requirejs}function d(e){return void 0===e&&(e={}),e.url||(e.url=i),new r.utils.Promise(function(r,t){var o=u();if(o){var i=o.getAttribute("src");i!==e.url?t(new Error("The ArcGIS API for JavaScript is already loaded ("+i+").")):s()?r(o):a(o,r,t)}else s()?t(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&n(e.css),e.requirejsConfig&&window.require.config(e.requirejsConfig),o=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),e.url,a(o,function(){o.setAttribute("data-esri-loader","loaded"),r(o)},t),document.body.appendChild(o))})}function c(e,t){return void 0===t&&(t={}),function(e){return new r.utils.Promise(function(r,t){null==window.activeRequireFunction?t("esriLoader.setRequireJSConfig() has not been called: You MUST call this function before using esriLoader"):window.activeRequireFunction(["require"],function(n){n(e,function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];r(e)},t)})})}(e)}function l(e){console.log("Setting requirejs-esri-loader's config:"),console.log(e),window.activeRequireFunction=window.require.config(e)}r.utils={Promise:o?window.Promise:void 0},r.getScript=u,r.isLoaded=s,r.loadScript=d,r.loadModules=c,r.setRequireJSConfig=l,r.default={setRequireJSConfig:l,getScript:u,isLoaded:s,loadModules:c,loadScript:d,loadCss:n,utils:r.utils}}])});
+define(function(){return function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=0)}([function(e,r,t){var n=t(1),o=t(4)(n);t.p=document.querySelector("body").getAttribute("data-base-url")+"nbextensions/arcgis-map-ipywidget";window.require&&function(e){return new Promise((r,t)=>{fetch(e,{mode:"cors"}).then(n=>{n.status>=200&&n.status<300?n.text().then(e=>{r(e)}).catch(e=>{t(e)}):t("HTTP request on "+e+" returned code "+status)})})}(n.CdnUrl).then(e=>{o.setRequireJSConfig(n.BaseRequireJSConfig),console.log("Initializing esriLoader for quicker load times..."),o.loadModules(["esri/Map","esri/views/MapView","esri/views/SceneView","esri/layers/Layer"],n.EsriLoaderOptions).then(([e,r,t,n])=>{console.log("esriLoader initialization completed successfully!")}).catch(e=>{console.log("esriLoader initialization ran into an error:"),console.log(e)})}).catch(e=>{console.log("Cannot reach "+n.CdnUrl+": Not pre-loading, waiting for user to specify the proper CDN path")}),e.exports={load_ipython_extension:function(){}}},function(e,r,t){var n=t(2),o=t(3);n.JupyterTarget="notebook",n.BaseRequireJSConfig={map:{"*":{"arcgis-map-ipywidget":"/nbextensions/arcgis/arcgis-map-ipywidget.js","legacy-mapview":"/nbextensions/arcgis/legacy-mapview.js"}},config:{has:{"esri-featurelayer-webgl":1},geotext:{useXhr:function(e){return!0},openXhr:!1,onXhr:function(e,r){var t="undefined"!=typeof XMLHttpRequest&&"withCredentials"in new XMLHttpRequest;e.open("GET",t?r:proxyUrl+"?"+r,!0)}}}},o(n,n.CdnUrl),e.exports=n},function(e,r){var t="//js.arcgis.com/4.8/",n={CdnUrl:t,CdnMainCssUrl:"https://js.arcgis.com/4.8/esri/css/main.css",EsriLoaderOptions:{url:t,dojoConfig:{has:{"esri-featurelayer-webgl":1}}},minJSAPIVersion:"4.8"};e.exports=n},function(e,r){e.exports=function(e,r){if(e.CdnUrl=r,e.EsriLoaderOptions.url=e.CdnUrl,"notebook"===e.JupyterTarget)e.BaseRequireJSConfig.packages=[{name:"esri",location:e.CdnUrl+"esri"},{name:"dojo",location:e.CdnUrl+"dojo"},{name:"dojox",location:e.CdnUrl+"dojox"},{name:"dijit",location:e.CdnUrl+"dijit"},{name:"dstore",location:e.CdnUrl+"dstore"},{name:"moment",location:e.CdnUrl+"moment"},{name:"@dojo",location:e.CdnUrl+"@dojo"},{name:"cldrjs",location:e.CdnUrl+"cldrjs",main:"dist/cldr"},{name:"globalize",location:e.CdnUrl+"globalize",main:"dist/globalize"},{name:"maquette",location:e.CdnUrl+"maquette",main:"dist/maquette.umd"},{name:"maquette-css-transitions",location:e.CdnUrl+"maquette-css-transitions",main:"dist/maquette-css-transitions.umd"},{name:"maquette-jsx",location:e.CdnUrl+"maquette-jsx",main:"dist/maquette-jsx.umd"},{name:"tslib",location:e.CdnUrl+"tslib",main:"tslib"}],window.require&&(window.customRequire=window.require.config(e.BaseRequireJSConfig));else if("lab"===e.JupyterTarget){var t=document.querySelector("script[data-esri-loader]");null!=t&&t.parentNode.removeChild(t)}}},function(e,r,t){var n=t(5),o=t(6);e.exports=function(e){if(e.JupyterTarget){if("lab"===e.JupyterTarget)return n;if("notebook"===e.JupyterTarget)return o;throw"Misconfigured config file! Failing"}throw"config does not specify 'JupyterTarget'! Failing"}},function(e,r,t){!function(e){"use strict";function r(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}var t,n="https://js.arcgis.com/4.8/";function o(e,r,t){var n;t&&(n=function(e,r){var t=function(n){r(n.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",t,!1)};return e.addEventListener("error",t,!1),t}(e,t));var o=function(){r(e),e.removeEventListener("load",o,!1),n&&e.removeEventListener("error",n,!1)};e.addEventListener("load",o,!1)}var i={Promise:"undefined"!=typeof window?window.Promise:void 0};function a(){return document.querySelector("script[data-esri-loader]")}function u(){var e=window.require;return e&&e.on}function s(e){return void 0===e&&(e={}),e.url||(e.url=n),new i.Promise(function(n,i){var s=a();if(s){var d=s.getAttribute("src");d!==e.url?i(new Error("The ArcGIS API for JavaScript is already loaded ("+d+").")):u()?n(s):o(s,n,i)}else u()?i(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&r(e.css),e.dojoConfig&&(window.dojoConfig=e.dojoConfig),s=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),t=e.url,o(s,function(){s.setAttribute("data-esri-loader","loaded"),n(s)},i),document.body.appendChild(s))})}function d(e){return new i.Promise(function(r,t){var n=window.require.on("error",t);window.require(e,function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.remove(),r(e)})})}function l(e,r){return void 0===r&&(r={}),u()?d(e):(!r.url&&t&&(r.url=t),s(r).then(function(){return d(e)}))}var c={getScript:a,isLoaded:u,loadModules:l,loadScript:s,loadCss:r,utils:i};e.utils=i,e.getScript=a,e.isLoaded=u,e.loadScript=s,e.loadModules=l,e.default=c,e.loadCss=r,Object.defineProperty(e,"__esModule",{value:!0})}(r)},function(e,r,t){"use strict";r.__esModule=!0;function n(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}r.loadCss=n;var o="undefined"!=typeof window,i="https://js.arcgis.com/4.7/";function a(e,r,t){var n;t&&(n=function(e,r){var t=function(n){r(n.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",t,!1)};return e.addEventListener("error",t,!1),t}(e,t));var o=function(){r(e),e.removeEventListener("load",o,!1),n&&e.removeEventListener("error",n,!1)};e.addEventListener("load",o,!1)}function u(){return document.querySelector("script[data-esri-loader]")}function s(){return window.require&&window.requirejs}function d(e){return void 0===e&&(e={}),e.url||(e.url=i),new r.utils.Promise(function(r,t){var o=u();if(o){var i=o.getAttribute("src");i!==e.url?t(new Error("The ArcGIS API for JavaScript is already loaded ("+i+").")):s()?r(o):a(o,r,t)}else s()?t(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&n(e.css),e.requirejsConfig&&window.require.config(e.requirejsConfig),o=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),e.url,a(o,function(){o.setAttribute("data-esri-loader","loaded"),r(o)},t),document.body.appendChild(o))})}function l(e,t){return void 0===t&&(t={}),function(e){return new r.utils.Promise(function(r,t){null==window.activeRequireFunction?t("esriLoader.setRequireJSConfig() has not been called: You MUST call this function before using esriLoader"):window.activeRequireFunction(["require"],function(n){n(e,function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];r(e)},t)})})}(e)}function c(e){console.log("Setting requirejs-esri-loader's config:"),console.log(e),window.activeRequireFunction=window.require.config(e)}r.utils={Promise:o?window.Promise:void 0},r.getScript=u,r.isLoaded=s,r.loadScript=d,r.loadModules=l,r.setRequireJSConfig=c,r.default={setRequireJSConfig:c,getScript:u,isLoaded:s,loadModules:l,loadScript:d,loadCss:n,utils:r.utils}}])});
 //# sourceMappingURL=extension.js.map

dist/legacy-mapview.js

@@ -1,2 +0,2 @@
-define(["@jupyter-widgets/base"],function(e){return function(e){var r={};function n(t){if(r[t])return r[t].exports;var a=r[t]={i:t,l:!1,exports:{}};return e[t].call(a.exports,a,a.exports,n),a.l=!0,a.exports}return n.m=e,n.c=r,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,r){if(1&r&&(e=n(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(n.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var a in e)n.d(t,a,function(r){return e[r]}.bind(null,a));return t},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},n.p="",n(n.s=0)}([function(e,r,n){var t,a=n(1),i=n(2),o=n(3),s=n(4);if(console.log("Loading arcgis-map-ipywidget..."),!s.JupyterTarget)throw"config does not specify 'JupyterTarget'! Failing";if("lab"===s.JupyterTarget)console.log("Using the default esri-loader..."),t=o;else{if("notebook"!==s.JupyterTarget)throw"Misconfigured config file! Failing";console.log("Using the custom RequireJS esri-loader..."),t=i}console.log("Config loaded:"),console.log(s);var l=s.EsriLoaderOptions,d=a.DOMWidgetView.extend({render:function(){console.log("starting to render.."),t.loadModules(["esri/config"],l).then(([e])=>{console.log(e)}).catch(e=>{console.log("Caught an error!"),console.log(e)})},not_used:function(){$("body").addClass("claro");var e=this,r=this.model.get("_token_info");if(r&&""!=r.trim()){var n=JSON.parse(r);esriConfig.defaults.io.corsEnabledServers.push(n.server);var t=new ServerInfo;t.server=n.server,t.tokenServiceUrl=n.tokenurl,IdentityManager.registerServers([t]);var a=n.username,i=n.password;IdentityManager.generateToken(t,{username:a,password:i}).then(function(e){IdentityManager.registerToken({server:t.server,userId:a,token:e.token,expires:e.expires,ssl:e.ssl})}).then(function(r){o(e)})}else o(e);function o(e){IPython.keyboard_manager.disable();var r=e.model.get("_gallerybasemaps");if(r.length>0)for(var n=e.model.get("_gbasemaps_def"),t=0;t<r.length;t++)esriBasemaps[r[t]]={baseMapLayers:n[t],title:r[t]};var a=e.model.get("id");if(a&&""!=a.trim()){var i=e.model.get("_arcgis_url");i&&""!=i.trim()&&(arcgisUtils.arcgisUrl=i),arcgisUtils.createMap(a,e.el).then(function(r){IPython.keyboard_manager.enable(),e.map=r.map,e.map.disableKeyboardNavigation(),e.toolbar=new Draw(e.map),e.toolbar.on("draw-end",d),e.map.on("click",c),e.mode_changed(),e.basemap_changed(),e.layer_changed(),e.start_time_changed(),e.end_time_changed()})}else{if(e.model.get("_extent").indexOf("{")>-1){var o=JSON.parse(e.model.get("_extent")),l=new Extent;l.xmin=o.xmin,l.xmax=o.xmax,l.ymin=o.ymin,l.ymax=o.ymax,l.spatialReference=new SpatialReference({wkid:4326}),e.map=new Map(e.el,{basemap:e.model.get("_basemap"),extent:l})}else e.map=new Map(e.el,{basemap:e.model.get("_basemap"),center:e.model.get("center").reverse(),zoom:e.model.get("zoom")});e.map.on("load",s)}}function s(r){console.log("***on_load"),IPython.keyboard_manager.enable(),r.map.disableKeyboardNavigation(),r.map.disableMapNavigation(),r.map.on("mouse-drag-start",function(){r.map.enableMapNavigation()}),r.map.on("mouse-out",function(){r.map.disableMapNavigation()}),e.toolbar=new Draw(r.map),e.toolbar.on("draw-end",d),r.map.on("extent-change",l),r.map.on("click",c),e.mode_changed(),e.basemap_changed(),e.layer_changed(),e.start_time_changed(),e.end_time_changed()}function l(r){var n=r.extent,t=r.levelChange;e.extent_change(n,t)}function d(r){var n=r.geometry,t=e.map.graphics.add(new Graphic(n,new SimpleFillSymbol));e.toolbar.deactivate(),e.draw_end(n);var a={geometry:n,symbol:t.symbol},i=e.model.get("_js_interactive_drawn_graphic");_current_js_dg_list2=""==i?[]:JSON.parse(i),_current_js_dg_list2.push(a),e.model.set("_js_interactive_drawn_graphic",JSON.stringify(_current_js_dg_list2)),e.touch()}function c(r){e.map.enableMapNavigation(),e.mouse_clicked(r.mapPoint)}this.model.on("change:zoom",this.zoom_changed,this),this.model.on("change:mode",this.mode_changed,this),this.model.on("change:_extent",this.extent_changed,this),this.model.on("change:center",this.center_changed,this),this.model.on("change:_basemap",this.basemap_changed,this),this.model.on("change:_gallerybasemaps",this.gallerybasemaps_changed,this),this.model.on("change:_addlayer",this.layer_changed,this),this.model.on("change:start_time",this.start_time_changed,this),this.model.on("change:end_time",this.end_time_changed,this),this.model.on("change:_layerId_to_remove",this.remove_layer,this)},zoom_changed:function(){this.map.setZoom(this.model.get("zoom"))},mode_changed:function(){if("navigate"==this.model.get("mode"))console.log("***mode = navigate"),this.toolbar.deactivate();else if("###clear_graphics"==this.model.get("mode"))this.map.graphics.clear(),this.model.set("_js_interactive_drawn_graphic","");else if("###remove_layers"==this.model.get("mode"))this.map.removeAllLayers();else if(this.model.get("mode").indexOf("{")>-1){console.log("***mode=draw_geometry***");var e=JSON.parse(this.model.get("mode")),r=new Graphic(e);if(null==r.symbol)if("polyline"===r.geometry.type)console.log("GEOM TYPE POLYLINE"),r.symbol=new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID,new dojo.Color([255,0,0,.5]),3);else if("polygon"===r.geometry.type){console.log("GEOM TYPE POLYGON***");var n=new SimpleFillSymbol;n.setOutline(new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID,new dojo.Color([0,0,0,.5]),1)),n.setColor(new Color([255,127,0,.7])),r.symbol=n}else"point"===r.geometry.type?(console.log("GEOM TYPE POINT"),r.symbol=new PictureMarkerSymbol(nbextensionPath+"/icons/pink.png",32,32)):"multipoint"===r.geometry.type&&(console.log("GEOM TYPE MULTIPOINT"),r.symbol=new PictureMarkerSymbol(nbextensionPath+"/icons/pink.png",32,32));this.map.graphics.add(r)}else{var t=this.model.get("mode");console.log("***mode=draw_"+t),this.toolbar.activate(t)}},createTemplate:function(e){var r=array.map(e.fields,function(e){return{fieldName:e.name,label:e.alias,visible:!0}});return new PopupTemplate({title:e.name,fieldInfos:r})},layer_changed:function(){var e=this.map.getBasemap();if(this.model.get("_gallerybasemaps").indexOf(e)>=0&&(e="topo"),this.model.get("_addlayer").indexOf("{")>-1){console.log("***###***addlayer");var r=JSON.parse(this.model.get("_addlayer"));if("https:"===window.location.protocol&&r.url.startsWith("http:")&&(r.url=r.url.replace("http://","https://")),console.log(r),"KMLLayer"==r.type){console.log("KMLLayer "+r.url);var n=new KMLLayer(r.url);this.map.addLayer(n),n.on("load",function(){domStyle.set("loading","display","none")})}else if("ArcGISTiledMapServiceLayer"==r.type){var t=new ArcGISTiledMapServiceLayer(r.url);this.map.addLayer(t)}else if("ArcGISDynamicMapServiceLayer"==r.type){var a=new ArcGISDynamicMapServiceLayer(r.url);this.map.addLayer(a)}else if("VectorTileLayer"==r.type){var i=new VectorTileLayer(r.url);this.map.addLayer(i)}else if("FeatureLayer"==r.type||"Feature Layer"==r.type){console.log("Adding FeatureLayer "+r.url);var o=new FeatureLayer(r.url,{outFields:["*"]});if(null!=r.options){if(null!=(w=JSON.parse(r.options)).opacity&&(console.log("***opacity:"+w.opacity),o.setOpacity(w.opacity)),null!=w.definition_expression&&(console.log("***DEF EXP"),console.log(w.definition_expression),o.setDefinitionExpression(w.definition_expression)),"HeatmapRenderer"==w.renderer){var s=new HeatmapRenderer;o.setRenderer(s)}if(console.log("ClassedSizeRend0:"+w.renderer),console.log("ClassedSizeRend:"+w.field_name),"HeatmapRenderer"==w.renderer){s=new HeatmapRenderer;var l={};null!=w.field_name&&(l={field:w.field_name});s=new HeatmapRenderer(l);o.setRenderer(s)}else if("ClassedSizeRenderer"==w.renderer)console.log("ClassedSizeRenderer..."),setTimeout(function(){m(w)},500);else if("ClassedColorRenderer"==w.renderer)setTimeout(function(){c(w)},500);else{var d=jsonUtils.fromJson(w.renderer);o.setRenderer(d)}function c(r){var n={layer:o,field:r.field_name,basemap:e,classificationMethod:"quantile"},t=Object.assign(n,r);console.log(t),smartMapping.createClassedColorRenderer(t).then(function(e){o.setRenderer(e.renderer),o.redraw(),console.log(e.renderer)})}function m(r){console.log("ClassedSizeRend2");var n={layer:o,field:r.field_name,basemap:e,classificationMethod:"quantile"},t=Object.assign(n,r);console.log(t),smartMapping.createClassedSizeRenderer(t).then(function(e){o.setRenderer(e.renderer),o.redraw()})}}if(null!=r.opacity&&o.setOpacity(r.opacity),null!=r.definition_expression&&(console.log("***DEF EXP"),console.log(r.definition_expression),o.setDefinitionExpression(r.definition_expression)),"HeatmapRenderer"==r.renderer){s=new HeatmapRenderer;o.setRenderer(s)}bRend=!1,bSRend=!1,this.map.addLayer(o),"ClassedColorRenderer"==r.renderer&&(bRend=!0),"ClassedSizeRenderer"==r.renderer&&(bSRend=!0),o.on("load",lang.hitch(this,function(){var e={id:o.id,normalization:o.normalization,refreshInterval:o.refreshInterval,url:o.url};o.renderer&&(e.renderer=o.renderer.toJson(),e.rendererType=o.renderer.declaredClass);var r=this.model.get("_js_layer_list");if(""==r)var n=[];else n=JSON.parse(r);n.push(e),this.model.set("_js_layer_list",JSON.stringify(n)),this.touch()})),o.on("renderer-change",lang.hitch(this,function(){if(void 0!==w)if("renderer"in w){if("ClassedColorRenderer"==w.renderer||"ClassedSizeRenderer"==w.renderer){var e=this.model.get("_js_layer_list");if(""!=e){console.log("Update renderer of latest layer");var r=JSON.parse(e);r[r.length-1].renderer=o.renderer.toJson(),r[r.length-1].rendererType=o.renderer.declaredClass,this.model.set("_js_layer_list",JSON.stringify(r)),this.touch(),console.log("CCR, CSR renderer updated")}}}else console.log("Fired due to some other event");else console.log("Not sure which fired renderer-change")})),o.on("load",lang.hitch(this,function(){o.setInfoTemplate(this.createTemplate(o)),bRend&&function(r){smartMapping.createClassedColorRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}(r.field_name),bSRend&&function(r){console.log("ClassedSizeRend2"),smartMapping.createClassedSizeRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}(r.field_name)}))}else if("ImageryLayer"==r.type){console.log("ArcGISImageServiceLayer "+r.url);var u={},g=!1,p=-1;if(null!=r.options){var f=JSON.parse(r.options);if(f.opacity&&(p=f.opacity),f.swipelayer&&(g=f.swipelayer),f.imageServiceParameters){var h=new ImageServiceParameters;if(f.imageServiceParameters.renderingRule){var y=new RasterFunction(f.imageServiceParameters.renderingRule);h.renderingRule=y}if(f.imageServiceParameters.mosaicRule){var v=new MosaicRule(f.imageServiceParameters.mosaicRule);h.mosaicRule=v}f.imageServiceParameters.bandIds&&(h.bandIds=f.imageServiceParameters.bandIds),u.imageServiceParameters=h}}o=new ArcGISImageServiceLayer(r.url,u);if(-1!=p&&(console.log("******Setting opacity "),o.setOpacity(p)),this.map.addLayer(o),g)console.log("Swipe Layer"),new LayerSwipe({type:"vertical",map:map,layers:[o]},this.model.get("_swipe_div")).startup();o.on("load",lang.hitch(this,function(){var e={id:o.id,bandIds:o.bandIds,mosaicRule:o.mosaicRule,url:o.url,renderingRule:o.renderingRule};o.renderer&&(e.renderer=o.renderer,e.rendererType=o.renderer.declaredClass);var r=this.model.get("_js_layer_list");if(""==r)var n=[];else n=JSON.parse(r);n.push(e),this.model.set("_js_layer_list",JSON.stringify(n)),this.touch()}))}else{u={mode:FeatureLayer.MODE_SNAPSHOT};var _={};if(null!=r.options&&(_=Object.assign(u,JSON.parse(r.options))),console.log("***Feature Collection layer###***"),console.log("inspecting if feature collection contains layers"),"layers"in r&&(r=r.layers[0]),(o=new FeatureLayer(r,_)).setInfoTemplate(this.createTemplate(o)),null!=r.options){var w=JSON.parse(r.options);if(console.log("ClassedSizeRend0:"+w.renderer),console.log("ClassedSizeRend:"+w.field_name),"HeatmapRenderer"==w.renderer){s=new HeatmapRenderer,l={};null!=w.field_name&&(l={field:w.field_name});s=new HeatmapRenderer(l);o.setRenderer(s)}function c(r){smartMapping.createClassedColorRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}function m(r){console.log("ClassedSizeRend2"),smartMapping.createClassedSizeRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}"ClassedSizeRenderer"==w.renderer&&(console.log("ClassedSizeRenderer..."),setTimeout(function(){m(w.field_name)},500)),"ClassedColorRenderer"==w.renderer&&setTimeout(function(){c(w.field_name)},500)}this.map.addLayer(o),console.log("added the fc layer");var S={id:o.id,normalization:o.normalization,refreshInterval:o.refreshInterval,url:o.url};o.renderer&&(S.renderer=o.renderer,S.rendererType=o.renderer.declaredClass);var b=this.model.get("_js_layer_list");if(""==b)var C=[];else C=JSON.parse(b);C.push(S),this.model.set("_js_layer_list",JSON.stringify(C)),this.touch()}}},remove_layer:function(){var e=this.model.get("_layerId_to_remove"),r=this.map.getLayer(e);console.log("*** removing individual layer ***"),this.map.removeLayer(r)},center_changed:function(){console.log("changing center"),this.map.centerAt(this.model.get("center").reverse())},extent_changed:function(){console.log("changing extent@@@@@");var e=JSON.parse(this.model.get("_extent")),r=new Extent;r.xmin=e.xmin,r.xmax=e.xmax,r.ymin=e.ymin,r.ymax=e.ymax,r.spatialReference=new SpatialReference({wkid:4326}),this.map.setExtent(r)},start_time_changed:function(){var e=this.model.get("start_time");if(e&&""!=e.trim()){console.log("changing start_time");var r=new TimeExtent;r.startTime=new Date(this.model.get("start_time")),r.endTime=new Date(this.model.get("end_time")),this.map.setTimeExtent(r)}},end_time_changed:function(){var e=this.model.get("end_time");if(e&&""!=e.trim()){console.log("changing end_time");var r=new TimeExtent;r.startTime=new Date(this.model.get("start_time")),r.endTime=new Date(this.model.get("end_time")),this.map.setTimeExtent(r)}},basemap_changed:function(){this.map.setBasemap(this.model.get("_basemap"));var e=this.map.on("basemap-change",lang.hitch(this,function(){e.remove();for(var r=[],n=0;n<this.map.basemapLayerIds.length;n++){var t=this.map.getLayer(this.map.basemapLayerIds[n]);try{var a=JSON.parse(t.resourceInfo).documentInfo.Title}catch(e){a=this.model.get("_basemap")}var i={url:t.url,title:a};r.push(i)}this.model.set("_js_basemap",JSON.stringify(r)),this.touch()}))},gallerybasemaps_changed:function(){console.log("**Using Basemaps Gallery....");var e=this.model.get("_gallerybasemaps");if(e.length>0)for(var r=this.model.get("_gbasemaps_def"),n=0;n<e.length;n++)esriBasemaps[e[n]]={baseMapLayers:r[n],title:e[n]}},mouse_clicked:function(e){this.send({event:"mouseclick",message:e})},draw_end:function(e){this.model.set("mode","navigate"),this.touch(),this.send({event:"draw-end",message:e})},extent_change:function(e,r){this.model.set("_jsextent",JSON.stringify(e)),this.touch()},events:{click:"_handle_click"},_handle_click:function(){this.send({event:"click",message:"xyz"})}});e.exports={LegacyMapView:d}},function(r,n){r.exports=e},function(e,r,n){"use strict";r.__esModule=!0;function t(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}r.loadCss=t;var a="undefined"!=typeof window,i="https://js.arcgis.com/4.7/";function o(e,r,n){var t;n&&(t=function(e,r){var n=function(t){r(t.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",n,!1)};return e.addEventListener("error",n,!1),n}(e,n));var a=function(){r(e),e.removeEventListener("load",a,!1),t&&e.removeEventListener("error",t,!1)};e.addEventListener("load",a,!1)}function s(){return document.querySelector("script[data-esri-loader]")}function l(){return window.require&&window.requirejs}function d(e){return void 0===e&&(e={}),e.url||(e.url=i),new r.utils.Promise(function(r,n){var a=s();if(a){var i=a.getAttribute("src");i!==e.url?n(new Error("The ArcGIS API for JavaScript is already loaded ("+i+").")):l()?r(a):o(a,r,n)}else l()?n(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&t(e.css),e.requirejsConfig&&window.require.config(e.requirejsConfig),a=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),e.url,o(a,function(){a.setAttribute("data-esri-loader","loaded"),r(a)},n),document.body.appendChild(a))})}function c(e,n){return void 0===n&&(n={}),function(e){return new r.utils.Promise(function(r,n){null==window.activeRequireFunction?n("esriLoader.setRequireJSConfig() has not been called: You MUST call this function before using esriLoader"):window.activeRequireFunction(["require"],function(t){t(e,function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];r(e)},n)})})}(e)}function m(e){console.log("Setting requirejs-esri-loader's config:"),console.log(e),window.activeRequireFunction=window.require.config(e)}r.utils={Promise:a?window.Promise:void 0},r.getScript=s,r.isLoaded=l,r.loadScript=d,r.loadModules=c,r.setRequireJSConfig=m,r.default={setRequireJSConfig:m,getScript:s,isLoaded:l,loadModules:c,loadScript:d,loadCss:t,utils:r.utils}},function(e,r,n){!function(e){"use strict";function r(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}var n,t="https://js.arcgis.com/4.8/";function a(e,r,n){var t;n&&(t=function(e,r){var n=function(t){r(t.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",n,!1)};return e.addEventListener("error",n,!1),n}(e,n));var a=function(){r(e),e.removeEventListener("load",a,!1),t&&e.removeEventListener("error",t,!1)};e.addEventListener("load",a,!1)}var i={Promise:"undefined"!=typeof window?window.Promise:void 0};function o(){return document.querySelector("script[data-esri-loader]")}function s(){var e=window.require;return e&&e.on}function l(e){return void 0===e&&(e={}),e.url||(e.url=t),new i.Promise(function(t,i){var l=o();if(l){var d=l.getAttribute("src");d!==e.url?i(new Error("The ArcGIS API for JavaScript is already loaded ("+d+").")):s()?t(l):a(l,t,i)}else s()?i(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&r(e.css),e.dojoConfig&&(window.dojoConfig=e.dojoConfig),l=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),n=e.url,a(l,function(){l.setAttribute("data-esri-loader","loaded"),t(l)},i),document.body.appendChild(l))})}function d(e){return new i.Promise(function(r,n){var t=window.require.on("error",n);window.require(e,function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];t.remove(),r(e)})})}function c(e,r){return void 0===r&&(r={}),s()?d(e):(!r.url&&n&&(r.url=n),l(r).then(function(){return d(e)}))}var m={getScript:o,isLoaded:s,loadModules:c,loadScript:l,loadCss:r,utils:i};e.utils=i,e.getScript=o,e.isLoaded=s,e.loadScript=l,e.loadModules=c,e.default=m,e.loadCss=r,Object.defineProperty(e,"__esModule",{value:!0})}(r)},function(e,r,n){var t=n(5),a=n(6);t.JupyterTarget="notebook",t.BaseRequireJSConfig={map:{"*":{"arcgis-map-ipywidget":"/nbextensions/arcgis/arcgis-map-ipywidget.js","legacy-mapview":"/nbextensions/arcgis/legacy-mapview.js"}},config:{geotext:{useXhr:function(e){return!0},openXhr:!1,onXhr:function(e,r){var n="undefined"!=typeof XMLHttpRequest&&"withCredentials"in new XMLHttpRequest;e.open("GET",n?r:proxyUrl+"?"+r,!0)}}}},a(t,t.CdnUrl),e.exports=t},function(e,r){var n="//js.arcgis.com/4.8/",t={CdnUrl:n,CdnMainCssUrl:"https://js.arcgis.com/4.8/esri/css/main.css",EsriLoaderOptions:{url:n},minJSAPIVersion:"4.8"};e.exports=t},function(e,r){e.exports=function(e,r){if(e.CdnUrl=r,e.EsriLoaderOptions.url=e.CdnUrl,"notebook"===e.JupyterTarget)e.BaseRequireJSConfig.packages=[{name:"esri",location:e.CdnUrl+"esri"},{name:"dojo",location:e.CdnUrl+"dojo"},{name:"dojox",location:e.CdnUrl+"dojox"},{name:"dijit",location:e.CdnUrl+"dijit"},{name:"dstore",location:e.CdnUrl+"dstore"},{name:"moment",location:e.CdnUrl+"moment"},{name:"@dojo",location:e.CdnUrl+"@dojo"},{name:"cldrjs",location:e.CdnUrl+"cldrjs",main:"dist/cldr"},{name:"globalize",location:e.CdnUrl+"globalize",main:"dist/globalize"},{name:"maquette",location:e.CdnUrl+"maquette",main:"dist/maquette.umd"},{name:"maquette-css-transitions",location:e.CdnUrl+"maquette-css-transitions",main:"dist/maquette-css-transitions.umd"},{name:"maquette-jsx",location:e.CdnUrl+"maquette-jsx",main:"dist/maquette-jsx.umd"},{name:"tslib",location:e.CdnUrl+"tslib",main:"tslib"}],window.require&&(window.customRequire=window.require.config(e.BaseRequireJSConfig));else if("lab"===e.JupyterTarget){var n=document.querySelector("script[data-esri-loader]");null!=n&&n.parentNode.removeChild(n)}}}])});
+define(["@jupyter-widgets/base"],function(e){return function(e){var r={};function n(t){if(r[t])return r[t].exports;var a=r[t]={i:t,l:!1,exports:{}};return e[t].call(a.exports,a,a.exports,n),a.l=!0,a.exports}return n.m=e,n.c=r,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,r){if(1&r&&(e=n(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(n.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var a in e)n.d(t,a,function(r){return e[r]}.bind(null,a));return t},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},n.p="",n(n.s=0)}([function(e,r,n){var t,a=n(1),i=n(2),o=n(3),s=n(4);if(console.log("Loading arcgis-map-ipywidget..."),!s.JupyterTarget)throw"config does not specify 'JupyterTarget'! Failing";if("lab"===s.JupyterTarget)console.log("Using the default esri-loader..."),t=o;else{if("notebook"!==s.JupyterTarget)throw"Misconfigured config file! Failing";console.log("Using the custom RequireJS esri-loader..."),t=i}console.log("Config loaded:"),console.log(s);var l=s.EsriLoaderOptions,d=a.DOMWidgetView.extend({render:function(){console.log("starting to render.."),t.loadModules(["esri/config"],l).then(([e])=>{console.log(e)}).catch(e=>{console.log("Caught an error!"),console.log(e)})},not_used:function(){$("body").addClass("claro");var e=this,r=this.model.get("_token_info");if(r&&""!=r.trim()){var n=JSON.parse(r);esriConfig.defaults.io.corsEnabledServers.push(n.server);var t=new ServerInfo;t.server=n.server,t.tokenServiceUrl=n.tokenurl,IdentityManager.registerServers([t]);var a=n.username,i=n.password;IdentityManager.generateToken(t,{username:a,password:i}).then(function(e){IdentityManager.registerToken({server:t.server,userId:a,token:e.token,expires:e.expires,ssl:e.ssl})}).then(function(r){o(e)})}else o(e);function o(e){IPython.keyboard_manager.disable();var r=e.model.get("_gallerybasemaps");if(r.length>0)for(var n=e.model.get("_gbasemaps_def"),t=0;t<r.length;t++)esriBasemaps[r[t]]={baseMapLayers:n[t],title:r[t]};var a=e.model.get("id");if(a&&""!=a.trim()){var i=e.model.get("_arcgis_url");i&&""!=i.trim()&&(arcgisUtils.arcgisUrl=i),arcgisUtils.createMap(a,e.el).then(function(r){IPython.keyboard_manager.enable(),e.map=r.map,e.map.disableKeyboardNavigation(),e.toolbar=new Draw(e.map),e.toolbar.on("draw-end",d),e.map.on("click",c),e.mode_changed(),e.basemap_changed(),e.layer_changed(),e.start_time_changed(),e.end_time_changed()})}else{if(e.model.get("_extent").indexOf("{")>-1){var o=JSON.parse(e.model.get("_extent")),l=new Extent;l.xmin=o.xmin,l.xmax=o.xmax,l.ymin=o.ymin,l.ymax=o.ymax,l.spatialReference=new SpatialReference({wkid:4326}),e.map=new Map(e.el,{basemap:e.model.get("_basemap"),extent:l})}else e.map=new Map(e.el,{basemap:e.model.get("_basemap"),center:e.model.get("center").reverse(),zoom:e.model.get("zoom")});e.map.on("load",s)}}function s(r){console.log("***on_load"),IPython.keyboard_manager.enable(),r.map.disableKeyboardNavigation(),r.map.disableMapNavigation(),r.map.on("mouse-drag-start",function(){r.map.enableMapNavigation()}),r.map.on("mouse-out",function(){r.map.disableMapNavigation()}),e.toolbar=new Draw(r.map),e.toolbar.on("draw-end",d),r.map.on("extent-change",l),r.map.on("click",c),e.mode_changed(),e.basemap_changed(),e.layer_changed(),e.start_time_changed(),e.end_time_changed()}function l(r){var n=r.extent,t=r.levelChange;e.extent_change(n,t)}function d(r){var n=r.geometry,t=e.map.graphics.add(new Graphic(n,new SimpleFillSymbol));e.toolbar.deactivate(),e.draw_end(n);var a={geometry:n,symbol:t.symbol},i=e.model.get("_js_interactive_drawn_graphic");_current_js_dg_list2=""==i?[]:JSON.parse(i),_current_js_dg_list2.push(a),e.model.set("_js_interactive_drawn_graphic",JSON.stringify(_current_js_dg_list2)),e.touch()}function c(r){e.map.enableMapNavigation(),e.mouse_clicked(r.mapPoint)}this.model.on("change:zoom",this.zoom_changed,this),this.model.on("change:mode",this.mode_changed,this),this.model.on("change:_extent",this.extent_changed,this),this.model.on("change:center",this.center_changed,this),this.model.on("change:_basemap",this.basemap_changed,this),this.model.on("change:_gallerybasemaps",this.gallerybasemaps_changed,this),this.model.on("change:_addlayer",this.layer_changed,this),this.model.on("change:start_time",this.start_time_changed,this),this.model.on("change:end_time",this.end_time_changed,this),this.model.on("change:_layerId_to_remove",this.remove_layer,this)},zoom_changed:function(){this.map.setZoom(this.model.get("zoom"))},mode_changed:function(){if("navigate"==this.model.get("mode"))console.log("***mode = navigate"),this.toolbar.deactivate();else if("###clear_graphics"==this.model.get("mode"))this.map.graphics.clear(),this.model.set("_js_interactive_drawn_graphic","");else if("###remove_layers"==this.model.get("mode"))this.map.removeAllLayers();else if(this.model.get("mode").indexOf("{")>-1){console.log("***mode=draw_geometry***");var e=JSON.parse(this.model.get("mode")),r=new Graphic(e);if(null==r.symbol)if("polyline"===r.geometry.type)console.log("GEOM TYPE POLYLINE"),r.symbol=new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID,new dojo.Color([255,0,0,.5]),3);else if("polygon"===r.geometry.type){console.log("GEOM TYPE POLYGON***");var n=new SimpleFillSymbol;n.setOutline(new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID,new dojo.Color([0,0,0,.5]),1)),n.setColor(new Color([255,127,0,.7])),r.symbol=n}else"point"===r.geometry.type?(console.log("GEOM TYPE POINT"),r.symbol=new PictureMarkerSymbol(nbextensionPath+"/icons/pink.png",32,32)):"multipoint"===r.geometry.type&&(console.log("GEOM TYPE MULTIPOINT"),r.symbol=new PictureMarkerSymbol(nbextensionPath+"/icons/pink.png",32,32));this.map.graphics.add(r)}else{var t=this.model.get("mode");console.log("***mode=draw_"+t),this.toolbar.activate(t)}},createTemplate:function(e){var r=array.map(e.fields,function(e){return{fieldName:e.name,label:e.alias,visible:!0}});return new PopupTemplate({title:e.name,fieldInfos:r})},layer_changed:function(){var e=this.map.getBasemap();if(this.model.get("_gallerybasemaps").indexOf(e)>=0&&(e="topo"),this.model.get("_addlayer").indexOf("{")>-1){console.log("***###***addlayer");var r=JSON.parse(this.model.get("_addlayer"));if("https:"===window.location.protocol&&r.url.startsWith("http:")&&(r.url=r.url.replace("http://","https://")),console.log(r),"KMLLayer"==r.type){console.log("KMLLayer "+r.url);var n=new KMLLayer(r.url);this.map.addLayer(n),n.on("load",function(){domStyle.set("loading","display","none")})}else if("ArcGISTiledMapServiceLayer"==r.type){var t=new ArcGISTiledMapServiceLayer(r.url);this.map.addLayer(t)}else if("ArcGISDynamicMapServiceLayer"==r.type){var a=new ArcGISDynamicMapServiceLayer(r.url);this.map.addLayer(a)}else if("VectorTileLayer"==r.type){var i=new VectorTileLayer(r.url);this.map.addLayer(i)}else if("FeatureLayer"==r.type||"Feature Layer"==r.type){console.log("Adding FeatureLayer "+r.url);var o=new FeatureLayer(r.url,{outFields:["*"]});if(null!=r.options){if(null!=(w=JSON.parse(r.options)).opacity&&(console.log("***opacity:"+w.opacity),o.setOpacity(w.opacity)),null!=w.definition_expression&&(console.log("***DEF EXP"),console.log(w.definition_expression),o.setDefinitionExpression(w.definition_expression)),"HeatmapRenderer"==w.renderer){var s=new HeatmapRenderer;o.setRenderer(s)}if(console.log("ClassedSizeRend0:"+w.renderer),console.log("ClassedSizeRend:"+w.field_name),"HeatmapRenderer"==w.renderer){s=new HeatmapRenderer;var l={};null!=w.field_name&&(l={field:w.field_name});s=new HeatmapRenderer(l);o.setRenderer(s)}else if("ClassedSizeRenderer"==w.renderer)console.log("ClassedSizeRenderer..."),setTimeout(function(){m(w)},500);else if("ClassedColorRenderer"==w.renderer)setTimeout(function(){c(w)},500);else{var d=jsonUtils.fromJson(w.renderer);o.setRenderer(d)}function c(r){var n={layer:o,field:r.field_name,basemap:e,classificationMethod:"quantile"},t=Object.assign(n,r);console.log(t),smartMapping.createClassedColorRenderer(t).then(function(e){o.setRenderer(e.renderer),o.redraw(),console.log(e.renderer)})}function m(r){console.log("ClassedSizeRend2");var n={layer:o,field:r.field_name,basemap:e,classificationMethod:"quantile"},t=Object.assign(n,r);console.log(t),smartMapping.createClassedSizeRenderer(t).then(function(e){o.setRenderer(e.renderer),o.redraw()})}}if(null!=r.opacity&&o.setOpacity(r.opacity),null!=r.definition_expression&&(console.log("***DEF EXP"),console.log(r.definition_expression),o.setDefinitionExpression(r.definition_expression)),"HeatmapRenderer"==r.renderer){s=new HeatmapRenderer;o.setRenderer(s)}bRend=!1,bSRend=!1,this.map.addLayer(o),"ClassedColorRenderer"==r.renderer&&(bRend=!0),"ClassedSizeRenderer"==r.renderer&&(bSRend=!0),o.on("load",lang.hitch(this,function(){var e={id:o.id,normalization:o.normalization,refreshInterval:o.refreshInterval,url:o.url};o.renderer&&(e.renderer=o.renderer.toJson(),e.rendererType=o.renderer.declaredClass);var r=this.model.get("_js_layer_list");if(""==r)var n=[];else n=JSON.parse(r);n.push(e),this.model.set("_js_layer_list",JSON.stringify(n)),this.touch()})),o.on("renderer-change",lang.hitch(this,function(){if(void 0!==w)if("renderer"in w){if("ClassedColorRenderer"==w.renderer||"ClassedSizeRenderer"==w.renderer){var e=this.model.get("_js_layer_list");if(""!=e){console.log("Update renderer of latest layer");var r=JSON.parse(e);r[r.length-1].renderer=o.renderer.toJson(),r[r.length-1].rendererType=o.renderer.declaredClass,this.model.set("_js_layer_list",JSON.stringify(r)),this.touch(),console.log("CCR, CSR renderer updated")}}}else console.log("Fired due to some other event");else console.log("Not sure which fired renderer-change")})),o.on("load",lang.hitch(this,function(){o.setInfoTemplate(this.createTemplate(o)),bRend&&function(r){smartMapping.createClassedColorRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}(r.field_name),bSRend&&function(r){console.log("ClassedSizeRend2"),smartMapping.createClassedSizeRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}(r.field_name)}))}else if("ImageryLayer"==r.type){console.log("ArcGISImageServiceLayer "+r.url);var u={},g=!1,p=-1;if(null!=r.options){var f=JSON.parse(r.options);if(f.opacity&&(p=f.opacity),f.swipelayer&&(g=f.swipelayer),f.imageServiceParameters){var h=new ImageServiceParameters;if(f.imageServiceParameters.renderingRule){var y=new RasterFunction(f.imageServiceParameters.renderingRule);h.renderingRule=y}if(f.imageServiceParameters.mosaicRule){var v=new MosaicRule(f.imageServiceParameters.mosaicRule);h.mosaicRule=v}f.imageServiceParameters.bandIds&&(h.bandIds=f.imageServiceParameters.bandIds),u.imageServiceParameters=h}}o=new ArcGISImageServiceLayer(r.url,u);if(-1!=p&&(console.log("******Setting opacity "),o.setOpacity(p)),this.map.addLayer(o),g)console.log("Swipe Layer"),new LayerSwipe({type:"vertical",map:map,layers:[o]},this.model.get("_swipe_div")).startup();o.on("load",lang.hitch(this,function(){var e={id:o.id,bandIds:o.bandIds,mosaicRule:o.mosaicRule,url:o.url,renderingRule:o.renderingRule};o.renderer&&(e.renderer=o.renderer,e.rendererType=o.renderer.declaredClass);var r=this.model.get("_js_layer_list");if(""==r)var n=[];else n=JSON.parse(r);n.push(e),this.model.set("_js_layer_list",JSON.stringify(n)),this.touch()}))}else{u={mode:FeatureLayer.MODE_SNAPSHOT};var _={};if(null!=r.options&&(_=Object.assign(u,JSON.parse(r.options))),console.log("***Feature Collection layer###***"),console.log("inspecting if feature collection contains layers"),"layers"in r&&(r=r.layers[0]),(o=new FeatureLayer(r,_)).setInfoTemplate(this.createTemplate(o)),null!=r.options){var w=JSON.parse(r.options);if(console.log("ClassedSizeRend0:"+w.renderer),console.log("ClassedSizeRend:"+w.field_name),"HeatmapRenderer"==w.renderer){s=new HeatmapRenderer,l={};null!=w.field_name&&(l={field:w.field_name});s=new HeatmapRenderer(l);o.setRenderer(s)}function c(r){smartMapping.createClassedColorRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}function m(r){console.log("ClassedSizeRend2"),smartMapping.createClassedSizeRenderer({layer:o,field:r,basemap:e,classificationMethod:"quantile"}).then(function(e){o.setRenderer(e.renderer),o.redraw()})}"ClassedSizeRenderer"==w.renderer&&(console.log("ClassedSizeRenderer..."),setTimeout(function(){m(w.field_name)},500)),"ClassedColorRenderer"==w.renderer&&setTimeout(function(){c(w.field_name)},500)}this.map.addLayer(o),console.log("added the fc layer");var S={id:o.id,normalization:o.normalization,refreshInterval:o.refreshInterval,url:o.url};o.renderer&&(S.renderer=o.renderer,S.rendererType=o.renderer.declaredClass);var b=this.model.get("_js_layer_list");if(""==b)var C=[];else C=JSON.parse(b);C.push(S),this.model.set("_js_layer_list",JSON.stringify(C)),this.touch()}}},remove_layer:function(){var e=this.model.get("_layerId_to_remove"),r=this.map.getLayer(e);console.log("*** removing individual layer ***"),this.map.removeLayer(r)},center_changed:function(){console.log("changing center"),this.map.centerAt(this.model.get("center").reverse())},extent_changed:function(){console.log("changing extent@@@@@");var e=JSON.parse(this.model.get("_extent")),r=new Extent;r.xmin=e.xmin,r.xmax=e.xmax,r.ymin=e.ymin,r.ymax=e.ymax,r.spatialReference=new SpatialReference({wkid:4326}),this.map.setExtent(r)},start_time_changed:function(){var e=this.model.get("start_time");if(e&&""!=e.trim()){console.log("changing start_time");var r=new TimeExtent;r.startTime=new Date(this.model.get("start_time")),r.endTime=new Date(this.model.get("end_time")),this.map.setTimeExtent(r)}},end_time_changed:function(){var e=this.model.get("end_time");if(e&&""!=e.trim()){console.log("changing end_time");var r=new TimeExtent;r.startTime=new Date(this.model.get("start_time")),r.endTime=new Date(this.model.get("end_time")),this.map.setTimeExtent(r)}},basemap_changed:function(){this.map.setBasemap(this.model.get("_basemap"));var e=this.map.on("basemap-change",lang.hitch(this,function(){e.remove();for(var r=[],n=0;n<this.map.basemapLayerIds.length;n++){var t=this.map.getLayer(this.map.basemapLayerIds[n]);try{var a=JSON.parse(t.resourceInfo).documentInfo.Title}catch(e){a=this.model.get("_basemap")}var i={url:t.url,title:a};r.push(i)}this.model.set("_js_basemap",JSON.stringify(r)),this.touch()}))},gallerybasemaps_changed:function(){console.log("**Using Basemaps Gallery....");var e=this.model.get("_gallerybasemaps");if(e.length>0)for(var r=this.model.get("_gbasemaps_def"),n=0;n<e.length;n++)esriBasemaps[e[n]]={baseMapLayers:r[n],title:e[n]}},mouse_clicked:function(e){this.send({event:"mouseclick",message:e})},draw_end:function(e){this.model.set("mode","navigate"),this.touch(),this.send({event:"draw-end",message:e})},extent_change:function(e,r){this.model.set("_jsextent",JSON.stringify(e)),this.touch()},events:{click:"_handle_click"},_handle_click:function(){this.send({event:"click",message:"xyz"})}});e.exports={LegacyMapView:d}},function(r,n){r.exports=e},function(e,r,n){"use strict";r.__esModule=!0;function t(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}r.loadCss=t;var a="undefined"!=typeof window,i="https://js.arcgis.com/4.7/";function o(e,r,n){var t;n&&(t=function(e,r){var n=function(t){r(t.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",n,!1)};return e.addEventListener("error",n,!1),n}(e,n));var a=function(){r(e),e.removeEventListener("load",a,!1),t&&e.removeEventListener("error",t,!1)};e.addEventListener("load",a,!1)}function s(){return document.querySelector("script[data-esri-loader]")}function l(){return window.require&&window.requirejs}function d(e){return void 0===e&&(e={}),e.url||(e.url=i),new r.utils.Promise(function(r,n){var a=s();if(a){var i=a.getAttribute("src");i!==e.url?n(new Error("The ArcGIS API for JavaScript is already loaded ("+i+").")):l()?r(a):o(a,r,n)}else l()?n(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&t(e.css),e.requirejsConfig&&window.require.config(e.requirejsConfig),a=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),e.url,o(a,function(){a.setAttribute("data-esri-loader","loaded"),r(a)},n),document.body.appendChild(a))})}function c(e,n){return void 0===n&&(n={}),function(e){return new r.utils.Promise(function(r,n){null==window.activeRequireFunction?n("esriLoader.setRequireJSConfig() has not been called: You MUST call this function before using esriLoader"):window.activeRequireFunction(["require"],function(t){t(e,function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];r(e)},n)})})}(e)}function m(e){console.log("Setting requirejs-esri-loader's config:"),console.log(e),window.activeRequireFunction=window.require.config(e)}r.utils={Promise:a?window.Promise:void 0},r.getScript=s,r.isLoaded=l,r.loadScript=d,r.loadModules=c,r.setRequireJSConfig=m,r.default={setRequireJSConfig:m,getScript:s,isLoaded:l,loadModules:c,loadScript:d,loadCss:t,utils:r.utils}},function(e,r,n){!function(e){"use strict";function r(e){var r=function(e){return document.querySelector('link[href*="'+e+'"]')}(e);return r||(r=function(e){var r=document.createElement("link");return r.rel="stylesheet",r.href=e,r}(e),document.head.appendChild(r)),r}var n,t="https://js.arcgis.com/4.8/";function a(e,r,n){var t;n&&(t=function(e,r){var n=function(t){r(t.error||new Error("There was an error attempting to load "+e.src)),e.removeEventListener("error",n,!1)};return e.addEventListener("error",n,!1),n}(e,n));var a=function(){r(e),e.removeEventListener("load",a,!1),t&&e.removeEventListener("error",t,!1)};e.addEventListener("load",a,!1)}var i={Promise:"undefined"!=typeof window?window.Promise:void 0};function o(){return document.querySelector("script[data-esri-loader]")}function s(){var e=window.require;return e&&e.on}function l(e){return void 0===e&&(e={}),e.url||(e.url=t),new i.Promise(function(t,i){var l=o();if(l){var d=l.getAttribute("src");d!==e.url?i(new Error("The ArcGIS API for JavaScript is already loaded ("+d+").")):s()?t(l):a(l,t,i)}else s()?i(new Error("The ArcGIS API for JavaScript is already loaded.")):(e.css&&r(e.css),e.dojoConfig&&(window.dojoConfig=e.dojoConfig),l=function(e){var r=document.createElement("script");return r.type="text/javascript",r.src=e,r.setAttribute("data-esri-loader","loading"),r}(e.url),n=e.url,a(l,function(){l.setAttribute("data-esri-loader","loaded"),t(l)},i),document.body.appendChild(l))})}function d(e){return new i.Promise(function(r,n){var t=window.require.on("error",n);window.require(e,function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];t.remove(),r(e)})})}function c(e,r){return void 0===r&&(r={}),s()?d(e):(!r.url&&n&&(r.url=n),l(r).then(function(){return d(e)}))}var m={getScript:o,isLoaded:s,loadModules:c,loadScript:l,loadCss:r,utils:i};e.utils=i,e.getScript=o,e.isLoaded=s,e.loadScript=l,e.loadModules=c,e.default=m,e.loadCss=r,Object.defineProperty(e,"__esModule",{value:!0})}(r)},function(e,r,n){var t=n(5),a=n(6);t.JupyterTarget="notebook",t.BaseRequireJSConfig={map:{"*":{"arcgis-map-ipywidget":"/nbextensions/arcgis/arcgis-map-ipywidget.js","legacy-mapview":"/nbextensions/arcgis/legacy-mapview.js"}},config:{has:{"esri-featurelayer-webgl":1},geotext:{useXhr:function(e){return!0},openXhr:!1,onXhr:function(e,r){var n="undefined"!=typeof XMLHttpRequest&&"withCredentials"in new XMLHttpRequest;e.open("GET",n?r:proxyUrl+"?"+r,!0)}}}},a(t,t.CdnUrl),e.exports=t},function(e,r){var n="//js.arcgis.com/4.8/",t={CdnUrl:n,CdnMainCssUrl:"https://js.arcgis.com/4.8/esri/css/main.css",EsriLoaderOptions:{url:n,dojoConfig:{has:{"esri-featurelayer-webgl":1}}},minJSAPIVersion:"4.8"};e.exports=t},function(e,r){e.exports=function(e,r){if(e.CdnUrl=r,e.EsriLoaderOptions.url=e.CdnUrl,"notebook"===e.JupyterTarget)e.BaseRequireJSConfig.packages=[{name:"esri",location:e.CdnUrl+"esri"},{name:"dojo",location:e.CdnUrl+"dojo"},{name:"dojox",location:e.CdnUrl+"dojox"},{name:"dijit",location:e.CdnUrl+"dijit"},{name:"dstore",location:e.CdnUrl+"dstore"},{name:"moment",location:e.CdnUrl+"moment"},{name:"@dojo",location:e.CdnUrl+"@dojo"},{name:"cldrjs",location:e.CdnUrl+"cldrjs",main:"dist/cldr"},{name:"globalize",location:e.CdnUrl+"globalize",main:"dist/globalize"},{name:"maquette",location:e.CdnUrl+"maquette",main:"dist/maquette.umd"},{name:"maquette-css-transitions",location:e.CdnUrl+"maquette-css-transitions",main:"dist/maquette-css-transitions.umd"},{name:"maquette-jsx",location:e.CdnUrl+"maquette-jsx",main:"dist/maquette-jsx.umd"},{name:"tslib",location:e.CdnUrl+"tslib",main:"tslib"}],window.require&&(window.customRequire=window.require.config(e.BaseRequireJSConfig));else if("lab"===e.JupyterTarget){var n=document.querySelector("script[data-esri-loader]");null!=n&&n.parentNode.removeChild(n)}}}])});
 //# sourceMappingURL=legacy-mapview.js.map

package.json

 {
   "name": "arcgis-map-ipywidget",
-  "version": "1.5.0-beta.23",
+  "version": "1.5.0-beta.24",
   "description": "The map widget for the ArcGIS API for Python",
@@ -5,0 +5,0 @@ "author": "esri",

src/arcgis-map-ipywidget/arcgis-map-ipywidget-model.js

@@ -32,3 +32,2 @@ //The main module that exports the javascript widget class
         //start layer specific model state
-        portal_items: [],
         _func_chains: [],
@@ -38,3 +37,2 @@ _add_this_notype_layer: {},
         _draw_these_notype_layers_on_widget_load: {},
-        _img_lyrs: [],
         _layers_to_remove: [],
@@ -41,0 +39,0 @@ _add_this_graphic: {},

src/arcgis-map-ipywidget/arcgis-map-ipywidget-view.js

@@ -86,4 +86,2 @@ //The main module that exports the javascript widget class
         this.model.on('change:_add_this_notype_layer', this.add_this_notype_layer_changed, this);
-        this.model.on('change:portal_items', this.portal_items_changed, this);
-        this.model.on('change:_img_lyrs', this.img_lyrs_change, this);
         this.model.on('change:_layers_to_remove', this.layers_to_remove_changed, this);
@@ -291,2 +289,5 @@ this.model.on('change:_add_this_graphic', this.graphics_changed, this);
         });
+        this._3dMap.map.allLayers.on('change', (event) => {
+            this.update_readonly_webmap();
+        });
     },
@@ -307,2 +308,13 @@
             this.model.save_changes()});
+
+        //Whenever you click on the map, send an event for python to listen to
+        this._2dMap.on(['click'], (event_) => {
+            this.send({ event: 'mouseclick', message: event_.mapPoint });
+        });
+
+        this._3dMap.on(['click'], (event_) => {
+            this.send({ event: 'mouseclick', message: event_.mapPoint });
+        });
+ 
+
     },
@@ -514,21 +526,2 @@
 
-    portal_items_changed: function(){
-    esriLoader.loadModules(['esri/layers/Layer'], options).then(([Layer]) => {
-        console.log("updating portal_items...");
-        var items = this.model.get("portal_items");
-        for(var i in items){
-            Layer.fromPortalItem({portalItem: items[i]}).then((layer) => {
-                this.map.add(layer);
-            }).catch((err) => {
-                this._displayErrorBox("Couldn't add 1 or more layer(s)."); 
-                console.warn("Error on adding layer " + items[i].id); 
-                console.warn(err);
-            });
-        }
-    }).catch((err) => {
-       this._displayErrorBox();
-       console.warn("Error on portal_items_changed: "); console.warn(err);
-    });
-    },
-
     webmap_changed: function(){
@@ -566,30 +559,34 @@ esriLoader.loadModules(['esri/WebMap']).then(([WebMap]) => {
         try{
+            var map;
             if(this._2dMap.map){
-                var layers_json = []
-                for(var i in this._2dMap.map.layers.toArray()){
-                    //TODO: Implement WebMap.toJSON() when it's added to JS API
-                    var layer = this._2dMap.map.layers.toArray()[i]
-                    var layer_json = { id : layer.id,
-                                       normalization : layer.normalization,
-                                       refreshInterval : layer.refreshInterval,
-                                       url : layer.url };
-                    if (layer.graphics){
-                        layer_json.graphics = [];
-                        for(var i in layer.graphics.toArray()){
-                            var graphic = layer.graphics.toArray()[i];
-                            var graphic_json = graphic.toJSON();
-                            graphic_json.shape = graphic.shape;
-                            layer_json.graphics.push(graphic_json);
-                        }
+                map = this._2dMap.map}
+            else {
+                map = this._3dMap.map
+            }
+            var layers_json = []
+            for(var i in map.layers.toArray()){
+                //TODO: Implement WebMap.toJSON() when it's added to JS API
+                var layer = map.layers.toArray()[i]
+                var layer_json = { id : layer.id,
+                                   normalization : layer.normalization,
+                                   refreshInterval : layer.refreshInterval,
+                                   url : layer.url };
+                if (layer.graphics){
+                    layer_json.graphics = [];
+                    for(var i in layer.graphics.toArray()){
+                        var graphic = layer.graphics.toArray()[i];
+                        var graphic_json = graphic.toJSON();
+                        graphic_json.shape = graphic.shape;
+                        layer_json.graphics.push(graphic_json);
                     }
-                    if (layer.renderer){
-                        layer_json.renderer = layer.renderer.toJSON();
-                        layer_json.rendererType = layer.renderer.declaredClass;}
-                    layers_json.push(layer_json) }
-                var wm = { layers : layers_json,
-                           ground : this._2dMap.map.ground.toJSON(),
-                           basemap : this._2dMap.map.basemap.toJSON() };
-                this.model.set('_readonly_webmap_from_js', wm);
-                this.model.save_changes();
-            }
+                }
+                if (layer.renderer){
+                    layer_json.renderer = layer.renderer.toJSON();
+                    layer_json.rendererType = layer.renderer.declaredClass;}
+                layers_json.push(layer_json) }
+            var wm = { layers : layers_json,
+                       ground : map.ground.toJSON(),
+                       basemap : map.basemap.toJSON() };
+            this.model.set('_readonly_webmap_from_js', wm);
+            this.model.save_changes();
         } catch(err){
@@ -712,10 +709,5 @@ this._displayErrorBox("Error updating readonly webmap json.");
                 typedLayer.id));
-            if(layerExistsOnMap){
-                console.log("Layer " + noTypeLayer._hashFromPython +
-                    " already exists on map: skipping");
-            } else {
-                console.log("Adding Layer " + noTypeLayer._hashFromPython +
-                    " to map.");
-                this.map.add(typedLayer);
-            }
+            console.log("Adding Layer " + noTypeLayer._hashFromPython + " " +
+                "to map.");
+            this.map.add(typedLayer);
         }).catch((err) => {
@@ -727,18 +719,2 @@ this._displayErrorBox("Could not update layer. " + err);
 
-    img_lyrs_changed: function(){
-        esriLoader.loadModules(['esri/layers/ImageryLayer'],
-        options).then(([ImageryLayer]) => {
-            console.log("Updating img_lyrs...");
-            var _img_lyrs = this.model.get("_img_lyrs");
-            for(var i in _img_lyrs){
-                var _img_lyr = _img_lyrs[i];
-                var layer = new ImageryLayer(_img_lyr);
-                this.map.add(layer);
-            }
-        }).catch((err) => {
-            this._displayErrorBox("Error adding imagery layer.");
-            console.warn("Error adding imagery layer"); console.warn(err);
-        });
-    },
-
     layers_to_remove_changed: function(){
@@ -750,8 +726,10 @@ try{
                 var layerId = _layers_to_remove[i];
-                var layer = this.map.findLayerById(layerId);
-                var layerExistsOnMap = Boolean(layer);
-                if(layerExistsOnMap){
-                    console.log("Attempting to remove layer" + layer.id);
-                    this.map.remove(layer);
-                }
+                do {
+                    var layer = this.map.findLayerById(layerId);
+                    var layerExistsOnMap = Boolean(layer);
+                    if(layerExistsOnMap){
+                        console.log("Attempting to remove layer" + layer.id);
+                        this.map.remove(layer);
+                    }
+                } while(layerExistsOnMap);
             }
@@ -858,2 +836,4 @@ } catch(err){
                     this.update_readonly_webmap();
+                    console.log("Sending draw-end event...");
+                    this.send({ event: 'draw-end', message: graphic.geometry.toJSON() })
                 });
@@ -983,5 +963,16 @@ }
                 }
-            } else{
+            } else if (_auth_mode.toLowerCase() === "prompt"){
+                var _portal_url = this.model.get("_portal_url");
+                if(_portal_url !== ""){
+                    esriConfig.portalUrl = _portal_url;
+                }
+                this._portal = new Portal({authMode: 'immediate'});
+                this._portal.load().then(() => {
+                    resolve(this._portal);
+                }).catch((err) => {
+                    reject(err);
+                });
+             } else {
                 reject("You must specify the '_auth_mode' model variable to " + 
-                       "either 'anonymous' or 'tokenbased'");
+                       "either 'anonymous', 'tokenbased', or 'prompt'");
             }
@@ -988,0 +979,0 @@ }).catch((err) => {

src/config/common.js

@@ -6,3 +6,8 @@ var CdnUrl = "//js.arcgis.com/4.8/";
 var EsriLoaderOptions = {
-    url: CdnUrl
+    url: CdnUrl,
+    dojoConfig: {
+        has: {
+            "esri-featurelayer-webgl": 1
+        }
+    }
 }
@@ -9,0 +14,0 @@

src/config/notebook.js

@@ -13,2 +13,6 @@ var config = require("./common");
     config : {
+            has: {
+              "esri-featurelayer-webgl": 1
+            },
+
             geotext: {
@@ -15,0 +19,0 @@

No alert changes

Worsened metrics

Total package byte prevSize

3175117

decreased by-0.11%

Lines of code

4631

decreased by-0.22%

No dependency changes