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.

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

Added OrdnanceSurvey Bing Layer for UK users. #891

Merged
merged 9 commits into from
Oct 11, 2016
Merged

Conversation

damocov
Copy link
Contributor

@damocov damocov commented Oct 9, 2016

Added additional layer for UK users with valid Bing Key, to access the UK Ordnance Survey mapping layer of Bing Maps.

Have added amended version of GWT openlayers bing layers source, with added layer type of ordnancesurvey" to allow traccar files to use the UK only layer.

Amended the MapView.java to add "Bing OSGB" as an option to use the ordnancesurvey layer.

Amended the mobile traccar-mobile.js to use the "Bing OSGB" option and ordnancesurvey layer.

Copy link
Owner

@vitalidze vitalidze left a comment

Choose a reason for hiding this comment

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

Basically looks good, but please remove .save files and there are couple of minor formatting comments.

ROAD("Road"),
HYBRID("AerialWithLabels"),
AERIAL("Aerial"),
ordnancesurvey("ordnancesurvey");
Copy link
Owner

Choose a reason for hiding this comment

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

Please change enum element name to be in upper-case letters.

@@ -86,6 +86,7 @@ public double toKnots(double speed) {
BING_ROAD("Bing Road") { @Override public boolean isBing() { return true; } },
BING_HYBRID("Bing Hybrid") { @Override public boolean isBing() { return true; } },
BING_AERIAL("Bing Aerial") { @Override public boolean isBing() { return true; } },
BING_OS("Bing OSGB") { @Override public boolean isBing() { return true; } },
Copy link
Owner

Choose a reason for hiding this comment

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

Let's name enum element in a more descriptive way, like BING_ORDNANCE_SURVEY, or at least BING_OSGB.

@damocov
Copy link
Contributor Author

damocov commented Oct 10, 2016

Makes sense, I've made those changes to the branch, but haven't yet had the chance to compile and test

@vitalidze
Copy link
Owner

Thank you for considering these changes. Now please check that it is working on your side and if it does I will merge changes.

@damocov
Copy link
Contributor Author

damocov commented Oct 10, 2016

I've just compiled and confirmed that it is working fine, on both "desktop" and mobile versions.

@vitalidze vitalidze merged commit 16caa7b into vitalidze:dev Oct 11, 2016
@vitalidze
Copy link
Owner

Squashed and merged. Thank you!

@vitalidze
Copy link
Owner

Included in latest release, written news, updated latest and demo versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants