Semantic tags: Just a few more (#4745)

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com>

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

@@ -36,6 +36,7 @@ Location,Patio,Outdoor,Patio,Patios,
 Location,Porch,Outdoor,Porch,Porches,
 Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
 Point,Alarm,,Alarm,,
+Point,Calculation,,Calculation,,
 Point,Control,,Control,,
 Point,Switch,Control,Switch,,
 Point,Forecast,,Forecast,,
@@ -67,6 +68,7 @@ Property,Gas,,Gas,,
 Property,Heating,,Heating,,
 Property,Humidity,,Humidity,Moisture,
 Property,Illuminance,,Illuminance,,
+Property,Info,,Information,,
 Property,Level,,Level,,
 Property,Light,,Light,"Lights, Lighting",
 Property,LowBattery,,Low Battery,,
@@ -84,6 +86,7 @@ Property,GeoLocation,Position,Geo Location,,
 Property,Power,,Power,,
 Property,Presence,,Presence,,
 Property,Pressure,,Pressure,,
+Property,Progress,,Progress,,
 Property,QualityOfService,,Quality of Service,,
 Property,Rain,,Rain,,
 Property,SignalStrength,,Signal Strength,,
@@ -103,6 +106,7 @@ Property,Water,,Water,,
 Property,Wind,,Wind,,
 Equipment,AlarmDevice,,Alarm Device,,
 Equipment,AlarmSystem,,Alarm System,Alarm Systems,
+Equipment,Application,,Application,Software program,
 Equipment,AudioVisual,,Audio Visual,,
 Equipment,Display,AudioVisual,Display,,
 Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",

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

@@ -76,6 +76,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Location.PORCH);
         defaultTags.add(DefaultSemanticTags.Location.TERRACE);
         defaultTags.add(DefaultSemanticTags.Point.ALARM);
+        defaultTags.add(DefaultSemanticTags.Point.CALCULATION);
         defaultTags.add(DefaultSemanticTags.Point.CONTROL);
         defaultTags.add(DefaultSemanticTags.Point.SWITCH);
         defaultTags.add(DefaultSemanticTags.Point.FORECAST);
@@ -107,6 +108,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Property.HEATING);
         defaultTags.add(DefaultSemanticTags.Property.HUMIDITY);
         defaultTags.add(DefaultSemanticTags.Property.ILLUMINANCE);
+        defaultTags.add(DefaultSemanticTags.Property.INFO);
         defaultTags.add(DefaultSemanticTags.Property.LEVEL);
         defaultTags.add(DefaultSemanticTags.Property.LIGHT);
         defaultTags.add(DefaultSemanticTags.Property.LOW_BATTERY);
@@ -124,6 +126,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Property.POWER);
         defaultTags.add(DefaultSemanticTags.Property.PRESENCE);
         defaultTags.add(DefaultSemanticTags.Property.PRESSURE);
+        defaultTags.add(DefaultSemanticTags.Property.PROGRESS);
         defaultTags.add(DefaultSemanticTags.Property.QUALITY_OF_SERVICE);
         defaultTags.add(DefaultSemanticTags.Property.RAIN);
         defaultTags.add(DefaultSemanticTags.Property.SIGNAL_STRENGTH);
@@ -143,6 +146,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
         defaultTags.add(DefaultSemanticTags.Property.WIND);
         defaultTags.add(DefaultSemanticTags.Equipment.ALARM_DEVICE);
         defaultTags.add(DefaultSemanticTags.Equipment.ALARM_SYSTEM);
+        defaultTags.add(DefaultSemanticTags.Equipment.APPLICATION);
         defaultTags.add(DefaultSemanticTags.Equipment.AUDIO_VISUAL);
         defaultTags.add(DefaultSemanticTags.Equipment.DISPLAY);
         defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR);

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

@@ -218,6 +218,11 @@ public class DefaultSemanticTags {
                 "Alarm", //
                 "", //
                 "");
