From 306098fbeda545babb2c48c80e7fe98e22abb801 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 16 Nov 2015 11:46:59 +1300
Subject: Update device status in the database

---
 debug.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'debug.xml')

diff --git a/debug.xml b/debug.xml
index 47f17bdae..b09a73d0a 100644
--- a/debug.xml
+++ b/debug.xml
@@ -209,6 +209,10 @@
         UPDATE device SET name = :name, uniqueId = :uniqueId WHERE id = :id;
     </entry>
 
+    <entry key='database.updateDeviceStatus'>
+        UPDATE device SET status = :status, lastUpdate = :lastUpdate WHERE id = :id;
+    </entry>
+
     <entry key='database.deleteDevice'>
         DELETE FROM device WHERE id = :id;
     </entry>
-- 
cgit v1.2.3


From 3990d779545c7dba72324182058ae20730311f97 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 18 Nov 2015 15:32:05 +1300
Subject: Implement location provider channel handler

---
 debug.xml                                    |  3 ++
 src/org/traccar/BasePipelineFactory.java     |  9 ++++
 src/org/traccar/Context.java                 | 13 ++++++
 src/org/traccar/LocationProviderHandler.java | 68 ++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+)
 create mode 100644 src/org/traccar/LocationProviderHandler.java

(limited to 'debug.xml')

diff --git a/debug.xml b/debug.xml
index b09a73d0a..2e6e4e12a 100644
--- a/debug.xml
+++ b/debug.xml
@@ -18,6 +18,9 @@
     <entry key='geocoder.type'>nominatim</entry>
     <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
 
+    <entry key='location.enable'>false</entry>
+    <entry key='location.key'>fake</entry>
+
     <entry key='distance.enable'>true</entry>
 
     <!--<entry key='filter.enable'>true</entry>
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 6b877883d..4244da8c9 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -31,6 +31,7 @@ import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.handler.logging.LoggingHandler;
 import org.jboss.netty.handler.timeout.IdleStateHandler;
 import org.traccar.helper.Log;
+import org.traccar.location.LocationProvider;
 
 public abstract class BasePipelineFactory implements ChannelPipelineFactory {
 
@@ -40,6 +41,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
     private FilterHandler filterHandler;
     private DistanceHandler distanceHandler;
     private ReverseGeocoderHandler reverseGeocoderHandler;
+    private LocationProviderHandler locationProviderHandler;
 
     private static final class OpenChannelHandler extends SimpleChannelHandler {
 
@@ -103,6 +105,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
                     Context.getReverseGeocoder(), Context.getConfig().getBoolean("geocode.processInvalidPositions"));
         }
 
+        if (Context.getLocationProvider() != null) {
+            locationProviderHandler = new LocationProviderHandler(Context.getLocationProvider());
+        }
+
         if (Context.getConfig().getBoolean("distance.enable")) {
             distanceHandler = new DistanceHandler();
         }
@@ -132,6 +138,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (reverseGeocoderHandler != null) {
             pipeline.addLast("geocoder", reverseGeocoderHandler);
         }
+        if (locationProviderHandler != null) {
+            pipeline.addLast("location", locationProviderHandler);
+        }
         pipeline.addLast("remoteAddress", new RemoteAddressHandler());
 
         addDynamicHandlers(pipeline);
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 113ed02ec..aff72cd01 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -29,6 +29,8 @@ import org.traccar.geocode.NominatimReverseGeocoder;
 import org.traccar.geocode.OpenCageReverseGeocoder;
 import org.traccar.geocode.ReverseGeocoder;
 import org.traccar.helper.Log;
