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

Export first (from) and last (to) waypoints as well in GeoJSON / GPX

Browse source
This commit is contained in:
Phyks (Lucas Verney) 2019-07-14 13:41:10 +02:00
parent 9da3f20816
commit c6e466ca7b
1 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
brouter-core/src/main/java/btools/router/OsmTrack.java
View file

@ -536,13 +536,23 @@ public final class OsmTrack
if ( exportWaypoints ) if ( exportWaypoints )
{ {
for( int i=1; i<=matchedWaypoints.size() - 2; i++ ) for( int i=0; i<=matchedWaypoints.size() - 1; i++ )
{ {
sb.append( " <wpt lon=\"" ).append( formatILon( matchedWaypoints.get(i).waypoint.ilon ) ).append( "\" lat=\"" ) sb.append( " <wpt lon=\"" ).append( formatILon( matchedWaypoints.get(i).waypoint.ilon ) ).append( "\" lat=\"" )
.append( formatILat( matchedWaypoints.get(i).waypoint.ilat ) ).append( "\">\n" ) .append( formatILat( matchedWaypoints.get(i).waypoint.ilat ) ).append( "\">\n" )
.append( " <name>" ).append( matchedWaypoints.get(i).name ).append( "</name>\n" ) .append( " <name>" ).append( matchedWaypoints.get(i).name ).append( "</name>\n" );
.append( " <type>via</type>\n" ) if(i == 0)
.append( " </wpt>\n" ); {
sb.append( " <type>from</type>\n" );
}
else if (i == matchedWaypoints.size() - 1)
{
sb.append( " <type>to</type>\n" );
}
else {
sb.append( " <type>via</type>\n" );
}
sb.append( " </wpt>\n" );
} }
} }
sb.append( " <trk>\n" ); sb.append( " <trk>\n" );
@ -731,13 +741,24 @@ public final class OsmTrack
if ( exportWaypoints ) if ( exportWaypoints )
{ {
sb.append( " },\n" ); sb.append( " },\n" );
for( int i=1; i<=matchedWaypoints.size() - 2; i++ ) for( int i=0; i<=matchedWaypoints.size() - 1; i++ )
{ {
sb.append( " {\n" ); sb.append( " {\n" );
sb.append( " \"type\": \"Feature\",\n" ); sb.append( " \"type\": \"Feature\",\n" );
sb.append( " \"properties\": {\n" ); sb.append( " \"properties\": {\n" );
sb.append( " \"name\": \"" + matchedWaypoints.get(i).name + "\",\n" ); sb.append( " \"name\": \"" + matchedWaypoints.get(i).name + "\",\n" );
if(i == 0)
{
sb.append( " \"type\": \"from\"\n" );
}
else if (i == matchedWaypoints.size() - 1)
{
sb.append( " \"type\": \"to\"\n" );
}
else
sb.append( " \"type\": \"via\"\n" ); sb.append( " \"type\": \"via\"\n" );
{
}
sb.append( " },\n" ); sb.append( " },\n" );
sb.append( " \"geometry\": {\n" ); sb.append( " \"geometry\": {\n" );
sb.append( " \"type\": \"Point\",\n" ); sb.append( " \"type\": \"Point\",\n" );
@ -746,9 +767,14 @@ public final class OsmTrack
sb.append( " " + formatILat(matchedWaypoints.get(i).waypoint.ilat) + "\n" ); sb.append( " " + formatILat(matchedWaypoints.get(i).waypoint.ilat) + "\n" );
sb.append( " ]\n" ); sb.append( " ]\n" );
sb.append( " }\n" ); sb.append( " }\n" );
if (i < matchedWaypoints.size() - 1) {
sb.append( " },\n" );
}
else {
sb.append( " }\n" ); sb.append( " }\n" );
} }
} }
}
else { else {
sb.append( " }\n" ); sb.append( " }\n" );
} }