+        public static final SemanticTag CALCULATION = new SemanticTagImpl( //
+                "Point_Calculation", //
+                "Calculation", //
+                "", //
+                "");
         public static final SemanticTag CONTROL = new SemanticTagImpl( //
                 "Point_Control", //
                 "Control", //
@@ -376,6 +381,11 @@ public class DefaultSemanticTags {
                 "Illuminance", //
                 "", //
                 "");
+        public static final SemanticTag INFO = new SemanticTagImpl( //
+                "Property_Info", //
+                "Information", //
+                "", //
+                "");
         public static final SemanticTag LEVEL = new SemanticTagImpl( //
                 "Property_Level", //
                 "Level", //
@@ -461,6 +471,11 @@ public class DefaultSemanticTags {
                 "Pressure", //
                 "", //
                 "");
+        public static final SemanticTag PROGRESS = new SemanticTagImpl( //
+                "Property_Progress", //
+                "Progress", //
+                "", //
+                "");
         public static final SemanticTag QUALITY_OF_SERVICE = new SemanticTagImpl( //
                 "Property_QualityOfService", //
                 "Quality of Service", //
@@ -559,6 +574,11 @@ public class DefaultSemanticTags {
                 "Alarm System", //
                 "", //
                 "Alarm Systems");
+        public static final SemanticTag APPLICATION = new SemanticTagImpl( //
+                "Equipment_Application", //
+                "Application", //
+                "", //
+                "Software program");
         public static final SemanticTag AUDIO_VISUAL = new SemanticTagImpl( //
                 "Equipment_AudioVisual", //
                 "Audio Visual", //

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

@@ -36,6 +36,7 @@ Location_Outdoor_Patio=Patio,Patios
 Location_Outdoor_Porch=Porch,Porches
 Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks
 Point_Alarm=Alarm
+Point_Calculation=Calculation
 Point_Control=Control
 Point_Control_Switch=Switch
 Point_Forecast=Forecast
@@ -67,6 +68,7 @@ Property_Gas=Gas
 Property_Heating=Heating
 Property_Humidity=Humidity,Moisture
 Property_Illuminance=Illuminance
+Property_Info=Information
 Property_Level=Level
 Property_Light=Light,Lights,Lighting
 Property_LowBattery=Low Battery
@@ -84,6 +86,7 @@ Property_Position_GeoLocation=Geo Location
 Property_Power=Power
 Property_Presence=Presence
 Property_Pressure=Pressure
+Property_Progress=Progress
 Property_QualityOfService=Quality of Service
 Property_Rain=Rain
 Property_SignalStrength=Signal Strength
@@ -103,6 +106,7 @@ Property_Water=Water
 Property_Wind=Wind
 Equipment_AlarmDevice=Alarm Device
 Equipment_AlarmSystem=Alarm System,Alarm Systems
+Equipment_Application=Application,Software program
 Equipment_AudioVisual=Audio Visual
 Equipment_AudioVisual_Display=Display
 Equipment_AudioVisual_Display_Projector=Projector,Projectors,Beamer,Beamers

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

@@ -296,6 +296,7 @@
 			<xs:enumeration value="Heating"/>
 			<xs:enumeration value="Humidity"/>
 			<xs:enumeration value="Illuminance"/>
+			<xs:enumeration value="Info"/>
 			<xs:enumeration value="Level"/>
 			<xs:enumeration value="Light"/>
 			<xs:enumeration value="LowBattery"/>
@@ -315,6 +316,7 @@
 			<xs:enumeration value="Power"/>
 			<xs:enumeration value="Presence"/>
 			<xs:enumeration value="Pressure"/>
+			<xs:enumeration value="Progress"/>
 			<xs:enumeration value="QualityOfService"/>
 			<xs:enumeration value="Radon"/>
 			<xs:enumeration value="Rain"/>
@@ -339,6 +341,7 @@
 			<!-- Begin Allowed Semantic Point Tag Values -->
 			<!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy -->
 			<xs:enumeration value="Alarm"/>
+			<xs:enumeration value="Calculation"/>
 			<xs:enumeration value="Control"/>
 			<xs:enumeration value="Forecast"/>
 			<xs:enumeration value="Measurement"/>
@@ -361,6 +364,7 @@
 			<xs:enumeration value="AlarmDevice"/>
 			<xs:enumeration value="AlarmSystem"/>
 			<xs:enumeration value="AlarmZone"/>
+			<xs:enumeration value="Application"/>
 			<xs:enumeration value="Aquarium"/>
 			<xs:enumeration value="AudioVisual"/>
 			<xs:enumeration value="BackDoor"/>