diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-01-17 22:35:15 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-17 22:35:15 +1300 |
commit | a1320c0d021df77f0a73f6663eddd9e286273634 (patch) | |
tree | 3fafeab956e2743a5b9b9519761df7001fb93948 | |
parent | ca7f360a4c4aca3aedfefafb21addc1eeb4cb7af (diff) | |
parent | 8224082fa8ebaf0e78bc6d6a72ed4f04bb277586 (diff) | |
download | traccar-server-a1320c0d021df77f0a73f6663eddd9e286273634.tar.gz traccar-server-a1320c0d021df77f0a73f6663eddd9e286273634.tar.bz2 traccar-server-a1320c0d021df77f0a73f6663eddd9e286273634.zip |
Merge pull request #3719 from Abyss777/poi_layer
Add poiLayer field to User/Server model
-rw-r--r-- | schema/changelog-3.16.xml | 8 | ||||
-rw-r--r-- | src/org/traccar/model/Server.java | 12 | ||||
-rw-r--r-- | src/org/traccar/model/User.java | 12 |
3 files changed, 30 insertions, 2 deletions
diff --git a/schema/changelog-3.16.xml b/schema/changelog-3.16.xml index f95156133..4e8e1cda9 100644 --- a/schema/changelog-3.16.xml +++ b/schema/changelog-3.16.xml @@ -12,5 +12,13 @@ <column name="disabled" type="BOOLEAN" defaultValueBoolean="false" /> </addColumn> + <addColumn tableName="users"> + <column name="poilayer" type="VARCHAR(512)" /> + </addColumn> + + <addColumn tableName="servers"> + <column name="poilayer" type="VARCHAR(512)" /> + </addColumn> + </changeSet> </databaseChangeLog> diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java index 072e85d55..c6161397b 100644 --- a/src/org/traccar/model/Server.java +++ b/src/org/traccar/model/Server.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -157,4 +157,14 @@ public class Server extends ExtendedModel { public void setLimitCommands(boolean limitCommands) { this.limitCommands = limitCommands; } + + private String poiLayer; + + public String getPoiLayer() { + return poiLayer; + } + + public void setPoiLayer(String poiLayer) { + this.poiLayer = poiLayer; + } } diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java index b1883213c..7f97d4781 100644 --- a/src/org/traccar/model/User.java +++ b/src/org/traccar/model/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -230,6 +230,16 @@ public class User extends ExtendedModel { this.limitCommands = limitCommands; } + private String poiLayer; + + public String getPoiLayer() { + return poiLayer; + } + + public void setPoiLayer(String poiLayer) { + this.poiLayer = poiLayer; + } + @QueryIgnore public String getPassword() { return null; |