Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

updated output for app

Browse source
This commit is contained in:
afischerdev 2023-11-20 18:12:21 +01:00
parent 149b83056e
commit 24e15b5466
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
View file

@ -12,6 +12,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import btools.router.FormatGpx;
import btools.router.FormatJson;
import btools.router.FormatKml;
import btools.router.OsmNodeNamed; import btools.router.OsmNodeNamed;
import btools.router.OsmTrack; import btools.router.OsmTrack;
import btools.router.RoutingContext; import btools.router.RoutingContext;
@ -151,42 +154,41 @@ public class BRouterWorker {
if ("kml".equals(rc.outputFormat)) writeFromat = OUTPUT_FORMAT_KML; if ("kml".equals(rc.outputFormat)) writeFromat = OUTPUT_FORMAT_KML;
if ("json".equals(rc.outputFormat)) writeFromat = OUTPUT_FORMAT_JSON; if ("json".equals(rc.outputFormat)) writeFromat = OUTPUT_FORMAT_JSON;
} }
OsmTrack track = null;
OsmTrack track = cr.getFoundTrack(); track = cr.getFoundTrack();
if (track != null) { if (track != null) {
track.exportWaypoints = rc.exportWaypoints; track.exportWaypoints = rc.exportWaypoints;
if (pathToFileResult == null) { if (pathToFileResult == null) {
switch (writeFromat) { switch (writeFromat) {
case OUTPUT_FORMAT_GPX:
return track.formatAsGpx();
case OUTPUT_FORMAT_KML: case OUTPUT_FORMAT_KML:
return track.formatAsKml(); return new FormatKml(rc).format(track);
case OUTPUT_FORMAT_JSON: case OUTPUT_FORMAT_JSON:
return track.formatAsGeoJson(); return new FormatJson(rc).format(track);
case OUTPUT_FORMAT_GPX:
default: default:
return track.formatAsGpx(); return new FormatGpx(rc).format(track);
} }
} }
try {
switch (writeFromat) {
case OUTPUT_FORMAT_GPX:
track.writeGpx(pathToFileResult);
break;
case OUTPUT_FORMAT_KML:
track.writeKml(pathToFileResult);
break;
case OUTPUT_FORMAT_JSON:
track.writeJson(pathToFileResult);
break;
default:
track.writeGpx(pathToFileResult);
break;
}
} catch (Exception e) {
return "error writing file: " + e;
}
} }
try {
switch (writeFromat) {
case OUTPUT_FORMAT_KML:
new FormatKml(rc).write(pathToFileResult, track);
break;
case OUTPUT_FORMAT_JSON:
new FormatJson(rc).write(pathToFileResult, track);
break;
case OUTPUT_FORMAT_GPX:
default:
new FormatGpx(rc).write(pathToFileResult, track);
break;
}
} catch (Exception e) {
return "error writing file: " + e;
}
} else { // get other infos } else { // get other infos
if (cr.getErrorMessage() != null) { if (cr.getErrorMessage() != null) {
return cr.getErrorMessage(); return cr.getErrorMessage();