From b7403aaadd130bf1496b97c07667842813d99550 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 5 Sep 2016 14:27:30 +0500 Subject: Implement retrieving map center from current map --- web/app/view/MapController.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'web/app/view/MapController.js') diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index bc6a5d404..288593dab 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -23,7 +23,8 @@ Ext.define('Traccar.view.MapController', { controller: { '*': { selectDevice: 'selectDevice', - selectReport: 'selectReport' + selectReport: 'selectReport', + getMapCenter: 'getMapCenter' } }, store: { @@ -304,5 +305,13 @@ Ext.define('Traccar.view.MapController', { this.fireEvent('selectReport', record, false); } } + }, + + getMapCenter: function () { + var zoom, center, projection; + projection = this.getView().getMapView().getProjection(); + center = ol.proj.transform(this.getView().getMapView().getCenter(), projection, 'EPSG:4326'); + zoom = this.getView().getMapView().getZoom(); + this.fireEvent('setCenterFromMap', center[1], center[0], zoom); } }); -- cgit v1.2.3 From 97e80ec49fddec3d56880bae47bd070474fa8fa3 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 6 Sep 2016 15:58:03 +0500 Subject: - Remove field container - Renamed functions and strings --- web/app/view/MapController.js | 6 +++--- web/app/view/ServerDialog.js | 37 +++++++++++++++++----------------- web/app/view/ServerDialogController.js | 15 +++++++------- web/app/view/UserDialog.js | 37 +++++++++++++++++----------------- web/l10n/en.json | 2 +- 5 files changed, 49 insertions(+), 48 deletions(-) (limited to 'web/app/view/MapController.js') diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index 288593dab..c0ac2c534 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -24,7 +24,7 @@ Ext.define('Traccar.view.MapController', { '*': { selectDevice: 'selectDevice', selectReport: 'selectReport', - getMapCenter: 'getMapCenter' + mapstaterequest: 'getMapState' } }, store: { @@ -307,11 +307,11 @@ Ext.define('Traccar.view.MapController', { } }, - getMapCenter: function () { + getMapState: function () { var zoom, center, projection; projection = this.getView().getMapView().getProjection(); center = ol.proj.transform(this.getView().getMapView().getCenter(), projection, 'EPSG:4326'); zoom = this.getView().getMapView().getZoom(); - this.fireEvent('setCenterFromMap', center[1], center[0], zoom); + this.fireEvent('mapstate', center[1], center[0], zoom); } }); diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js index 83f9c47f2..40afa4ec3 100644 --- a/web/app/view/ServerDialog.js +++ b/web/app/view/ServerDialog.js @@ -66,21 +66,22 @@ Ext.define('Traccar.view.ServerDialog', { displayField: 'name', valueField: 'key' }, { - xtype: 'fieldcontainer', - reference: 'mapCenter', - defaultType: 'numberfield', - items: [{ - name: 'latitude', - fieldLabel: Strings.positionLatitude, - decimalPrecision: Traccar.Style.coordinatePrecision - }, { - name: 'longitude', - fieldLabel: Strings.positionLongitude, - decimalPrecision: Traccar.Style.coordinatePrecision - }, { - name: 'zoom', - fieldLabel: Strings.serverZoom - }] + xtype: 'numberfield', + reference: 'latitude', + name: 'latitude', + fieldLabel: Strings.positionLatitude, + decimalPrecision: Traccar.Style.coordinatePrecision + }, { + xtype: 'numberfield', + reference: 'longitude', + name: 'longitude', + fieldLabel: Strings.positionLongitude, + decimalPrecision: Traccar.Style.coordinatePrecision + }, { + xtype: 'numberfield', + reference: 'zoom', + name: 'zoom', + fieldLabel: Strings.serverZoom }, { xtype: 'checkboxfield', name: 'twelveHourFormat', @@ -93,10 +94,10 @@ Ext.define('Traccar.view.ServerDialog', { text: Strings.sharedAttributes, handler: 'showAttributesView' }, { - glyph: 'xf276@FontAwesome', + glyph: 'xf041@FontAwesome', minWidth: 0, - handler: 'getFromMap', - tooltip: Strings.sharedGetFromMap, + handler: 'getMapState', + tooltip: Strings.sharedGetMapState, tooltipType: 'title' }, { xtype: 'tbfill' diff --git a/web/app/view/ServerDialogController.js b/web/app/view/ServerDialogController.js index 42760ca58..55f49f676 100644 --- a/web/app/view/ServerDialogController.js +++ b/web/app/view/ServerDialogController.js @@ -23,20 +23,19 @@ Ext.define('Traccar.view.ServerDialogController', { listen: { controller: { '*': { - setCenterFromMap: 'setCenterFromMap' + mapstate: 'setMapState' } } } }, - getFromMap: function (button) { - this.fireEvent('getMapCenter'); + getMapState: function (button) { + this.fireEvent('mapstaterequest'); }, - setCenterFromMap: function (lat, lon, zoom) { - var mapCenter = this.lookupReference('mapCenter'); - mapCenter.down('numberfield[name="latitude"]').setValue(lat); - mapCenter.down('numberfield[name="longitude"]').setValue(lon); - mapCenter.down('numberfield[name="zoom"]').setValue(zoom); + setMapState: function (lat, lon, zoom) { + this.getView().lookupReference('latitude').setValue(lat); + this.getView().lookupReference('longitude').setValue(lon); + this.getView().lookupReference('zoom').setValue(zoom); } }); diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js index 46b86dd5d..f9e704ee5 100644 --- a/web/app/view/UserDialog.js +++ b/web/app/view/UserDialog.js @@ -70,21 +70,22 @@ Ext.define('Traccar.view.UserDialog', { displayField: 'name', valueField: 'key' }, { - xtype: 'fieldcontainer', - reference: 'mapCenter', - defaultType: 'numberfield', - items: [{ - name: 'latitude', - fieldLabel: Strings.positionLatitude, - decimalPrecision: Traccar.Style.coordinatePrecision - }, { - name: 'longitude', - fieldLabel: Strings.positionLongitude, - decimalPrecision: Traccar.Style.coordinatePrecision - }, { - name: 'zoom', - fieldLabel: Strings.serverZoom - }] + xtype: 'numberfield', + reference: 'latitude', + name: 'latitude', + fieldLabel: Strings.positionLatitude, + decimalPrecision: Traccar.Style.coordinatePrecision + }, { + xtype: 'numberfield', + reference: 'longitude', + name: 'longitude', + fieldLabel: Strings.positionLongitude, + decimalPrecision: Traccar.Style.coordinatePrecision + }, { + xtype: 'numberfield', + reference: 'zoom', + name: 'zoom', + fieldLabel: Strings.serverZoom }, { xtype: 'checkboxfield', name: 'twelveHourFormat', @@ -97,10 +98,10 @@ Ext.define('Traccar.view.UserDialog', { text: Strings.sharedAttributes, handler: 'showAttributesView' }, { - glyph: 'xf276@FontAwesome', + glyph: 'xf041@FontAwesome', minWidth: 0, - handler: 'getFromMap', - tooltip: Strings.sharedGetFromMap, + handler: 'getMapState', + tooltip: Strings.sharedGetMapState, tooltipType: 'title' }, { xtype: 'tbfill' diff --git a/web/l10n/en.json b/web/l10n/en.json index 88f572e33..e61710523 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -28,7 +28,7 @@ "sharedDistance": "Distance", "sharedHourAbbreviation": "h", "sharedMinuteAbbreviation": "m", - "sharedGetFromMap": "Get from Map", + "sharedGetMapState": "Get Map State", "errorTitle": "Error", "errorUnknown": "Unknown error", "errorConnection": "Connection error", -- cgit v1.2.3 From 68d284f3023d49c0c3ae9879c5c75c9b152eda3b Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 6 Sep 2016 16:09:11 +0500 Subject: Rename other events to lowercase --- web/app/view/BaseMap.js | 2 +- web/app/view/DevicesController.js | 8 ++++---- web/app/view/GeofenceDialogController.js | 2 +- web/app/view/GeofenceMapController.js | 2 +- web/app/view/MapController.js | 10 +++++----- web/app/view/ReportController.js | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'web/app/view/MapController.js') diff --git a/web/app/view/BaseMap.js b/web/app/view/BaseMap.js index 77646cbef..62b2c5735 100644 --- a/web/app/view/BaseMap.js +++ b/web/app/view/BaseMap.js @@ -100,7 +100,7 @@ Ext.define('Traccar.view.BaseMap', { this.map.on('click', function (e) { this.map.forEachFeatureAtPixel(e.pixel, function (feature, layer) { - this.fireEvent('selectFeature', feature); + this.fireEvent('selectfeature', feature); }, this); }, this); }, diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js index 6dcc45448..68dd16025 100644 --- a/web/app/view/DevicesController.js +++ b/web/app/view/DevicesController.js @@ -31,8 +31,8 @@ Ext.define('Traccar.view.DevicesController', { listen: { controller: { '*': { - selectDevice: 'selectDevice', - selectReport: 'selectReport' + selectdevice: 'selectDevice', + selectreport: 'selectReport' } }, store: { @@ -121,7 +121,7 @@ Ext.define('Traccar.view.DevicesController', { var device; if (pressed) { device = this.getView().getSelectionModel().getSelection()[0]; - this.fireEvent('selectDevice', device, true); + this.fireEvent('selectdevice', device, true); } }, @@ -136,7 +136,7 @@ Ext.define('Traccar.view.DevicesController', { onSelectionChange: function (selected) { this.updateButtons(selected); if (selected.getCount() > 0) { - this.fireEvent('selectDevice', selected.getLastSelected(), true); + this.fireEvent('selectdevice', selected.getLastSelected(), true); } }, diff --git a/web/app/view/GeofenceDialogController.js b/web/app/view/GeofenceDialogController.js index b04935b9c..5638db362 100644 --- a/web/app/view/GeofenceDialogController.js +++ b/web/app/view/GeofenceDialogController.js @@ -26,7 +26,7 @@ Ext.define('Traccar.view.GeofenceDialogController', { listen: { controller: { '*': { - saveArea: 'saveArea' + savearea: 'saveArea' } } } diff --git a/web/app/view/GeofenceMapController.js b/web/app/view/GeofenceMapController.js index d643c89e4..c508127d7 100644 --- a/web/app/view/GeofenceMapController.js +++ b/web/app/view/GeofenceMapController.js @@ -27,7 +27,7 @@ Ext.define('Traccar.view.GeofenceMapController', { if (this.getView().getFeatures().getLength() > 0) { geometry = this.getView().getFeatures().pop().getGeometry(); projection = this.getView().getMapView().getProjection(); - this.fireEvent('saveArea', Traccar.GeofenceConverter.geometryToWkt(projection, geometry)); + this.fireEvent('savearea', Traccar.GeofenceConverter.geometryToWkt(projection, geometry)); button.up('window').close(); } }, diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index c0ac2c534..3b0db6b07 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -22,8 +22,8 @@ Ext.define('Traccar.view.MapController', { listen: { controller: { '*': { - selectDevice: 'selectDevice', - selectReport: 'selectReport', + selectdevice: 'selectDevice', + selectreport: 'selectReport', mapstaterequest: 'getMapState' } }, @@ -43,7 +43,7 @@ Ext.define('Traccar.view.MapController', { }, component: { '#': { - selectFeature: 'selectFeature' + selectfeature: 'selectFeature' } } } @@ -300,9 +300,9 @@ Ext.define('Traccar.view.MapController', { var record = feature.get('record'); if (record) { if (record instanceof Traccar.model.Device) { - this.fireEvent('selectDevice', record, false); + this.fireEvent('selectdevice', record, false); } else { - this.fireEvent('selectReport', record, false); + this.fireEvent('selectreport', record, false); } } }, diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 3a3345d83..a6253952a 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -29,8 +29,8 @@ Ext.define('Traccar.view.ReportController', { listen: { controller: { '*': { - selectDevice: 'selectDevice', - selectReport: 'selectReport' + selectdevice: 'selectDevice', + selectreport: 'selectReport' } } } @@ -116,7 +116,7 @@ Ext.define('Traccar.view.ReportController', { onSelectionChange: function (selected) { if (selected.getCount() > 0) { - this.fireEvent('selectReport', selected.getLastSelected(), true); + this.fireEvent('selectreport', selected.getLastSelected(), true); } }, -- cgit v1.2.3