From 3bca9b52972232d09034243a3d3ebc948d746646 Mon Sep 17 00:00:00 2001
From: jahow <jahow_dude@yahoo.fr>
Date: Wed, 19 Jun 2019 15:06:24 +0200
Subject: [PATCH] Webgl / use feature index for hit detection in points layer

For each feature its opacity value index is encoded on 4 bytes
in the color values, and the uid is stored in the opacity
value, allowing for a much higher range of uids to be read.
---
 src/ol/renderer/webgl/PointsLayer.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/ol/renderer/webgl/PointsLayer.js b/src/ol/renderer/webgl/PointsLayer.js
index bf2994136b..6f430792c5 100644
--- a/src/ol/renderer/webgl/PointsLayer.js
+++ b/src/ol/renderer/webgl/PointsLayer.js
@@ -493,6 +493,8 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
         color
       );
 
+      // for hit detection, the feature uid is saved in the opacity value
+      // and the index of the opacity value is encoded in the color values
       elementIndex = writePointFeatureInstructions(
         this.hitRenderInstructions_,
         elementIndex,
@@ -503,9 +505,9 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
         u1,
         v1,
         size,
-        opacity,
+        opacity > 0 ? Number(getUid(feature)) : 0,
         rotateWithView,
-        colorEncodeId(parseInt(getUid(feature)), tmpColor)
+        colorEncodeId(elementIndex + 7, tmpColor)
       );
     }
 
@@ -534,6 +536,10 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
    * @inheritDoc
    */
   forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, declutteredFeatures) {
+    if (!this.hitRenderInstructions_) {
+      return;
+    }
+
     const pixel = applyTransform(frameState.coordinateToPixelTransform, coordinate.slice());
 
     const data = this.hitRenderTarget_.readPixel(pixel[0], pixel[1]);
@@ -543,7 +549,9 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
       data[2] / 255,
       data[3] / 255
     ];
-    const uid = colorDecodeId(color).toString();
+    const index = colorDecodeId(color);
+    const opacity = this.hitRenderInstructions_[index];
+    const uid = Math.floor(opacity).toString();
 
     const source = this.getLayer().getSource();
     const feature = source.getFeatureByUid(uid);