Resolving conflicts with master

1 files changed, 26 insertions, 0 deletions

diff --git a/web/app/view/map/GeofenceMapController.js b/web/app/view/map/GeofenceMapController.js
index f075ac93..31ab586c 100644
--- a/web/app/view/map/GeofenceMapController.js
+++ b/web/app/view/map/GeofenceMapController.js
@@ -33,6 +33,32 @@ Ext.define('Traccar.view.map.GeofenceMapController', {
         }
     },
 
+    onFileChange: function (fileField) {
+        var reader, view = this.getView();
+        if (fileField.fileInputEl.dom.files.length > 0) {
+            reader = new FileReader();
+            reader.onload = function () {
+                var parser, xml, segment, projection, points = [];
+                parser = new DOMParser();
+                xml = parser.parseFromString(reader.result, 'text/xml');
+                segment = xml.getElementsByTagName('trkseg')[0];
+                projection = view.mapView.getProjection();
+                Array.from(segment.getElementsByTagName('trkpt')).forEach(function (point) {
+                    var lat, lon;
+                    lat = Number(point.getAttribute('lat'));
+                    lon = Number(point.getAttribute('lon'));
+                    points.push(ol.proj.transform([lon, lat], 'EPSG:4326', projection));
+                });
+                view.getFeatures().clear();
+                view.getFeatures().push(new ol.Feature(new ol.geom.LineString(points)));
+            };
+            reader.onerror = function (event) {
+                Traccar.app.showError(event.target.error);
+            };
+            reader.readAsText(fileField.fileInputEl.dom.files[0]);
+        }
+    },
+
     onSaveClick: function (button) {
         var geometry, projection;
         if (this.getView().getFeatures().getLength() > 0) {