+import org.traccar.location.LocationProvider;
+import org.traccar.location.OpenCellIdLocationProvider;
 import org.traccar.web.WebServer;
 
 public final class Context {
@@ -78,6 +80,12 @@ public final class Context {
         return reverseGeocoder;
     }
 
+    private static LocationProvider locationProvider;
+
+    public static LocationProvider getLocationProvider() {
+        return locationProvider;
+    }
+
     private static WebServer webServer;
 
     public static WebServer getWebServer() {
@@ -144,6 +152,11 @@ public final class Context {
             }
         }
 
+        if (config.getBoolean("location.enable")) {
+            String key = config.getString("location.key");
+            locationProvider = new OpenCellIdLocationProvider(key);
+        }
+
         if (config.getBoolean("web.enable")) {
             if (config.getString("web.type", "new").equals("new")
                     || config.getString("web.type", "new").equals("api")) {
diff --git a/src/org/traccar/LocationProviderHandler.java b/src/org/traccar/LocationProviderHandler.java
new file mode 100644
index 000000000..024d9fb95
--- /dev/null
+++ b/src/org/traccar/LocationProviderHandler.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015 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;
+
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.traccar.location.LocationProvider;
+import org.traccar.model.Position;
+
+public class LocationProviderHandler implements ChannelUpstreamHandler {
+
+    private final LocationProvider locationProvider;
+
+    public LocationProviderHandler(LocationProvider locationProvider) {
+        this.locationProvider = locationProvider;
+    }
+
+    @Override
+    public void handleUpstream(final ChannelHandlerContext ctx, ChannelEvent evt) throws Exception {
+        if (!(evt instanceof MessageEvent)) {
+            ctx.sendUpstream(evt);
+            return;
+        }
+
+        final MessageEvent e = (MessageEvent) evt;
+        Object message = e.getMessage();
+        if (message instanceof Position) {
+            final Position position = (Position) message;
+            if (locationProvider != null && position.getOutdated()) {
+                locationProvider.getLocation(position.getAttributes(), new LocationProvider.LocationProviderCallback() {
+                    @Override
+                    public void onSuccess(double latitude, double longitude) {
+                        position.setFixTime(position.getDeviceTime());
+                        position.setLatitude(latitude);
+                        position.setLongitude(longitude);
+                        Channels.fireMessageReceived(ctx, position, e.getRemoteAddress());
+                    }
+
+                    @Override
+                    public void onFailure() {
+                        Channels.fireMessageReceived(ctx, position, e.getRemoteAddress());
+                    }
+                });
+            } else {
+                Channels.fireMessageReceived(ctx, position, e.getRemoteAddress());
+            }
+        } else {
+            Channels.fireMessageReceived(ctx, message, e.getRemoteAddress());
+        }
+    }
+
+}
-- 
cgit v1.2.3


From a7f7df0ebdf56a6dbaa5a17600c05c5b6d3033a4 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 18 Nov 2015 22:04:41 +1300
Subject: Support GSM based locations (fix #346)

---
 debug.xml                                          |  2 ++
 src/org/traccar/location/BaseLocationProvider.java | 22 +++++++++----
 .../traccar/protocol/Gps103ProtocolDecoder.java    | 36 +++++++++++++++++++---
 .../protocol/Gps103ProtocolDecoderTest.java        |  5 ++-
 4 files changed, 54 insertions(+), 11 deletions(-)

(limited to 'debug.xml')

diff --git a/debug.xml b/debug.xml
index 2e6e4e12a..426dadc4c 100644
--- a/debug.xml
+++ b/debug.xml
@@ -20,6 +20,8 @@
 
     <entry key='location.enable'>false</entry>
     <entry key='location.key'>fake</entry>
+    <entry key='location.mcc'>260</entry>
+    <entry key='location.mnc'>2</entry>
 
     <entry key='distance.enable'>true</entry>
 
diff --git a/src/org/traccar/location/BaseLocationProvider.java b/src/org/traccar/location/BaseLocationProvider.java
index 80b10b33c..d6eddc1cd 100644
--- a/src/org/traccar/location/BaseLocationProvider.java
+++ b/src/org/traccar/location/BaseLocationProvider.java
@@ -15,6 +15,7 @@
  */
 package org.traccar.location;
 
+import org.traccar.Context;
 import org.traccar.model.Event;
 
 import java.util.Map;
@@ -23,13 +24,22 @@ public abstract class BaseLocationProvider implements LocationProvider {
 
     @Override
     public void getLocation(Map<String, Object> attributes, LocationProviderCallback callback) {
-        if (attributes.containsKey(Event.KEY_MCC) || attributes.containsKey(Event.KEY_MNC)) {
-            Number mcc = (Number) attributes.get(Event.KEY_MCC);
-            Number mnc = (Number) attributes.get(Event.KEY_MNC);
-            Number lac = (Number) attributes.get(Event.KEY_LAC);
-            Number cid = (Number) attributes.get(Event.KEY_CID);
-            getLocation(mcc.intValue(), mnc.intValue(), lac.longValue(), cid.longValue(), callback);
+
+        Number mcc = (Number) attributes.get(Event.KEY_MCC);
+        if (mcc == null) {
+            mcc = Context.getConfig().getInteger("location.mcc");
+        }
+
+        Number mnc = (Number) attributes.get(Event.KEY_MNC);
+        if (mnc == null) {
+            mnc = Context.getConfig().getInteger("location.mnc");
         }
+
+        Number lac = (Number) attributes.get(Event.KEY_LAC);
+        Number cid = (Number) attributes.get(Event.KEY_CID);
+
+        getLocation(mcc.intValue(), mnc.intValue(), lac.longValue(), cid.longValue(), callback);
+
     }
 
     protected abstract void getLocation(int mcc, int mnc, long lac, long cid, LocationProviderCallback callback);
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index aa693f42e..a91848f5b 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -63,6 +63,17 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
             .any()
             .compile();
 
+    private static final Pattern PATTERN_NETWORK = new PatternBuilder()
+            .text("imei:")
+            .number("(d+),")                     // imei
+            .expression("[^,]+,")                // alarm
+            .number("d+,,")
+            .text("L,,,")
+            .number("(x+),,")                    // lac
+            .number("(x+),,,")                   // cid
+            .any()
+            .compile();
+
     private static final Pattern PATTERN_HANDSHAKE = new PatternBuilder()
             .number("##,imei:(d+),A")
             .compile();
@@ -93,14 +104,31 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
-        Parser parser = new Parser(PATTERN, sentence);
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+
+        Parser parser = new Parser(PATTERN_NETWORK, sentence);
+        if (parser.matches()) {
+
+            if (!identify(parser.next(), channel, remoteAddress)) {
+                return null;
+            }
+            position.setDeviceId(getDeviceId());
+
+            getLastLocation(position, null);
+
+            position.set(Event.KEY_LAC, parser.nextInt(16));
+            position.set(Event.KEY_CID, parser.nextInt(16));
+
+            return position;
+
+        }
+
+        parser = new Parser(PATTERN, sentence);
         if (!parser.matches()) {
             return null;
         }
 
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
-
         String imei = parser.next();
         if (!identify(imei, channel, remoteAddress)) {
             return null;
diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
index 03d7b5c72..371b137fd 100644
--- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
@@ -10,7 +10,10 @@ public class Gps103ProtocolDecoderTest extends ProtocolDecoderTest {
 
         Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new Gps103Protocol());
 
-        verifyNothing(decoder, text(
+        verifyAttributes(decoder, text(
+                "imei:359710041100000,tracker,000000000,,L,,,fa8,,c9af,,,,,0,0,0.00%,,"));
+
+        verifyAttributes(decoder, text(
                 "imei:863070016871385,tracker,0000000119,,L,,,0FB6,,CB5D,,,"));
 
         verifyPosition(decoder, text(
-- 
cgit v1.2.3