Merge pull request #453 from Abyss777/move_map

Move map related classes to subfolder

9 files changed, 23 insertions, 23 deletions

diff --git a/web/app/view/GeofenceDialogController.js b/web/app/view/GeofenceDialogController.js
index 936c46dc..e6bb753b 100644
--- a/web/app/view/GeofenceDialogController.js
+++ b/web/app/view/GeofenceDialogController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ Ext.define('Traccar.view.GeofenceDialogController', {
 
     requires: [
         'Traccar.view.BaseWindow',
-        'Traccar.view.GeofenceMap'
+        'Traccar.view.map.GeofenceMap'
     ],
 
     config: {
diff --git a/web/app/view/Main.js b/web/app/view/Main.js
index da6e5394..c186efd0 100644
--- a/web/app/view/Main.js
+++ b/web/app/view/Main.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ Ext.define('Traccar.view.Main', {
         'Traccar.view.Devices',
         'Traccar.view.State',
         'Traccar.view.Report',
-        'Traccar.view.Map'
+        'Traccar.view.map.Map'
     ],
 
     layout: 'border',
diff --git a/web/app/view/MainMobile.js b/web/app/view/MainMobile.js
index 347db315..b0d4223b 100644
--- a/web/app/view/MainMobile.js
+++ b/web/app/view/MainMobile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.MainMobile', {
         'Traccar.view.Devices',
         'Traccar.view.State',
         'Traccar.view.Report',
-        'Traccar.view.Map'
+        'Traccar.view.map.Map'
     ],
 
     layout: 'card',
diff --git a/web/app/view/BaseMap.js b/web/app/view/map/BaseMap.js
index c755b6c9..ac3b2694 100644
--- a/web/app/view/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.BaseMap', {
+Ext.define('Traccar.view.map.BaseMap', {
     extend: 'Ext.panel.Panel',
     xtype: 'baseMapView',
 
diff --git a/web/app/view/GeofenceMap.js b/web/app/view/map/GeofenceMap.js
index 0a56b337..37d3be74 100644
--- a/web/app/view/GeofenceMap.js
+++ b/web/app/view/map/GeofenceMap.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.GeofenceMap', {
-    extend: 'Traccar.view.BaseMap',
+Ext.define('Traccar.view.map.GeofenceMap', {
+    extend: 'Traccar.view.map.BaseMap',
     xtype: 'geofenceMapView',
 
     requires: [
-        'Traccar.view.GeofenceMapController',
+        'Traccar.view.map.GeofenceMapController',
         'Traccar.GeofenceConverter'
     ],
 
diff --git a/web/app/view/GeofenceMapController.js b/web/app/view/map/GeofenceMapController.js
index ff5c70c6..ffafb7f8 100644
--- a/web/app/view/GeofenceMapController.js
+++ b/web/app/view/map/GeofenceMapController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.GeofenceMapController', {
+Ext.define('Traccar.view.map.GeofenceMapController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.geofenceMap',
 
diff --git a/web/app/view/Map.js b/web/app/view/map/Map.js
index a3879ab9..d4e654eb 100644
--- a/web/app/view/Map.js
+++ b/web/app/view/map/Map.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.Map', {
-    extend: 'Traccar.view.BaseMap',
+Ext.define('Traccar.view.map.Map', {
+    extend: 'Traccar.view.map.BaseMap',
     xtype: 'mapView',
 
     requires: [
-        'Traccar.view.MapController',
+        'Traccar.view.map.MapController',
         'Traccar.view.SettingsMenu'
     ],
 
diff --git a/web/app/view/MapController.js b/web/app/view/map/MapController.js
index 04e8c448..8a5e81c6 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/map/MapController.js
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.MapController', {
-    extend: 'Traccar.view.MapMarkerController',
+Ext.define('Traccar.view.map.MapController', {
+    extend: 'Traccar.view.map.MapMarkerController',
     alias: 'controller.map',
 
     requires: [
diff --git a/web/app/view/MapMarkerController.js b/web/app/view/map/MapMarkerController.js
index fa380e76..9dcb356c 100644
--- a/web/app/view/MapMarkerController.js
+++ b/web/app/view/map/MapMarkerController.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.MapMarkerController', {
+Ext.define('Traccar.view.map.MapMarkerController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.mapMarker',