Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scale update units #6138

Closed
wants to merge 9 commits into from
Closed

Scale update units #6138

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9749515
Add ScaleControl method to update unit of measure
Feb 13, 2018
64e9140
Add ScaleControl test file
Feb 13, 2018
914c57e
Update documentation
Feb 13, 2018
15fbbed
Update name of method and example code
Feb 17, 2018
6d7b572
Add test for setUnit method
Feb 17, 2018
80f2791
Correct param documentation for setUnit method
Feb 20, 2018
ff9c13f
Fix param documentation for setUnit method
Feb 20, 2018
fb650c2
Read unit from scale's html
Mar 1, 2018
f8bc7b3
Simplify regex in scale test
Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions test/unit/ui/control/scale.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,13 @@ test('ScaleControl should change unit of distance after calling setUnit', (t) =>
const scale = new ScaleControl();
map.addControl(scale);

t.equal(scale.options.unit, 'metric');
let unit = map.getContainer().querySelectorAll('.mapboxgl-ctrl-bottom-left .mapboxgl-ctrl-scale')[0].innerHTML.match(/[a-zA-Z]+|[0-9]+/g)[1];

t.equal(unit, 'km');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ryanhamley small nitpick: let's simplify this just a tad to:

let contents = map.getContainer().querySelector('.mapboxgl-ctrl-bottom-left .mapboxgl-ctrl-scale').innerText; // (not 100% sure jsdom supports innerText, but worth a shot
t.match(contents, /\bkm\b/);


scale.setUnit('imperial');
t.equal(scale.options.unit, 'imperial');
unit = map.getContainer().querySelectorAll('.mapboxgl-ctrl-bottom-left .mapboxgl-ctrl-scale')[0].innerHTML.match(/[a-zA-Z]+|[0-9]+/g)[1];

t.equal(unit, 'mi');
t.end();
});