geojs 1.10.0 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.10.0",
+  "version": "1.10.3",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -27,6 +27,7 @@
   },
   "optionalDependencies": {
     "d3": "^3.5.17",
+    "glslang-validator-prebuilt-predownloaded": "^0.0.2",
     "hammerjs": "^2.0.8",
     "vtk.js": "*"
   },
@@ -53,7 +54,6 @@
     "express": "^4.17.2",
     "fs-extra": "^10.0.0",
     "glob": "^8.0.1",
-    "glslang-validator-prebuilt": "^0.0.7",
     "imports-loader": "^4.0.0",
     "jaguarjs-jsdoc": "^1.0.2",
     "jasmine-core": "^4.0.0",
@@ -135,7 +135,7 @@
     "build-website-tutorials": "node tutorials/build-website.js && webpack --config webpack-website-tutorials.config.js",
     "lint": "eslint --cache . --max-warnings=0",
     "puglint": "pug-lint src examples",
-    "glsllint": "find . \\( -name '*.frag' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt/bin/glslangValidator --stdin -S frag || exit 1; done' sh {} \\+ && find . \\( -name '*.vert' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt/bin/glslangValidator --stdin -S vert || exit 1; done' sh {} \\+",
+    "glsllint": "chmod +x node_modules/glslang-validator-prebuilt-predownloaded/bin/glslangValidator.linux; find . \\( -name '*.frag' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt-predownloaded/bin/glslangValidator.linux --stdin -S frag || exit 1; done' sh {} \\+ && find . \\( -name '*.vert' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt-predownloaded/bin/glslangValidator.linux --stdin -S vert || exit 1; done' sh {} \\+",
     "test-headless": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
     "test-headless-all": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
     "test-headed": "GEOJS_TEST_CASE=tests/test-headed.js karma start karma-cov.conf.js --single-run --browsers ChromeFull",

package/src/canvas/quadFeature.js

