From a9e8731b3efe7ced46047475beb12c7465b7d044 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Mon, 31 Dec 2018 16:52:26 +0100 Subject: [PATCH] voice hints in json --- brouter-core/src/main/java/btools/router/OsmTrack.java | 7 +++++++ .../src/main/java/btools/router/VoiceHint.java | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 0611abb..4b8ac23 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -563,6 +563,13 @@ public final class OsmTrack sb.append( " \"total-time\": \"" ).append( getTotalSeconds() ).append( "\",\n" ); sb.append( " \"total-energy\": \"" ).append( energy ).append( "\",\n" ); sb.append( " \"cost\": \"" ).append( cost ).append( "\",\n" ); + sb.append( " \"voicehints\": [\n" ); + for( VoiceHint hint: voiceHints.list ) + { + sb.append( " [" ).append( hint.indexInTrack ).append( ',' ).append( hint.getCommand() ).append( ',' ).append( hint.getExitNumber() ).append( "],\n" ); + } + sb.deleteCharAt( sb.lastIndexOf( "," ) ); + sb.append( " ],\n" ); sb.append( " \"messages\": [\n" ); sb.append( " [\"" ).append( MESSAGES_HEADER.replaceAll( "\t", "\", \"" ) ).append( "\"],\n" ); for ( String m : aggregateMessages() ) diff --git a/brouter-core/src/main/java/btools/router/VoiceHint.java b/brouter-core/src/main/java/btools/router/VoiceHint.java index d6b112d..9634ee2 100644 --- a/brouter-core/src/main/java/btools/router/VoiceHint.java +++ b/brouter-core/src/main/java/btools/router/VoiceHint.java @@ -65,6 +65,16 @@ public class VoiceHint badWays.add( badWay ); } + public int getCommand() + { + return cmd; + } + + public int getExitNumber() + { + return roundaboutExit; + } + public String getCommandString() { switch ( cmd )