From 0350d762a7c08199e79dc401b6c6821d7e2a21bd Mon Sep 17 00:00:00 2001 From: amilasilva88 Date: Thu, 13 Aug 2015 20:28:58 +0800 Subject: Added ODOMeter and Modification to Mobile UI --- src/org/traccar/BasePipelineFactory.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/org/traccar/BasePipelineFactory.java') diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index 4d8b0ffc4..410b57318 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -38,6 +38,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { private int resetDelay; private FilterHandler filterHandler; + private ODOMeterHandler odoMeterHandler; private ReverseGeocoderHandler reverseGeocoderHandler; protected class OpenChannelHandler extends SimpleChannelHandler { @@ -92,6 +93,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { filterHandler = new FilterHandler(); } + if (Context.getConfig().getBoolean("system.odometer.enable")) { + odoMeterHandler = new ODOMeterHandler(); + } + if (Context.getReverseGeocoder() != null) { reverseGeocoderHandler = new ReverseGeocoderHandler( Context.getReverseGeocoder(), Context.getConfig().getBoolean("geocode.processInvalidPositions")); @@ -114,6 +119,11 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { if (filterHandler != null) { pipeline.addLast("filter", filterHandler); } + + if (odoMeterHandler != null) { + pipeline.addLast("odoMeter", odoMeterHandler); + } + if (reverseGeocoderHandler != null) { pipeline.addLast("geocoder", reverseGeocoderHandler); } -- cgit v1.2.3 From a70f478740514e6e60ffbe49906a9c6150b2ec99 Mon Sep 17 00:00:00 2001 From: amilasilva88 Date: Fri, 14 Aug 2015 11:46:27 +0800 Subject: Refactoring - tabs to spaces and naming conventions --- debug.xml | 6 ++-- src/org/traccar/BasePipelineFactory.java | 13 ++------ src/org/traccar/OdometerHandler.java | 57 +++++++++++++++----------------- src/org/traccar/model/Position.java | 6 ++-- web/app/view/report/Report.js | 4 +-- web/app/view/state/StateController.js | 4 +-- 6 files changed, 40 insertions(+), 50 deletions(-) (limited to 'src/org/traccar/BasePipelineFactory.java') diff --git a/debug.xml b/debug.xml index 2742356ca..25f2cc320 100644 --- a/debug.xml +++ b/debug.xml @@ -99,7 +99,7 @@ altitude FLOAT NOT NULL, speed FLOAT NOT NULL, course FLOAT NOT NULL, - odoMeter FLOAT NOT NULL, + odometer FLOAT NOT NULL, address VARCHAR(512), other VARCHAR(4096) NOT NULL, FOREIGN KEY (deviceId) REFERENCES device (id) ON DELETE CASCADE); @@ -235,8 +235,8 @@ - INSERT INTO position (deviceId, protocol, serverTime, deviceTime, fixTime, valid, latitude, longitude, altitude, speed, course, odoMeter, address, other) - VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :odoMeter, :address, :other); + INSERT INTO position (deviceId, protocol, serverTime, deviceTime, fixTime, valid, latitude, longitude, altitude, speed, course, odometer, address, other) + VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :odometer, :address, :other); diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index 410b57318..6c4a6b5bd 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -25,7 +25,6 @@ import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.DownstreamMessageEvent; -import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelHandler; import org.jboss.netty.handler.logging.LoggingHandler; @@ -38,7 +37,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { private int resetDelay; private FilterHandler filterHandler; - private ODOMeterHandler odoMeterHandler; + private OdometerHandler odometerHandler; private ReverseGeocoderHandler reverseGeocoderHandler; protected class OpenChannelHandler extends SimpleChannelHandler { @@ -93,10 +92,6 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { filterHandler = new FilterHandler(); } - if (Context.getConfig().getBoolean("system.odometer.enable")) { - odoMeterHandler = new ODOMeterHandler(); - } - if (Context.getReverseGeocoder() != null) { reverseGeocoderHandler = new ReverseGeocoderHandler( Context.getReverseGeocoder(), Context.getConfig().getBoolean("geocode.processInvalidPositions")); @@ -119,11 +114,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { if (filterHandler != null) { pipeline.addLast("filter", filterHandler); } - - if (odoMeterHandler != null) { - pipeline.addLast("odoMeter", odoMeterHandler); + if (odometerHandler != null) { + pipeline.addLast("odometer", odometerHandler); } - if (reverseGeocoderHandler != null) { pipeline.addLast("geocoder", reverseGeocoderHandler); } diff --git a/src/org/traccar/OdometerHandler.java b/src/org/traccar/OdometerHandler.java index 781dd274d..5a813fc3a 100644 --- a/src/org/traccar/OdometerHandler.java +++ b/src/org/traccar/OdometerHandler.java @@ -9,44 +9,41 @@ import org.traccar.model.Position; /** *

