From 5032e598ea2e386e20404f4525253bb76803dfc3 Mon Sep 17 00:00:00 2001
From: Vitaly Litvak <vitavaque@gmail.com>
Date: Tue, 10 May 2016 22:46:39 +0300
Subject: [PATCH] Show error message when trying to load track with
 'snap-to-roads' function but data is not available from third-party provider

---
 .../org/traccar/web/client/controller/ArchiveController.java  | 4 ++--
 src/main/java/org/traccar/web/client/i18n/Messages.java       | 2 ++
 .../resources/org/traccar/web/client/i18n/Messages.properties | 1 +
 .../org/traccar/web/client/i18n/Messages_ru.properties        | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/traccar/web/client/controller/ArchiveController.java b/src/main/java/org/traccar/web/client/controller/ArchiveController.java
index 455a8097..8fda6249 100644
--- a/src/main/java/org/traccar/web/client/controller/ArchiveController.java
+++ b/src/main/java/org/traccar/web/client/controller/ArchiveController.java
@@ -246,13 +246,13 @@ public void onResponseReceived(Request request, Response response) {
                         snappedTracks.put(device.getId(), snappedTrack);
                         showArchive(device);
                     } else {
-                        GWT.log("Incorrect response code: " + response.getStatusCode());
+                        new AlertMessageBox(i18n.error(), i18n.errSnapToRoads(response.getStatusCode(), response.getText())).show();
                     }
                 }
 
                 @Override
                 public void onError(Request request, Throwable exception) {
-                    GWT.log("Request error", exception);
+                    new AlertMessageBox(i18n.error(), i18n.errSnapToRoads(-1, exception.getLocalizedMessage())).show();
                 }
             });
         } catch (RequestException re) {
diff --git a/src/main/java/org/traccar/web/client/i18n/Messages.java b/src/main/java/org/traccar/web/client/i18n/Messages.java
index ea644f90..2e20dbad 100644
--- a/src/main/java/org/traccar/web/client/i18n/Messages.java
+++ b/src/main/java/org/traccar/web/client/i18n/Messages.java
@@ -550,4 +550,6 @@ String defaultNotificationTemplate(@Select DeviceEventType type,
     String showOdometer();
 
     String matchServiceURL();
+
+    String errSnapToRoads(int code, String text);
 }
diff --git a/src/main/resources/org/traccar/web/client/i18n/Messages.properties b/src/main/resources/org/traccar/web/client/i18n/Messages.properties
index f0487f8b..91d20e9a 100644
--- a/src/main/resources/org/traccar/web/client/i18n/Messages.properties
+++ b/src/main/resources/org/traccar/web/client/i18n/Messages.properties
@@ -47,6 +47,7 @@ loadingData = Loading...
 errNoResults = No results found for selected period
 errFillFields = All form fields must be filled first
 errNoDeviceNameOrId = Please fill both name and unique identifier fields
+errSnapToRoads = Error loading track snapped to roads ({0}): {1}
 # archive column headers
 valid = Valid
 time = Time
diff --git a/src/main/resources/org/traccar/web/client/i18n/Messages_ru.properties b/src/main/resources/org/traccar/web/client/i18n/Messages_ru.properties
index 10ac503b..60766d49 100644
--- a/src/main/resources/org/traccar/web/client/i18n/Messages_ru.properties
+++ b/src/main/resources/org/traccar/web/client/i18n/Messages_ru.properties
@@ -47,6 +47,7 @@ loadingData = Загрузка...
 errNoResults = В выбранном периоде нет записей
 errFillFields = Все поля должны быть заполнены
 errNoDeviceNameOrId = Пожалуйста введите имя и уникальный код
+errSnapToRoads = Ошибка загрузки точек с привязкой к дорогам ({0}): {1}
 # archive column headers
 valid = Правильно
 time = Время