Move units to attributes and add volume units

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;
-    }
 }