Ol v6141

package.json

@@ -39,9 +39,9 @@
     "downloadjs": "^1.4.7",
     "elm-pep": "^1.0.6",
     "html2canvas": "^1.4.0",
-    "ol-mapbox-style": "6.8.3",
+    "ol-mapbox-style": "7.1.0",
     "jspdf": "^2.5.0",
-    "ol": "^6.12.0",
+    "ol": "^6.14.1",
     "pepjs": "^0.5.3",
     "proj4": "^2.7.5"
   },

src/featureinfo.js

@@ -1,4 +1,5 @@
 import Overlay from 'ol/Overlay';
+import TileLayer from 'ol/layer/Tile';
 import OGlide from './oglide';
 import { Component, Modal } from './ui';
 import Popup from './popup';
@@ -662,13 +663,24 @@ const Featureinfo = function Featureinfo(options = {}) {
         // Check if there is a clickable feature when mouse is moved.
         map.on('pointermove', evt => {
           if (!pointerActive || evt.dragging) return;
-          // Just check if there is a pixel here. Pretty annoying on hatched symbols or hollow areas.
-          // Note that forEachLayerAtPixel actually only checks if there is a pixel on the canvas where the layer resides,
-          // so non queryable layers must not share canvas with queryable layers, otherwise there will be false positives.
-          // When a pixel is found on the canvas, the callback is called with all layers added to that canvas as it does not know which layer actually draw a pixel there. But we don't care which
-          // layer was hit to change the pointer.
-          // Hit tolerence seems to be ignored. It would probably look funny anyway.
-          map.getViewport().style.cursor = map.forEachLayerAtPixel(evt.pixel, () => true, { layerFilter: (l) => l.get('queryable') }) ? 'pointer' : '';
+          let cursor = '';
+          const features = map.getFeaturesAtPixel(evt.pixel, { layerFilter(layer) {
+            return layer.get('queryable');
+          }
+          });
+          if (features.length > 0) {
+            cursor = 'pointer';
+          } else {
+            const layers = viewer.getQueryableLayers().filter(layer => layer instanceof TileLayer);
+            for (let i = 0; i < layers.length; i += 1) {
+              const layer = layers[i];
+              if (layer.getData(evt.pixel) instanceof Uint8ClampedArray && layer.getData(evt.pixel)[3] > 0) {
+                cursor = 'pointer';
+                break;
+              }
+            }
+          }
+          map.getViewport().style.cursor = cursor;
         });
       }
     },

src/getfeatureinfo.js

@@ -135,31 +135,6 @@ function getAGSIdentifyUrl({ layer, coordinate }, viewer) {
   }).catch(error => console.error(error));
 }
 
-function isTainted({
-  pixel,
-  layerFilter,
-  map
-}) {
-  try {
-    if (layerFilter) {
-      map.forEachLayerAtPixel(pixel, (layer) => layerFilter === layer);
-    }
-
-    return false;
-  } catch (e) {
-    console.error(e);
-    return true;
-  }
-}
-
-function layerAtPixel({
-  pixel,
-  matchLayer,
-  map
-}) {
-  map.forEachLayerAtPixel(pixel, (layer) => matchLayer === layer);
-}
-
 function getGetFeatureInfoRequest({ layer, coordinate }, viewer) {
   const layerType = layer.get('type');
   const obj = {};
@@ -201,48 +176,17 @@ function getGetFeatureInfoRequest({ layer, coordinate }, viewer) {
 
 function getFeatureInfoRequests({
   coordinate,
-  layers,
-  map,
   pixel
 }, viewer) {
   const requests = [];
-  // Check for support of crossOrigin in image, absent in IE 8 and 9
-  if ('crossOrigin' in new (Image)()) {
-    map.forEachLayerAtPixel(pixel, (layer) => {
-      if (layer.get('queryable')) {
-        const item = getGetFeatureInfoRequest({ layer, coordinate }, viewer);
-        if (item) {
-          requests.push(item);
-        }
+  viewer.getQueryableLayers().forEach(layer => {
+    if (layer.getData(pixel) instanceof Uint8ClampedArray && layer.getData(pixel)[3] > 0) {
+      const item = getGetFeatureInfoRequest({ layer, coordinate }, viewer);
+      if (item) {
+        requests.push(item);
       }
-    });
-  } else if (isTainted({ map, pixel })) { // If canvas is tainted
-    layers.forEach((layer) => {
-      if (layer.get('queryable')) {
-        // If layer is tainted, then create request for layer
-        if (isTainted({ pixel, layer, map })) {
-          const item = getGetFeatureInfoRequest({ layer, coordinate }, viewer);
-          if (item) {
-            requests.push(item);
-          }
-        } else if (layerAtPixel({ pixel, layer, map })) { // If layer is not tainted, test if layer hit at pixel
-          const item = getGetFeatureInfoRequest({ layer, coordinate }, viewer);
-          if (item) {
-            requests.push(item);
-          }
-        }
-      }
-    });
-  } else { // If crossOrigin is not supported and canvas not tainted
-    map.forEachLayerAtPixel(pixel, (layer) => {
-      if (layer.get('queryable') === true) {
-        const item = getGetFeatureInfoRequest({ layer, coordinate }, viewer);
-        if (item) {
-          requests.push(item);
-        }
-      }
-    });
-  }
+    }
+  });
   return requests;
 }