aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-01-04 02:13:15 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2017-01-04 01:13:15 +1300
commitb579253139b5a2a21c9daafa411e78b6c4a5a852 (patch)
treec93f250a66ac48c36c6230cbca3608922ccd9415
parent7bd6551a2f5712d63bea7e8711944fbeb78323c8 (diff)
downloadtraccar-server-b579253139b5a2a21c9daafa411e78b6c4a5a852.tar.gz
traccar-server-b579253139b5a2a21c9daafa411e78b6c4a5a852.tar.bz2
traccar-server-b579253139b5a2a21c9daafa411e78b6c4a5a852.zip
Provide default radio type
-rw-r--r--src/org/traccar/model/CellTower.java10
-rw-r--r--src/org/traccar/model/Network.java2
-rw-r--r--test/org/traccar/geolocation/GeolocationProviderTest.java10
3 files changed, 16 insertions, 6 deletions
diff --git a/src/org/traccar/model/CellTower.java b/src/org/traccar/model/CellTower.java
index e572dfb10..74ed8a4ea 100644
--- a/src/org/traccar/model/CellTower.java
+++ b/src/org/traccar/model/CellTower.java
@@ -46,6 +46,16 @@ public class CellTower {
return fromLacCid(lac, cid);
}
+ private String radioType;
+
+ public String getRadioType() {
+ return radioType;
+ }
+
+ public void setRadioType(String radioType) {
+ this.radioType = radioType;
+ }
+
private Long cellId;
public Long getCellId() {
diff --git a/src/org/traccar/model/Network.java b/src/org/traccar/model/Network.java
index 389ce1fdd..c5be95887 100644
--- a/src/org/traccar/model/Network.java
+++ b/src/org/traccar/model/Network.java
@@ -50,7 +50,7 @@ public class Network {
this.homeMobileNetworkCode = homeMobileNetworkCode;
}
- private String radioType;
+ private String radioType = "gsm";
public String getRadioType() {
return radioType;
diff --git a/test/org/traccar/geolocation/GeolocationProviderTest.java b/test/org/traccar/geolocation/GeolocationProviderTest.java
index adfd36b96..5a701d859 100644
--- a/test/org/traccar/geolocation/GeolocationProviderTest.java
+++ b/test/org/traccar/geolocation/GeolocationProviderTest.java
@@ -13,16 +13,16 @@ public class GeolocationProviderTest extends BaseTest {
@Test
public void test() throws Exception {
if (enable) {
- testGoogleLocationProvider();
+ testLocationProvider();
}
}
- public void testGoogleLocationProvider() throws Exception {
- GoogleGeolocationProvider locationProvider = new GoogleGeolocationProvider("KEY");
+ public void testLocationProvider() throws Exception {
+ MozillaGeolocationProvider provider = new MozillaGeolocationProvider();
- Network network = new Network(CellTower.from(260, 2, 10250, 26511));
+ Network network = new Network(CellTower.from(208, 1, 2, 1234567));
- locationProvider.getLocation(network, new GeolocationProvider.LocationProviderCallback() {
+ provider.getLocation(network, new GeolocationProvider.LocationProviderCallback() {
@Override
public void onSuccess(double latitude, double longitude, double accuracy) {
Assert.assertEquals(60.07254, latitude, 0.00001);