geojs 1.15.3 → 1.15.5

package/.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-node@v5
+    - uses: actions/setup-node@v6
       with:
         node-version: '20'
     - uses: browser-actions/setup-firefox@latest
@@ -45,7 +45,7 @@ jobs:
         python3 tests/runners/baseline_images.py -cevb _build
     - name: Upload test images on failure
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: images
         path: |
@@ -53,7 +53,7 @@ jobs:
           _build/Baseline*tgz
     - name: Upload artifacts
       if: ${{ always() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: dist
         path: |
@@ -61,7 +61,7 @@ jobs:
           dist/built
     - name: Upload built website
       if: ${{ success() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: website
         path: |
@@ -71,7 +71,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     # Don't pin version to test with the latest common version
-    - uses: actions/setup-node@v5
+    - uses: actions/setup-node@v6
       with:
         node-version: 'lts/*'
     - run: npm --version && node --version
@@ -95,7 +95,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Import artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: website
         path: website/public
@@ -110,14 +110,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-node@v5
+    - uses: actions/setup-node@v6
       with:
         node-version: 'lts/*'
     - run: sudo apt-get update
     - run: sudo apt-get install --yes --no-install-recommends optipng imagemagick build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev liblzma-dev
     - run: npm ci
     - name: Import artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: dist
         path: dist

package/geo.js

@@ -26491,7 +26491,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.15.3";
+module.exports = "1.15.5";
 
 /***/ }),
 
@@ -91919,6 +91919,9 @@ var _webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
           context.drawImage(img, x, y, 1, 1, 0, 0, 1, 1);
           var pixel = context.getImageData(0, 0, 1, 1).data;
           var idx = pixel[0] + pixel[1] * 256 + pixel[2] * 256 * 256;
+          if (idx === 16777215) {
+            continue;
+          }
           result = {
             index: [idx],
             found: [m_this.data()[idx]]
@@ -92073,7 +92076,8 @@ var util = __webpack_require__(642);
  * @extends geo.feature.spec
  * @property {string|function|HTMLImageElement} [url] URL of a pixel map or an
  *   HTML Image element.  The rgb data is interpreted as an index of the form
- *   0xbbggrr.  The alpha channel is ignored.
+ *   0xbbggrr.  The alpha channel is ignored.  An index of 0xffffff is treated
+ *   as a no-data value for hit-tests.
  * @property {geo.geoColor|function} [color] The color that should be used
  *   for each data element.  Data elements correspond to the indices in the
  *   pixel map. If an index is larger than the number of data elements, it will
@@ -96228,6 +96232,8 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       uniform,
       indices,
       items = [],
+      itemsk,
+      itemsktri,
       target_gcs = m_this.gcs(),
       map_gcs = m_this.layer().map().gcs(),
       numPts = 0,
@@ -96341,11 +96347,13 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
     color = fillColorVal;
     fill = fillVal;
     for (k = 0; k < items.length; k += 1) {
-      n = items[k].triangles.length;
-      vertices = items[k].vertices;
-      item = items[k].item;
-      itemIndex = items[k].itemIndex;
-      original = items[k].original;
+      itemsk = items[k];
+      itemsktri = itemsk.triangles;
+      n = itemsktri.length;
+      vertices = itemsk.vertices;
+      item = itemsk.item;
+      itemIndex = itemsk.itemIndex;
+      original = itemsk.original;
       uniform = uniformVal === undefined ? uniformFunc(item, itemIndex) : uniformVal;
       opacity = fillOpacityVal;
       if (uniform) {
@@ -96362,7 +96370,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       if (!fill) {
         opacity = 0;
       }
-      if (uniform && onlyStyle && items[k].uniform && items[k].color && color.r === items[k].color.r && color.g === items[k].color.g && color.b === items[k].color.b && opacity === items[k].opacity) {
+      if (uniform && onlyStyle && itemsk.uniform && itemsk.color && color.r === itemsk.color.r && color.g === itemsk.color.g && color.b === itemsk.color.b && opacity === itemsk.opacity) {
         d += n;
         d3 += n * 3;
         continue;
@@ -96374,7 +96382,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillColor[d3 + 2] = color.b;
           fillOpacity[d] = opacity;
         } else {
-          j = items[k].triangles[i] * 3;
+          j = itemsktri[i] * 3;
           if (!onlyStyle) {
             posBuf[d3] = vertices[j] - m_origin[0];
             posBuf[d3 + 1] = vertices[j + 1] - m_origin[1];
@@ -96393,10 +96401,10 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillOpacity[d] = opacity;
         }
       }
-      if (uniform || items[k].uniform) {
-        items[k].uniform = uniform;
-        items[k].color = color;
-        items[k].opacity = opacity;
+      if (uniform || itemsk.uniform) {
+        itemsk.uniform = uniform;
+        itemsk.color = color;
+        itemsk.opacity = opacity;
       }
     }
     if (!onlyStyle) {
@@ -98037,7 +98045,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "36f5efe9fe98ff0e952442662614c39f2e2ec9c3";
+module.exports = "7e5d31a4b54e0b11df0181c56998d36dd8b8988d";
 
 /***/ }),
 

package/geo.lean.js

@@ -23500,7 +23500,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.15.3";
+module.exports = "1.15.5";
 
 /***/ }),
 
@@ -64105,6 +64105,9 @@ var _webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
           context.drawImage(img, x, y, 1, 1, 0, 0, 1, 1);
           var pixel = context.getImageData(0, 0, 1, 1).data;
           var idx = pixel[0] + pixel[1] * 256 + pixel[2] * 256 * 256;
+          if (idx === 16777215) {
+            continue;
+          }
           result = {
             index: [idx],
             found: [m_this.data()[idx]]
@@ -64259,7 +64262,8 @@ var util = __webpack_require__(642);
  * @extends geo.feature.spec
  * @property {string|function|HTMLImageElement} [url] URL of a pixel map or an
  *   HTML Image element.  The rgb data is interpreted as an index of the form
- *   0xbbggrr.  The alpha channel is ignored.
+ *   0xbbggrr.  The alpha channel is ignored.  An index of 0xffffff is treated
+ *   as a no-data value for hit-tests.
  * @property {geo.geoColor|function} [color] The color that should be used
  *   for each data element.  Data elements correspond to the indices in the
  *   pixel map. If an index is larger than the number of data elements, it will
@@ -68414,6 +68418,8 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       uniform,
       indices,
       items = [],
+      itemsk,
+      itemsktri,
       target_gcs = m_this.gcs(),
       map_gcs = m_this.layer().map().gcs(),
       numPts = 0,
@@ -68527,11 +68533,13 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
     color = fillColorVal;
     fill = fillVal;
     for (k = 0; k < items.length; k += 1) {
-      n = items[k].triangles.length;
-      vertices = items[k].vertices;
-      item = items[k].item;
-      itemIndex = items[k].itemIndex;
-      original = items[k].original;
+      itemsk = items[k];
+      itemsktri = itemsk.triangles;
+      n = itemsktri.length;
+      vertices = itemsk.vertices;
+      item = itemsk.item;
+      itemIndex = itemsk.itemIndex;
+      original = itemsk.original;
       uniform = uniformVal === undefined ? uniformFunc(item, itemIndex) : uniformVal;
       opacity = fillOpacityVal;
       if (uniform) {
@@ -68548,7 +68556,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       if (!fill) {
         opacity = 0;
       }
-      if (uniform && onlyStyle && items[k].uniform && items[k].color && color.r === items[k].color.r && color.g === items[k].color.g && color.b === items[k].color.b && opacity === items[k].opacity) {
+      if (uniform && onlyStyle && itemsk.uniform && itemsk.color && color.r === itemsk.color.r && color.g === itemsk.color.g && color.b === itemsk.color.b && opacity === itemsk.opacity) {
         d += n;
         d3 += n * 3;
         continue;
@@ -68560,7 +68568,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillColor[d3 + 2] = color.b;
           fillOpacity[d] = opacity;
         } else {
-          j = items[k].triangles[i] * 3;
+          j = itemsktri[i] * 3;
           if (!onlyStyle) {
             posBuf[d3] = vertices[j] - m_origin[0];
             posBuf[d3 + 1] = vertices[j + 1] - m_origin[1];
@@ -68579,10 +68587,10 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillOpacity[d] = opacity;
         }
       }
-      if (uniform || items[k].uniform) {
-        items[k].uniform = uniform;
-        items[k].color = color;
-        items[k].opacity = opacity;
+      if (uniform || itemsk.uniform) {
+        itemsk.uniform = uniform;
+        itemsk.color = color;
+        itemsk.opacity = opacity;
       }
     }
     if (!onlyStyle) {
@@ -70223,7 +70231,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "36f5efe9fe98ff0e952442662614c39f2e2ec9c3";
+module.exports = "7e5d31a4b54e0b11df0181c56998d36dd8b8988d";
 
 /***/ }),