- * Odometer handler + * Odometer - total mileage calculation handler *

* * @author Amila Silva * */ -public class ODOMeterHandler extends BaseDataHandler { +public class OdometerHandler extends BaseDataHandler { - public ODOMeterHandler() { - Log.debug("System based odometer calculation enabled for all devices"); - } + public OdometerHandler() { + Log.debug("System based odometer calculation enabled for all devices"); + } - private Position getLastPosition(long deviceId) { - if (Context.getConnectionManager() != null) { - return Context.getConnectionManager().getLastPosition(deviceId); - } - return null; - } + private Position getLastPosition(long deviceId) { + if (Context.getConnectionManager() != null) { + return Context.getConnectionManager().getLastPosition(deviceId); + } + return null; + } - private Position calculateDistance(Position position) { - Position last = getLastPosition(position.getDeviceId()); - if (last != null) { - double distance = DistanceCalculator.distance( - position.getLatitude(), position.getLongitude(), - last.getLatitude(), last.getLongitude()); - distance = Math.round((distance) * 100.0) / 100.0; - double odoMeter = distance + last.getOdoMeter(); -// Log.debug("::: Device Course : " + position.getDeviceId() -// + ", Distance :" + distance + "m, Odometer :" + odoMeter -// + " m"); - position.setOdoMeter(odoMeter); - } - return position; - } + private Position calculateDistance(Position position) { + Position last = getLastPosition(position.getDeviceId()); + if (last != null) { + double distance = DistanceCalculator.distance( + position.getLatitude(), position.getLongitude(), + last.getLatitude(), last.getLongitude()); + distance = Math.round((distance) * 100.0) / 100.0; + double odometer = distance + last.getOdometer(); + position.setOdometer(odometer); + } + return position; + } - @Override - protected Position handlePosition(Position position) { - return calculateDistance(position); - } + @Override + protected Position handlePosition(Position position) { + return calculateDistance(position); + } } diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 8c3340d9c..0c928439c 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -57,9 +57,9 @@ public class Position extends Event implements Factory { public double getCourse() { return course; } public void setCourse(double course) { this.course = course; } - private double odoMeter; // value in meters - public double getOdoMeter() { return odoMeter; } - public void setOdoMeter(double odoMeter) { this.odoMeter = odoMeter; } + private double odometer; // value in meters + public double getOdometer() { return odometer; } + public void setOdometer(double odometer) { this.odometer = odometer; } private String address; public String getAddress() { return address; } diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js index 6c43b9463..5466c7887 100644 --- a/web/app/view/report/Report.js +++ b/web/app/view/report/Report.js @@ -91,8 +91,8 @@ Ext.define('Traccar.view.report.Report', { } }, /* { text: strings.positionCourse, dataIndex: 'course', flex: 1 }, */ - { text: 'Odometer', dataIndex: 'odoMeter', flex: 1, - renderer: function(value) { + { text: 'Odometer', dataIndex: 'odometer', flex: 1, + renderer: function(value) { var distanceUnits = Ext.getStore('DistanceUnits'); var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || ''; return distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit); diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js index 6f222f6a8..685805418 100644 --- a/web/app/view/state/StateController.js +++ b/web/app/view/state/StateController.js @@ -63,7 +63,7 @@ Ext.define('Traccar.view.state.StateController', { priority: 7, name: strings.positionCourse },*/ - 'odoMeter': { + 'odometer': { priority: 7, name: 'Odometer' }, @@ -92,7 +92,7 @@ Ext.define('Traccar.view.state.StateController', { value = speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit); } - if (key === 'odoMeter') { + if (key === 'odometer') { var distanceUnits = Ext.getStore('DistanceUnits'); var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || ''; value = distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit); -- cgit v1.2.3 From 17ff0791718807be18e9f63aa095ed86d4b82b1c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 18 Aug 2015 13:22:16 +1200 Subject: Re-factor server side classes --- debug.xml | 11 +++--- src/org/traccar/BasePipelineFactory.java | 10 ++++-- src/org/traccar/DistanceHandler.java | 59 +++++++++++++++++++++++++++++++ src/org/traccar/OdometerHandler.java | 55 ---------------------------- src/org/traccar/model/Event.java | 1 + src/org/traccar/model/Position.java | 4 --- test/org/traccar/DistanceHandlerTest.java | 22 ++++++++++++ 7 files changed, 94 insertions(+), 68 deletions(-) create mode 100644 src/org/traccar/DistanceHandler.java delete mode 100644 src/org/traccar/OdometerHandler.java create mode 100644 test/org/traccar/DistanceHandlerTest.java (limited to 'src/org/traccar/BasePipelineFactory.java') diff --git a/debug.xml b/debug.xml index 25f2cc320..ceee553ce 100644 --- a/debug.xml +++ b/debug.xml @@ -18,15 +18,15 @@ nominatim http://nominatim.openstreetmap.org/reverse + true + - - true - + @@ -99,7 +99,6 @@ altitude FLOAT NOT NULL, speed FLOAT NOT NULL, course FLOAT NOT NULL, - odometer FLOAT NOT NULL, address VARCHAR(512), other VARCHAR(4096) NOT NULL, FOREIGN KEY (deviceId) REFERENCES device (id) ON DELETE CASCADE); @@ -235,8 +234,8 @@ - INSERT INTO position (deviceId, protocol, serverTime, deviceTime, fixTime, valid, latitude, longitude, altitude, speed, course, odometer, address, other) - VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :odometer, :address, :other); + INSERT INTO position (deviceId, protocol, serverTime, deviceTime, fixTime, valid, latitude, longitude, altitude, speed, course, address, other) + VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :address, :other); diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index 6c4a6b5bd..216e48709 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -37,7 +37,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { private int resetDelay; private FilterHandler filterHandler; - private OdometerHandler odometerHandler; + private DistanceHandler distanceHandler; private ReverseGeocoderHandler reverseGeocoderHandler; protected class OpenChannelHandler extends SimpleChannelHandler { @@ -96,6 +96,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { reverseGeocoderHandler = new ReverseGeocoderHandler( Context.getReverseGeocoder(), Context.getConfig().getBoolean("geocode.processInvalidPositions")); } + + if (Context.getConfig().getBoolean("distance.enable")) { + distanceHandler = new DistanceHandler(); + } } protected abstract void addSpecificHandlers(ChannelPipeline pipeline); @@ -114,8 +118,8 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { if (filterHandler != null) { pipeline.addLast("filter", filterHandler); } - if (odometerHandler != null) { - pipeline.addLast("odometer", odometerHandler); + if (distanceHandler != null) { + pipeline.addLast("distance", distanceHandler); } if (reverseGeocoderHandler != null) { pipeline.addLast("geocoder", reverseGeocoderHandler); diff --git a/src/org/traccar/DistanceHandler.java b/src/org/traccar/DistanceHandler.java new file mode 100644 index 000000000..57dddfe87 --- /dev/null +++ b/src/org/traccar/DistanceHandler.java @@ -0,0 +1,59 @@ +/* + * Copyright 2015 Amila Silva + * + * 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.traccar.helper.DistanceCalculator; +import org.traccar.model.Event; +import org.traccar.model.Position; + +import java.math.BigDecimal; + +public class DistanceHandler extends BaseDataHandler { + + private Position getLastPosition(long deviceId) { + if (Context.getConnectionManager() != null) { + return Context.getConnectionManager().getLastPosition(deviceId); + } + return null; + } + + public Position calculateDistance(Position position) { + + double distance = 0.0; + + Position last = getLastPosition(position.getDeviceId()); + if (last != null) { + if (last.getOther().containsKey(Event.KEY_DISTANCE)) { + distance = ((Number) last.getOther().get(Event.KEY_DISTANCE)).doubleValue(); + } + + distance += DistanceCalculator.distance( + position.getLatitude(), position.getLongitude(), + last.getLatitude(), last.getLongitude()); + + distance = BigDecimal.valueOf(distance).setScale(2).doubleValue(); + } + + position.set(Event.KEY_DISTANCE, distance); + return position; + } + + @Override + protected Position handlePosition(Position position) { + return calculateDistance(position); + } + +} diff --git a/src/org/traccar/OdometerHandler.java b/src/org/traccar/OdometerHandler.java deleted file mode 100644 index d5860c02e..000000000 --- a/src/org/traccar/OdometerHandler.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * - */ -package org.traccar; - -import org.traccar.helper.DistanceCalculator; -import org.traccar.helper.Log; -import org.traccar.model.Position; - -/** - *

- * Odometer - total mileage calculation handler - *

- * - * @author Amila Silva - * - */ -public class OdometerHandler extends BaseDataHandler { - - public OdometerHandler() { - Log.debug("System based odometer calculation enabled for all devices"); - } - - private Position getLastPosition(long deviceId) { - if (Context.getConnectionManager() != null) { - return Context.getConnectionManager().getLastPosition(deviceId); - } - return null; - } - - private Position calculateDistance(Position position) { - Position last = getLastPosition(position.getDeviceId()); - if (last != null) { - // set odometer only on movement - double odometer = 0.0; - if (last.getSpeed() == 0 && position.getSpeed() == 0) { - odometer = last.getOdometer(); - } else { - double distance = DistanceCalculator.distance( - position.getLatitude(), position.getLongitude(), - last.getLatitude(), last.getLongitude()); - distance = Math.round((distance) * 100.0) / 100.0; - odometer = distance + last.getOdometer(); - } - position.setOdometer(odometer); - } - return position; - } - - @Override - protected Position handlePosition(Position position) { - return calculateDistance(position); - } - -} diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java index df9a9a8e5..831ae31b3 100644 --- a/src/org/traccar/model/Event.java +++ b/src/org/traccar/model/Event.java @@ -78,6 +78,7 @@ public abstract class Event { public static final String KEY_CHARGE = "charge"; public static final String KEY_IP = "ip"; public static final String KEY_ARCHIVE = "archive"; + public static final String KEY_DISTANCE = "distance"; // Starts with 1 not 0 public static final String PREFIX_TEMP = "temp"; diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 0c928439c..62c999d94 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -56,10 +56,6 @@ public class Position extends Event implements Factory { private double course; public double getCourse() { return course; } public void setCourse(double course) { this.course = course; } - - private double odometer; // value in meters - public double getOdometer() { return odometer; } - public void setOdometer(double odometer) { this.odometer = odometer; } private String address; public String getAddress() { return address; } diff --git a/test/org/traccar/DistanceHandlerTest.java b/test/org/traccar/DistanceHandlerTest.java new file mode 100644 index 000000000..8afeb83f0 --- /dev/null +++ b/test/org/traccar/DistanceHandlerTest.java @@ -0,0 +1,22 @@ +package org.traccar; + +import org.junit.Test; +import org.traccar.model.Event; +import org.traccar.model.Position; + +import static org.junit.Assert.assertEquals; + +public class DistanceHandlerTest { + + @Test + public void testCalculateDistance() throws Exception { + + DistanceHandler distanceHandler = new DistanceHandler(); + + Position position = distanceHandler.calculateDistance(new Position()); + + assertEquals(0.0, position.getOther().get(Event.KEY_DISTANCE)); + + } + +} -- cgit v1.2.3