Add property tag for lock state (#4882)

* add lock state property

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>

bundles/org.openhab.core.semantics/model/SemanticTags.csv

@@ -79,8 +79,9 @@ Property,Motion,,Motion,,Motion detected
 Property,Noise,,Noise,,
 Property,Oil,,Oil,,
 Property,Opening,,Opening,,Opening of a door or window etc.
+Property,LockState,Opening,Lock State,,State of the lock on a door or window etc.
 Property,OpenLevel,Opening,Open Level,,Open position (analog) of a door or window etc.
-Property,OpenState,Opening,Open State,Open Closed,Open state (digital) of a door or window etc.
+Property,OpenState,Opening,Open State,,Open state (digital) of a door or window etc.
 Property,Position,,Position,,Position measurement or control
 Property,GeoLocation,Position,Geo Location,,Geo location coordinate
 Property,Power,,Power,,

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java

@@ -119,6 +119,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Property.NOISE);
         defaultTags.add(DefaultSemanticTags.Property.OIL);
         defaultTags.add(DefaultSemanticTags.Property.OPENING);
+        defaultTags.add(DefaultSemanticTags.Property.LOCK_STATE);
         defaultTags.add(DefaultSemanticTags.Property.OPEN_LEVEL);
         defaultTags.add(DefaultSemanticTags.Property.OPEN_STATE);
         defaultTags.add(DefaultSemanticTags.Property.POSITION);

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTags.java

@@ -436,6 +436,11 @@ public class DefaultSemanticTags {
                 "Opening", //
                 "Opening of a door or window etc.", //
                 "");
+        public static final SemanticTag LOCK_STATE = new SemanticTagImpl( //
+                "Property_Opening_LockState", //
+                "Lock State", //
+                "State of the lock on a door or window etc.", //
+                "");
         public static final SemanticTag OPEN_LEVEL = new SemanticTagImpl( //
                 "Property_Opening_OpenLevel", //
                 "Open Level", //
@@ -445,7 +450,7 @@ public class DefaultSemanticTags {
                 "Property_Opening_OpenState", //
                 "Open State", //
                 "Open state (digital) of a door or window etc.", //
-                "Open Closed");
+                "");
         public static final SemanticTag POSITION = new SemanticTagImpl( //
                 "Property_Position", //
                 "Position", //

bundles/org.openhab.core.semantics/src/main/resources/tags.properties

@@ -105,9 +105,11 @@ Property_Noise=Noise
 Property_Oil=Oil
 Property_Opening=Opening
 Property_Opening__description=Opening of a door or window etc.
+Property_Opening_LockState=Lock State
+Property_Opening_LockState__description=State of the lock on a door or window etc.
 Property_Opening_OpenLevel=Open Level
 Property_Opening_OpenLevel__description=Open position (analog) of a door or window etc.
-Property_Opening_OpenState=Open State,Open Closed
+Property_Opening_OpenState=Open State
 Property_Opening_OpenState__description=Open state (digital) of a door or window etc.
 Property_Position=Position
 Property_Position__description=Position measurement or control

bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd

@@ -299,6 +299,7 @@
 			<xs:enumeration value="Info"/>
 			<xs:enumeration value="Level"/>
 			<xs:enumeration value="Light"/>
+			<xs:enumeration value="LockState"/>
 			<xs:enumeration value="LowBattery"/>
 			<xs:enumeration value="MediaControl"/>
 			<xs:enumeration value="Mode"/>