branch develop-2.x updated (511a297 -> 4684b92)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 511a297 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 4684b92 Revert previous fix on DmdConverter (Fixes #4140) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4684b92ed96819af5b0f58078850c546e8391f51 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 20 13:03:10 2017 +0100 Revert previous fix on DmdConverter (Fixes #4140) Summary of changes: .../java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 4684b92ed96819af5b0f58078850c546e8391f51 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 20 13:03:10 2017 +0100 Revert previous fix on DmdConverter (Fixes #4140) --- .../java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java index e17d484..40e9e3b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java @@ -103,7 +103,9 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { Integer degre = degresStr.isEmpty() || "-".equals(degresStr) ? null : Math.abs(Integer.valueOf(degresStr)); Integer minutes = minutesStr.isEmpty() ? null : Integer.valueOf(minutesStr); Integer decimal = decimalesStr.isEmpty() ? null : Integer.valueOf(decimalesStr); - + if (decimalesStr.length() == 1 && decimal != null && decimal > 0) { + decimal *= 10; + } boolean signed = degresStr.contains("-"); result = DmdCoordinate.valueOf(signed, degre, @@ -134,7 +136,7 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { signStr, StringUtils.leftPad(degreeStr, forLongitude ? 3 : 2, nullValue.equals(degreeStr) ? ' ' : fillChar), StringUtils.leftPad(minuteStr, 2, nullValue.equals(minuteStr) ? ' ' : fillChar), - StringUtils.rightPad(decimalStr, 2, nullValue.equals(decimalStr) ? ' ' : fillChar)); + StringUtils.leftPad(decimalStr, 2, nullValue.equals(decimalStr) ? ' ' : fillChar)); } } return aClass.cast(result); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm