From 0205c79afa8a51944d6c0e860e505a5905216ff3 Mon Sep 17 00:00:00 2001 From: Nabin Dhakal Date: Thu, 9 May 2024 14:05:47 +0545 Subject: [PATCH 1/2] maneuver null modifier to empty strng --- .../navigation/NavigateResponseConverterMapLibre.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java index e1aeb13..042a9ca 100644 --- a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java +++ b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java @@ -869,8 +869,12 @@ private static void putManeuver(InstructionResponse instruction, ObjectNode inst // putLocation(points.getLat(0), points.getLon(0), maneuver); String modifier = getModifier(instruction); - if (modifier != null) + if (modifier != null){ + maneuver.put("modifier", modifier); + }else{ + maneuver.put("modifier", ""); + } maneuver.put("type", getTurnType(instruction, isFirstInstructionOfLeg)); // exit number From 41501e84b1f1717adcecfeabf158e71581ce48b4 Mon Sep 17 00:00:00 2001 From: Nabin Dhakal Date: Thu, 9 May 2024 14:22:02 +0545 Subject: [PATCH 2/2] exit updated from null to zero --- .../navigation/NavigateResponseConverterMapLibre.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java index 042a9ca..117bc86 100644 --- a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java +++ b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterMapLibre.java @@ -878,8 +878,11 @@ private static void putManeuver(InstructionResponse instruction, ObjectNode inst maneuver.put("type", getTurnType(instruction, isFirstInstructionOfLeg)); // exit number - if (instruction.getSign() == InstructionResponse.USE_ROUNDABOUT || instruction.getSign() == InstructionResponse.LEAVE_ROUNDABOUT ) + if (instruction.getSign() == InstructionResponse.USE_ROUNDABOUT || instruction.getSign() == InstructionResponse.LEAVE_ROUNDABOUT ){ maneuver.put("exit", instruction.getExitNumber()); + }else{ + maneuver.put("exit", 0); + } // final BaatoTranslationMap navigateResponseConverterTranslationMap = new NavigateResponseConverterTranslationMap(locale.getLanguage()).doImport(); // maneuver.put("instruction", instruction.getTurnDescription(navigateResponseConverterTranslationMap.get("en_US"))); maneuver.put("instruction", instruction.getTurnDescription(trMap.get(locale.getLanguage())));