aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-11-08 15:04:43 +0500
committerAbyss777 <abyss@fox5.ru>2017-11-13 12:33:27 +0500
commitd93e45e176fc2cbba6525f100ef084d904baa1c1 (patch)
tree4b704e487600bda6c1604e39c1c1719962808525
parentb36bb685ff31b06c7f50e660aebd3a69db5de5d7 (diff)
downloadetbsa-traccar-web-d93e45e176fc2cbba6525f100ef084d904baa1c1.tar.gz
etbsa-traccar-web-d93e45e176fc2cbba6525f100ef084d904baa1c1.tar.bz2
etbsa-traccar-web-d93e45e176fc2cbba6525f100ef084d904baa1c1.zip
Implement geocoding retry
-rw-r--r--web/app/view/ReportController.js34
-rw-r--r--web/app/view/State.js3
-rw-r--r--web/app/view/StateController.js28
-rw-r--r--web/l10n/en.json1
4 files changed, 64 insertions, 2 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 80e56ba..5d4d00c 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -40,6 +40,9 @@ Ext.define('Traccar.view.ReportController', {
selectreport: 'selectReport'
}
},
+ global: {
+ routegeocode: 'onGeocode'
+ },
store: {
'#ReportEvents': {
add: 'loadRelatedPositions',
@@ -423,6 +426,28 @@ Ext.define('Traccar.view.ReportController', {
this.updateButtons();
},
+ onGeocode: function (positionId) {
+ var position = Ext.getStore('ReportRoute').getById(positionId);
+ if (position && !position.get('address')) {
+ Ext.Ajax.request({
+ scope: this,
+ method: 'GET',
+ url: 'api/server/geocode',
+ params: {
+ latitude: position.get('latitude'),
+ longitude: position.get('longitude')
+ },
+ success: function (response) {
+ position.set('address', response.responseText);
+ position.commit();
+ },
+ failure: function (response) {
+ Traccar.app.showError(response);
+ }
+ });
+ }
+ },
+
routeColumns: [{
text: Strings.reportDeviceName,
dataIndex: 'deviceId',
@@ -455,7 +480,14 @@ Ext.define('Traccar.view.ReportController', {
}, {
text: Strings.positionAddress,
dataIndex: 'address',
- renderer: Traccar.AttributeFormatter.getFormatter('address')
+ renderer: function (value, metaData, record) {
+ if (!value) {
+ return '<a href="#" onclick="Ext.fireEvent(\'routegeocode\', ' +
+ record.getId() + ')" >' +
+ Strings.stateShowAddress + '</a>';
+ }
+ return Traccar.AttributeFormatter.getFormatter('address')(value);
+ }
}],
eventsColumns: [{
diff --git a/web/app/view/State.js b/web/app/view/State.js
index 32f9586..d4c56d7 100644
--- a/web/app/view/State.js
+++ b/web/app/view/State.js
@@ -63,6 +63,9 @@ Ext.define('Traccar.view.State', {
renderer: function (value, metaData, record) {
if (record.get('attribute') === 'alarm') {
metaData.tdCls = 'view-color-red';
+ } else if (record.get('name') === Strings.positionAddress && !value) {
+ return '<a href="#" onclick="Ext.fireEvent(\'stategeocode\')" >' +
+ Strings.stateShowAddress + '</a>';
}
return value;
}
diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js
index 70f0228..44b0138 100644
--- a/web/app/view/StateController.js
+++ b/web/app/view/StateController.js
@@ -36,6 +36,9 @@ Ext.define('Traccar.view.StateController', {
deselectfeature: 'deselectFeature'
}
},
+ global: {
+ stategeocode: 'onGeocode'
+ },
store: {
'#LatestPositions': {
add: 'updateLatest',
@@ -48,7 +51,6 @@ Ext.define('Traccar.view.StateController', {
}
},
-
init: function () {
var i, hideAttributesPreference, attributesList;
if (Traccar.app.getUser().get('admin') ||
@@ -184,5 +186,29 @@ Ext.define('Traccar.view.StateController', {
this.position = null;
Ext.getStore('Attributes').removeAll();
}
+ },
+
+ onGeocode: function () {
+ var positionId = this.position.getId();
+ if (!this.position.get('address')) {
+ Ext.Ajax.request({
+ scope: this,
+ method: 'GET',
+ url: 'api/server/geocode',
+ params: {
+ latitude: this.position.get('latitude'),
+ longitude: this.position.get('longitude')
+ },
+ success: function (response) {
+ if (this.position && this.position.getId() === positionId) {
+ this.position.set('address', response.responseText);
+ this.updatePosition();
+ }
+ },
+ failure: function (response) {
+ Traccar.app.showError(response);
+ }
+ });
+ }
}
});
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 0744a7d..9327898 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -241,6 +241,7 @@
"stateTitle": "State",
"stateName": "Attribute",
"stateValue": "Value",
+ "stateShowAddress": "Show Address",
"commandTitle": "Command",
"commandSend": "Send",
"commandSent": "Command has been sent",