-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add bindPopup API to the Marker class (#3056)
* add bindPopup and other related methods to the Marker class * add DOM tests for Marker * add unbindPopup method to Marker with tests, add bindPopup to debug/markers.html * refactor to conform to setter/getter conventions * fix markers.html debug page
- Loading branch information
Showing
5 changed files
with
183 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| 'use strict'; | ||
|
|
||
| var test = require('tap').test; | ||
| var jsdomGlobal = require('jsdom-global'); | ||
|
|
||
| var extend = require('../../../js/util/util').extend; | ||
| var Map = require('../../../js/ui/map'); | ||
| var Marker = require('../../../js/ui/marker'); | ||
| var Popup = require('../../../js/ui/popup'); | ||
|
|
||
| function prepareDOM() { | ||
| var cleanup = jsdomGlobal(); | ||
| var mapdiv = document.createElement('div'); | ||
| mapdiv.id = "map"; | ||
| document.body.appendChild(mapdiv); | ||
| return cleanup; | ||
| } | ||
|
|
||
| function createMap(options, callback) { | ||
| var map = new Map(extend({ | ||
| container: 'map', | ||
| attributionControl: false, | ||
| trackResize: true, | ||
| style: { | ||
| "version": 8, | ||
| "sources": {}, | ||
| "layers": [] | ||
| } | ||
| }, options)); | ||
|
|
||
| if (callback) map.on('load', function () { | ||
| callback(null, map); | ||
| }); | ||
|
|
||
| return map; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| test('Marker', function (t) { | ||
| t.test('constructor', function (t) { | ||
| var cleanup = prepareDOM(); | ||
| var el = document.createElement('div'); | ||
| var marker = new Marker(el); | ||
| t.ok(marker.getElement(), 'marker element is created'); | ||
| cleanup(); | ||
| t.end(); | ||
| }); | ||
|
|
||
| t.test('marker is added to map', function (t) { | ||
| var cleanup = prepareDOM(); | ||
| var map = createMap(); | ||
| var el = document.createElement('div'); | ||
| map.on('load', function () { | ||
| var marker = new Marker(el).setLngLat([-77.01866, 38.888]); | ||
| t.ok(marker.addTo(map) instanceof Marker, 'marker.addTo(map) returns Marker instance'); | ||
| t.ok(marker._map, 'marker instance is bound to map instance'); | ||
| cleanup(); | ||
| t.end(); | ||
| }); | ||
| }); | ||
|
|
||
| t.test('popups can be bound to marker instance', function (t) { | ||
| var cleanup = prepareDOM(); | ||
| var map = createMap(); | ||
| var el = document.createElement('div'); | ||
| var popup = new Popup(); | ||
| var marker = new Marker(el).setLngLat([-77.01866, 38.888]).addTo(map); | ||
| marker.setPopup(popup); | ||
| t.ok(marker.getPopup() instanceof Popup, 'popup created with Popup instance'); | ||
| cleanup(); | ||
| t.end(); | ||
| }); | ||
|
|
||
| t.test('popups can be unbound from a marker instance', function (t) { | ||
| var cleanup = prepareDOM(); | ||
| var map = createMap(); | ||
| var el = document.createElement('div'); | ||
| var marker = new Marker(el).setLngLat([-77.01866, 38.888]).addTo(map); | ||
| marker.setPopup(new Popup()); | ||
| t.ok(marker.getPopup() instanceof Popup); | ||
| t.ok(marker.setPopup() instanceof Marker, 'passing no argument to Marker.setPopup() is valid'); | ||
| t.ok(!marker.getPopup(), 'Calling setPopup with no argument successfully removes Popup instance from Marker instance'); | ||
| t.end(); | ||
| cleanup(); | ||
| }); | ||
|
|
||
| t.end(); | ||
| }); | ||
|
|