100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI update: make use of util function to present label
Vincent8f5f3717dec2
diff --git a/ui/component/or-map/src/markers/or-map-marker-asset.ts b/ui/component/or-map/src/markers/or-map-marker-asset.tsindex 9cf97d1e4..c0fbd1eb0 100644--- a/ui/component/or-map/src/markers/or-map-marker-asset.ts+++ b/ui/component/or-map/src/markers/or-map-marker-asset.ts@@ -180,24 +180,18 @@ export class OrMapMarkerAsset extends subscribe(manager)(OrMapMarker) {this.direction = undefined;this.displayValue = undefined;- const attr = asset.attributes ? asset.attributes[WellknownAttributes.LOCATION] : undefined;- this._updateLocation(attr ? attr.value as GeoJSONPoint : null);+ const locAttr = asset.attributes ? asset.attributes[WellknownAttributes.LOCATION] : undefined;+ this._updateLocation(locAttr ? locAttr.value as GeoJSONPoint : null);const assetTypeConfig = getMarkerConfigForAssetType(this.config, asset.type);const showDirection = !assetTypeConfig || !assetTypeConfig.hideDirection;- const showLabel = assetTypeConfig && assetTypeConfig.showLabel && !!assetTypeConfig.attributeName;+ const showLabel = assetTypeConfig && assetTypeConfig.showLabel === true && !!assetTypeConfig.attributeName;+ const showUnits = !!(assetTypeConfig && assetTypeConfig.showUnits !== false);if (showLabel && asset.attributes && asset.attributes[assetTypeConfig?.attributeName]) {- const attrVal = asset.attributes[assetTypeConfig?.attributeName].value;- if (attrVal !== undefined && attrVal !== null) {- this.displayValue = attrVal.toString();-- if (assetTypeConfig.showUnits !== false && attr) {- const attributeDescriptor = AssetModelUtil.getAttributeDescriptor(assetTypeConfig.attributeName, asset.type!);- const unit = Util.resolveUnits(Util.getAttributeUnits(attr, attributeDescriptor, asset.type));- this.displayValue = `${this.displayValue} ${unit}`;- }- }+ const attr = asset.attributes[assetTypeConfig.attributeName];+ const descriptors = AssetModelUtil.getAttributeAndValueDescriptors(asset.type, attr.name, attr);+ this.displayValue = Util.getAttributeValueAsString(attr, descriptors[0], asset.type, showUnits, "-");}if (showDirection) {