Fix backward-compatibility for not-defined Marker options (internal-2374)

Author: underoot

src/ui/marker.ts

@@ -33,11 +33,6 @@ export type MarkerOptions = {
 };
 
 const defaultOptions: MarkerOptions = {
-    anchor: 'center',
-    color: '#3FB1CE',
-    scale: 1,
-    draggable: false,
-    clickTolerance: 0,
     rotation: 0,
     rotationAlignment: 'auto',
     pitchAlignment: 'auto',
@@ -129,18 +124,29 @@ export default class Marker extends Evented<MarkerEvents> {
             '_clearFadeTimer'
         ], this);
 
-        options = extend({}, defaultOptions, options);
-
-        this._anchor = options.anchor;
-        this._color = options.color;
-        this._scale = options.scale;
-        this._draggable = options.draggable;
-        this._clickTolerance = options.clickTolerance;
-        this._rotation = options.rotation;
-        this._rotationAlignment = options.rotationAlignment;
-        this._pitchAlignment = options.pitchAlignment;
-        this._occludedOpacity = options.occludedOpacity;
-        this._altitude = options.altitude;
+        const {
+            anchor = 'center',
+            color = '#3FB1CE',
+            scale = 1,
+            draggable = false,
+            clickTolerance = 0,
+            rotation = defaultOptions.rotation,
+            rotationAlignment = defaultOptions.rotationAlignment,
+            pitchAlignment = defaultOptions.pitchAlignment,
+            occludedOpacity = defaultOptions.occludedOpacity,
+            altitude = defaultOptions.altitude,
+        } = options || {};
+
+        this._anchor = anchor;
+        this._color = color;
+        this._scale = scale;
+        this._draggable = draggable;
+        this._clickTolerance = clickTolerance;
+        this._rotation = rotation;
+        this._rotationAlignment = rotationAlignment;
+        this._pitchAlignment = pitchAlignment;
+        this._occludedOpacity = occludedOpacity;
+        this._altitude = altitude;
 
         this._state = 'inactive';
         this._isDragging = false;

test/unit/ui/marker.test.ts

@@ -29,6 +29,16 @@ test('Marker uses a default marker element with an appropriate offset', () => {
     expect(marker.getOffset().equals(new Point(0, -14))).toBeTruthy();
 });
 
+test('Marker retain default options for passed undefined', () => {
+    const marker = new Marker({
+        rotation: undefined,
+        altitude: undefined,
+    });
+
+    expect(marker.getRotation()).toEqual(0);
+    expect(marker.getAltitude()).toEqual(0);
+});
+
 test('Marker uses a default marker element with custom color', () => {
     const marker = new Marker({color: '#123456'});
     expect(marker.getElement().innerHTML.includes('#123456')).toBeTruthy();