geojs 1.7.0 → 1.7.3

package/.github/workflows/main.yml

@@ -10,6 +10,8 @@ on:
   release:
     types:
       - created
+  schedule:
+    - cron: "0 7 * * 1"
 
 jobs:
   build:
@@ -63,6 +65,24 @@ jobs:
         name: website
         path: |
           website/public
+  unpinned:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    # Don't pin version to test with the latest common version
+    - uses: actions/setup-node@v2
+    - run: npm --version && node --version
+    - uses: browser-actions/setup-firefox@latest
+    - run: sudo apt-get remove --yes fonts-lato
+    - run: fc-list
+    - run: firefox --version
+    - run: google-chrome --version
+    # Delete the package-lock to test with the latest libraries allowed
+    - run: rm package-lock.json
+    - run: npm install
+    - run: npm run setup-website
+    - run: npm run ci-xvfb
+    - run: npm run ci-build-website
   deploy-website:
     if: ${{ github.ref == 'refs/heads/master' }}
     needs: build

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # GeoJS Change Log
 
+## Version 1.7.3
+
+### Bug Fixes
+
+- Emit layerMove event when changing a lyer's z-index ([#1185](../../pull/1185))
+
+## Version 1.7.2
+
+### Bug Fixes
+
+- Tile layers with keepLower: false purged tiles on high zoom ([#1178](../../pull/1178))
+
+## Version 1.7.1
+
+### Improvements
+
+- Reduce texture memory check ([#1175](../../pull/1175))
+
 ## Version 1.7.0
 
 ### Features

package/geo.js

@@ -8138,6 +8138,16 @@ geo_event.layerAdd = 'geo_layerAdd';
  */
 
 geo_event.layerRemove = 'geo_layerRemove';
+/**
+ * Triggered when a layer z-index is changed.
+ *
+ * @event geo.event.layerMove
+ * @type {geo.event.base}
+ * @property {geo.map} target The current map.
+ * @property {geo.layer} layer The old layer that was removed.
+ */
+
+geo_event.layerMove = 'geo_layerMove';
 /**
  * Triggered when the map's zoom level is changed.
  *
@@ -13723,7 +13733,7 @@ var layer = function layer(arg) {
     if (zIndex !== m_zIndex) {
       m_zIndex = zIndex;
       m_node.css('z-index', m_zIndex);
-      m_this.geoTrigger(geo_event.layerRemove, {
+      m_this.geoTrigger(geo_event.layerMove, {
         layer: m_this
       });
     }
@@ -26252,7 +26262,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "1d12f116c34ea5a1423ecb767df24b2291e53b06";
+module.exports = "0bc7b69498f5cc8cb411e7db7a8049eda5043a68";
 
 /***/ }),
 
@@ -29847,7 +29857,7 @@ var tileLayer = function tileLayer(arg) {
         changed = false,
         old,
         level,
-        minLevel = m_this._options.keepLower ? m_this._options.minLevel : Math.max(maxLevel, m_this._options.minLevel);
+        minLevel = m_this._options.keepLower ? m_this._options.minLevel : Math.min(Math.max(maxLevel, m_this._options.minLevel), m_this._options.maxLevel);
 
     if (maxLevel < minLevel) {
       maxLevel = minLevel;
@@ -30787,7 +30797,7 @@ var tileLayer = function tileLayer(arg) {
       /* For tile layers that should only keep one layer, if loading is
        * finished, purge all but the current layer.  This is important for
        * semi-transparent layers. */
-      if ((doneLoading || m_this._isCovered(tile)) && zoom !== tile.index.level && (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel)) {
+      if ((doneLoading || m_this._isCovered(tile)) && zoom !== tile.index.level && (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel) && (zoom < m_this._options.maxLevel || tile.index.level !== m_this._options.maxLevel)) {
         return true;
       }
     }
@@ -30951,9 +30961,9 @@ var tileLayer = function tileLayer(arg) {
   /**
    * Get/set the baseQuad.
    *
-   * @property {object} [baseQuad] A quad feature element to draw before below
-   *   any tile layers.  If specified, this uses the quad defaults, so this is
-   *   a ``geo.quadFeature.position`` object with, typically, an ``image``
+   * @property {object} [baseQuad] A quad feature element to draw below 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.
    * @name geo.tileLayer.baseQuad
@@ -38716,7 +38726,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.7.0";
+module.exports = "1.7.3";
 
 /***/ }),
 
@@ -42926,6 +42936,8 @@ var registerFeature = (__webpack_require__(4647).registerFeature);
 var quadFeature = __webpack_require__(5017);
 
 var timestamp = __webpack_require__(6618);
+
+var _memoryCheckLargestTested = 4096 * 4096;
 /**
  * Create a new instance of class quadFeature.
  *
@@ -43343,8 +43355,12 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
       quad.texture.bind(renderState); // only check if the context is out of memory when using modestly large
       // textures.  The check is slow.
 
-      if ((quad.image.width > 4096 || quad.image.height > 4096 || quad.image.width * quad.image.height > 4194304) && context.getError() === context.OUT_OF_MEMORY) {
-        console.log('Insufficient GPU memory for texture');
+      if (quad.image.width * quad.image.height > _memoryCheckLargestTested) {
+        _memoryCheckLargestTested = quad.image.width * quad.image.height;
+
+        if (context.getError() === context.OUT_OF_MEMORY) {
+          console.log('Insufficient GPU memory for texture');
+        }
       }
 
       if (quad.opacity !== opacity) {
@@ -44065,10 +44081,12 @@ var webglRenderer = function webglRenderer(arg) {
       renderState.m_context = m_this._glContext();
       m_viewer.exit(renderState);
 
-      if (m_this._glContext() !== vgl.GL && m_this._glContext().getExtension('WEBGL_lose_context') && m_this._glContext().getExtension('WEBGL_lose_context').loseContext) {
-        m_this._glContext().getExtension('WEBGL_lose_context').loseContext();
+      var context = m_this._glContext();
+
+      if (context !== vgl.GL && context.getExtension('WEBGL_lose_context') && context.getExtension('WEBGL_lose_context').loseContext) {
+        context.getExtension('WEBGL_lose_context').loseContext();
       }
-    } // make sure we clear shaders associated with the generate context, too
+    } // make sure we clear shaders associated with the generated context, too
 
 
     vgl.clearCachedShaders(vgl.GL);

package/geo.lean.js

@@ -8138,6 +8138,16 @@ geo_event.layerAdd = 'geo_layerAdd';
  */
 
 geo_event.layerRemove = 'geo_layerRemove';
+/**
+ * Triggered when a layer z-index is changed.
+ *
+ * @event geo.event.layerMove
+ * @type {geo.event.base}
+ * @property {geo.map} target The current map.
+ * @property {geo.layer} layer The old layer that was removed.
+ */
+
+geo_event.layerMove = 'geo_layerMove';
 /**
  * Triggered when the map's zoom level is changed.
  *
@@ -13723,7 +13733,7 @@ var layer = function layer(arg) {
     if (zIndex !== m_zIndex) {
       m_zIndex = zIndex;
       m_node.css('z-index', m_zIndex);
-      m_this.geoTrigger(geo_event.layerRemove, {
+      m_this.geoTrigger(geo_event.layerMove, {
         layer: m_this
       });
     }
@@ -26252,7 +26262,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "1d12f116c34ea5a1423ecb767df24b2291e53b06";
+module.exports = "0bc7b69498f5cc8cb411e7db7a8049eda5043a68";
 
 /***/ }),
 
@@ -29847,7 +29857,7 @@ var tileLayer = function tileLayer(arg) {
         changed = false,
         old,
         level,
-        minLevel = m_this._options.keepLower ? m_this._options.minLevel : Math.max(maxLevel, m_this._options.minLevel);
+        minLevel = m_this._options.keepLower ? m_this._options.minLevel : Math.min(Math.max(maxLevel, m_this._options.minLevel), m_this._options.maxLevel);
 
     if (maxLevel < minLevel) {
       maxLevel = minLevel;
@@ -30787,7 +30797,7 @@ var tileLayer = function tileLayer(arg) {
       /* For tile layers that should only keep one layer, if loading is
        * finished, purge all but the current layer.  This is important for
        * semi-transparent layers. */
-      if ((doneLoading || m_this._isCovered(tile)) && zoom !== tile.index.level && (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel)) {
+      if ((doneLoading || m_this._isCovered(tile)) && zoom !== tile.index.level && (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel) && (zoom < m_this._options.maxLevel || tile.index.level !== m_this._options.maxLevel)) {
         return true;
       }
     }
@@ -30951,9 +30961,9 @@ var tileLayer = function tileLayer(arg) {
   /**
    * Get/set the baseQuad.
    *
-   * @property {object} [baseQuad] A quad feature element to draw before below
-   *   any tile layers.  If specified, this uses the quad defaults, so this is
-   *   a ``geo.quadFeature.position`` object with, typically, an ``image``
+   * @property {object} [baseQuad] A quad feature element to draw below 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.
    * @name geo.tileLayer.baseQuad
@@ -38716,7 +38726,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.7.0";
+module.exports = "1.7.3";
 
 /***/ }),
 
@@ -42926,6 +42936,8 @@ var registerFeature = (__webpack_require__(4647).registerFeature);
 var quadFeature = __webpack_require__(5017);
 
 var timestamp = __webpack_require__(6618);
+
+var _memoryCheckLargestTested = 4096 * 4096;
 /**
  * Create a new instance of class quadFeature.
  *
@@ -43343,8 +43355,12 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
       quad.texture.bind(renderState); // only check if the context is out of memory when using modestly large
       // textures.  The check is slow.
 
-      if ((quad.image.width > 4096 || quad.image.height > 4096 || quad.image.width * quad.image.height > 4194304) && context.getError() === context.OUT_OF_MEMORY) {
-        console.log('Insufficient GPU memory for texture');
+      if (quad.image.width * quad.image.height > _memoryCheckLargestTested) {
+        _memoryCheckLargestTested = quad.image.width * quad.image.height;
+
+        if (context.getError() === context.OUT_OF_MEMORY) {
+          console.log('Insufficient GPU memory for texture');
+        }
       }
 
       if (quad.opacity !== opacity) {
@@ -44065,10 +44081,12 @@ var webglRenderer = function webglRenderer(arg) {
       renderState.m_context = m_this._glContext();
       m_viewer.exit(renderState);
 
-      if (m_this._glContext() !== vgl.GL && m_this._glContext().getExtension('WEBGL_lose_context') && m_this._glContext().getExtension('WEBGL_lose_context').loseContext) {
-        m_this._glContext().getExtension('WEBGL_lose_context').loseContext();
+      var context = m_this._glContext();
+
+      if (context !== vgl.GL && context.getExtension('WEBGL_lose_context') && context.getExtension('WEBGL_lose_context').loseContext) {
+        context.getExtension('WEBGL_lose_context').loseContext();
       }
-    } // make sure we clear shaders associated with the generate context, too
+    } // make sure we clear shaders associated with the generated context, too
 
 
     vgl.clearCachedShaders(vgl.GL);