bedroomghost/brouter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added export formats

Browse Source
This commit is contained in:
afischerdev 2025-04-05 18:09:15 +02:00
parent 2682981da9
commit 7e117d9675
3 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
brouter-core/src/main/java/btools/router/FormatGpx.java
View File

@ -197,25 +197,28 @@ public class FormatGpx extends Formatter {
for (int i = 0; i <= t.pois.size() - 1; i++) {
OsmNodeNamed poi = t.pois.get(i);
formatWaypointGpx(sb, poi);
formatWaypointGpx(sb, poi, "poi");
}
if (t.exportWaypoints) {
for (int i = 0; i <= t.matchedWaypoints.size() - 1; i++) {
MatchedWaypoint wt = t.matchedWaypoints.get(i);
sb.append(" <wpt lon=\"").append(formatILon(wt.waypoint.ilon)).append("\" lat=\"")
.append(formatILat(wt.waypoint.ilat)).append("\">\n")
.append(" <name>").append(StringUtils.escapeXml10(wt.name)).append("</name>\n");
if (i == 0) {
sb.append(" <type>from</type>\n");
formatWaypointGpx(sb, wt, "from");
} else if (i == t.matchedWaypoints.size() - 1) {
sb.append(" <type>to</type>\n");
formatWaypointGpx(sb, wt, "to");
} else {
sb.append(" <type>via</type>\n");
formatWaypointGpx(sb, wt, "via");
}
sb.append(" </wpt>\n");
}
}
if (t.exportCorrectedWaypoints && t.correctedWaypoints != null) {
for (int i = 0; i <= t.correctedWaypoints.size() - 1; i++) {
OsmNodeNamed n = t.correctedWaypoints.get(i);
formatWaypointGpx(sb, n, "via_corr");
}
}
sb.append(" <trk>\n");
if (turnInstructionMode == 9
|| turnInstructionMode == 2
@ -454,7 +457,7 @@ public class FormatGpx extends Formatter {
StringWriter sw = new StringWriter(8192);
BufferedWriter bw = new BufferedWriter(sw);
formatGpxHeader(bw);
formatWaypointGpx(bw, n);
formatWaypointGpx(bw, n, null);
formatGpxFooter(bw);
bw.close();
sw.close();
@ -477,7 +480,7 @@ public class FormatGpx extends Formatter {
sb.append("</gpx>\n");
}
public void formatWaypointGpx(BufferedWriter sb, OsmNodeNamed n) throws IOException {
public void formatWaypointGpx(BufferedWriter sb, OsmNodeNamed n, String type) throws IOException {
sb.append(" <wpt lon=\"").append(formatILon(n.ilon)).append("\" lat=\"")
.append(formatILat(n.ilat)).append("\">");
if (n.getSElev() != Short.MIN_VALUE) {
@ -489,6 +492,24 @@ public class FormatGpx extends Formatter {
if (n.nodeDescription != null && rc != null) {
sb.append("<desc>").append(rc.expctxWay.getKeyValueDescription(false, n.nodeDescription)).append("</desc>");
}
if (type != null) {
sb.append("<type>").append(type).append("</type>");
}
sb.append("</wpt>\n");
}
public void formatWaypointGpx(BufferedWriter sb, MatchedWaypoint wp, String type) throws IOException {
sb.append(" <wpt lon=\"").append(formatILon(wp.waypoint.ilon)).append("\" lat=\"")
.append(formatILat(wp.waypoint.ilat)).append("\">");
if (wp.waypoint.getSElev() != Short.MIN_VALUE) {
sb.append("<ele>").append("" + wp.waypoint.getElev()).append("</ele>");
}
if (wp.name != null) {
sb.append("<name>").append(StringUtils.escapeXml10(wp.name)).append("</name>");
}
if (type != null) {
sb.append("<type>").append(type).append("</type>");
}
sb.append("</wpt>\n");
}

16
brouter-core/src/main/java/btools/router/FormatJson.java
View File

@ -126,7 +126,7 @@ public class FormatJson extends Formatter {
sb.append(" ]\n");
sb.append(" }\n");
if (t.exportWaypoints || !t.pois.isEmpty()) {
if (t.exportWaypoints || t.exportCorrectedWaypoints || !t.pois.isEmpty()) {
sb.append(" },\n");
for (int i = 0; i <= t.pois.size() - 1; i++) {
OsmNodeNamed poi = t.pois.get(i);
@ -137,6 +137,7 @@ public class FormatJson extends Formatter {
sb.append(" \n");
}
if (t.exportWaypoints) {
if (!t.pois.isEmpty()) sb.append(" ,\n");
for (int i = 0; i <= t.matchedWaypoints.size() - 1; i++) {
String type;
if (i == 0) {
@ -155,6 +156,19 @@ public class FormatJson extends Formatter {
sb.append(" \n");
}
}
if (t.exportCorrectedWaypoints) {
if (t.exportWaypoints) sb.append(" ,\n");
for (int i = 0; i <= t.correctedWaypoints.size() - 1; i++) {
String type = "via_corr";
OsmNodeNamed wp = t.correctedWaypoints.get(i);
addFeature(sb, type, wp.name, wp.ilat, wp.ilon, wp.getSElev());
if (i < t.correctedWaypoints.size() - 1) {
sb.append(",");
}
sb.append(" \n");
}
}
} else {
sb.append(" }\n");
}

16
brouter-core/src/main/java/btools/router/FormatKml.java
View File

@ -43,7 +43,7 @@ public class FormatKml extends Formatter {
sb.append(" </LineString>\n");
sb.append(" </Placemark>\n");
sb.append(" </Folder>\n");
if (t.exportWaypoints || !t.pois.isEmpty()) {
if (t.exportWaypoints || t.exportCorrectedWaypoints || !t.pois.isEmpty()) {
if (!t.pois.isEmpty()) {
sb.append(" <Folder>\n");
sb.append(" <name>poi</name>\n");
@ -62,6 +62,10 @@ public class FormatKml extends Formatter {
}
createFolder(sb, "end", t.matchedWaypoints.subList(size - 1, size));
}
if (t.exportCorrectedWaypoints) {
int size = t.correctedWaypoints.size();
createViaFolder(sb, "via_cor", t.correctedWaypoints.subList(0, size));
}
}
sb.append(" </Document>\n");
sb.append("</kml>\n");
@ -79,6 +83,16 @@ public class FormatKml extends Formatter {
sb.append(" </Folder>\n");
}
private void createViaFolder(StringBuilder sb, String type, List<OsmNodeNamed> waypoints) {
sb.append(" <Folder>\n");
sb.append(" <name>" + type + "</name>\n");
for (int i = 0; i < waypoints.size(); i++) {
OsmNodeNamed wp = waypoints.get(i);
createPlaceMark(sb, wp.name, wp.ilat, wp.ilon);
}
sb.append(" </Folder>\n");
}
private void createPlaceMark(StringBuilder sb, String name, int ilat, int ilon) {
sb.append(" <Placemark>\n");
sb.append(" <name>" + StringUtils.escapeXml10(name) + "</name>\n");