Merge pull request #621 from Abyss777/retry_geocode

Add "Show Address" link in State panel

4 files changed, 65 insertions, 2 deletions

diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 80e56ba..e266bf4 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,29 @@ 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();
+                    this.fireEvent('selectReport', position);
+                },
+                failure: function (response) {
+                    Traccar.app.showError(response);
+                }
+            });
+        }
+    },
+
     routeColumns: [{
         text: Strings.reportDeviceName,
         dataIndex: 'deviceId',
@@ -455,7 +481,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..95529a4 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.sharedShowAddress + '</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..25c8c69 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -72,6 +72,7 @@
     "sharedSavedCommand": "Saved Command",
     "sharedSavedCommands": "Saved Commands",
     "sharedNew": "New…",
+    "sharedShowAddress": "Show Address",
     "attributeSpeedLimit": "Speed Limit",
     "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
     "attributeMaintenanceStart": "Maintenance: Start",