Merge pull request #49 from DavidLevinsky/master

Fixed bound layer masks and fixed style paths

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vts-browser-js",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "JavaScript WebGL 3D maps rendering engine",
   "main": "src/browser/index.js",
   "scripts": {

src/core/core.js

@@ -468,7 +468,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.5.0';
+    return (full ? 'Core: ' : '') + '2.5.2';
 }
 
 

src/core/inspector/stylesheets.js

@@ -121,7 +121,7 @@ InspectorStylesheets.prototype.onUpdate = function() {
 
 
 InspectorStylesheets.prototype.niceStyleFormat = function(data) {
-    if (!data) {
+    if (!data || !data.data) {
         return '';
     }
 

src/core/map/stylesheet.js

@@ -5,7 +5,7 @@ import {utils as utils_} from '../utils/utils';
 var utils = utils_;
 
 
-var MapStylesheet = function(map, id, url) {
+var MapStylesheet = function(map, id, url, freeLayer) {
     this.generateLines = true;
     this.map = map;
     this.stats = map.stats;
@@ -15,12 +15,17 @@ var MapStylesheet = function(map, id, url) {
     this.loadState = 0;
     this.size = 0;
     this.fileSize = 0;
+    this.freeLayer = freeLayer;
 
     if (typeof url === 'object') {
         this.data = url;
         this.loadState = 2;
     } else {
-        this.url = this.map.url.processUrl(url);
+        if (this.freeLayer) {
+            this.url = this.freeLayer.processUrl(url, '');
+        } else {
+            this.url = this.map.url.processUrl(url);
+        }
 
         //load style directly
         utils.loadJSON(this.url, this.onLoaded.bind(this), this.onLoadError.bind(this), null, (utils.useCredentials ? (this.url.indexOf(this.map.url.baseUrl) != -1) : false), this.map.core.xhrParams);

src/core/map/surface.js

@@ -319,7 +319,7 @@ MapSurface.prototype.setStyle = function(style) {
     this.stylesheet = this.map.getStylesheet(style);
 
     if (!this.stylesheet) {
-        this.stylesheet = new MapStylesheet(this.map, style, style);
+        this.stylesheet = new MapStylesheet(this.map, style, style, this);
         this.map.addStylesheet(style, this.stylesheet); 
     } 
 

src/core/map/texture.js

@@ -271,7 +271,7 @@ MapTexture.prototype.getMaskTexture = function() {
 
 MapTexture.prototype.getGpuMaskTexture = function() {
     if (this.extraBound) {
-        if (this.extraBound.texture && this.extraBound.texture.mask) {
+        if (this.extraBound.texture && this.extraBound.texture.maskTexture) {
             return this.extraBound.texture.getGpuMaskTexture();
         }
         return null;