[mybmw] Fix images not loading anymore (#16643)

* [mybmw] fix image not loading anymore Fixes #16642

Signed-off-by: Martin Grassl <martin.grassl@digital-filestore.de>

diff --git a/bundles/org.openhab.binding.mybmw/README.md b/bundles/org.openhab.binding.mybmw/README.md
index c1c1c30e9128fe1706baa907c59085d2c9c80265..dd5d4339c00311991f908d0f9e7fb295ae3404e2 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/README.md
+++ b/bundles/org.openhab.binding.mybmw/README.md
@@ -492,13 +492,9 @@ Image representation of the vehicle.
 | png                 | Image  | Read     | The image as png          |
 | view                | String | Write    | The view port of the car  |
 
-Possible view ports:
+Possible view ports (currently only one is available, which is automatically set as default):
 
-- _VehicleStatus_ Front Left Side View
-- _FrontView_ Front View
-- _FrontLeft_ Front Left Side View
-- _FrontRight_ Front Right Side View
-- _RearView_ Rear View
+- _AngleSideViewForty_ Front Left Side View
 
 ## Further Descriptions
 

diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/ImageProperties.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/ImageProperties.java
index 16543818785860a4c8578a9a206394ceca3bf993..2de4712edc5c3800d97af03c9ee8fce4f7460a65 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/ImageProperties.java
+++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/ImageProperties.java
@@ -24,7 +24,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 public class ImageProperties {
     public static final int RETRY_COUNTER = 5;
     public int failCounter = 0;
-    public String viewport = "VehicleStatus";
+    public String viewport = "AngleSideViewForty"; // default view
 
     public ImageProperties(String viewport) {
         this.viewport = viewport;

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties
index e740934957759cbc05ec4404847b88a659c3d67f..290fb611dda63378cc9746761dfdbe17fad98371 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties
@@ -98,11 +98,7 @@ channel-type.mybmw.home-distance-channel.label = Distance From Home
 channel-type.mybmw.hood-channel.label = Hood
 
 channel-type.mybmw.image-update-channel.label = Force update of the image
-channel-type.mybmw.image-view-channel.command.option.FrontLeft = Left Side View
-channel-type.mybmw.image-view-channel.command.option.FrontRight = Right Side View
-channel-type.mybmw.image-view-channel.command.option.FrontView = Front View
-channel-type.mybmw.image-view-channel.command.option.RearView = Rear View
-channel-type.mybmw.image-view-channel.command.option.VehicleStatus = Front Side View
+channel-type.mybmw.image-view-channel.command.option.AngleSideViewForty = Left Side View
 channel-type.mybmw.image-view-channel.label = Image Viewport
 channel-type.mybmw.last-fetched-channel.label = Last Openhab Update Timestamp
 channel-type.mybmw.last-update-channel.label = Last Car Status Timestamp

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/image-channel-types.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/image-channel-types.xml
index 6caf17952e62b267182f66a84ae975c7dcee8613..d8961cfbcbcd3ba17b9c44fafc4f45d862e3a0b0 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/image-channel-types.xml
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/image-channel-types.xml
@@ -13,11 +13,7 @@
                <label>Image Viewport</label>
                <command>
                        <options>
-                               <option value="VehicleStatus">Front Side View</option>
-                               <option value="FrontView">Front View</option>
-                               <option value="FrontLeft">Left Side View</option>
-                               <option value="FrontRight">Right Side View</option>
-                               <option value="RearView">Rear View</option>
+                               <option value="AngleSideViewForty">Left Side View</option>
                        </options>
                </command>
        </channel-type>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev.xml
index 2cc92d32946b24d23d27eab26019673aeb36b5dd..236e6a77b46c11dfdd774faf5ac428ea59b073b3 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev.xml
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev.xml
@@ -29,7 +29,7 @@
                </channel-groups>
 
                <properties>
-                       <property name="thingTypeVersion">2</property>
+                       <property name="thingTypeVersion">3</property>
                </properties>
 
                <representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev_rex.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev_rex.xml
index e21f6c5445098296f1d749f644c3d406c6c678a9..eee5be7c617bdcfa77eae98f9a98777bc6f24ee9 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev_rex.xml
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev_rex.xml
@@ -29,7 +29,7 @@
                </channel-groups>
 
                <properties>
-                       <property name="thingTypeVersion">2</property>
+                       <property name="thingTypeVersion">3</property>
                </properties>
 
                <representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-conv.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-conv.xml
index 1808edd814aedbab7e3cd595d617411ca20e04a2..29eec9e7039e37ccd97a638aa348c550073cae5b 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-conv.xml
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-conv.xml
@@ -26,7 +26,7 @@
                </channel-groups>
 
                <properties>
-                       <property name="thingTypeVersion">2</property>
+                       <property name="thingTypeVersion">3</property>
                </properties>
 
                <representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-phev.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-phev.xml
index 8e2e0c1c946c38588dee1cdd38ab26ae607b333c..09aad7ec006aafba351bdf1d690fdeb0d6ff8c85 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-phev.xml
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-phev.xml
@@ -29,7 +29,7 @@
                </channel-groups>
 
                <properties>
-                       <property name="thingTypeVersion">2</property>
+                       <property name="thingTypeVersion">3</property>
                </properties>
 
                <representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/update/thing-update.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/update/thing-update.xml
index 1f7fb82c4d670d3d3c0a5db743c749e4c54142ec..c410099f32d74a7098f72bcb15ab3a307775acfb 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/update/thing-update.xml
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/update/thing-update.xml
@@ -44,6 +44,15 @@
                        </add-channel>
                        <!-- channels to be updated -->
                </instruction-set>
+               <instruction-set targetVersion="3">
+                       <!-- channels to be removed -->
+                       <!-- channels to be added -->
+                       <!-- channels to be updated -->
+                       <update-channel id="view" groupIds="image">
+                               <type>mybmw:image-view-channel</type>
+                               <label>Image Viewport</label>
+                       </update-channel>
+               </instruction-set>
        </thing-type>
        <thing-type uid="mybmw:bev">
                <instruction-set targetVersion="1">
@@ -78,6 +87,15 @@
                        </add-channel>
                        <!-- channels to be updated -->
                </instruction-set>
+               <instruction-set targetVersion="3">
+                       <!-- channels to be removed -->
+                       <!-- channels to be added -->
+                       <!-- channels to be updated -->
+                       <update-channel id="view" groupIds="image">
+                               <type>mybmw:image-view-channel</type>
+                               <label>Image Viewport</label>
+                       </update-channel>
+               </instruction-set>
        </thing-type>
        <thing-type uid="mybmw:conv">
                <instruction-set targetVersion="1">
@@ -110,6 +128,15 @@
                        </add-channel>
                        <!-- channels to be updated -->
                </instruction-set>
+               <instruction-set targetVersion="3">
+                       <!-- channels to be removed -->
+                       <!-- channels to be added -->
+                       <!-- channels to be updated -->
+                       <update-channel id="view" groupIds="image">
+                               <type>mybmw:image-view-channel</type>
+                               <label>Image Viewport</label>
+                       </update-channel>
+               </instruction-set>
        </thing-type>
        <thing-type uid="mybmw:phev">
                <instruction-set targetVersion="1">
@@ -152,6 +179,15 @@
                        </add-channel>
                        <!-- channels to be updated -->
                </instruction-set>
+               <instruction-set targetVersion="3">
+                       <!-- channels to be removed -->
+                       <!-- channels to be added -->
+                       <!-- channels to be updated -->
+                       <update-channel id="view" groupIds="image">
+                               <type>mybmw:image-view-channel</type>
+                               <label>Image Viewport</label>
+                       </update-channel>
+               </instruction-set>
        </thing-type>
 
 </update:update-descriptions>