From 865c6e3fdccc5b59b55501aa58fd921cdb8a1ec1 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 2 Jan 2016 09:24:45 +1300 Subject: Correct date if device sends not full time --- src/org/traccar/helper/DateUtil.java | 55 ++++++++++++++++++++++ src/org/traccar/protocol/TaipProtocolDecoder.java | 13 +---- .../traccar/protocol/TramigoProtocolDecoder.java | 4 +- test/org/traccar/helper/DateUtilTest.java | 29 ++++++++++++ .../protocol/TramigoProtocolDecoderTest.java | 6 +-- 5 files changed, 92 insertions(+), 15 deletions(-) create mode 100644 src/org/traccar/helper/DateUtil.java create mode 100644 test/org/traccar/helper/DateUtilTest.java diff --git a/src/org/traccar/helper/DateUtil.java b/src/org/traccar/helper/DateUtil.java new file mode 100644 index 000000000..9d4148ac1 --- /dev/null +++ b/src/org/traccar/helper/DateUtil.java @@ -0,0 +1,55 @@ +/* + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.helper; + +import java.util.Calendar; +import java.util.Date; + +public class DateUtil { + + public static Date correctDay(Date guess) { + return correctDate(new Date(), guess, Calendar.DAY_OF_MONTH); + } + + public static Date correctYear(Date guess) { + return correctDate(new Date(), guess, Calendar.YEAR); + } + + public static Date correctDate(Date now, Date guess, int field) { + + if (guess.getTime() > now.getTime()) { + Date previous = dateAdd(guess, field, -1); + if (now.getTime() - previous.getTime() < guess.getTime() - now.getTime()) { + return previous; + } + } else if (guess.getTime() < now.getTime()) { + Date next = dateAdd(guess, field, 1); + if (next.getTime() - now.getTime() < now.getTime() - guess.getTime()) { + return next; + } + } + + return guess; + } + + private static Date dateAdd(Date guess, int field, int amount) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(guess); + calendar.add(field, amount); + return calendar.getTime(); + } + +} diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java index 565d4a0c7..202b9dd63 100644 --- a/src/org/traccar/protocol/TaipProtocolDecoder.java +++ b/src/org/traccar/protocol/TaipProtocolDecoder.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.helper.DateBuilder; +import org.traccar.helper.DateUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -68,17 +69,7 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder { DateBuilder dateBuilder = new DateBuilder(new Date()) .setTime(0, 0, 0, 0) .addMillis(seconds * 1000); - - long millis = dateBuilder.getDate().getTime(); - long diff = System.currentTimeMillis() - millis; - - if (diff > 12 * 60 * 60 * 1000) { - millis += 24 * 60 * 60 * 1000; - } else if (diff < -12 * 60 * 60 * 1000) { - millis -= 24 * 60 * 60 * 1000; - } - - return new Date(millis); + return DateUtil.correctDay(dateBuilder.getDate()); } @Override diff --git a/src/org/traccar/protocol/TramigoProtocolDecoder.java b/src/org/traccar/protocol/TramigoProtocolDecoder.java index da34bcdfa..10bab3d6c 100644 --- a/src/org/traccar/protocol/TramigoProtocolDecoder.java +++ b/src/org/traccar/protocol/TramigoProtocolDecoder.java @@ -28,6 +28,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; +import org.traccar.helper.DateUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Event; import org.traccar.model.Position; @@ -126,7 +127,8 @@ public class TramigoProtocolDecoder extends BaseProtocolDecoder { return null; } DateFormat dateFormat = new SimpleDateFormat("HH:mm MMM d yyyy", Locale.ENGLISH); - position.setTime(dateFormat.parse(matcher.group(1) + " " + Calendar.getInstance().get(Calendar.YEAR))); + position.setTime(DateUtil.correctYear( + dateFormat.parse(matcher.group(1) + " " + Calendar.getInstance().get(Calendar.YEAR)))); return position; diff --git a/test/org/traccar/helper/DateUtilTest.java b/test/org/traccar/helper/DateUtilTest.java new file mode 100644 index 000000000..ae5f20696 --- /dev/null +++ b/test/org/traccar/helper/DateUtilTest.java @@ -0,0 +1,29 @@ +package org.traccar.helper; + +import org.junit.Assert; +import org.junit.Test; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; + +public class DateUtilTest { + + @Test + public void testCorrectDate() throws ParseException { + + DateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Assert.assertEquals(f.parse("2015-12-31 23:59:59"), + DateUtil.correctDate(f.parse("2016-01-01 00:00:01"), f.parse("2016-01-01 23:59:59"), Calendar.DAY_OF_MONTH)); + + Assert.assertEquals(f.parse("2016-01-01 00:00:02"), + DateUtil.correctDate(f.parse("2016-01-01 00:00:01"), f.parse("2016-01-01 00:00:02"), Calendar.DAY_OF_MONTH)); + + Assert.assertEquals(f.parse("2016-01-01 00:00:02"), + DateUtil.correctDate(f.parse("2016-01-01 00:00:01"), f.parse("2015-12-31 00:00:02"), Calendar.DAY_OF_MONTH)); + + } + +} diff --git a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java index da04e5bf1..9ac02a7ad 100644 --- a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java @@ -12,11 +12,11 @@ public class TramigoProtocolDecoderTest extends ProtocolTest { TramigoProtocolDecoder decoder = new TramigoProtocolDecoder(new TramigoProtocol()); - /*verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, "80005408b000af000101b23903677f00c8436d3842616c697365204f6e653a20416c6c756d616765206d61726368652064e974656374e92c20676172e92c20302e3735206b6d20452064652045636f6c65204175746f726f757465206465204b696e73686173612c2056696c6c65206465204b696e73686173612c204b696e73686173612c2043442c202d342e33343130362c2031352e33343931352c2030313a3030204a616e2031202020454f46")); - verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, - "8000011bb0009e0001015b93032ef6f35994a9545472616d69676f3a204d6f76696e672c20302e3930206b6d205345206f66204372616e6562726f6f6b20466972652053746174696f6e2c2050656e726974682c205379646e65792c2041552c202d33332e37303732322c203135302e37313735392c2053452077697468207370656564203337206b6d2f682c2031393a3438204a616e20342020454f46"));*/ + //verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, + // "8000011bb0009e0001015b93032ef6f35994a9545472616d69676f3a204d6f76696e672c20302e3930206b6d205345206f66204372616e6562726f6f6b20466972652053746174696f6e2c2050656e726974682c205379646e65792c2041552c202d33332e37303732322c203135302e37313735392c2053452077697468207370656564203337206b6d2f682c2031393a3438204a616e20342020454f46")); // Tramigo: Parked, 0.12 km E of McDonald's H.V. dela Costa, Makati, 11:07 Mar 27 // Tramigo: Moving, 0.90 km SE of Cranebrook Fire Station, Penrith, Sydney, AU, -33.70722, 150.71759, SE with speed 37 km/h, 19:48 Jan 4 EOF -- cgit v1.2.3