geojs 1.4.1 → 1.6.0

package/src/webgl/layer.js

@@ -141,7 +141,7 @@ var webgl_layer = function () {
             opacity,
             lowerTileLayers;
         layers.forEach(function (layer) {
-          let autoshare = layer.autoshareRenderer(),
+          const autoshare = layer.autoshareRenderer(),
               isTileLayer = layer instanceof tileLayer;
           if (!autoshare || !layer.renderer() || layer.renderer().api() !== webglRenderer.apiname) {
             renderer = null;

package/src/webgl/markerFeature.js

@@ -129,7 +129,7 @@ var webgl_markerFeature = function (arg) {
 
     posFunc = m_this.position();
 
-    for (let key in styleKeys) {
+    for (const key in styleKeys) {
       styleFunc[key] = m_this.style.get(key);
       if (!util.isFunction(m_this.style(key))) {
         styleUni[key] = styleFunc[key]();
@@ -183,7 +183,7 @@ var webgl_markerFeature = function (arg) {
         }
       }
       // unrolling this would speed it up
-      for (let key in styleKeys) {
+      for (const key in styleKeys) {
         styleVal[key] = styleUni[key] === undefined ? styleFunc[key](item, i) : styleUni[key];
       }
       styleVal.scaleWithZoom = markerFeature.scaleMode[styleVal.scaleWithZoom] || (styleVal.scaleWithZoom >= 1 && styleVal.scaleWithZoom <= 3 ? styleVal.scaleWithZoom : 0);
@@ -219,7 +219,7 @@ var webgl_markerFeature = function (arg) {
     }
 
     if (m_this._primitiveShapeAuto) {
-      let maxr = m_this._approximateMaxRadius(m_this.renderer().map().zoom());
+      const maxr = m_this._approximateMaxRadius(m_this.renderer().map().zoom());
       if ((m_this._primitiveShape === markerFeature.primitiveShapes.sprite && maxr > webglRenderer._maxPointSize) ||
           (m_this._primitiveShape !== markerFeature.primitiveShapes.sprite && maxr <= webglRenderer._maxPointSize)) {
         // Switch primitive
@@ -339,7 +339,7 @@ var webgl_markerFeature = function (arg) {
         needsRefresh = true;
       }
       if (key === sbkey) {
-        let mod = m_this.modified;
+        const mod = m_this.modified;
         if (!needsRefresh) {
           // don't allow modified to be adjusted if we don't need to refresh
           m_this.modified = () => {};

package/src/webgl/meshColored.js

@@ -140,11 +140,11 @@ var webgl_meshColored = function (arg) {
         posAttr = vgl.vertexAttribute('pos'),
         valueAttr = vgl.vertexAttribute('value'),
         opacityAttr = vgl.vertexAttribute('opacity'),
-        sourcePositions = vgl.sourceDataP3fv({'name': 'pos'}),
+        sourcePositions = vgl.sourceDataP3fv({name: 'pos'}),
         sourceValues = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.One, {'name': 'value'}),
+          1, vgl.vertexAttributeKeysIndexed.One, {name: 'value'}),
         sourceOpacity = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Two, {'name': 'opacity'}),
+          1, vgl.vertexAttributeKeysIndexed.Two, {name: 'opacity'}),
         primitive = new vgl.triangles();
     m_modelViewUniform = new vgl.modelViewOriginUniform('modelViewMatrix');
 

package/src/webgl/pointFeature.js

@@ -321,7 +321,7 @@ var webgl_pointFeature = function (arg) {
       } else {
         needsRefresh = true;
       }
-      let mod = m_this.modified;
+      const mod = m_this.modified;
       if (!needsRefresh) {
         // don't allow modified to be adjusted if we don't need to refresh
         m_this.modified = () => {};
@@ -362,25 +362,25 @@ var webgl_pointFeature = function (arg) {
         mat = vgl.material(),
         blend = vgl.blend(),
         geom = vgl.geometryData(),
-        sourcePositions = vgl.sourceDataP3fv({'name': 'pos'}),
+        sourcePositions = vgl.sourceDataP3fv({name: 'pos'}),
         sourceUnits = vgl.sourceDataAnyfv(
-          2, vgl.vertexAttributeKeysIndexed.One, {'name': 'unit'}),
+          2, vgl.vertexAttributeKeysIndexed.One, {name: 'unit'}),
         sourceRadius = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Two, {'name': 'radius'}),
+          1, vgl.vertexAttributeKeysIndexed.Two, {name: 'radius'}),
         sourceStrokeWidth = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Three, {'name': 'strokeWidth'}),
+          1, vgl.vertexAttributeKeysIndexed.Three, {name: 'strokeWidth'}),
         sourceFillColor = vgl.sourceDataAnyfv(
-          3, vgl.vertexAttributeKeysIndexed.Four, {'name': 'fillColor'}),
+          3, vgl.vertexAttributeKeysIndexed.Four, {name: 'fillColor'}),
         sourceFill = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Five, {'name': 'fill'}),
+          1, vgl.vertexAttributeKeysIndexed.Five, {name: 'fill'}),
         sourceStrokeColor = vgl.sourceDataAnyfv(
-          3, vgl.vertexAttributeKeysIndexed.Six, {'name': 'strokeColor'}),
+          3, vgl.vertexAttributeKeysIndexed.Six, {name: 'strokeColor'}),
         sourceStroke = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Seven, {'name': 'stroke'}),
+          1, vgl.vertexAttributeKeysIndexed.Seven, {name: 'stroke'}),
         sourceAlpha = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Eight, {'name': 'fillOpacity'}),
