Semantic Tags: Tweaks to tags (#4708)

* Tweaks to Point and Property tags

Signed-off-by: Andrew Fiddian-Green <[email protected]>

Author: andrewfg

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

@@ -38,13 +38,10 @@ Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
 Point,Alarm,,Alarm,,
 Point,Control,,Control,,
 Point,Switch,Control,Switch,,
+Point,Forecast,,Forecast,,
 Point,Measurement,,Measurement,,
 Point,Setpoint,,Setpoint,,
 Point,Status,,Status,,
-Point,LowBattery,Status,LowBattery,,
-Point,OpenLevel,Status,OpenLevel,,
-Point,OpenState,Status,OpenState,,
-Point,Tampered,Status,Tampered,,
 Property,AirQuality,,Air Quality,,
 Property,AQI,AirQuality,AQI,Air Quality Index,
 Property,CO,AirQuality,CO,Carbon Monoxide,
@@ -59,9 +56,11 @@ Property,Airflow,,Airflow,,
 Property,App,,App,Application,Software program
 Property,Brightness,,Brightness,,
 Property,Channel,,Channel,,
+Property,Color,,Color,,
 Property,ColorTemperature,,Color Temperature,,
 Property,Current,,Current,,
 Property,Duration,,Duration,,
+Property,Enabled,,Enabled,,
 Property,Energy,,Energy,,
 Property,Frequency,,Frequency,,
 Property,Gas,,Gas,,
@@ -70,14 +69,18 @@ Property,Humidity,,Humidity,Moisture,
 Property,Illuminance,,Illuminance,,
 Property,Level,,Level,,
 Property,Light,,Light,"Lights, Lighting",
+Property,LowBattery,,Low Battery,,
+Property,MediaControl,,Media Control,,
 Property,Mode,,Mode,,
-Property,AutoManual,Mode,Auto Manual,,
-Property,EnabledDisabled,Mode,Enabled Disabled,,
+Property,Moisture,,Moisture,,
+Property,Motion,,Motion,,
 Property,Noise,,Noise,,
 Property,Oil,,Oil,,
-Property,OnOff,,On Off,,
-Property,OpenClosed,,Open Closed,,
 Property,Opening,,Opening,,
+Property,OpenLevel,Opening,Open Level,,
+Property,OpenState,Opening,Open State,Open Closed,
+Property,Position,,Position,,
+Property,GeoLocation,Position,Geo Location,,
 Property,Power,,Power,,
 Property,Presence,,Presence,,
 Property,Pressure,,Pressure,,
@@ -88,6 +91,7 @@ Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,
 Property,Smoke,,Smoke,,
 Property,SoundVolume,,Sound Volume,,
 Property,Speed,,Speed,,
+Property,Tampered,,Tampered,,
 Property,Temperature,,Temperature,Temperatures,
 Property,Tilt,,Tilt,,
 Property,Timestamp,,Timestamp,,
@@ -97,15 +101,18 @@ Property,Vibration,,Vibration,,
 Property,Voltage,,Voltage,,
 Property,Water,,Water,,
 Property,Wind,,Wind,,
+Equipment,AlarmDevice,,Alarm Device,,
 Equipment,AlarmSystem,,Alarm System,Alarm Systems,
 Equipment,AudioVisual,,Audio Visual,,
+Equipment,Display,AudioVisual,Display,,
+Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",
+Equipment,Television,Display,Television,"Televisions, TV, TVs",
 Equipment,MediaPlayer,AudioVisual,Media Player,,
 Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",
 Equipment,Screen,AudioVisual,Screen,Screens,
-Equipment,Television,AudioVisual,Television,"Televisions, TV, TVs",
+Equipment,Speaker,AudioVisual,Speaker,Speakers,
 Equipment,Battery,,Battery,Batteries,
 Equipment,Bed,,Bed,,
-Equipment,Blinds,,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
 Equipment,Camera,,Camera,Cameras,
 Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",
 Equipment,Computer,,Computer,,
@@ -185,31 +192,33 @@ Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,
 Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,
 Equipment,Printer,,Printer,,
 Equipment,Printer3D,Printer,3D Printer,,
-Equipment,Projector,,Projector,"Projectors, Beamer, Beamers",
 Equipment,Pump,,Pump,Pumps,
 Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump",
 Equipment,RemoteControl,,Remote Control,Remote Controls,
 Equipment,Sensor,,Sensor,Sensors,
 Equipment,AirQualitySensor,Sensor,Air Quality Sensor,,
 Equipment,CO2Sensor,Sensor,CO2 Sensor,,
 Equipment,COSensor,Sensor,CO Sensor,,
+Equipment,ContactSensor,Sensor,Contact Sensor,,
 Equipment,ElectricMeter,Sensor,Electric Meter,,
+Equipment,FireDetector,Sensor,Fire Detector,,
+Equipment,FlameDetector,FireDetector,Flame Detector,,
+Equipment,HeatDetector,FireDetector,Heat Detector,,
+Equipment,SmokeDetector,FireDetector,Smoke Detector,Smoke Detectors,
 Equipment,GasMeter,Sensor,Gas Meter,,
 Equipment,GlassBreakDetector,Sensor,Glass Break Detector,,
-Equipment,HeatDetector,Sensor,Heat Detector,Flame detector,
 Equipment,HumiditySensor,Sensor,Humidity Sensor,Hygrometer,
 Equipment,IlluminanceSensor,Sensor,Illuminance Sensor,,
 Equipment,LeakSensor,Sensor,Leak Sensor,,
 Equipment,OccupancySensor,Sensor,Occupancy Sensor,,
 Equipment,MotionDetector,OccupancySensor,Motion Detector,"Motion Detectors, Motion Sensor, Motion Sensors",
-Equipment,SmokeDetector,Sensor,Smoke Detector,Smoke Detectors,
 Equipment,TemperatureSensor,Sensor,Temperature Sensor,,
+Equipment,VibrationSensor,Sensor,Vibration Sensor,,
 Equipment,WaterMeter,Sensor,Water Meter,,
 Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,,
 Equipment,WeatherStation,Sensor,Weather Station,,
 Equipment,Siren,,Siren,Sirens,
 Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",
-Equipment,Speaker,,Speaker,Speakers,
 Equipment,Tool,,Tool,,
 Equipment,Tracker,,Tracker,,
 Equipment,Valve,,Valve,Valves,
@@ -244,4 +253,5 @@ Equipment,Toaster,WhiteGood,Toaster,Toaster Oven,
 Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines,
 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,

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

@@ -78,13 +78,10 @@ public DefaultSemanticTagProvider() {
         defaultTags.add(DefaultSemanticTags.Point.ALARM);
         defaultTags.add(DefaultSemanticTags.Point.CONTROL);
         defaultTags.add(DefaultSemanticTags.Point.SWITCH);
+        defaultTags.add(DefaultSemanticTags.Point.FORECAST);
         defaultTags.add(DefaultSemanticTags.Point.MEASUREMENT);
         defaultTags.add(DefaultSemanticTags.Point.SETPOINT);
         defaultTags.add(DefaultSemanticTags.Point.STATUS);
-        defaultTags.add(DefaultSemanticTags.Point.LOW_BATTERY);
-        defaultTags.add(DefaultSemanticTags.Point.OPEN_LEVEL);
-        defaultTags.add(DefaultSemanticTags.Point.OPEN_STATE);
-        defaultTags.add(DefaultSemanticTags.Point.TAMPERED);
         defaultTags.add(DefaultSemanticTags.Property.AIR_QUALITY);
         defaultTags.add(DefaultSemanticTags.Property.AQI);
         defaultTags.add(DefaultSemanticTags.Property.CO);
@@ -99,9 +96,11 @@ public DefaultSemanticTagProvider() {
         defaultTags.add(DefaultSemanticTags.Property.APP);
         defaultTags.add(DefaultSemanticTags.Property.BRIGHTNESS);
         defaultTags.add(DefaultSemanticTags.Property.CHANNEL);
+        defaultTags.add(DefaultSemanticTags.Property.COLOR);
         defaultTags.add(DefaultSemanticTags.Property.COLOR_TEMPERATURE);
         defaultTags.add(DefaultSemanticTags.Property.CURRENT);
         defaultTags.add(DefaultSemanticTags.Property.DURATION);
+        defaultTags.add(DefaultSemanticTags.Property.ENABLED);
         defaultTags.add(DefaultSemanticTags.Property.ENERGY);
         defaultTags.add(DefaultSemanticTags.Property.FREQUENCY);
         defaultTags.add(DefaultSemanticTags.Property.GAS);
@@ -110,14 +109,18 @@ public DefaultSemanticTagProvider() {
         defaultTags.add(DefaultSemanticTags.Property.ILLUMINANCE);
         defaultTags.add(DefaultSemanticTags.Property.LEVEL);
         defaultTags.add(DefaultSemanticTags.Property.LIGHT);
+        defaultTags.add(DefaultSemanticTags.Property.LOW_BATTERY);
+        defaultTags.add(DefaultSemanticTags.Property.MEDIA_CONTROL);
         defaultTags.add(DefaultSemanticTags.Property.MODE);
-        defaultTags.add(DefaultSemanticTags.Property.AUTO_MANUAL);
-        defaultTags.add(DefaultSemanticTags.Property.ENABLED_DISABLED);
+        defaultTags.add(DefaultSemanticTags.Property.MOISTURE);
+        defaultTags.add(DefaultSemanticTags.Property.MOTION);
         defaultTags.add(DefaultSemanticTags.Property.NOISE);
         defaultTags.add(DefaultSemanticTags.Property.OIL);
-        defaultTags.add(DefaultSemanticTags.Property.ON_OFF);
-        defaultTags.add(DefaultSemanticTags.Property.OPEN_CLOSED);
         defaultTags.add(DefaultSemanticTags.Property.OPENING);
+        defaultTags.add(DefaultSemanticTags.Property.OPEN_LEVEL);
+        defaultTags.add(DefaultSemanticTags.Property.OPEN_STATE);
+        defaultTags.add(DefaultSemanticTags.Property.POSITION);
+        defaultTags.add(DefaultSemanticTags.Property.GEO_LOCATION);
         defaultTags.add(DefaultSemanticTags.Property.POWER);
         defaultTags.add(DefaultSemanticTags.Property.PRESENCE);
         defaultTags.add(DefaultSemanticTags.Property.PRESSURE);
@@ -128,6 +131,7 @@ public DefaultSemanticTagProvider() {
         defaultTags.add(DefaultSemanticTags.Property.SMOKE);
         defaultTags.add(DefaultSemanticTags.Property.SOUND_VOLUME);
         defaultTags.add(DefaultSemanticTags.Property.SPEED);
+        defaultTags.add(DefaultSemanticTags.Property.TAMPERED);
         defaultTags.add(DefaultSemanticTags.Property.TEMPERATURE);
         defaultTags.add(DefaultSemanticTags.Property.TILT);
         defaultTags.add(DefaultSemanticTags.Property.TIMESTAMP);
@@ -137,15 +141,18 @@ public DefaultSemanticTagProvider() {
         defaultTags.add(DefaultSemanticTags.Property.VOLTAGE);
         defaultTags.add(DefaultSemanticTags.Property.WATER);
         defaultTags.add(DefaultSemanticTags.Property.WIND);
+        defaultTags.add(DefaultSemanticTags.Equipment.ALARM_DEVICE);
         defaultTags.add(DefaultSemanticTags.Equipment.ALARM_SYSTEM);
         defaultTags.add(DefaultSemanticTags.Equipment.AUDIO_VISUAL);
+        defaultTags.add(DefaultSemanticTags.Equipment.DISPLAY);
+        defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR);
+        defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION);
         defaultTags.add(DefaultSemanticTags.Equipment.MEDIA_PLAYER);
         defaultTags.add(DefaultSemanticTags.Equipment.RECEIVER);
         defaultTags.add(DefaultSemanticTags.Equipment.SCREEN);
-        defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION);
+        defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER);
         defaultTags.add(DefaultSemanticTags.Equipment.BATTERY);
         defaultTags.add(DefaultSemanticTags.Equipment.BED);
-        defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
         defaultTags.add(DefaultSemanticTags.Equipment.CAMERA);
         defaultTags.add(DefaultSemanticTags.Equipment.CLEANING_ROBOT);
         defaultTags.add(DefaultSemanticTags.Equipment.COMPUTER);
@@ -225,31 +232,33 @@ public DefaultSemanticTagProvider() {
         defaultTags.add(DefaultSemanticTags.Equipment.WIND_GENERATOR);
         defaultTags.add(DefaultSemanticTags.Equipment.PRINTER);
         defaultTags.add(DefaultSemanticTags.Equipment.PRINTER3D);
-        defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR);
         defaultTags.add(DefaultSemanticTags.Equipment.PUMP);
         defaultTags.add(DefaultSemanticTags.Equipment.WATER_FEATURE);
         defaultTags.add(DefaultSemanticTags.Equipment.REMOTE_CONTROL);
         defaultTags.add(DefaultSemanticTags.Equipment.SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.AIR_QUALITY_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.CO2_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.CO_SENSOR);
+        defaultTags.add(DefaultSemanticTags.Equipment.CONTACT_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.ELECTRIC_METER);
+        defaultTags.add(DefaultSemanticTags.Equipment.FIRE_DETECTOR);
+        defaultTags.add(DefaultSemanticTags.Equipment.FLAME_DETECTOR);
+        defaultTags.add(DefaultSemanticTags.Equipment.HEAT_DETECTOR);
+        defaultTags.add(DefaultSemanticTags.Equipment.SMOKE_DETECTOR);
         defaultTags.add(DefaultSemanticTags.Equipment.GAS_METER);
         defaultTags.add(DefaultSemanticTags.Equipment.GLASS_BREAK_DETECTOR);
-        defaultTags.add(DefaultSemanticTags.Equipment.HEAT_DETECTOR);
         defaultTags.add(DefaultSemanticTags.Equipment.HUMIDITY_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.ILLUMINANCE_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.LEAK_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.OCCUPANCY_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.MOTION_DETECTOR);
-        defaultTags.add(DefaultSemanticTags.Equipment.SMOKE_DETECTOR);
         defaultTags.add(DefaultSemanticTags.Equipment.TEMPERATURE_SENSOR);
+        defaultTags.add(DefaultSemanticTags.Equipment.VIBRATION_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.WATER_METER);
         defaultTags.add(DefaultSemanticTags.Equipment.WATER_QUALITY_SENSOR);
         defaultTags.add(DefaultSemanticTags.Equipment.WEATHER_STATION);
         defaultTags.add(DefaultSemanticTags.Equipment.SIREN);
         defaultTags.add(DefaultSemanticTags.Equipment.SMARTPHONE);
-        defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER);
         defaultTags.add(DefaultSemanticTags.Equipment.TOOL);
         defaultTags.add(DefaultSemanticTags.Equipment.TRACKER);
         defaultTags.add(DefaultSemanticTags.Equipment.VALVE);
@@ -284,6 +293,7 @@ public DefaultSemanticTagProvider() {
         defaultTags.add(DefaultSemanticTags.Equipment.WASHING_MACHINE);
         defaultTags.add(DefaultSemanticTags.Equipment.WINDOW);
         defaultTags.add(DefaultSemanticTags.Equipment.WINDOW_COVERING);
+        defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
         defaultTags.add(DefaultSemanticTags.Equipment.DRAPES);
     }