aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/location
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-26 09:30:43 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-26 09:30:43 +0500
commitaa12e5c750e771016545269ffa39409b06b47eee (patch)
treed21b4414b532bfc53c9a905f3caa09f70b43b59e /src/org/traccar/location
parentac2405f0d57fac51fe95aa755f90fe82f26f73bc (diff)
downloadtrackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.tar.gz
trackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.tar.bz2
trackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.zip
- Simplification of the hierarchy of models classes
- Removed automatically founded unnecessary imports
Diffstat (limited to 'src/org/traccar/location')
-rw-r--r--src/org/traccar/location/BaseLocationProvider.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/org/traccar/location/BaseLocationProvider.java b/src/org/traccar/location/BaseLocationProvider.java
index c422ed50a..7778cc0c5 100644
--- a/src/org/traccar/location/BaseLocationProvider.java
+++ b/src/org/traccar/location/BaseLocationProvider.java
@@ -17,7 +17,7 @@ package org.traccar.location;
import org.traccar.Config;
import org.traccar.Context;
-import org.traccar.model.Event;
+import org.traccar.model.Position;
import java.util.Map;
@@ -28,18 +28,18 @@ public abstract class BaseLocationProvider implements LocationProvider {
Config config = Context.getConfig();
- Number mcc = (Number) attributes.get(Event.KEY_MCC);
+ Number mcc = (Number) attributes.get(Position.KEY_MCC);
if (mcc == null && config.hasKey("location.mcc")) {
mcc = config.getInteger("location.mcc");
}
- Number mnc = (Number) attributes.get(Event.KEY_MNC);
+ Number mnc = (Number) attributes.get(Position.KEY_MNC);
if (mnc == null && config.hasKey("location.mnc")) {
mnc = config.getInteger("location.mnc");
}
- Number lac = (Number) attributes.get(Event.KEY_LAC);
- Number cid = (Number) attributes.get(Event.KEY_CID);
+ Number lac = (Number) attributes.get(Position.KEY_LAC);
+ Number cid = (Number) attributes.get(Position.KEY_CID);
if (mcc != null && mnc != null && lac != null && cid != null) {
getLocation(mcc.intValue(), mnc.intValue(), lac.longValue(), cid.longValue(), callback);