From 545a09fcb383595f8a012a2504cd61a924ca62ac Mon Sep 17 00:00:00 2001
From: Gali Nelle <galinelle.mapbox@gmail.com>
Date: Fri, 10 Apr 2020 12:57:46 +0300
Subject: [PATCH] Fix LocationIndicator not updating image sizes when image
 manager content changes

---
 metrics/ignores/platform-linux.json           |   3 +-
 .../change_image/expected.png                 | Bin 0 -> 12111 bytes
 .../change_image/style.json                   | 104 ++++++++++++++++++
 .../render_location_indicator_layer.cpp       |  46 ++++----
 4 files changed, 133 insertions(+), 20 deletions(-)
 create mode 100644 metrics/tests/location_indicator/change_image/expected.png
 create mode 100644 metrics/tests/location_indicator/change_image/style.json

diff --git a/metrics/ignores/platform-linux.json b/metrics/ignores/platform-linux.json
index 29d06bfc3..ec018eb80 100644
--- a/metrics/ignores/platform-linux.json
+++ b/metrics/ignores/platform-linux.json
@@ -21,5 +21,6 @@
     "location_indicator/tilted_texture_shift_top_left": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering",
     "location_indicator/tilted_texture_shift_top_right": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering",
     "location_indicator/two_textures": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering",
-    "location_indicator/image_pixel_ratio": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering"
+    "location_indicator/image_pixel_ratio": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering",
+    "location_indicator/change_image": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering"
 }
