Combine Xexun decoders (fix #1282)

1 files changed, 0 insertions, 150 deletions

diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
deleted file mode 100644
index aba913ed3..000000000
--- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2012 - 2014 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.protocol;
-
-import java.util.Calendar;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-
-import org.traccar.BaseProtocolDecoder;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-public class Xexun2ProtocolDecoder extends BaseProtocolDecoder {
-
-    public Xexun2ProtocolDecoder(XexunProtocol protocol) {
-        super(protocol);
-    }
-
-    static private Pattern pattern = Pattern.compile(
-            "[\r\n]*" +
-            "(\\d+)," +                         // Serial
-            "([^,]+)?," +                       // Number
-            "G[PN]RMC," +
-            "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS)
-            "([AV])," +                         // Validity
-            "(\\d{2})(\\d{2}\\.\\d+)," +        // Latitude (DDMM.MMMM)
-            "([NS])," +
-            "(\\d{3})(\\d{2}\\.\\d+)," +        // Longitude (DDDMM.MMMM)
-            "([EW])," +
-            "(\\d+\\.\\d+)," +                  // Speed
-            "(\\d+\\.\\d+)?," +                 // Course
-            "(\\d{2})(\\d{2})(\\d{2})," +       // Date (DDMMYY)
-            "[^\\*]*\\*..,"       +             // Checksum
-            "([FL])," +                         // Signal
-            "(?:([^,]*),)?" +                   // Alarm
-            ".*imei:" +
-            "(\\d+)," +                         // IMEI
-            "(\\d+)," +                         // Satellites
-            "(-?\\d+\\.\\d+)?," +               // Altitude
-            "[FL]:(\\d+\\.\\d+)V" +             // Power
-            ".*" +
-            "[\r\n]*");
-
-    @Override
-    protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, Object msg)
-            throws Exception {
-
-        // Parse message
-        String sentence = (String) msg;
-        Matcher parser = pattern.matcher(sentence);
-        if (!parser.matches()) {
-            return null;
-        }
-
-        // Create new position
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
-
-        Integer index = 1;
-
-        // Serial
-        position.set("serial", parser.group(index++));
-
-        // Number
-        position.set("number", parser.group(index++));
-
-        // Time
-        Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        time.clear();
-        time.set(Calendar.HOUR_OF_DAY, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MILLISECOND, Integer.valueOf(parser.group(index++)));
-
-        // Validity
-        position.setValid(parser.group(index++).compareTo("A") == 0);
-
-        // Latitude
-        Double latitude = Double.valueOf(parser.group(index++));
-        latitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
-        position.setLatitude(latitude);
-
-        // Longitude
-        Double longitude = Double.valueOf(parser.group(index++));
-        longitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("W") == 0) longitude = -longitude;
-        position.setLongitude(longitude);
-
-        // Speed
-        position.setSpeed(Double.valueOf(parser.group(index++)));
-
-        // Course
-        String course = parser.group(index++);
-        if (course != null) {
-            position.setCourse(Double.valueOf(course));
-        }
-
-        // Date
-        time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
-        time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
-        position.setTime(time.getTime());
-
-        // Signal
-        position.set("signal", parser.group(index++));
-
-        // Alarm
-        position.set(Event.KEY_ALARM, parser.group(index++));
-
-        // Get device by IMEI
-        if (!identify(parser.group(index++), channel)) {
-            return null;
-        }
-        position.setDeviceId(getDeviceId());
-
-        // Satellites
-        position.set(Event.KEY_SATELLITES, parser.group(index++).replaceFirst ("^0*(?![\\.$])", ""));
-
-        // Altitude
-        String altitude = parser.group(index++);
-        if (altitude != null) {
-            position.setAltitude(Double.valueOf(altitude));
-        }
-
-        // Power
-        position.set(Event.KEY_POWER, Double.valueOf(parser.group(index++)));
-
-        return position;
-    }
-
-}