Semantic tags: add zones, move battery (#4738)

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

bundles/org.openhab.core.model.script/src.moved/test/java/org/openhab/core/model/script/actions/SemanticsTest.java

@@ -112,7 +112,7 @@ public class SemanticsTest {
         indoorTagClass = semanticTagRegistryImpl.getTagClassById("Location_Indoor");
         bathroomTagClass = semanticTagRegistryImpl.getTagClassById("Location_Indoor_Room_Bathroom");
         cleaningRobotTagClass = semanticTagRegistryImpl.getTagClassById("Equipment_CleaningRobot");
-        batteryTagClass = semanticTagRegistryImpl.getTagClassById("Equipment_Battery");
+        batteryTagClass = semanticTagRegistryImpl.getTagClassById("Equipment_PowerSupply_Battery");
 
         when(itemRegistryMock.getItem("TestHouse")).thenReturn(indoorLocationItem);
         when(itemRegistryMock.getItem("TestBathRoom")).thenReturn(bathroomLocationItem);

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

@@ -111,7 +111,6 @@ Equipment,MediaPlayer,AudioVisual,Media Player,,
 Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",
 Equipment,Screen,AudioVisual,Screen,Screens,
 Equipment,Speaker,AudioVisual,Speaker,Speakers,
-Equipment,Battery,,Battery,Batteries,
 Equipment,Bed,,Bed,,
 Equipment,Camera,,Camera,Cameras,
 Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",
@@ -183,6 +182,7 @@ Equipment,PetFeeder,PetCare,Pet Feeder,,
 Equipment,PetFlap,PetCare,Pet Flap,"Cat Flap, Dog Flap",
 Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets, Smart Plug, Smart Plugs",
 Equipment,PowerSupply,,Power Supply,,
+Equipment,Battery,PowerSupply,Battery,Batteries,
 Equipment,EVSE,PowerSupply,Electric Vehicle Supply Equipment,"EV Charger, Car Charger",
 Equipment,Generator,PowerSupply,Generator,Emergency Generator,
 Equipment,Inverter,PowerSupply,Inverter,Inverters,
@@ -256,3 +256,5 @@ Equipment,Window,,Window,Windows,
 Equipment,WindowCovering,,Window Covering,,
 Equipment,Blinds,WindowCovering,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
 Equipment,Drapes,WindowCovering,Drapes,Curtains,
+Equipment,Zone,,Zone,,
+Equipment,AlarmZone,Zone,Alarm Zone,,

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

@@ -151,7 +151,6 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Equipment.RECEIVER);
         defaultTags.add(DefaultSemanticTags.Equipment.SCREEN);
         defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER);
-        defaultTags.add(DefaultSemanticTags.Equipment.BATTERY);
         defaultTags.add(DefaultSemanticTags.Equipment.BED);
         defaultTags.add(DefaultSemanticTags.Equipment.CAMERA);
         defaultTags.add(DefaultSemanticTags.Equipment.CLEANING_ROBOT);
@@ -223,6 +222,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Equipment.PET_FLAP);
         defaultTags.add(DefaultSemanticTags.Equipment.POWER_OUTLET);
         defaultTags.add(DefaultSemanticTags.Equipment.POWER_SUPPLY);
+        defaultTags.add(DefaultSemanticTags.Equipment.BATTERY);
         defaultTags.add(DefaultSemanticTags.Equipment.EVSE);
         defaultTags.add(DefaultSemanticTags.Equipment.GENERATOR);
         defaultTags.add(DefaultSemanticTags.Equipment.INVERTER);
@@ -296,6 +296,8 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Equipment.WINDOW_COVERING);
         defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
         defaultTags.add(DefaultSemanticTags.Equipment.DRAPES);
+        defaultTags.add(DefaultSemanticTags.Equipment.ZONE);
+        defaultTags.add(DefaultSemanticTags.Equipment.ALARM_ZONE);
     }
 
     @Override

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

@@ -599,11 +599,6 @@ public class DefaultSemanticTags {
                 "Speaker", //
                 "", //
                 "Speakers");
-        public static final SemanticTag BATTERY = new SemanticTagImpl( //
-                "Equipment_Battery", //
-                "Battery", //
-                "", //
-                "Batteries");
         public static final SemanticTag BED = new SemanticTagImpl( //
                 "Equipment_Bed", //
                 "Bed", //
@@ -959,6 +954,11 @@ public class DefaultSemanticTags {
                 "Power Supply", //
                 "", //
                 "");
+        public static final SemanticTag BATTERY = new SemanticTagImpl( //
+                "Equipment_PowerSupply_Battery", //
+                "Battery", //
+                "", //
+                "Batteries");
         public static final SemanticTag EVSE = new SemanticTagImpl( //
                 "Equipment_PowerSupply_EVSE", //
                 "Electric Vehicle Supply Equipment", //
@@ -1324,5 +1324,15 @@ public class DefaultSemanticTags {
                 "Drapes", //
                 "", //
                 "Curtains");
+        public static final SemanticTag ZONE = new SemanticTagImpl( //
+                "Equipment_Zone", //
+                "Zone", //
+                "", //
+                "");
+        public static final SemanticTag ALARM_ZONE = new SemanticTagImpl( //
+                "Equipment_Zone_AlarmZone", //
+                "Alarm Zone", //
+                "", //
+                "");
     }
 }

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

@@ -111,7 +111,6 @@ Equipment_AudioVisual_MediaPlayer=Media Player
 Equipment_AudioVisual_Receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers
 Equipment_AudioVisual_Screen=Screen,Screens
 Equipment_AudioVisual_Speaker=Speaker,Speakers
-Equipment_Battery=Battery,Batteries
 Equipment_Bed=Bed
 Equipment_Camera=Camera,Cameras
 Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots
@@ -183,6 +182,7 @@ Equipment_PetCare_PetFeeder=Pet Feeder
 Equipment_PetCare_PetFlap=Pet Flap,Cat Flap,Dog Flap
 Equipment_PowerOutlet=Power Outlet,Power Outlets,Outlet,Outlets,Smart Plug,Smart Plugs
 Equipment_PowerSupply=Power Supply
+Equipment_PowerSupply_Battery=Battery,Batteries
 Equipment_PowerSupply_EVSE=Electric Vehicle Supply Equipment,EV Charger,Car Charger
 Equipment_PowerSupply_Generator=Generator,Emergency Generator
 Equipment_PowerSupply_Inverter=Inverter,Inverters
@@ -256,3 +256,5 @@ Equipment_Window=Window,Windows
 Equipment_WindowCovering=Window Covering
 Equipment_WindowCovering_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters
 Equipment_WindowCovering_Drapes=Drapes,Curtains
+Equipment_Zone=Zone
+Equipment_Zone_AlarmZone=Alarm Zone

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

@@ -360,6 +360,7 @@
 			<xs:enumeration value="AirQualitySensor"/>
 			<xs:enumeration value="AlarmDevice"/>
 			<xs:enumeration value="AlarmSystem"/>
+			<xs:enumeration value="AlarmZone"/>
 			<xs:enumeration value="Aquarium"/>
 			<xs:enumeration value="AudioVisual"/>
 			<xs:enumeration value="BackDoor"/>
@@ -508,6 +509,7 @@
 			<xs:enumeration value="Window"/>
 			<xs:enumeration value="WindowCovering"/>
 			<xs:enumeration value="WirelessAccessPoint"/>
+			<xs:enumeration value="Zone"/>
 			<!-- End Allowed Semantic Equipment Tag Values -->
 		</xs:restriction>
 	</xs:simpleType>