geojs 1.10.1 → 1.10.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # GeoJS Change Log
 
+## Version 1.10.3
+
+### Performance improvements
+
+- Reduce the time it takes to switch texture interpolation ([#1230](../../pull/1230))
+
+## Version 1.10.2
+
+### Improvements
+
+- Directly support nearest pixel or bicubic on quad interpolation ([#1229](../../pull/1229))
+
+## Version 1.10.1
+
+### Improvements
+
+- Make clamping at the end of a map transition optional ([#1226](../../pull/1226))
+
 ## Version 1.10.0
 
 ### Features

package/geo.js

@@ -8017,6 +8017,17 @@ var canvas_quadFeature = function canvas_quadFeature(arg) {
 
     var oldAlpha = context2d.globalAlpha;
     var opacity = oldAlpha;
+    var nearestPixel = m_this.nearestPixel();
+
+    if (nearestPixel !== undefined) {
+      if (nearestPixel !== true && util.isNonNullFinite(nearestPixel)) {
+        var curZoom = m_this.layer().map().zoom();
+        nearestPixel = curZoom >= nearestPixel;
+      }
+
+      context2d.imageSmoothingEnabled = !nearestPixel;
+    }
+
     $.each([m_quads.imgQuads, m_quads.vidQuads], function (listidx, quadlist) {
       if (!quadlist) {
         return;
@@ -8086,6 +8097,7 @@ var canvas_quadFeature = function canvas_quadFeature(arg) {
     }
 
     context2d.setTransform(1, 0, 0, 1, 0, 0);
+    context2d.imageSmoothingEnabled = true;
   };
   /**
    * If this returns true, the render will be skipped and tried again on the
@@ -8544,6 +8556,10 @@ var canvas_tileLayer = function canvas_tileLayer() {
   this._update = function (request) {
     s_update.call(m_this, request);
 
+    if (m_quadFeature && m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(m_this.nearestPixel());
+    }
+
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
 
     return m_this;
@@ -18628,6 +18644,10 @@ var map = function map(arg) {
     m_autoshareRenderer = arg === null ? undefined : arg;
     return m_this;
   };
+  /* Report the current version on the map object. */
+
+
+  this._version = __webpack_require__(2978);
   /**
    * Draw a layer image to a canvas context.  The layer's opacity and transform
    * are applied.  This is used as part of making a screenshot.
@@ -18641,7 +18661,6 @@ var map = function map(arg) {
    * @private
    */
 
-
   function drawLayerImageToContext(context, opacity, elem, img, mixBlendMode) {
     context.globalAlpha = opacity;
 
@@ -24200,6 +24219,7 @@ var pixelmapLayer = function pixelmapLayer(arg) {
   this._init = function () {
     // Call super class init
     s_init.apply(m_this, arguments);
+    m_this.nearestPixel(true, true);
     var pixelmapArgs = {
       quadFeature: m_this.features()[0]
     };
@@ -26010,6 +26030,10 @@ var feature = __webpack_require__(6837);
  *   call `cacheUpdate` on the data item or for all data.
  * @property {geo.quadFeature.styleSpec} [style] Style object with default
  *   style options.
+ * @property {boolean|number} [nearestPixel] If true, image quads are
+ *   rendered with near-neighbor sampling.  If false, with interpolated
+ *   sampling.  If a number, interpolate at that zoom level or below and
+ *   nearest neighbor at that zoom level or above.
  */
 
 /**
@@ -26073,6 +26097,7 @@ var quadFeature = function quadFeature(arg) {
   var m_this = this,
       s_init = this._init,
       m_cacheQuads,
+      m_nearestPixel = arg.nearestPixel,
       m_nextQuadId = 0,
       m_images = [],
       m_videos = [],
@@ -26755,6 +26780,27 @@ var quadFeature = function quadFeature(arg) {
 
     return null;
   };
+  /**
+   * Get/Set nearestPixel value.
+   *
+   * @param {boolean|number} [val] If not specified, return the current value.
+   *    If true, image quads are rendered with near-neighbor sampling.  If
+   *    false, with interpolated sampling.  If a number, interpolate at that
+   *    zoom level or below and nearest neighbor at that zoom level or above.
+   * @returns {boolean|number|this}
+   */
+
+
+  this.nearestPixel = function (val) {
+    if (val === undefined) {
+      return m_nearestPixel;
+    } else {
+      m_nearestPixel = val;
+      m_this.modified();
+    }
+
+    return m_this;
+  };
   /**
    * Initialize.
    *
@@ -27823,7 +27869,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "b37bd8311e8146b64ad199fccd0b4a5404d78157";
+module.exports = "3e924c64da3ad1b47324b2d5106e85db1bf1d809";
 
 /***/ }),
 
@@ -30731,6 +30777,10 @@ var featureLayer = __webpack_require__(3715);
  *   any tile layers.  If specified, this uses the quad defaults, so this is a
  *   ``geo.quadFeature.position`` object with, typically, an ``image`` property
  *   added to it.  The quad positions are in the map gcs coordinates.
+ * @property {boolean|number} [nearestPixel] If true, image quads are
+ *   rendered with near-neighbor sampling.  If false, with interpolated
+ *   sampling.  If a number, interpolate at that zoom level or below and
+ *   nearest neighbor at that zoom level or above.
  */
 
 /**
@@ -30894,6 +30944,7 @@ var tileLayer = function tileLayer(arg) {
       m_reference,
       m_exited,
       m_lastBaseQuad,
+      m_nearestPixel = arg.nearestPixel,
       m_this = this; // copy the options into a private variable
 
   this._options = $.extend(true, {}, arg); // set the layer attribution text
@@ -32535,6 +32586,36 @@ var tileLayer = function tileLayer(arg) {
 
     return m_this;
   };
+  /**
+   * Get/Set nearestPixel value.
+   *
+   * @param {boolean|number} [val] If not specified, return the current value.
+   *    If true, image quads are rendered with near-neighbor sampling.  If
+   *    false, with interpolated sampling.  If a number, interpolate at that
+   *    zoom level or below and nearest neighbor at that zoom level or above.
+   * @param {boolean} [skipUpdate] If specifying val and this value is truthy,
+   *    don't update the layer or mark it as modified.
+   * @returns {boolean|number|this}
+   */
+
+
+  this.nearestPixel = function (val, skipUpdate) {
+    if (val === undefined) {
+      return m_nearestPixel;
+    }
+
+    if (m_nearestPixel !== val) {
+      m_nearestPixel = val;
+
+      if (!skipUpdate) {
+        m_this.modified();
+
+        m_this._update();
+      }
+    }
+
+    return m_this;
+  };
   /**
    * Get/set the baseQuad.
    *
@@ -40948,7 +41029,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.1";
+module.exports = "1.10.4";
 
 /***/ }),
 
@@ -43942,7 +44023,8 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
       m_quadFeature = m_this.layer().createFeature('quad', {
         selectionAPI: false,
         gcs: m_this.gcs(),
-        visible: m_this.visible(undefined, true)
+        visible: m_this.visible(undefined, true),
+        nearestPixel: true
       });
       m_quadFeatureInit = false;
     }
@@ -43964,11 +44046,6 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
       };
 
       m_quadFeature._hookRenderImageQuads = function (renderState, quads) {
-        quads.forEach(function (quad) {
-          if (quad.image && quad.texture && !quad.texture.nearestPixel()) {
-            quad.texture.setNearestPixel(true);
-          }
-        });
         m_lookupTable.bind(renderState, quads);
       };
 
@@ -44002,6 +44079,10 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
 
   if (arg.quadFeature) {
     m_quadFeature = arg.quadFeature;
+
+    if (m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(true);
+    }
   }
 
   this._init(arg);
@@ -45204,6 +45285,8 @@ var quadFeature = __webpack_require__(5017);
 
 var timestamp = __webpack_require__(6618);
 
+var util = __webpack_require__(4634);
+
 var _memoryCheckLargestTested = 4096 * 4096;
 /**
  * Create a new instance of class quadFeature.
@@ -45608,6 +45691,34 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
         h,
         quadw,
         quadh;
+    var nearestPixel = m_this.nearestPixel();
+
+    if (nearestPixel !== undefined) {
+      if (nearestPixel !== true && util.isNonNullFinite(nearestPixel)) {
+        var curZoom = m_this.layer().map().zoom();
+        nearestPixel = curZoom >= nearestPixel;
+      }
+
+      m_quads.imgQuads.forEach(function (quad) {
+        if (quad.image && quad.texture && quad.texture.nearestPixel() !== nearestPixel) {
+          /* This could just be
+           *   quad.texture.setNearestPixel(nearestPixel);
+           * but that needlessly redecodes the image.  Instead, just change the
+           * the interpolation flags, then change the nearestPixel value
+           * without triggering a complete re-setup. */
+          renderState.m_context.bindTexture(vgl.GL.TEXTURE_2D, quad.texture.textureHandle());
+          renderState.m_context.texParameteri(vgl.GL.TEXTURE_2D, vgl.GL.TEXTURE_MIN_FILTER, nearestPixel ? vgl.GL.NEAREST : vgl.GL.LINEAR);
+          renderState.m_context.texParameteri(vgl.GL.TEXTURE_2D, vgl.GL.TEXTURE_MAG_FILTER, nearestPixel ? vgl.GL.NEAREST : vgl.GL.LINEAR);
+          renderState.m_context.bindTexture(vgl.GL.TEXTURE_2D, null);
+          var oldmod = quad.texture.modified;
+
+          quad.texture.modified = function () {};
+
+          quad.texture.setNearestPixel(nearestPixel);
+          quad.texture.modified = oldmod;
+        }
+      });
+    }
 
     if (m_this._hookRenderImageQuads) {
       m_this._hookRenderImageQuads(renderState, m_quads.imgQuads);
@@ -46002,6 +46113,10 @@ var webgl_tileLayer = function webgl_tileLayer() {
   this._update = function (request) {
     s_update.call(m_this, request);
 
+    if (m_quadFeature && m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(m_this.nearestPixel());
+    }
+
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
 
     return m_this;

package/geo.lean.js

@@ -8017,6 +8017,17 @@ var canvas_quadFeature = function canvas_quadFeature(arg) {
 
     var oldAlpha = context2d.globalAlpha;
     var opacity = oldAlpha;
+    var nearestPixel = m_this.nearestPixel();
+
+    if (nearestPixel !== undefined) {
+      if (nearestPixel !== true && util.isNonNullFinite(nearestPixel)) {
+        var curZoom = m_this.layer().map().zoom();
+        nearestPixel = curZoom >= nearestPixel;
+      }
+
+      context2d.imageSmoothingEnabled = !nearestPixel;
+    }
+
     $.each([m_quads.imgQuads, m_quads.vidQuads], function (listidx, quadlist) {
       if (!quadlist) {
         return;
@@ -8086,6 +8097,7 @@ var canvas_quadFeature = function canvas_quadFeature(arg) {
     }
 
     context2d.setTransform(1, 0, 0, 1, 0, 0);
+    context2d.imageSmoothingEnabled = true;
   };
   /**
    * If this returns true, the render will be skipped and tried again on the
@@ -8544,6 +8556,10 @@ var canvas_tileLayer = function canvas_tileLayer() {
   this._update = function (request) {
     s_update.call(m_this, request);
 
+    if (m_quadFeature && m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(m_this.nearestPixel());
+    }
+
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
 
     return m_this;
@@ -18628,6 +18644,10 @@ var map = function map(arg) {
     m_autoshareRenderer = arg === null ? undefined : arg;
     return m_this;
   };
+  /* Report the current version on the map object. */
+
+
+  this._version = __webpack_require__(2978);
   /**
    * Draw a layer image to a canvas context.  The layer's opacity and transform
    * are applied.  This is used as part of making a screenshot.
@@ -18641,7 +18661,6 @@ var map = function map(arg) {
    * @private
    */
 
-
   function drawLayerImageToContext(context, opacity, elem, img, mixBlendMode) {
     context.globalAlpha = opacity;
 
@@ -24200,6 +24219,7 @@ var pixelmapLayer = function pixelmapLayer(arg) {
   this._init = function () {
     // Call super class init
     s_init.apply(m_this, arguments);
+    m_this.nearestPixel(true, true);
     var pixelmapArgs = {
       quadFeature: m_this.features()[0]
     };
@@ -26010,6 +26030,10 @@ var feature = __webpack_require__(6837);
  *   call `cacheUpdate` on the data item or for all data.
  * @property {geo.quadFeature.styleSpec} [style] Style object with default
  *   style options.
+ * @property {boolean|number} [nearestPixel] If true, image quads are
+ *   rendered with near-neighbor sampling.  If false, with interpolated
+ *   sampling.  If a number, interpolate at that zoom level or below and
+ *   nearest neighbor at that zoom level or above.
  */
 
 /**
@@ -26073,6 +26097,7 @@ var quadFeature = function quadFeature(arg) {
   var m_this = this,
       s_init = this._init,
       m_cacheQuads,
+      m_nearestPixel = arg.nearestPixel,
       m_nextQuadId = 0,
       m_images = [],
       m_videos = [],
@@ -26755,6 +26780,27 @@ var quadFeature = function quadFeature(arg) {
 
     return null;
   };
+  /**
+   * Get/Set nearestPixel value.
+   *
+   * @param {boolean|number} [val] If not specified, return the current value.
+   *    If true, image quads are rendered with near-neighbor sampling.  If
+   *    false, with interpolated sampling.  If a number, interpolate at that
+   *    zoom level or below and nearest neighbor at that zoom level or above.
+   * @returns {boolean|number|this}
+   */
+
+
+  this.nearestPixel = function (val) {
+    if (val === undefined) {
+      return m_nearestPixel;
+    } else {
+      m_nearestPixel = val;
+      m_this.modified();
+    }
+
+    return m_this;
+  };
   /**
    * Initialize.
    *
@@ -27823,7 +27869,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "b37bd8311e8146b64ad199fccd0b4a5404d78157";
+module.exports = "3e924c64da3ad1b47324b2d5106e85db1bf1d809";
 
 /***/ }),
 
@@ -30731,6 +30777,10 @@ var featureLayer = __webpack_require__(3715);
  *   any tile layers.  If specified, this uses the quad defaults, so this is a
  *   ``geo.quadFeature.position`` object with, typically, an ``image`` property
  *   added to it.  The quad positions are in the map gcs coordinates.
+ * @property {boolean|number} [nearestPixel] If true, image quads are
+ *   rendered with near-neighbor sampling.  If false, with interpolated
+ *   sampling.  If a number, interpolate at that zoom level or below and
+ *   nearest neighbor at that zoom level or above.
  */
 
 /**
@@ -30894,6 +30944,7 @@ var tileLayer = function tileLayer(arg) {
       m_reference,
       m_exited,
       m_lastBaseQuad,
+      m_nearestPixel = arg.nearestPixel,
       m_this = this; // copy the options into a private variable
 
   this._options = $.extend(true, {}, arg); // set the layer attribution text
@@ -32535,6 +32586,36 @@ var tileLayer = function tileLayer(arg) {
 
     return m_this;
   };
+  /**
+   * Get/Set nearestPixel value.
+   *
+   * @param {boolean|number} [val] If not specified, return the current value.
+   *    If true, image quads are rendered with near-neighbor sampling.  If
+   *    false, with interpolated sampling.  If a number, interpolate at that
+   *    zoom level or below and nearest neighbor at that zoom level or above.
+   * @param {boolean} [skipUpdate] If specifying val and this value is truthy,
+   *    don't update the layer or mark it as modified.
+   * @returns {boolean|number|this}
+   */
+
+
+  this.nearestPixel = function (val, skipUpdate) {
+    if (val === undefined) {
+      return m_nearestPixel;
+    }
+
+    if (m_nearestPixel !== val) {
+      m_nearestPixel = val;
+
+      if (!skipUpdate) {
+        m_this.modified();
+
+        m_this._update();
+      }
+    }
+
+    return m_this;
+  };
   /**
    * Get/set the baseQuad.
    *
@@ -40948,7 +41029,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.1";
+module.exports = "1.10.4";
 
 /***/ }),
 
@@ -43942,7 +44023,8 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
       m_quadFeature = m_this.layer().createFeature('quad', {
         selectionAPI: false,
         gcs: m_this.gcs(),
-        visible: m_this.visible(undefined, true)
+        visible: m_this.visible(undefined, true),
+        nearestPixel: true
       });
       m_quadFeatureInit = false;
     }
@@ -43964,11 +44046,6 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
       };
 
       m_quadFeature._hookRenderImageQuads = function (renderState, quads) {
-        quads.forEach(function (quad) {
-          if (quad.image && quad.texture && !quad.texture.nearestPixel()) {
-            quad.texture.setNearestPixel(true);
-          }
-        });
         m_lookupTable.bind(renderState, quads);
       };
 
@@ -44002,6 +44079,10 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
 
   if (arg.quadFeature) {
     m_quadFeature = arg.quadFeature;
+
+    if (m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(true);
+    }
   }
 
   this._init(arg);
@@ -45204,6 +45285,8 @@ var quadFeature = __webpack_require__(5017);
 
 var timestamp = __webpack_require__(6618);
 
+var util = __webpack_require__(4634);
+
 var _memoryCheckLargestTested = 4096 * 4096;
 /**
  * Create a new instance of class quadFeature.
@@ -45608,6 +45691,34 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
         h,
         quadw,
         quadh;
+    var nearestPixel = m_this.nearestPixel();
+
+    if (nearestPixel !== undefined) {
+      if (nearestPixel !== true && util.isNonNullFinite(nearestPixel)) {
+        var curZoom = m_this.layer().map().zoom();
+        nearestPixel = curZoom >= nearestPixel;
+      }
+
+      m_quads.imgQuads.forEach(function (quad) {
+        if (quad.image && quad.texture && quad.texture.nearestPixel() !== nearestPixel) {
+          /* This could just be
+           *   quad.texture.setNearestPixel(nearestPixel);
+           * but that needlessly redecodes the image.  Instead, just change the
+           * the interpolation flags, then change the nearestPixel value
+           * without triggering a complete re-setup. */
+          renderState.m_context.bindTexture(vgl.GL.TEXTURE_2D, quad.texture.textureHandle());
+          renderState.m_context.texParameteri(vgl.GL.TEXTURE_2D, vgl.GL.TEXTURE_MIN_FILTER, nearestPixel ? vgl.GL.NEAREST : vgl.GL.LINEAR);
+          renderState.m_context.texParameteri(vgl.GL.TEXTURE_2D, vgl.GL.TEXTURE_MAG_FILTER, nearestPixel ? vgl.GL.NEAREST : vgl.GL.LINEAR);
+          renderState.m_context.bindTexture(vgl.GL.TEXTURE_2D, null);
+          var oldmod = quad.texture.modified;
+
+          quad.texture.modified = function () {};
+
+          quad.texture.setNearestPixel(nearestPixel);
+          quad.texture.modified = oldmod;
+        }
+      });
+    }
 
     if (m_this._hookRenderImageQuads) {
       m_this._hookRenderImageQuads(renderState, m_quads.imgQuads);
@@ -46002,6 +46113,10 @@ var webgl_tileLayer = function webgl_tileLayer() {
   this._update = function (request) {
     s_update.call(m_this, request);
 
+    if (m_quadFeature && m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(m_this.nearestPixel());
+    }
+
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
 
     return m_this;