From fe5e6f7e1aaa01dfe8d61af46c3b818f8c566a25 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 6 Sep 2017 13:43:51 +0500
Subject: Move units to attributes and add volume units

---
 src/org/traccar/model/User.java | 30 ------------------------------
 1 file changed, 30 deletions(-)

(limited to 'src/org/traccar/model/User.java')

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;
-    }
 }
-- 
cgit v1.2.3