fixed undefined variables

src/browser/browser.js

@@ -308,19 +308,21 @@ Browser.prototype.updateUI = function(key) {
 
 
 Browser.prototype.setConfigParam = function(key, value, ignoreCore) {
+    var map = this.getMap();
+
     switch (key) {
     case 'pos':                
     case 'position':
         this.config.position = value;
-        if (this.map) {
-            this.map.setPosition(this.config.position);
+        if (map) {
+            map.setPosition(this.config.position);
         }
         break;
 
     case 'view':
         this.config.view = value;
-        if (this.map) {
-            this.map.setView(this.config.view);
+        if (map) {
+            map.setView(this.config.view);
         }
         break;
 
@@ -352,7 +354,7 @@ Browser.prototype.setConfigParam = function(key, value, ignoreCore) {
     case 'inertia':              this.config.inertia = utils.validateNumberArray(value, 3, [0,0,0], [0.99, 0.99, 0.99], [0.85, 0.9, 0.7]); break;
     case 'rotate':             
         this.config.autoRotate = utils.validateNumber(value, Number.NEGATIVEINFINITY, Number.POSITIVEINFINITY, 0);
-        if (this.map && this.autopilot) {
+        if (map && this.autopilot) {
             this.autopilot.setAutorotate(this.config.autoRotate);
         }
         break;
@@ -364,31 +366,33 @@ Browser.prototype.setConfigParam = function(key, value, ignoreCore) {
             ];
         }
 
-        if (this.map && this.autopilot) {
+        if (map && this.autopilot) {
             this.autopilot.setAutorotate(this.config.autoRotate);
         }
         break;
     }
 
     if (ignoreCore) {
-        if ((key.indexOf('map') == 0 || key.indexOf('mario') == 0 || key.indexOf('authorization') == 0) && this.core.getMap()) {
-            this.core.getMap().setConfigParam(key, value);
+        if ((key.indexOf('map') == 0 || key.indexOf('mario') == 0 || key.indexOf('authorization') == 0) && map) {
+            map.setConfigParam(key, value);
         }
 
         if (key.indexOf('renderer') == 0) {
-            this.core.getRenderer().setConfigParam(key, value);
+            map.setConfigParam(key, value);
         }
     }
 };
 
 
 Browser.prototype.getConfigParam = function(key) {
+    var map = this.getMap();
+
     switch (key) {
     case 'pos':
     case 'position':
 
-        if (this.map) {
-            this.map.getPosition();
+        if (map) {
+            map.getPosition();
         } else {
             return this.config.position;
         }
@@ -397,8 +401,8 @@ Browser.prototype.getConfigParam = function(key) {
 
     case 'view':               
 
-        if (this.map) {
-            return this.map.getView();
+        if (map) {
+            return map.getView();
         } else {
             return this.config.view;
         }
@@ -433,15 +437,15 @@ Browser.prototype.getConfigParam = function(key) {
     case 'pan':                  return this.config.autoPan;
     }
 
-    if (ignoreCore) {
-        if (key.indexOf('map') == 0 && this.core.getMap()) {
-            return this.core.getMap().getConfigParam(key, value);
-        }
+    //if (ignoreCore) {
+    if (key.indexOf('map') == 0 && map) {
+        return map.getConfigParam(key);
+    }
 
-        if (key.indexOf('renderer') == 0) {
-            return this.core.getRenderer().getConfigParam(key, value);
-        }
+    if (key.indexOf('renderer') == 0) {
+        return map.getConfigParam(key);
     }
+    //}
 };
 
 

src/browser/interface.js

@@ -156,7 +156,7 @@ BrowserInterface.prototype.setParam = function(key, value) {
 
 
 BrowserInterface.prototype.getParam = function(key) {
-    return this.getConfigParam(key, value);
+    return this.getConfigParam(key);
 };
 
 

src/browser/ui/ui.js

@@ -121,7 +121,7 @@ UI.prototype.setControlVisible = function(id, state) {
 
 UI.prototype.getControlVisible = function(id) {
     if (this.controls[id] != null) {
-        this.controls[id].getVisible(state);
+        this.controls[id].getVisible();
     }
 };
 

src/core/core.js

@@ -433,7 +433,7 @@ Core.prototype.getConfigParam = function(key) {
         return this.config.inspector;
     } else {
         if (key.indexOf('map') == 0 && this.getMap() != null) {
-            return this.getMap().getConfigParam(key, value);
+            return this.getMap().getConfigParam(key);
         }
 
         if (key.indexOf('renderer') == 0) {

src/core/map/config.js

@@ -3,6 +3,7 @@ import MapBoundLayer_ from './bound-layer';
 import MapCredit_ from './credit';
 import MapPosition_ from './position';
 import MapRefFrame_ from './refframe';
+import MapView_ from './view';
 import MapSrs_ from './srs';
 import MapSurface_ from './surface';
 import MapVirtualSurface_ from './virtual-surface';
@@ -13,6 +14,7 @@ var MapPosition = MapPosition_;
 var MapCredit = MapCredit_;
 var MapBoundLayer = MapBoundLayer_;
 var MapRefFrame = MapRefFrame_;
+var MapView = MapView_;
 var MapSrs = MapSrs_;
 var MapSurface = MapSurface_;
 var MapVirtualSurface = MapVirtualSurface_;

src/core/map/draw-tiles.js

@@ -557,11 +557,11 @@ MapDrawTiles.prototype.updateTileRenderCommands = function(tile, submeshes) {
 };
 
 
-MapDrawTiles.prototype.updateTileBoundsDirectly = function(preventLoad, priority) {
+/*MapDrawTiles.prototype.updateTileBoundsDirectly = function(preventLoad, priority) {
     if (tile.surfaceMesh.isReady(preventLoad, priority) && !preventLoad) {
         this.updateTileBounds(tile, tile.surfaceMesh.submeshes);
     }
-};
+};*/
 
 
 MapDrawTiles.prototype.updateTileBounds = function(tile, submeshes) {

src/core/map/interface.js

@@ -99,7 +99,7 @@ MapInterface.prototype.getSurfaceInfo = function(surfaceId) {
 
 
 MapInterface.prototype.getSrses = function() {
-    return this.map.getSrses(surfaceId);
+    return this.map.getSrses();
 };
 
 
@@ -294,7 +294,7 @@ MapInterface.prototype.setConfigParam = function(key, value) {
 
 
 MapInterface.prototype.getConfigParam = function(key) {
-    return this.map.getConfigParam(key, value);
+    return this.map.getConfigParam(key);
 };
 
 

src/core/map/map.js

@@ -6,6 +6,7 @@ import MapView_ from './view';
 import MapVirtualSurface_ from './virtual-surface';
 import MapSurfaceTree_ from './surface-tree';
 import MapResourceTree_ from './resource-tree';
+import MapSrs_ from './srs';
 import MapCache_ from './cache';
 import MapCamera_ from './camera';
 import MapConfig_ from './config';
@@ -27,6 +28,7 @@ var MapView = MapView_;
 var MapVirtualSurface = MapVirtualSurface_;
 var MapSurfaceTree = MapSurfaceTree_;
 var MapResourceTree = MapResourceTree_;
+var MapSrs = MapSrs_;
 var MapCache = MapCache_;
 var MapCamera = MapCamera_;
 var MapConfig = MapConfig_;

src/core/map/metatile.js

@@ -342,7 +342,7 @@ MapMetatile.prototype.applyMetatatileBitplanes = function() {
     for (var i = 0; i < 1; i++) {
         if (this.flagPlanes[i]) {
 
-            bitplane = this.flagPlanes[i]; 
+            var bitplane = this.flagPlanes[i]; 
 
             for (var y = 0; y < this.sizey; y++) {
                 for (var x = 0; x < this.sizex; x++) {
@@ -368,7 +368,7 @@ MapMetatile.prototype.applyMetatatileBitplanes = function() {
 MapMetatile.prototype.applyMetatanodeBitplanes = function(x, y) {
     for (var i = 0; i < 1; i++) {
         if (this.flagPlanes[i]) {
-            bitplane = this.flagPlanes[i]; 
+            var bitplane = this.flagPlanes[i]; 
             var byteIndex = this.sizex * y + x;
             var bitIndex = byteIndex & 7;
             var bitMask = 1 << bitIndex;

src/core/map/render-slots.js

@@ -72,7 +72,7 @@ MapRenderSlots.prototype.setRenderSlotEnabled = function(id, state) {
 
 
 MapRenderSlots.prototype.getRenderSlotEnabled = function(id) {
-    var index = this.getRenderSlotIndex(id2);
+    var index = this.getRenderSlotIndex(id);
     if (index != -1) {
         return this.renderSlots[index].enabled;
     }

src/core/map/srs.js

@@ -137,7 +137,7 @@ MapSrs.prototype.getFinalHeight = function(coords) {
 MapSrs.prototype.getGeoidGridDelta = function(coords, original) {
     if (this.geoidGridMap != null && this.isGeoidGridReady()) {
         //get cooords in geoidGrid space
-        mapCoords = this.proj4(this.srsProj4, this.geoidGrid.srsProj4, [coords[0], coords[1]]);
+        var mapCoords = this.proj4(this.srsProj4, this.geoidGrid.srsProj4, [coords[0], coords[1]]);
 
         //get image coords
         var px = mapCoords[0] - this.geoidGrid.extents.ll[0];

src/core/map/surface-tree.js

@@ -12,7 +12,7 @@ var MapSurfaceTree = function(map, freeLayer, freeLayerSurface) {
     this.freeLayer = freeLayer;
     this.freeLayerSurface = freeLayerSurface;
     this.metaBinaryOrder = this.map.referenceFrame.params.metaBinaryOrder;
-    this.initialized = false;
+    //this.initialized = false;
     //this.geocent = !this.map.getNavigationSrs().isProjected();
 
     this.surfaceTree = new MapSurfaceTile(this.map, null, this.rootId);
@@ -41,15 +41,15 @@ MapSurfaceTree.prototype.kill = function() {
 };
 
 
-MapSurfaceTree.prototype.init = function() {
+/*MapSurfaceTree.prototype.init = function() {
     var url = this.map.url.makeUrl(surface.metaUrl, {lod:result[0], ix:result[1], iy:result[2] });  //result???
     map.loader.load(url, metatile.load.bind(metatile, url));
 
     this.metatileTree.load();
     this.surfaceTree.metatile = 1;
 
     this.initialized = true;
-};
+};*/
 
 
 MapSurfaceTree.prototype.findSurfaceTile = function(id) {

src/core/map/surface.js

@@ -346,15 +346,6 @@ MapSurface.prototype.getNavUrl = function(id, skipBaseUrl) {
 };
 
 
-MapSurface.prototype.getNavTemplate = function(id, skipBaseUrl) {
-    if (this.navUrl.indexOf('//') != -1){
-        return this.navUrl;
-    } else {
-        this.map.url.baseUrl + url;
-    }
-};
-
-
 MapSurface.prototype.getMeshUrl = function(id, skipBaseUrl) {
     return this.map.url.makeUrl(this.meshUrl, {lod:id[0], ix:id[1], iy:id[2] }, null, skipBaseUrl);
 };

src/core/renderer/interface.js

@@ -427,7 +427,7 @@ RendererInterface.prototype.setConfigParam = function(key, value) {
 
 
 RendererInterface.prototype.getConfigParam = function(key) {
-    return this.renderer.getConfigParam(key, value);
+    return this.renderer.getConfigParam(key);
 };
 
 

src/core/renderer/renderer.js

@@ -559,7 +559,7 @@ Renderer.prototype.saveScreenshot = function(output, filename, filetype) {
             window.URL.revokeObjectURL(url);  
         }, 0); 
     } if (output == 'tab') {
-        window.open(canvas.toDataURL('image/' + type));
+        window.open(canvas.toDataURL('image/' + filetype));
     }
 
     return imageData;