Merge branch 'master' into master

1 files changed, 8 insertions, 28 deletions

diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index 4ded65204..072e85d55 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -15,12 +15,12 @@
  */
 package org.traccar.model;
 
-import java.util.TimeZone;
-
+import org.traccar.database.QueryIgnore;
 import org.traccar.helper.Log;
 
-public class Server extends Extensible {
+public class Server extends ExtendedModel {
 
+    @QueryIgnore
     public String getVersion() {
         return Log.getAppVersion();
     }
@@ -88,26 +88,6 @@ public class Server extends Extensible {
         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() {
@@ -168,13 +148,13 @@ public class Server extends Extensible {
         this.coordinateFormat = coordinateFormat;
     }
 
-    private String timezone;
+    private boolean limitCommands;
 
-    public void setTimezone(String timezone) {
-        this.timezone = timezone != null ? TimeZone.getTimeZone(timezone).getID() : null;
+    public boolean getLimitCommands() {
+        return limitCommands;
     }
 
-    public String getTimezone() {
-        return timezone;
+    public void setLimitCommands(boolean limitCommands) {
+        this.limitCommands = limitCommands;
     }
 }