diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-03 11:03:05 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-03 11:03:05 +1200 |
commit | a265f39cef279d84bbeee5be68c17d22896bb685 (patch) | |
tree | 0f5b1e9f6e2db005dcda388c160f63c92fef236a /web/app/view/map | |
parent | e301d477ee95c0ae7f3d06f0950368cb5d8fe226 (diff) | |
download | trackermap-server-a265f39cef279d84bbeee5be68c17d22896bb685.tar.gz trackermap-server-a265f39cef279d84bbeee5be68c17d22896bb685.tar.bz2 trackermap-server-a265f39cef279d84bbeee5be68c17d22896bb685.zip |
Rename style properties
Diffstat (limited to 'web/app/view/map')
-rw-r--r-- | web/app/view/map/Map.js | 8 | ||||
-rw-r--r-- | web/app/view/map/MapController.js | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/web/app/view/map/Map.js b/web/app/view/map/Map.js index 00daa774c..5702ff7b5 100644 --- a/web/app/view/map/Map.js +++ b/web/app/view/map/Map.js @@ -58,14 +58,14 @@ Ext.define('Traccar.view.map.Map', { source: this.vectorSource }); - var lat = user.get('latitude') || server.get('latitude') || styles.map_default_lat; - var lon = user.get('longitude') || server.get('longitude') || styles.map_default_lon; - var zoom = user.get('zoom') || server.get('zoom') || styles.map_default_zoom; + var lat = user.get('latitude') || server.get('latitude') || styles.mapDefaultLat; + var lon = user.get('longitude') || server.get('longitude') || styles.mapDefaultLon; + var zoom = user.get('zoom') || server.get('zoom') || styles.mapDefaultZoom; this.mapView = new ol.View({ center: ol.proj.fromLonLat([lat, lon]), zoom: zoom, - maxZoom: styles.map_max_zoom + maxZoom: styles.mapMaxZoom }); this.map = new ol.Map({ diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js index 27a42a2ce..98922a307 100644 --- a/web/app/view/map/MapController.js +++ b/web/app/view/map/MapController.js @@ -66,7 +66,7 @@ Ext.define('Traccar.view.map.MapController', { if (data[i].deviceId in this.liveData) { this.liveData[data[i].deviceId].setGeometry(geometry); } else { - var style = this.getMarkerStyle(styles.map_live_radius, styles.map_live_color); + var style = this.getMarkerStyle(styles.mapLiveRadius, styles.mapLiveColor); var marker = new ol.Feature({ geometry: geometry, originalStyle: style @@ -88,8 +88,8 @@ Ext.define('Traccar.view.map.MapController', { getLineStyle: function() { return new ol.style.Style({ stroke: new ol.style.Stroke({ - color: styles.map_stroke_color, - width: styles.map_route_width + color: styles.mapStrokeColor, + width: styles.mapRouteWidth }) }); }, @@ -116,8 +116,8 @@ Ext.define('Traccar.view.map.MapController', { color: color }), stroke: new ol.style.Stroke({ - color: styles.map_stroke_color, - width: styles.map_marker_stroke + color: styles.mapStrokeColor, + width: styles.mapMarkerStroke }) }) }); @@ -142,7 +142,7 @@ Ext.define('Traccar.view.map.MapController', { ]); positions.push(point); - var style = this.getMarkerStyle(styles.map_report_radius, styles.map_report_color); + var style = this.getMarkerStyle(styles.mapReportRadius, styles.mapReportColor); var feature = new ol.Feature({ geometry: new ol.geom.Point(positions[index]), originalStyle: style @@ -189,10 +189,10 @@ Ext.define('Traccar.view.map.MapController', { } if (feature !== undefined) { - feature.setStyle(this.getMarkerStyle(styles.map_select_radius, styles.map_select_color)); + feature.setStyle(this.getMarkerStyle(styles.mapSelectRadius, styles.mapSelectColor)); var pan = ol.animation.pan({ - duration: styles.map_delay, + duration: styles.mapDelay, source: this.getView().mapView.getCenter() }); this.getView().map.beforeRender(pan); |