aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-09-06 21:08:31 +1200
committerGitHub <noreply@github.com>2017-09-06 21:08:31 +1200
commitf0578c7b5f8737e019a9cf05935d2caaa940f0ca (patch)
tree778b00dd1a6162007cb08239d475884843a678ba /src/org/traccar/model
parent3e5167131c758dd6e75e0f5d9b265a1514baac0c (diff)
parentfe5e6f7e1aaa01dfe8d61af46c3b818f8c566a25 (diff)
downloadtrackermap-server-f0578c7b5f8737e019a9cf05935d2caaa940f0ca.tar.gz
trackermap-server-f0578c7b5f8737e019a9cf05935d2caaa940f0ca.tar.bz2
trackermap-server-f0578c7b5f8737e019a9cf05935d2caaa940f0ca.zip
Merge pull request #3507 from Abyss777/units_attributes
Move units to attributes and add volume units
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r--src/org/traccar/model/Server.java32
-rw-r--r--src/org/traccar/model/User.java30
2 files changed, 0 insertions, 62 deletions
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index 246be0b4f..bfe881479 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -15,8 +15,6 @@
*/
package org.traccar.model;
-import java.util.TimeZone;
-
import org.traccar.database.QueryIgnore;
import org.traccar.helper.Log;
@@ -90,26 +88,6 @@ public class Server extends ExtendedModel {
this.mapUrl = mapUrl;
}
- private String distanceUnit;
-
- public String getDistanceUnit() {
- return distanceUnit;
- }
-
- public void setDistanceUnit(String distanceUnit) {
- this.distanceUnit = distanceUnit;
- }
-
- private String speedUnit;
-
- public String getSpeedUnit() {
- return speedUnit;
- }
-
- public void setSpeedUnit(String speedUnit) {
- this.speedUnit = speedUnit;
- }
-
private double latitude;
public double getLatitude() {
@@ -169,14 +147,4 @@ public class Server extends ExtendedModel {
public void setCoordinateFormat(String coordinateFormat) {
this.coordinateFormat = coordinateFormat;
}
-
- private String timezone;
-
- public void setTimezone(String timezone) {
- this.timezone = timezone != null ? TimeZone.getTimeZone(timezone).getID() : null;
- }
-
- public String getTimezone() {
- return timezone;
- }
}
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 3557521ab..043c23036 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -22,7 +22,6 @@ import org.traccar.database.QueryIgnore;
import org.traccar.helper.Hashing;
import java.util.Date;
-import java.util.TimeZone;
public class User extends ExtendedModel {
@@ -86,26 +85,6 @@ public class User extends ExtendedModel {
this.map = map;
}
- private String distanceUnit;
-
- public String getDistanceUnit() {
- return distanceUnit;
- }
-
- public void setDistanceUnit(String distanceUnit) {
- this.distanceUnit = distanceUnit;
- }
-
- private String speedUnit;
-
- public String getSpeedUnit() {
- return speedUnit;
- }
-
- public void setSpeedUnit(String speedUnit) {
- this.speedUnit = speedUnit;
- }
-
private double latitude;
public double getLatitude() {
@@ -272,13 +251,4 @@ public class User extends ExtendedModel {
return Hashing.validatePassword(password, hashedPassword, salt);
}
- private String timezone;
-
- public void setTimezone(String timezone) {
- this.timezone = timezone != null ? TimeZone.getTimeZone(timezone).getID() : null;
- }
-
- public String getTimezone() {
- return timezone;
- }
}