aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--setup/default.xml1
-rw-r--r--src/org/traccar/protocol/StarcomProtocol.java45
-rw-r--r--src/org/traccar/protocol/StarcomProtocolDecoder.java121
-rw-r--r--test/org/traccar/protocol/StarcomProtocolDecoderTest.java18
4 files changed, 0 insertions, 185 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 5dbecd5bd..ec0ff86d2 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -223,6 +223,5 @@
<entry key='oko.port'>5152</entry>
<entry key='ivt401.port'>5153</entry>
<entry key='sigfox.port'>5154</entry>
- <entry key='starcom.port'>5155</entry>
</properties>
diff --git a/src/org/traccar/protocol/StarcomProtocol.java b/src/org/traccar/protocol/StarcomProtocol.java
deleted file mode 100644
index f29d54bfe..000000000
--- a/src/org/traccar/protocol/StarcomProtocol.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- *
- * 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 org.jboss.netty.bootstrap.ConnectionlessBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.traccar.BaseProtocol;
-import org.traccar.TrackerServer;
-
-import java.util.List;
-
-public class StarcomProtocol extends BaseProtocol {
-
- public StarcomProtocol() {
- super("starcom");
- }
-
- @Override
- public void initTrackerServers(List<TrackerServer> serverList) {
- serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) {
- @Override
- protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("stringEncoder", new StringEncoder());
- pipeline.addLast("stringDecoder", new StringDecoder());
- pipeline.addLast("objectDecoder", new StarcomProtocolDecoder(StarcomProtocol.this));
- }
- });
- }
-
-}
diff --git a/src/org/traccar/protocol/StarcomProtocolDecoder.java b/src/org/traccar/protocol/StarcomProtocolDecoder.java
deleted file mode 100644
index 42c7ba12f..000000000
--- a/src/org/traccar/protocol/StarcomProtocolDecoder.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- *
- * 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 org.jboss.netty.channel.Channel;
-import org.traccar.BaseProtocolDecoder;
-import org.traccar.DeviceSession;
-import org.traccar.model.Position;
-
-import java.net.SocketAddress;
-import java.text.SimpleDateFormat;
-
-public class StarcomProtocolDecoder extends BaseProtocolDecoder {
-
- public StarcomProtocolDecoder(StarcomProtocol protocol) {
- super(protocol);
- }
-
- @Override
- protected Object decode(
- Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
-
- String sentence = (String) msg;
- sentence = sentence.substring(sentence.indexOf('|') + 1, sentence.lastIndexOf('|'));
-
- Position position = new Position();
- position.setProtocol(getProtocolName());
-
- for (String entry : sentence.split(",")) {
- int delimiter = entry.indexOf('=');
- String key = entry.substring(0, delimiter);
- String value = entry.substring(delimiter + 1);
- switch (key) {
- case "unit":
- DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, value);
- if (deviceSession != null) {
- position.setDeviceId(deviceSession.getDeviceId());
- }
- break;
- case "gps_valid":
- position.setValid(Integer.parseInt(value) != 0);
- break;
- case "datetime_utc":
- position.setTime(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(value));
- break;
- case "latitude":
- position.setLatitude(Double.parseDouble(value));
- break;
- case "longitude":
- position.setLongitude(Double.parseDouble(value));
- break;
- case "altitude":
- position.setAltitude(Double.parseDouble(value));
- break;
- case "velocity":
- position.setSpeed(Integer.parseInt(value));
- break;
- case "heading":
- position.setCourse(Integer.parseInt(value));
- break;
- case "eventid":
- position.set(Position.KEY_EVENT, Integer.parseInt(value));
- break;
- case "odometer":
- position.set(Position.KEY_ODOMETER, Long.parseLong(value));
- break;
- case "satellites":
- position.set(Position.KEY_SATELLITES, Integer.parseInt(value));
- break;
- case "ignition":
- position.set(Position.KEY_IGNITION, Integer.parseInt(value) != 0);
- break;
- case "door":
- position.set(Position.KEY_DOOR, Integer.parseInt(value) != 0);
- break;
- case "arm":
- position.set(Position.KEY_ARMED, Integer.parseInt(value) != 0);
- break;
- case "fuel":
- position.set(Position.KEY_FUEL_LEVEL, Integer.parseInt(value));
- break;
- case "rpm":
- position.set(Position.KEY_RPM, Integer.parseInt(value));
- break;
- case "main_voltage":
- position.set(Position.KEY_POWER, Double.parseDouble(value));
- break;
- case "backup_voltage":
- position.set(Position.KEY_BATTERY, Double.parseDouble(value));
- break;
- case "analog1":
- case "analog2":
- case "analog3":
- position.set(Position.PREFIX_ADC + (key.charAt(key.length() - 1) - '0'), Double.parseDouble(value));
- break;
- case "extra1":
- case "extra2":
- case "extra3":
- position.set(key, value);
- default:
- break;
- }
- }
-
- return position;
- }
-
-}
diff --git a/test/org/traccar/protocol/StarcomProtocolDecoderTest.java b/test/org/traccar/protocol/StarcomProtocolDecoderTest.java
deleted file mode 100644
index 1ae37f5a0..000000000
--- a/test/org/traccar/protocol/StarcomProtocolDecoderTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.traccar.protocol;
-
-import org.junit.Test;
-import org.traccar.ProtocolTest;
-
-public class StarcomProtocolDecoderTest extends ProtocolTest {
-
- @Test
- public void testDecode() throws Exception {
-
- StarcomProtocolDecoder decoder = new StarcomProtocolDecoder(new StarcomProtocol());
-
- verifyPosition(decoder, text(
- "|unit=111111,unittype=5,address=111.111.111.111,kind=1,pending=1,mileage=23.808,odometer=1300,logic_state=1,reason=1,eventid=52,response=1,longitude=-11.11111,latitude=-11.11111,altitude=786,gps_valid=1,gps_connected=1,satellites=7,velocity=1,heading=0,emergency=0,driver=0,ignition=1,door=1,arm=0,disarm=0,extra1=0,extra2=0,extra3=0,siren=0,lock=0,immobilizer=1,unlock=0,fuel=0,rpm=0,modemsignal=0,main_voltage=12.06,backup_voltage=-1.00,analog1=0.00,analog2=0.00,analog3=0.00,datetime_utc=2017/11/16 03:18:59,datetime_actual=2017/11/16 03:18:59,network=TCPIP.1|\r\n"));
-
- }
-
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 20:58:15 +0000