Minor decoding and pipeline fixes

2 files changed, 4 insertions, 3 deletions

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 74b59a486..775d609a7 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -188,15 +188,15 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
 
         addSpecificHandlers(pipeline);
 
+        if (geolocationHandler != null) {
+            pipeline.addLast("location", geolocationHandler);
+        }
         if (hemisphereHandler != null) {
             pipeline.addLast("hemisphere", hemisphereHandler);
         }
         if (geocoderHandler != null) {
             pipeline.addLast("geocoder", geocoderHandler);
         }
-        if (geolocationHandler != null) {
-            pipeline.addLast("location", geolocationHandler);
-        }
         pipeline.addLast("remoteAddress", new RemoteAddressHandler());
 
         addDynamicHandlers(pipeline);
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
index e5fa76a47..54d2bf28f 100644
--- a/src/org/traccar/BaseProtocolDecoder.java
+++ b/src/org/traccar/BaseProtocolDecoder.java
@@ -162,6 +162,7 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
                 position.setAltitude(last.getAltitude());
                 position.setSpeed(last.getSpeed());
                 position.setCourse(last.getCourse());
+                position.setAccuracy(last.getAccuracy());
             } else {
                 position.setFixTime(new Date(0));
             }