diff --git a/metrics/tests/location_indicator/change_image/expected.png b/metrics/tests/location_indicator/change_image/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffd054207860efc5b4189d7646cb60ce4d9fb062
GIT binary patch
literal 12111
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
b3=2GJezYdk_4DZZVl7N<juanuz4`wD-ACz)

literal 0
HcmV?d00001

diff --git a/metrics/tests/location_indicator/change_image/style.json b/metrics/tests/location_indicator/change_image/style.json
new file mode 100644
index 000000000..7aed158bc
--- /dev/null
+++ b/metrics/tests/location_indicator/change_image/style.json
@@ -0,0 +1,104 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 512,
+      "height": 256,
+      "operations": [
+        [
+          "addImage",
+          "puck_hat",
+          "puck_hat.png",
+          {"pixelRatio": 2.0}
+        ],
+        [
+          "addImage",
+          "puck",
+          "puck.png",
+          {"pixelRatio": 2.0}
+
+        ],
+        [
+          "addImage",
+          "puck_shadow",
+          "puck_shadow.png",
+          {"pixelRatio": 2.0}
+        ],
+        [ "sleep", 500 ],
+        [
+          "addImage",
+          "puck_hat",
+          "puck_hat.png",
+          {"pixelRatio": 4.0}
+        ]
+      ]
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+              139.766707,
+                35.693055
+
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "center": [ 139.766707, 35.693055 ],
+  "zoom": 16,
+  "pitch" : 0,
+  "bearing" : 42,
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "lightseagreen"
+      }
+    },
+    {
+      "id": "puck123",
+      "type": "circle",
+      "source": "geojson",
+      "paint": {
+        "circle-radius": 40,
+        "circle-color" : "rgba(255,0,0,0.1)"
+      }
+    },
+    {
+      "id": "puck124",
+      "type": "location-indicator",
+      "layout" : {
+          "bearing-image" : "puck",
+          "top-image" : "puck_hat",
+          "shadow-image" : "puck_shadow"
+      },
+      "paint" : {
+          "bearing" : 45,
+          "perspective-compensation" : 1,
+          "image-tilt-displacement" : 6.5,
+          "location" : [ 35.693055, 139.766707, 0],
+          "accuracy-radius": 90.0,
+          "bearing-image-size" : 0.52,
+          "top-image-size" : 0.36,
+          "shadow-image-size" : 0.4,
+
+          "accuracy-radius-color": "rgba(255,0,0,0.2)",
+          "accuracy-radius-border-color": "rgba(255,0,255,0.6)"
+      }
+    }
+  ]
+}
diff --git a/src/mbgl/renderer/layers/render_location_indicator_layer.cpp b/src/mbgl/renderer/layers/render_location_indicator_layer.cpp
index f3d72f02d..99eef054f 100644
--- a/src/mbgl/renderer/layers/render_location_indicator_layer.cpp
+++ b/src/mbgl/renderer/layers/render_location_indicator_layer.cpp
@@ -272,12 +272,11 @@ public:
             Assign can be called any time. Conversely, upload must be called with a bound gl context.
         */
         void assign(const Immutable<style::Image::Impl>* img) {
-            if ((img && &img->get()->image == image) || (!img && !image)) return;
             imageDirty = true;
-            image = (img) ? &img->get()->image : nullptr;
+            image = (img) ? &(img->get()->image) : nullptr;
             width = height = 0;
             pixelRatio = 1.0f;
-            if (img) {
+            if (image) {
                 sharedImage = *img; // keep reference until uploaded
                 width = image->size.width;
                 height = image->size.height;
@@ -293,7 +292,7 @@ public:
             initialize();
 
             MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texId));
-            if (!image || !image->valid()) {
+            if (!sharedImage || !image || !image->valid()) {
                 MBGL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr));
             } else {
                 MBGL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D,
@@ -399,9 +398,9 @@ public:
                    params.puckShadowScale != oldParams.puckShadowScale)
             bearingChanged = true; // changes puck geometry but not necessarily the location
         if (params.errorRadiusMeters != oldParams.errorRadiusMeters) radiusChanged = true;
-        setTextureFromImageID(params.puckImagePath, texPuck, params);
-        setTextureFromImageID(params.puckShadowImagePath, texShadow, params);
-        setTextureFromImageID(params.puckHatImagePath, texPuckHat, params);
+        bearingChanged |= setTextureFromImageID(params.puckImagePath, texPuck, params);
+        bearingChanged |= setTextureFromImageID(params.puckShadowImagePath, texShadow, params);
+        bearingChanged |= setTextureFromImageID(params.puckHatImagePath, texPuckHat, params);
 
         projectionCircle = params.projectionMatrix;
         const Point<double> positionMercator = project(params.puckPosition, *params.state);
@@ -514,7 +513,10 @@ protected:
         return vec2(posScreenDelta - posScreen).normalized();
     }
 
-    void updatePuck(const mbgl::LocationIndicatorRenderParameters& params) { return updatePuckPerspective(params); }
+    void updatePuck(const mbgl::LocationIndicatorRenderParameters& params) {
+        updatePuckPerspective(params);
+        bearingChanged = false;
+    }
 
     void updatePuckPerspective(const mbgl::LocationIndicatorRenderParameters& params) {
         const TransformState& s = *params.state;
@@ -572,8 +574,6 @@ protected:
             hatGeometry[i] =
                 vec2(hatOffset + (verticalShift * (tilt * params.puckLayersDisplacement * horizontalScaleFactor)));
         }
-
-        bearingChanged = false;
     }
 
     void drawRadius(const mbgl::LocationIndicatorRenderParameters& params) {
@@ -636,23 +636,31 @@ protected:
         return s.screenCoordinateToLatLng(flippedPoint, wrapMode);
     }
 
-    void setTextureFromImageID(const std::string& imagePath,
-                               std::shared_ptr<Texture>& tex,
+    bool setTextureFromImageID(const std::string& imagePath,
+                               std::shared_ptr<Texture>& texture,
                                const mbgl::LocationIndicatorRenderParameters& params) {
+        bool updated = false;
         if (textures.find(imagePath) == textures.end()) {
             std::shared_ptr<Texture> tx = std::make_shared<Texture>();
-            if (!imagePath.empty() && params.imageManager)
+            if (!imagePath.empty() && params.imageManager) {
                 tx->assign(params.imageManager->getSharedImage(imagePath));
-            else
+                updated = true;
+            } else {
                 tx->assign(nullptr);
+            }
             textures[imagePath] = tx;
+            texture = tx;
         } else {
-            const Immutable<style::Image::Impl>* ima = params.imageManager->getSharedImage(imagePath);
-            const mbgl::PremultipliedImage* img = (ima) ? &ima->get()->image : nullptr;
-            if (textures.at(imagePath)->image != img) // image for the ID might have changed.
-                textures.at(imagePath)->assign(ima);
+            const Immutable<style::Image::Impl>* sharedImage = params.imageManager->getSharedImage(imagePath);
+            const mbgl::PremultipliedImage* img = (sharedImage) ? &sharedImage->get()->image : nullptr;
+            std::shared_ptr<Texture>& tex = textures.at(imagePath);
+            if (tex->image != img) { // image for the ID might have changed.
+                tex->assign(sharedImage);
+                updated = true;
+            }
+            texture = tex;
         }
-        tex = textures.at(imagePath);
+        return updated;
     }
 
     std::map<std::string, std::shared_ptr<Texture>> textures;