diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-17 13:09:05 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-17 13:09:05 +1300 |
| commit | da76f9195ec6fbf0e6a0a6419eec908b91f844b7 (patch) | |
| tree | ad5617253f8c2db48d6111339bba585cb18ea3d0 /src/org/traccar/helper/Parser.java | |
| parent | 8fcd8010074624277537375edc3e473096020ed3 (diff) | |
| download | trackermap-server-da76f9195ec6fbf0e6a0a6419eec908b91f844b7.tar.gz trackermap-server-da76f9195ec6fbf0e6a0a6419eec908b91f844b7.tar.bz2 trackermap-server-da76f9195ec6fbf0e6a0a6419eec908b91f844b7.zip | |
Refactor GPS103 protocol decoder
Diffstat (limited to 'src/org/traccar/helper/Parser.java')
| -rw-r--r-- | src/org/traccar/helper/Parser.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java index 107ae7bff..7694a9623 100644 --- a/src/org/traccar/helper/Parser.java +++ b/src/org/traccar/helper/Parser.java @@ -80,7 +80,8 @@ public class Parser { public enum CoordinateFormat { DEG_MIN_HEM, - HEM_DEG + HEM_DEG, + HEM_DEG_MIN_HEM } public double nextCoordinate(CoordinateFormat format) { @@ -92,9 +93,16 @@ public class Parser { hemisphere = next(); coordinate = nextDouble(); break; - case DEG_MIN_HEM: + case HEM_DEG_MIN_HEM: + hemisphere = next(); + coordinate = nextInt(); + coordinate += nextDouble() / 60; + if (hasNext()) { + hemisphere = next(); + } + break; default: - coordinate = nextDouble(); + coordinate = nextInt(); coordinate += nextDouble() / 60; hemisphere = next(); break; |