+          1, vgl.vertexAttributeKeysIndexed.Eight, {name: 'fillOpacity'}),
         sourceStrokeOpacity = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Nine, {'name': 'strokeOpacity'}),
+          1, vgl.vertexAttributeKeysIndexed.Nine, {name: 'strokeOpacity'}),
         primitive;
     m_modelViewUniform = new vgl.modelViewOriginUniform('modelViewMatrix', m_origin);
 

package/src/webgl/polygonFeature.js

@@ -267,11 +267,11 @@ var webgl_polygonFeature = function (arg) {
         fragmentShader = createFragmentShader(),
         blend = vgl.blend(),
         geom = vgl.geometryData(),
-        sourcePositions = vgl.sourceDataP3fv({'name': 'pos'}),
+        sourcePositions = vgl.sourceDataP3fv({name: 'pos'}),
         sourceFillColor = vgl.sourceDataAnyfv(
-          3, vgl.vertexAttributeKeysIndexed.Two, {'name': 'fillColor'}),
+          3, vgl.vertexAttributeKeysIndexed.Two, {name: 'fillColor'}),
         sourceFillOpacity = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Three, {'name': 'fillOpacity'}),
+          1, vgl.vertexAttributeKeysIndexed.Three, {name: 'fillOpacity'}),
         trianglePrimitive = vgl.triangles();
     m_modelViewUniform = new vgl.modelViewOriginUniform('modelViewMatrix');
 

package/src/webgl/quadFeature.js

@@ -361,7 +361,9 @@ var webgl_quadFeature = function (arg) {
         return;
       }
       quad.texture.bind(renderState);
-
+      if (context.getError() === context.OUT_OF_MEMORY) {
+        console.log('Insufficient GPU memory for texture');
+      }
       if (quad.opacity !== opacity) {
         opacity = quad.opacity;
         context.uniform1fv(renderState.m_material.shaderProgram()

package/src/webgl/webglRenderer.js

@@ -271,8 +271,7 @@ var webglRenderer = function (arg) {
 
   // Connect to pan event.  This is sufficient, as all zooms and rotations also
   // produce a pan
-  m_this.layer().geoOn(geo_event.pan, function (evt) {
-    void (evt);
+  m_this.layer().geoOn(geo_event.pan, function (_evt) {
     m_updateCamera = true;
   });
 

package/src/polyfills.js

@@ -1,4 +0,0 @@
-// prevent errors from double inclusion in downstream libraries
-if (!global._babelPolyfill) {
-  require('babel-polyfill');
-}