aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/helper/DateUtil.java55
-rw-r--r--src/org/traccar/protocol/TaipProtocolDecoder.java13
-rw-r--r--src/org/traccar/protocol/TramigoProtocolDecoder.java4
3 files changed, 60 insertions, 12 deletions
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;