Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mapbox/mapbox-navigation-android
Browse files Browse the repository at this point in the history
  • Loading branch information
danesfeder committed Sep 21, 2017
2 parents a9df339 + e6b4b1c commit 8d0ba38
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion navigation/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ext {
dep = [
// mapbox
mapboxMapSdk : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.3',
mapboxServices : 'com.mapbox.mapboxsdk:mapbox-android-services:2.3.0-SNAPSHOT',
mapboxServices : 'com.mapbox.mapboxsdk:mapbox-android-services:2.2.4',
locationLayerPlugin : 'com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.1.0',

// unit test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public class NavigationCamera implements ProgressChangeListener {

private static final int CAMERA_TILT = 50;
private static final int CAMERA_TILT = 45;
private static int CAMERA_ZOOM = 17;

private MapboxMap mapboxMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ class ScreenDensityMap extends SparseArray<Double> {

ScreenDensityMap() {
put(DENSITY_LOW, 50d);
put(DENSITY_MEDIUM, 56d);
put(DENSITY_HIGH, 68d);
put(DENSITY_260, 71d);
put(DENSITY_280, 74d);
put(DENSITY_300, 77d);
put(DENSITY_XHIGH, 80d);
put(DENSITY_340, 83d);
put(DENSITY_360, 86d);
put(DENSITY_400, 92d);
put(DENSITY_420, 93d);
put(DENSITY_XXHIGH, 95d);
put(DENSITY_560, 113d);
put(DENSITY_XXXHIGH, 125d);
put(DENSITY_MEDIUM, 54d);
put(DENSITY_HIGH, 63d);
put(DENSITY_260, 68d);
put(DENSITY_280, 72d);
put(DENSITY_300, 73d);
put(DENSITY_XHIGH, 74d);
put(DENSITY_340, 76d);
put(DENSITY_360, 78d);
put(DENSITY_400, 80d);
put(DENSITY_420, 83d);
put(DENSITY_XXHIGH, 87d);
put(DENSITY_560, 100d);
put(DENSITY_XXXHIGH, 111d);
}

double getTargetDistance(int density) {
Expand Down

0 comments on commit 8d0ba38

Please sign in to comment.