Commit 8fa2317
Scale bar nautical miles (#6897)
Adds `ScaleBarSettings.distanceUnits`/`ScaleBarViewOptions.units` along
with adding support for nautical scale bar units.
Now scale bar supports: metric, imperial and nautical units.
Addresses: https://mapbox.atlassian.net/browse/MAPSSDK-869
cc @mapbox/maps-android
cc @mapbox/maps-ios
cc @mapbox/sdk-ci
GitOrigin-RevId: 1abaf1d4b41491333bb9ab5061025ebacc5792b91 parent 1ce7b3c commit 8fa2317
File tree
27 files changed
+592
-68
lines changed- app/src
- androidTest/java/com/mapbox/maps/testapp/scalebar/generated
- main/res/layout
- plugin-attribution/src/test/java/com/mapbox/maps/plugin/attribution/generated
- plugin-compass/src/test/java/com/mapbox/maps/plugin/compass/generated
- plugin-gestures/src/main/res/values
- plugin-logo/src/test/java/com/mapbox/maps/plugin/logo/generated
- plugin-scalebar
- api
- Release
- src
- main
- java/com/mapbox/maps/plugin/scalebar
- generated
- res-public/values
- res/values
- test/java/com/mapbox/maps/plugin/scalebar
- generated
- sdk-base
- api
- Release
- src
- main
- java/com/mapbox/maps/plugin
- scalebar/generated
- ksp/com/mapbox/maps/plugin/scalebar/generated
- test/java/com/mapbox/maps/plugin/scalebar
27 files changed
+592
-68
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
app/src/androidTest/java/com/mapbox/maps/testapp/scalebar/generated/ScaleBarAttributeParserTest.kt
Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| |||
Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
| 7 | + | |
6 | 8 | | |
7 | 9 | | |
8 | 10 | | |
| |||
0 commit comments