Fix typos

3 files changed, 4 insertions, 81 deletions

diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 7ccf84b4..957992da 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -188,7 +188,6 @@ Ext.define('Traccar.AttributeFormatter', {
 
     getAttributeFormatter: function (key) {
         var dataType = Ext.getStore('PositionAttributes').getAttributeDataType(key);
-<<<<<<< HEAD
 
         switch (dataType) {
             case 'distance':
@@ -209,36 +208,13 @@ Ext.define('Traccar.AttributeFormatter', {
                 return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedLiterPerHourAbbreviation);
             default:
                 return this.defaultFormatter;
-=======
-        if (!dataType) {
-            return this.defaultFormatter;
-        } else if (dataType === 'distance') {
-            return this.distanceFormatter;
-        } else if (dataType === 'speed') {
-            return this.speedFormatter;
-        } else if (dataType === 'driverUniqueId') {
-            return this.driverUniqueIdFormatter;
-        } else if (dataType === 'voltage') {
-            return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedVoltAbbreviation);
-        } else if (dataType === 'percentage') {
-            return this.numberFormatterFactory(Traccar.Style.numberPrecision, '&#37;');
-        } else if (dataType === 'temperature') {
-            return this.numberFormatterFactory(Traccar.Style.numberPrecision, '&deg;C');
-        } else if (dataType === 'volume') {
-            return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedLiterAbbreviation);
-        } else if (dataType === 'consumption') {
-            return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedLiterPerHourAbbreviation);
-        } else {
-            return this.defaultFormatter;
->>>>>>> e0bb9b92d07176677b3043530660af3bc30774d7
         }
     },
 
     getAttributeConverter: function (key) {
         var dataType = Ext.getStore('PositionAttributes').getAttributeDataType(key);
-<<<<<<< HEAD
 
-        switch (dataType){
+        switch (dataType) {
             case 'distance':
                 return this.distanceConverter;
             case 'speed':
@@ -247,20 +223,6 @@ Ext.define('Traccar.AttributeFormatter', {
                 return function (value) {
                     return value;
                 };
-=======
-        if (!dataType) {
-            return function (value) {
-                return value;
-            };
-        } else if (dataType === 'distance') {
-            return this.distanceConverter;
-        } else if (dataType === 'speed') {
-            return this.speedConverter;
-        } else {
-            return function (value) {
-                return value;
-            };
->>>>>>> e0bb9b92d07176677b3043530660af3bc30774d7
         }
     }
 });
diff --git a/web/app/GeofenceConverter.js b/web/app/GeofenceConverter.js
index d3d562e7..4891e7b1 100644
--- a/web/app/GeofenceConverter.js
+++ b/web/app/GeofenceConverter.js
@@ -19,13 +19,8 @@ Ext.define('Traccar.GeofenceConverter', {
     singleton: true,
 
     wktToGeometry: function (mapView, wkt) {
-<<<<<<< HEAD
-        var geometry, projection, resolutionAtEquator, pointResolution, resolutionFactor, points = [], center, radius,
-            content, i, lat, lon, coordinates;
-=======
         var geometry, projection, resolutionAtEquator, pointResolution, resolutionFactor,
             points = [], center, radius, content, i, lat, lon, coordinates;
->>>>>>> e0bb9b92d07176677b3043530660af3bc30774d7
         if (wkt.lastIndexOf('POLYGON', 0) === 0) {
             content = wkt.match(/\([^()]+\)/);
             if (content !== null) {
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index cac5a596..c6eb5b48 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -101,13 +101,13 @@ Ext.define('Traccar.view.map.BaseMap', {
                             index = index < 0 ? index + urlsLength : index;
 
                             if (x < 0) {
-                                x = 'M' + (-x);
+                                x = 'M' + -x;
                             }
                             if (y < 0) {
-                                y = 'M' + (-y);
+                                y = 'M' + -y;
                             }
                             return 'http://online{}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl'
-                                    .replace('{}', index).replace('{x}', x).replace('{y}', y).replace('{z}', z);
+                                .replace('{}', index).replace('{x}', x).replace('{y}', y).replace('{z}', z);
                         },
                         tileGrid: new ol.tilegrid.TileGrid({
                             extent: ol.proj.transformExtent([-180, -74, 180, 74], 'EPSG:4326', 'BD-MC'),
@@ -117,45 +117,11 @@ Ext.define('Traccar.view.map.BaseMap', {
                                 262144, 131072, 65536, 32768, 16384, 8192, 4096, 2048,
                                 1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5
                             ]
-<<<<<<< HEAD
                         }),
                         attributions: [
                             new ol.Attribution({
                                 html: '&copy; <a href="http://map.baidu.com/">Baidu</a>'
                             })
-=======
-                        })
-                    ]
-                })
-            });
-        } else if (type === 'baidu') {
-            layer = new ol.layer.Tile({
-                source: new ol.source.XYZ({
-                    projection: 'BD-MC',
-                    tileUrlFunction: function (tileCoord) {
-                        var urlsLength = 5, z = tileCoord[0], x = tileCoord[1], y = tileCoord[2], hash, index;
-
-                        hash = (x << z) + y;
-                        index = hash % urlsLength;
-                        index = index < 0 ? index + urlsLength : index;
-
-                        if (x < 0) {
-                            x = 'M' + -x;
-                        }
-                        if (y < 0) {
-                            y = 'M' + -y;
-                        }
-                        return 'http://online{}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl'
-                            .replace('{}', index).replace('{x}', x).replace('{y}', y).replace('{z}', z);
-                    },
-                    tileGrid: new ol.tilegrid.TileGrid({
-                        extent: ol.proj.transformExtent([-180, -74, 180, 74], 'EPSG:4326', 'BD-MC'),
-                        origin: [0, 0],
-                        minZoom: 3,
-                        resolutions: [
-                            262144, 131072, 65536, 32768, 16384, 8192, 4096, 2048,
-                            1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5
->>>>>>> e0bb9b92d07176677b3043530660af3bc30774d7
                         ]
                     })
                 });