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

Fix small issues

Browse source
This commit is contained in:
vshcherb 2014-03-29 20:48:05 +01:00
parent d01ebd2d47
commit c2c0ec5303
3 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd-java/src/net/osmand/render/RenderingRule.java
View file

@ -152,10 +152,17 @@ public class RenderingRule {
}
}
bls.append("]");
indent += " ";
for(RenderingRule rc : getIfChildren()){
String cindent = indent + " [] ";
bls.append("\n").append(cindent);
rc.toString(indent + " ", bls);
}
for(RenderingRule rc : getIfElseChildren()){
bls.append("\n").append(indent);
rc.toString(indent, bls);
String cindent = indent + " + ";
bls.append("\n").append(cindent);
rc.toString(indent + " ", bls);
}
return bls;

6
OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java
View file

@ -429,8 +429,8 @@ public class RenderingRulesStorage {
public void printDebug(int state, PrintStream out){
for(int key : tagValueGlobalRules[state].keys()) {
RenderingRule rr = tagValueGlobalRules[state].get(key);
out.print("\n\n"+getTagString(key) + " : " + getValueString(key));
printRenderingRule("", rr, out);
out.print("\n\n"+getTagString(key) + " : " + getValueString(key) + "\n ");
printRenderingRule(" ", rr, out);
}
}
@ -450,7 +450,7 @@ public class RenderingRulesStorage {
}
};
storage.parseRulesFromXmlInputStream(RenderingRulesStorage.class.getResourceAsStream("default.render.xml"), resolver);
// storage.printDebug(TEXT_RULES, System.out);
storage.printDebug(TEXT_RULES, System.out);
// long tm = System.nanoTime();
// int count = 100000;
// for (int i = 0; i < count; i++) {

56
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -40,9 +40,8 @@ import net.osmand.plus.activities.actions.ShareLocation;
import net.osmand.plus.activities.actions.StartGPSStatus;
import net.osmand.plus.activities.search.SearchActivity;
import net.osmand.plus.development.OsmandDevelopmentPlugin;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.BaseMapLayer;
import net.osmand.plus.views.MapTileLayer;
import net.osmand.plus.views.OsmandMapTileView;
@ -450,23 +449,29 @@ public class MapActivityActions implements DialogProvider {
}
public void setGPXRouteParams(GPXFile result) {
GPXRouteParamsBuilder params = new GPXRouteParamsBuilder(result, mapActivity.getMyApplication().getSettings());
params.setAnnounceWaypoints(settings.SPEAK_GPX_WPT.get());
params.setCalculateOsmAndRoute(settings.CALC_GPX_ROUTE.get());
List<Location> ps = params.getPoints();
if(!ps.isEmpty()) {
Location loc = ps.get(ps.size() -1);
TargetPointsHelper tg = mapActivity.getMyApplication().getTargetPointsHelper();
tg.navigateToPoint(new LatLon(loc.getLatitude(), loc.getLongitude()), false, -1);
if(tg.getPointToStart() == null) {
loc = ps.get(0);
tg.setStartPoint(new LatLon(loc.getLatitude(), loc.getLongitude()), false, null);
if(result == null) {
mapActivity.getRoutingHelper().setGpxParams(null);
settings.FOLLOW_THE_GPX_ROUTE.set(null);
} else {
GPXRouteParamsBuilder params = new GPXRouteParamsBuilder(result, mapActivity.getMyApplication()
.getSettings());
params.setAnnounceWaypoints(settings.SPEAK_GPX_WPT.get());
params.setCalculateOsmAndRoute(settings.CALC_GPX_ROUTE.get());
List<Location> ps = params.getPoints();
mapActivity.getRoutingHelper().setGpxParams(params);
settings.FOLLOW_THE_GPX_ROUTE.set(result.path);
if (!ps.isEmpty()) {
Location loc = ps.get(ps.size() - 1);
TargetPointsHelper tg = mapActivity.getMyApplication().getTargetPointsHelper();
tg.navigateToPoint(new LatLon(loc.getLatitude(), loc.getLongitude()), false, -1);
if (tg.getPointToStart() == null) {
loc = ps.get(0);
tg.setStartPoint(new LatLon(loc.getLatitude(), loc.getLongitude()), false, null);
}
tg.updateRoutingHelper();
}
tg.updateRoutingHelper();
}
mapActivity.getRoutingHelper().setGpxParams(params);
settings.FOLLOW_THE_GPX_ROUTE.set(result.path);
}
public void enterRoutePlanningMode(final LatLon from, final String fromName) {
@ -477,23 +482,22 @@ public class MapActivityActions implements DialogProvider {
bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
setGPXRouteParams(gpxFile);
enterRoutePlanningModeImpl(from, fromName);
enterRoutePlanningModeImpl(gpxFile, from, fromName);
}
});
bld.setPositiveButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
bld.setNegativeButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
enterRoutePlanningModeImpl(from, fromName);
enterRoutePlanningModeImpl(null, from, fromName);
}
});
bld.show();
} else {
enterRoutePlanningModeImpl(from, fromName);
enterRoutePlanningModeImpl(null, from, fromName);
}
}
private void enterRoutePlanningModeImpl(LatLon from, String fromName) {
private void enterRoutePlanningModeImpl(GPXFile gpxFile, LatLon from, String fromName) {
ApplicationMode mode = settings.DEFAULT_APPLICATION_MODE.get();
if(mode == ApplicationMode.DEFAULT) {
mode = ApplicationMode.CAR;
@ -505,11 +509,13 @@ public class MapActivityActions implements DialogProvider {
app.getRoutingHelper().setAppMode(mode);
// save application mode controls
settings.FOLLOW_THE_ROUTE.set(false);
settings.FOLLOW_THE_GPX_ROUTE.set(null);
app.getRoutingHelper().setGpxParams(null);
app.getRoutingHelper().setFollowingMode(false);
app.getRoutingHelper().setRoutePlanningMode(true);
// reset start point
targets.setStartPoint(from, false, fromName);
// then calculate gpx
setGPXRouteParams(gpxFile);
targets.updateRoutingHelper();
mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
mapActivity.getMapView().refreshMap(true);