From 4bc0ce0f03530e45c106dbaeeedc96dc7ac96573 Mon Sep 17 00:00:00 2001
From: mike-000 <49240900+mike-000@users.noreply.github.com>
Date: Thu, 11 Aug 2022 21:31:48 +0100
Subject: [PATCH] do not scale displacement

---
 changelog/upgrade-notes.md                    |   4 +++
 src/ol/style/Icon.js                          |   8 ++++-
 src/ol/style/RegularShape.js                  |   8 ++++-
 test/browser/spec/ol/style/icon.test.js       |  26 ++++++++++++++
 .../spec/ol/style/regularshape.test.js        |  33 ++++++++++++++++++
 .../cases/regularshape-style/expected.png     | Bin 7294 -> 8250 bytes
 .../cases/regularshape-style/main.js          |  12 ++++++-
 7 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md
index 9531174088..c145ac5424 100644
--- a/changelog/upgrade-notes.md
+++ b/changelog/upgrade-notes.md
@@ -26,6 +26,10 @@ The control will now by default keep displaying the last mouse position when the
 
 The `PluggableMap` class has been removed.  If you want to create a custom map class, extend the `Map` class instead.
 
+#### ol/style/Icon and ol/style/RegularShape
+
+`ol/style/Image` and subclasses `displacement` is no longer scaled with the image.  If you previously expected this unintended behavior you should now increase the displacement when setting the scale.
+
 ### 6.15.0
 
 #### Deprecated `tilePixelRatio` option for data tile sources.
diff --git a/src/ol/style/Icon.js b/src/ol/style/Icon.js
index 414c8cd4a5..128d2dec45 100644
--- a/src/ol/style/Icon.js
+++ b/src/ol/style/Icon.js
@@ -293,7 +293,13 @@ class Icon extends ImageStyle {
       this.normalizedAnchor_ = anchor;
     }
     const displacement = this.getDisplacement();
