updated output for server

This commit is contained in:
afischerdev 2023-11-20 17:39:29 +01:00
parent ad3db9c004
commit 149b83056e

View file

@ -1,10 +1,12 @@
package btools.server.request; package btools.server.request;
import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.StringWriter;
import java.util.Map; import java.util.Map;
import btools.router.FormatCsv;
import btools.router.FormatGpx;
import btools.router.FormatJson;
import btools.router.FormatKml;
import btools.router.OsmTrack; import btools.router.OsmTrack;
import btools.router.RoutingContext; import btools.router.RoutingContext;
import btools.server.ServiceContext; import btools.server.ServiceContext;
@ -76,23 +78,17 @@ public class ServerHandler extends RequestHandler {
} }
if (format == null || "gpx".equals(format)) { if (format == null || "gpx".equals(format)) {
result = track.formatAsGpx(); result = new FormatGpx(rc).format(track);
} else if ("kml".equals(format)) { } else if ("kml".equals(format)) {
result = track.formatAsKml(); result = new FormatKml(rc).format(track);
} else if ("geojson".equals(format)) { } else if ("geojson".equals(format)) {
result = track.formatAsGeoJson(); result = new FormatJson(rc).format(track);
} else if ("csv".equals(format)) { } else if ("csv".equals(format)) {
try { result = new FormatCsv(rc).format(track);
StringWriter sw = new StringWriter();
BufferedWriter bw = new BufferedWriter(sw);
track.writeMessages(bw, rc);
return sw.toString();
} catch (Exception ex) {
return "Error: " + ex.getMessage();
}
} else { } else {
System.out.println("unknown track format '" + format + "', using default"); System.out.println("unknown track format '" + format + "', using default");
result = track.formatAsGpx(); //result = track.formatAsGpx();
result = new FormatGpx(rc).format(track);
} }
return result; return result;