diff options
Diffstat (limited to 'web/app/GeofenceConverter.js')
| -rw-r--r-- | web/app/GeofenceConverter.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/web/app/GeofenceConverter.js b/web/app/GeofenceConverter.js index 4891e7b1..d3d562e7 100644 --- a/web/app/GeofenceConverter.js +++ b/web/app/GeofenceConverter.js @@ -19,8 +19,13 @@ 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) { |