Merge branch 'develop' into cmv/feature/layerControl_api

cmv · Jan 14, 2016 · 37a1c63 · 37a1c63
2 parents 18bbfdf + a385dfa
commit 37a1c63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -151,9 +151,7 @@
         "comma-style": 2,
         "computed-property-spacing": [2, "never"],
         "consistent-this": [2, "self"],
-        "constructor-super": 2,
         "func-style": [2, "declaration"],
-        "id-match": [2, "^[a-z]+([A-Z][a-z]+)*$", {"properties": true}],
         "indent": [2, 4],
         "key-spacing": [2, {
             "beforeColon": false,

diff --git a/viewer/js/viewer/_MapMixin.js b/viewer/js/viewer/_MapMixin.js
@@ -27,8 +27,7 @@ define([
             var returnDeferred = new Deferred();
             var returnWarnings = [];
 
-            var container = dom.byId(this.config.layout.map) || 'mapCenter';
-            this.map = new Map(container, this.config.mapOptions);
+            this._createMap();
 
             if (this.config.mapOptions.basemap) {
                 this.map.on('load', lang.hitch(this, '_initLayers', returnWarnings));
@@ -44,6 +43,11 @@ define([
             return returnDeferred;
         },
 
+        _createMap: function () {
+            var container = dom.byId(this.config.layout.map) || 'mapCenter';
+            this.map = new Map(container, this.config.mapOptions);
+        },
+
         _onLayersAddResult: function (returnDeferred, returnWarnings, lyrsResult) {
             array.forEach(lyrsResult.layers, function (addedLayer) {
                 if (addedLayer.success !== true) {