@@ -138,6 +138,14 @@ var canvas_quadFeature = function (arg) {
 
     var oldAlpha = context2d.globalAlpha;
     var opacity = oldAlpha;
+    var nearestPixel = m_this.nearestPixel();
+    if (nearestPixel !== undefined) {
+      if (nearestPixel !== true && util.isNonNullFinite(nearestPixel)) {
+        const 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;
@@ -193,6 +201,7 @@ var canvas_quadFeature = function (arg) {
       context2d.globalAlpha = oldAlpha;
     }
     context2d.setTransform(1, 0, 0, 1, 0, 0);
+    context2d.imageSmoothingEnabled = true;
   };
 
   /**

package/src/canvas/tileLayer.js

@@ -69,6 +69,7 @@ var canvas_tileLayer = function () {
    */
   this._update = function (request) {
     s_update.call(m_this, request);
+    m_quadFeature.nearestPixel(m_this.nearestPixel());
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
     return m_this;
   };

package/src/map.js

@@ -407,18 +407,22 @@ var map = function (arg) {
    *    center.
    * @param {boolean} [ignoreDiscreteZoom] If `true`, ignore the discreteZoom
    *    option when determining the new view.
+   * @param {boolean} [ignoreClampBounds] If `true`, ignore the clampBounds
+   *    option when determining the new view.
    * @returns {number|this}
    * @fires geo.event.zoom
    * @fires geo.event.pan
    */
-  this.zoom = function (val, origin, ignoreDiscreteZoom) {
+  this.zoom = function (val, origin, ignoreDiscreteZoom, ignoreClampBounds) {
     if (val === undefined) {
       return m_zoom;
     }
     var evt, bounds;
     /* If we are zooming around a point, ignore the clamp bounds */
     var aroundPoint = (origin && (origin.mapgcs || origin.geo) && origin.map);
-    var ignoreClampBounds = aroundPoint;
+    if (aroundPoint) {
+      ignoreClampBounds = true;
+    }
 
     /* The ignoreDiscreteZoom flag is intended to allow non-integer zoom values
      * during animation. */
@@ -446,7 +450,7 @@ var map = function (arg) {
       m_this.pan({x: origin.map.x - shifted.x, y: origin.map.y - shifted.y},
                  ignoreDiscreteZoom, true);
     } else {
-      m_this.pan({x: 0, y: 0}, ignoreDiscreteZoom);
+      m_this.pan({x: 0, y: 0}, ignoreDiscreteZoom, ignoreClampBounds);
     }
     return m_this;
   };
@@ -1101,6 +1105,8 @@ var map = function (arg) {
    *    a value based on what canceled a transition, `transition`: the current
    *    transition that just completed, `next`: a boolean if another transition
    *    follows immediately.
+   * @param {boolean} [opts.endClamp=true] If `false`, the last center change
+   *    will not clamp to the bounds and zoom values.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
    *    the interface gcs, `null` to use the map gcs, or any other transform.
    *    Applies only to `opts.center` and to converting zoom values to height,
@@ -1205,7 +1211,8 @@ var map = function (arg) {
       zCoord: opts.zCoord,
       done: opts.done,
       duration: opts.duration,
-      zoomOrigin: opts.zoomOrigin
+      zoomOrigin: opts.zoomOrigin,
+      endClamp: opts.endClamp
     };
 
     m_transition.interp = opts.interp([
@@ -1260,9 +1267,10 @@ var map = function (arg) {
         if (!next) {
           if (m_transition.end.center) {
             var needZoom = m_zoom !== m_this._fix_zoom(m_transition.end.zoom);
-            m_this.center(m_transition.end.center, null, needZoom, needZoom);
+            var noEndClamp = needZoom || opts.endClamp === false;
+            m_this.center(m_transition.end.center, null, noEndClamp, noEndClamp);
           }
-          m_this.zoom(m_transition.end.zoom, m_transition.zoomOrigin);
+          m_this.zoom(m_transition.end.zoom, m_transition.zoomOrigin, opts.endClamp === false, opts.endClamp === false);
           m_this.rotation(fix_rotation(m_transition.end.rotation));
         }
 
@@ -1297,7 +1305,7 @@ var map = function (arg) {
         }, null, true, true);
       } else {
         m_center = m_this.gcsToWorld({x: p[0], y: p[1]}, null);
-        m_this.zoom(p[2], m_transition.zoomOrigin, true);
+        m_this.zoom(p[2], m_transition.zoomOrigin, true, true);
       }
       m_this.rotation(p[3], undefined, true);
 
@@ -1956,6 +1964,9 @@ var map = function (arg) {
     return m_this;
   };
 
+  /* Report the current version on the map object. */
+  this._version = require('./version');
+
   /**
    * 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.

package/src/pixelmapLayer.js

@@ -96,6 +96,7 @@ var pixelmapLayer = function (arg) {
   this._init = function () {
     // Call super class init
     s_init.apply(m_this, arguments);
+    m_this.nearestPixel(true, true);
 
     const pixelmapArgs = {quadFeature: m_this.features()[0]};
     if (arg.style) {

package/src/quadFeature.js

@@ -47,6 +47,10 @@ var feature = require('./feature');
  *   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.
  */
 
 /**
@@ -106,6 +110,7 @@ var quadFeature = function (arg) {
   var m_this = this,
       s_init = this._init,
       m_cacheQuads,
+      m_nearestPixel = arg.nearestPixel,
       m_nextQuadId = 0,
       m_images = [],
       m_videos = [],
@@ -677,6 +682,25 @@ var quadFeature = function (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.
    *

package/src/tileLayer.js

@@ -81,6 +81,10 @@ var featureLayer = require('./featureLayer');
  *   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.
  */
 
 /**
@@ -228,6 +232,7 @@ var tileLayer = function (arg) {
       m_reference,
       m_exited,
       m_lastBaseQuad,
+      m_nearestPixel = arg.nearestPixel,
       m_this = this;
 
   // copy the options into a private variable
@@ -1682,6 +1687,31 @@ var tileLayer = function (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.
    *

package/src/webgl/pixelmapFeature.js

@@ -134,7 +134,8 @@ var webgl_pixelmapFeature = function (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;
     }
@@ -153,11 +154,6 @@ var webgl_pixelmapFeature = function (arg) {
         prog.addUniform(lutHeight);
       };
       m_quadFeature._hookRenderImageQuads = (renderState, quads) => {
-        quads.forEach((quad) => {
-          if (quad.image && quad.texture && !quad.texture.nearestPixel()) {
-            quad.texture.setNearestPixel(true);
-          }
-        });
         m_lookupTable.bind(renderState, quads);
       };
       if (m_quadFeatureInit === false) {
@@ -188,6 +184,7 @@ var webgl_pixelmapFeature = function (arg) {
 
   if (arg.quadFeature) {
     m_quadFeature = arg.quadFeature;
+    m_quadFeature.nearestPixel(true);
   }
   this._init(arg);
   return this;

package/src/webgl/quadFeature.js

@@ -2,6 +2,7 @@ var inherit = require('../inherit');
 var registerFeature = require('../registry').registerFeature;
 var quadFeature = require('../quadFeature');
 var timestamp = require('../timestamp');
+var util = require('../util');
 
 let _memoryCheckLargestTested = 4096 * 4096;
 
@@ -364,6 +365,30 @@ var webgl_quadFeature = function (arg) {
         cropsrc = {x0: 0, y0: 0, x1: 1, y1: 1}, quadcropsrc,
         w, h, quadw, quadh;
 
+    let nearestPixel = m_this.nearestPixel();
+    if (nearestPixel !== undefined) {
+      if (nearestPixel !== true && util.isNonNullFinite(nearestPixel)) {
+        const curZoom = m_this.layer().map().zoom();
+        nearestPixel = curZoom >= nearestPixel;
+      }
+      m_quads.imgQuads.forEach((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);
+          const oldmod = quad.texture.modified;
+          quad.texture.modified = () => {};
+          quad.texture.setNearestPixel(nearestPixel);
+          quad.texture.modified = oldmod;
+        }
+      });
+    }
     if (m_this._hookRenderImageQuads) {
       m_this._hookRenderImageQuads(renderState, m_quads.imgQuads);
     }

package/src/webgl/tileLayer.js

@@ -171,6 +171,7 @@ var webgl_tileLayer = function () {
    */
   this._update = function (request) {
     s_update.call(m_this, request);
+    m_quadFeature.nearestPixel(m_this.nearestPixel());
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
     return m_this;
   };