From 75b22fee2dfc716a78665cf685cd5c38250a40cc Mon Sep 17 00:00:00 2001 From: Emux Date: Sat, 8 Oct 2016 16:36:51 +0300 Subject: [PATCH] Fix Travis build #200 #201 --- vtm-app/src/org/oscim/app/RouteSearch.java | 2 +- vtm-app/src/org/osmdroid/routing/Route.java | 2 +- .../src/org/osmdroid/routing/provider/OSRMRouteProvider.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vtm-app/src/org/oscim/app/RouteSearch.java b/vtm-app/src/org/oscim/app/RouteSearch.java index 3a1a4f96..92ef14e1 100644 --- a/vtm-app/src/org/oscim/app/RouteSearch.java +++ b/vtm-app/src/org/oscim/app/RouteSearch.java @@ -427,7 +427,7 @@ public class RouteSearch { time = hour + "h " + minute + "m"; } - double dis = ((double) (mStartPoint.distanceTo(mDestinationPoint))) / 1000; + double dis = ((double) (mStartPoint.sphericalDistance(mDestinationPoint))) / 1000; String distance; String shortpath; if (dis < 100) { diff --git a/vtm-app/src/org/osmdroid/routing/Route.java b/vtm-app/src/org/osmdroid/routing/Route.java index eab226cc..8423f376 100644 --- a/vtm-app/src/org/osmdroid/routing/Route.java +++ b/vtm-app/src/org/osmdroid/routing/Route.java @@ -103,7 +103,7 @@ public class Route { RouteLeg leg = new RouteLeg(/* i, i+1, mLinks */); legs.add(leg); } - boundingBox = BoundingBox.fromGeoPoints(routeHigh); + boundingBox = new BoundingBox(routeHigh); status = STATUS_DEFAULT; } diff --git a/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java b/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java index 976325b4..7b072fb1 100644 --- a/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java +++ b/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java @@ -254,7 +254,7 @@ public class OSRMRouteProvider extends RouteProvider { route = new Route(waypoints); } else { route.buildLegs(waypoints); - BoundingBox bb = BoundingBox.fromGeoPoints(route.routeHigh); + BoundingBox bb = new BoundingBox(route.routeHigh); //Correcting osmdroid bug #359: route.boundingBox = bb; // new BoundingBox(