Add map types store

6 files changed, 46 insertions, 2 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index 7eefaced3..f18c2768a 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -36,7 +36,8 @@ Ext.define('Traccar.Application', {
         'Positions',
         'LiveData',
         'Users',
-        'Parameters'
+        'Parameters',
+        'MapTypes'
     ],
 
     controllers: [
diff --git a/web/app/model/Server.js b/web/app/model/Server.js
index 128855a2b..9e4ab1eec 100644
--- a/web/app/model/Server.js
+++ b/web/app/model/Server.js
@@ -21,6 +21,10 @@ Ext.define('Traccar.model.Server', {
     fields: [
         { name: 'id', type: 'int' },
         { name: 'registration', type: 'boolean' },
+        { name: 'map', type: 'string' },
+        { name: 'language', type: 'string' },
+        { name: 'distanceUnit', type: 'string' },
+        { name: 'speedUnit', type: 'string' },
         { name: 'latitude', type: 'float' },
         { name: 'longitude', type: 'float' },
         { name: 'zoom', type: 'int' }
diff --git a/web/app/model/User.js b/web/app/model/User.js
index 4ed3a98d3..5b38fb64a 100644
--- a/web/app/model/User.js
+++ b/web/app/model/User.js
@@ -23,7 +23,14 @@ Ext.define('Traccar.model.User', {
         { name: 'name', type: 'string' },
         { name: 'email', type: 'string' },
         { name: 'password', type: 'string' },
-        { name: 'admin', type: 'boolean' }
+        { name: 'admin', type: 'boolean' },
+        { name: 'map', type: 'string' },
+        { name: 'language', type: 'string' },
+        { name: 'distanceUnit', type: 'string' },
+        { name: 'speedUnit', type: 'string' },
+        { name: 'latitude', type: 'float' },
+        { name: 'longitude', type: 'float' },
+        { name: 'zoom', type: 'int' }
     ],
 
     proxy: {
diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js
new file mode 100644
index 000000000..58e0a739c
--- /dev/null
+++ b/web/app/store/MapTypes.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Ext.define('Traccar.store.MapTypes', {
+    extend: 'Ext.data.Store',
+    fields: ['key', 'name'],
+    data : [
+        {"key": "osm", "name": "OpenStreetMap"},
+        {"key": "bing", "name": "Bing Maps"}
+    ]
+});
diff --git a/web/app/view/admin/ServerDialog.js b/web/app/view/admin/ServerDialog.js
index cc1fe2918..12170dc03 100644
--- a/web/app/view/admin/ServerDialog.js
+++ b/web/app/view/admin/ServerDialog.js
@@ -37,6 +37,13 @@ Ext.define('Traccar.view.admin.ServerDialog', {
             fieldLabel: strings.server_registration,
             allowBlank: false
         }, {
+            xtype: 'combobox',
+            name: 'map',
+            fieldLabel: strings.map_layer,
+            store: 'MapTypes',
+            displayField: 'name',
+            valueField: 'key'
+        }, {
             xtype: 'numberfield',
             name: 'latitude',
             fieldLabel: strings.position_latitude
diff --git a/web/l10n/en.js b/web/l10n/en.js
index 03816845f..7f169cf81 100644
--- a/web/l10n/en.js
+++ b/web/l10n/en.js
@@ -54,6 +54,7 @@ var strings = {
     server_registration: 'Registration',
 
     map_title: 'Map',
+    map_layer: 'Map Layer',
 
     state_title: 'State',
     state_name: 'Parameter',