-    return [anchor[0] - displacement[0], anchor[1] + displacement[1]];
+    const scale = this.getScaleArray();
+    // anchor is scaled by renderer but displacement should not be scaled
+    // so divide by scale here
+    return [
+      anchor[0] - displacement[0] / scale[0],
+      anchor[1] + displacement[1] / scale[1],
+    ];
   }
 
   /**
diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js
index d92b775168..5457707065 100644
--- a/src/ol/style/RegularShape.js
+++ b/src/ol/style/RegularShape.js
@@ -179,7 +179,13 @@ class RegularShape extends ImageStyle {
       return null;
     }
     const displacement = this.getDisplacement();
-    return [size[0] / 2 - displacement[0], size[1] / 2 + displacement[1]];
+    const scale = this.getScaleArray();
+    // anchor is scaled by renderer but displacement should not be scaled
+    // so divide by scale here
+    return [
+      size[0] / 2 - displacement[0] / scale[0],
+      size[1] / 2 + displacement[1] / scale[1],
+    ];
   }
 
   /**
diff --git a/test/browser/spec/ol/style/icon.test.js b/test/browser/spec/ol/style/icon.test.js
index c319a494b6..8c0714dbd4 100644
--- a/test/browser/spec/ol/style/icon.test.js
+++ b/test/browser/spec/ol/style/icon.test.js
@@ -243,6 +243,32 @@ describe('ol.style.Icon', function () {
         size[1] / 2 + 20,
       ]);
     });
+
+    it('scale applies to image size, not offset', function () {
+      const scale = 4;
+      let anchorScaled, anchorBig;
+
+      const iconStyleScaled = new Icon({
+        src: 'test.png',
+        size: size,
+        displacement: [20, 10],
+        scale: scale,
+      });
+      const iconStyleBig = new Icon({
+        src: 'test.png',
+        size: [size[0] * scale, size[1] * scale],
+        displacement: [20, 10],
+      });
+      anchorScaled = iconStyleScaled.getAnchor();
+      anchorBig = iconStyleBig.getAnchor();
+      expect(anchorScaled).to.eql([anchorBig[0] / scale, anchorBig[1] / scale]);
+
+      iconStyleScaled.setDisplacement([10, 20]);
+      iconStyleBig.setDisplacement([10, 20]);
+      anchorScaled = iconStyleScaled.getAnchor();
+      anchorBig = iconStyleBig.getAnchor();
+      expect(anchorScaled).to.eql([anchorBig[0] / scale, anchorBig[1] / scale]);
+    });
   });
 
   describe('#setAnchor', function () {
diff --git a/test/browser/spec/ol/style/regularshape.test.js b/test/browser/spec/ol/style/regularshape.test.js
index dc9f4e05ba..de1defe8c9 100644
--- a/test/browser/spec/ol/style/regularshape.test.js
+++ b/test/browser/spec/ol/style/regularshape.test.js
@@ -117,6 +117,39 @@ describe('ol.style.RegularShape', function () {
       expect(style.getDisplacement()[1]).to.eql(10);
       expect(style.getAnchor()).to.eql([-15, 15]);
     });
+
+    it('scale applies to rendered radius, not offset', function () {
+      let style;
+
+      style = new RegularShape({
+        radius: 5,
+        displacement: [10, 20],
+        scale: 4,
+      });
+      expect(style.getDisplacement()).to.an('array');
+      expect(style.getDisplacement()[0]).to.eql(10);
+      expect(style.getDisplacement()[1]).to.eql(20);
+      expect(style.getAnchor()).to.eql([2.5, 10]);
+      style.setDisplacement([20, 10]);
+      expect(style.getDisplacement()).to.an('array');
+      expect(style.getDisplacement()[0]).to.eql(20);
+      expect(style.getDisplacement()[1]).to.eql(10);
+      expect(style.getAnchor()).to.eql([0, 7.5]);
+
+      style = new RegularShape({
+        radius: 20,
+        displacement: [10, 20],
+      });
+      expect(style.getDisplacement()).to.an('array');
+      expect(style.getDisplacement()[0]).to.eql(10);
+      expect(style.getDisplacement()[1]).to.eql(20);
+      expect(style.getAnchor()).to.eql([10, 40]);
+      style.setDisplacement([20, 10]);
+      expect(style.getDisplacement()).to.an('array');
+      expect(style.getDisplacement()[0]).to.eql(20);
+      expect(style.getDisplacement()[1]).to.eql(10);
+      expect(style.getAnchor()).to.eql([0, 30]);
+    });
   });
 
   describe('#clone', function () {
diff --git a/test/rendering/cases/regularshape-style/expected.png b/test/rendering/cases/regularshape-style/expected.png
index 20581d3a2b5e5b186ee3542d3fae1ac9b942a86e..918749233101f119659b66d26ee63ec767a0b5dd 100644
GIT binary patch
literal 8250
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
ZVb{wn4Ak!m{uuyzB(Ex0BxC6J{{a27KTH4s

literal 7294
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
G9r-`5Pk|2r

diff --git a/test/rendering/cases/regularshape-style/main.js b/test/rendering/cases/regularshape-style/main.js
index 261415b1eb..8ff5f4159e 100644
--- a/test/rendering/cases/regularshape-style/main.js
+++ b/test/rendering/cases/regularshape-style/main.js
@@ -11,7 +11,7 @@ import View from '../../../../src/ol/View.js';
 import {Icon} from '../../../../src/ol/style.js';
 
 const vectorSource = new VectorSource();
-function createFeatures(stroke, fill, offSet = [0, 0]) {
+function createFeatures(stroke, fill, offSet = [0, 0], scale = 1) {
   let feature;
   feature = new Feature({
     geometry: new Point([offSet[0], offSet[1]]),
@@ -26,6 +26,7 @@ function createFeatures(stroke, fill, offSet = [0, 0]) {
         radius: 10,
         angle: Math.PI / 4,
         displacement: [-15, 15],
+        scale: scale,
       }),
     }),
     new Style({
@@ -36,6 +37,7 @@ function createFeatures(stroke, fill, offSet = [0, 0]) {
         anchorXUnits: 'fraction',
         anchorYUnits: 'fraction',
         displacement: [-15, 15],
+        scale: scale,
       }),
     }),
   ]);
@@ -131,6 +133,14 @@ createFeatures(
   null,
   [-50, -50]
 );
+createFeatures(
+  new Stroke({
+    lineDash: [10, 5],
+  }),
+  null,
+  [-50, 50],
+  1.5
+);
 
 createFeatures(new Stroke(), new Fill(), [50, -50]);