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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-06-13 00:37:12 +02:00
commit b971ace2f5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
View file

@ -38,15 +38,15 @@ public class CurrentPositionHelper {
private void initCtx(OsmandApplication app) { private void initCtx(OsmandApplication app) {
am = app.getSettings().getApplicationMode(); am = app.getSettings().getApplicationMode();
GeneralRouterProfile p ; String p ;
if (am.isDerivedRoutingFrom(ApplicationMode.BICYCLE)) { if (am.isDerivedRoutingFrom(ApplicationMode.BICYCLE)) {
p = GeneralRouterProfile.BICYCLE; p = GeneralRouterProfile.BICYCLE.name().toLowerCase();
} else if (am.isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) { } else if (am.isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) {
p = GeneralRouterProfile.PEDESTRIAN; p = GeneralRouterProfile.PEDESTRIAN.name().toLowerCase();
} else if (am.isDerivedRoutingFrom(ApplicationMode.CAR)) { } else if (am.isDerivedRoutingFrom(ApplicationMode.CAR)) {
p = GeneralRouterProfile.CAR; p = GeneralRouterProfile.CAR.name().toLowerCase();
} else { } else {
p = GeneralRouterProfile.CAR; p = "geocoding";
} }
BinaryMapIndexReader[] rs = new BinaryMapIndexReader[app.getResourceManager().getAddressRepositories().size()]; BinaryMapIndexReader[] rs = new BinaryMapIndexReader[app.getResourceManager().getAddressRepositories().size()];
if (rs.length > 0) { if (rs.length > 0) {
@ -54,10 +54,10 @@ public class CurrentPositionHelper {
for (RegionAddressRepository rep : app.getResourceManager().getAddressRepositories()) { for (RegionAddressRepository rep : app.getResourceManager().getAddressRepositories()) {
rs[i++] = rep.getFile(); rs[i++] = rep.getFile();
} }
RoutingConfiguration cfg = app.getDefaultRoutingConfig().build(p.name().toLowerCase(), 10, RoutingConfiguration cfg = app.getDefaultRoutingConfig().build(p, 10,
new HashMap<String, String>()); new HashMap<String, String>());
ctx = new RoutePlannerFrontEnd(false).buildRoutingContext(cfg, null, rs); ctx = new RoutePlannerFrontEnd(false).buildRoutingContext(cfg, null, rs);
RoutingConfiguration defCfg = app.getDefaultRoutingConfig().build(GeneralRouterProfile.CAR.name().toLowerCase(), 10, RoutingConfiguration defCfg = app.getDefaultRoutingConfig().build("geocoding", 10,
new HashMap<String, String>()); new HashMap<String, String>());
defCtx = new RoutePlannerFrontEnd(false).buildRoutingContext(defCfg, null, rs); defCtx = new RoutePlannerFrontEnd(false).buildRoutingContext(defCfg, null, rs);
} else { } else {