Allow setting popup before LngLat

mapbox · Dec 19, 2017 · 9a5af4e · 9a5af4e
1 parent dcb94f0
commit 9a5af4e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/ui/marker.js b/src/ui/marker.js
@@ -225,7 +225,7 @@ class Marker {
                 popup.options.offset = this._offset;
             }
             this._popup = popup;
-            this._popup.setLngLat(this._lngLat);
+            if (this._lngLat) this._popup.setLngLat(this._lngLat);
         }
 
         return this;

diff --git a/test/unit/ui/marker.test.js b/test/unit/ui/marker.test.js
@@ -5,6 +5,7 @@ const window = require('../../../src/util/window');
 const Map = require('../../../src/ui/map');
 const Marker = require('../../../src/ui/marker');
 const Popup = require('../../../src/ui/popup');
+const LngLat = require('../../../src/geo/lng_lat');
 
 function createMap() {
     const container = window.document.createElement('div');
@@ -63,6 +64,17 @@ test('Marker', (t) => {
         t.end();
     });
 
+    t.test('popups can be set before LngLat', (t) => {
+        const map = createMap();
+        const popup = new Popup();
+        const marker = new Marker(window.document.createElement('div'))
+            .setPopup(popup)
+            .setLngLat([-77.01866, 38.888])
+            .addTo(map);
+        t.deepEqual(popup.getLngLat(), new LngLat(-77.01866, 38.888));
+        t.end();
+    });
+
     t.test('marker centered by default', (t) => {
         const map = createMap();
         const element = window.document.createElement('div');