Move name config to be per device for easier management of the config #6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,8 @@ class ZigbeeFloorplanCard extends HTMLElement { | |
| if (!config.image) { | ||
| throw new Error('You need to define an image'); | ||
| } | ||
| if (!config.devices) { | ||
| throw new Error('You need to define devices'); | ||
| } | ||
|
|
||
| // Validate and sanitize config values | ||
|
|
@@ -32,13 +32,12 @@ class ZigbeeFloorplanCard extends HTMLElement { | |
| this._config = { | ||
| entity: this._sanitizeString(config.entity), | ||
| image: this._sanitizeUrl(config.image), | ||
| devices: config.devices, | ||
| image_width: imageWidth, | ||
| image_height: imageHeight, | ||
| circle_radius: circleRadius, | ||
| show_labels: config.show_labels !== false, | ||
| show_link_lqi: config.show_link_lqi === true, | ||
| mqtt_base_topic: this._sanitizeString(config.mqtt_base_topic || 'zigbee2mqtt') | ||
| }; | ||
|
Comment on lines
32
to
42
There was a problem hiding this comment. This change removes
Owner
Author
There was a problem hiding this comment. I can live with that. I will bump the mayor version. |
||
| } | ||
|
|
@@ -544,8 +543,8 @@ class ZigbeeFloorplanCard extends HTMLElement { | |
| } | ||
| processedLinks.add(linkKey); | ||
|
|
||
| const sourceCoords = this._config.devices[sourceAddr]; | ||
| const targetCoords = this._config.devices[targetAddr]; | ||
|
|
||
| if (sourceCoords && targetCoords) { | ||
| const lqi = link.lqi || link.linkquality || 0; | ||
|
|
@@ -600,9 +599,9 @@ class ZigbeeFloorplanCard extends HTMLElement { | |
|
|
||
| nodes.forEach(node => { | ||
| const ieeeAddr = node.ieeeAddr; | ||
| const device = this._config.devices[ieeeAddr]; | ||
|
|
||
| if (device) { | ||
| const deviceType = node.type || 'EndDevice'; // Coordinator, Router, EndDevice | ||
| const deviceClass = deviceType === 'Coordinator' ? 'coordinator' : | ||
| deviceType === 'Router' ? 'router' : 'end-device'; | ||
|
|
@@ -611,8 +610,8 @@ class ZigbeeFloorplanCard extends HTMLElement { | |
| // Draw circle | ||
| svgDevices.push(` | ||
| <circle | ||
| cx="${parseFloat(device.x)}" | ||
| cy="${parseFloat(device.y)}" | ||
| r="${parseInt(this._config.circle_radius)}" | ||
| class="device-circle ${deviceClass} ${isSelected ? 'selected' : ''}" | ||
| data-ieee="${this._escapeHtml(String(ieeeAddr))}" | ||
|
|
@@ -626,8 +625,8 @@ class ZigbeeFloorplanCard extends HTMLElement { | |
| const safeLabel = this._escapeHtml(String(label)); | ||
| svgDevices.push(` | ||
| <text | ||
| x="${parseFloat(device.x)}" | ||
| y="${parseFloat(device.y) + parseInt(this._config.circle_radius) + 15}" | ||
| class="device-label" | ||
| text-anchor="middle" | ||
| style="pointer-events: none;" | ||
|
|
@@ -641,9 +640,10 @@ class ZigbeeFloorplanCard extends HTMLElement { | |
| } | ||
|
|
||
| getDeviceLabel(ieeeAddr, friendlyName) { | ||
| // Priority 1: Name field in devices config | ||
| const device = this._config.devices && this._config.devices[ieeeAddr]; | ||
| if (device && device.name) { | ||
| return device.name; | ||
| } | ||
|
|
||
| // Priority 2: Friendly name from Zigbee2MQTT network map | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
setConfignow requiresconfig.devicesand will throw for existing configurations that still use the documenteddevice_coordinateskey from prior versions. To avoid a breaking change (or at least provide a smoother migration), consider acceptingdevice_coordinatesas a fallback/alias (and/or emitting a clear deprecation warning) before throwing an error.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can live with that. I will bump the mayor version.