Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix routing services

Browse source
This commit is contained in:
Victor Shcherb 2015-05-20 15:57:15 +03:00
parent 731c91d29d
commit 9b81a56236
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -7,8 +7,6 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.StringReader; import java.io.StringReader;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -44,7 +42,6 @@ import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.Version; import net.osmand.plus.Version;
import net.osmand.plus.activities.SettingsNavigationActivity; import net.osmand.plus.activities.SettingsNavigationActivity;
import net.osmand.plus.render.NativeOsmandLibrary; import net.osmand.plus.render.NativeOsmandLibrary;
import net.osmand.router.BinaryRoutePlanner.RouteSegment;
import net.osmand.router.GeneralRouter; import net.osmand.router.GeneralRouter;
import net.osmand.router.GeneralRouter.GeneralRouterProfile; import net.osmand.router.GeneralRouter.GeneralRouterProfile;
import net.osmand.router.GeneralRouter.RoutingParameter; import net.osmand.router.GeneralRouter.RoutingParameter;
@ -80,7 +77,8 @@ public class RouteProvider {
public enum RouteService { public enum RouteService {
OSMAND("OsmAnd (offline)"), YOURS("YOURS"), OSMAND("OsmAnd (offline)"), YOURS("YOURS"),
ORS("OpenRouteService"), OSRM("OSRM (only car)"), // ORS("OpenRouteService"), // disable ors due to no public rest service (testing2015 doesn't seem stable)
OSRM("OSRM (only car)"),
BROUTER("BRouter (offline)"), STRAIGHT("Straight line"); BROUTER("BRouter (offline)"), STRAIGHT("Straight line");
private final String name; private final String name;
private RouteService(String name){ private RouteService(String name){
@ -308,8 +306,8 @@ public class RouteProvider {
res = findBROUTERRoute(params); res = findBROUTERRoute(params);
} else if (params.type == RouteService.YOURS) { } else if (params.type == RouteService.YOURS) {
res = findYOURSRoute(params); res = findYOURSRoute(params);
} else if (params.type == RouteService.ORS) { // } else if (params.type == RouteService.ORS) {
res = findORSRoute(params); // res = findORSRoute(params);
} else if (params.type == RouteService.OSRM) { } else if (params.type == RouteService.OSRM) {
res = findOSRMRoute(params); res = findOSRMRoute(params);
} else if (params.type == RouteService.STRAIGHT){ } else if (params.type == RouteService.STRAIGHT){
@ -1109,10 +1107,12 @@ public class RouteProvider {
// possibly hide that API key because it is privacy of osmand // possibly hide that API key because it is privacy of osmand
// A6421860EBB04234AB5EF2D049F2CD8F key is compromised // A6421860EBB04234AB5EF2D049F2CD8F key is compromised
String scheme = ""; String scheme = "";
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) // https certificate doesn't seem to be accepted on Android
scheme = "https"; // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD && false) {
else // scheme = "https";
// } else {
scheme = "http"; scheme = "http";
// }
uri.append(scheme + "://router.project-osrm.org/viaroute?alt=false"); //$NON-NLS-1$ uri.append(scheme + "://router.project-osrm.org/viaroute?alt=false"); //$NON-NLS-1$
uri.append("&loc=").append(String.valueOf(params.start.getLatitude())); uri.append("&loc=").append(String.valueOf(params.start.getLatitude()));
uri.append(",").append(String.valueOf(params.start.getLongitude())); uri.append(",").append(String.valueOf(params.start.getLongitude()));