From 9b36b690301faa7b84bade074aae3e863be5495d Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 10 Nov 2016 14:25:30 +0500 Subject: - Simplify check - Fix scale --- web/app/DeviceImages.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/app/DeviceImages.js') diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js index f96a3b0..fac16a5 100644 --- a/web/app/DeviceImages.js +++ b/web/app/DeviceImages.js @@ -25,7 +25,7 @@ Ext.define('Traccar.DeviceImages', { if (category) { device = Ext.getStore('DeviceImages').findRecord('key', category, 0, false, false, true); } - if (device === undefined || device === null) { + if (!device) { device = Ext.getStore('DeviceImages').findRecord('key', 'default', 0, false, false, true); } svg = Ext.clone(device.get('svg')); @@ -44,13 +44,13 @@ Ext.define('Traccar.DeviceImages', { rotateTransform = 'rotate(' + angle + ' ' + (width / 2) + ' ' + (height / 2) + ')'; svg.getElementById(device.get('rotateId')).setAttribute('transform', rotateTransform); - width *= Traccar.Style.mapScaleNormal; - height *= Traccar.Style.mapScaleNormal; if (zoom) { width *= Traccar.Style.mapScaleSelected; height *= Traccar.Style.mapScaleSelected; scaleTransform = 'scale(' + Traccar.Style.mapScaleSelected + ') '; } else { + width *= Traccar.Style.mapScaleNormal; + height *= Traccar.Style.mapScaleNormal; scaleTransform = 'scale(' + Traccar.Style.mapScaleNormal + ') '; } -- cgit v1.2.3