meteocat 1.0.1 → 1.1.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.1.0](https://github.com/figorr/meteocat/compare/v1.0.2...v1.1.0) (2025-01-05)
+
+
+### Bug Fixes
+
+* 1.1.0 ([b0e0d9a](https://github.com/figorr/meteocat/commit/b0e0d9a3aa3d2f13bb4eff129311c8c6d4e04304))
+
+
+### Features
+
+* add wind bearing to weather entity ([0d40460](https://github.com/figorr/meteocat/commit/0d40460947466a644a51da3bf3361e89383ccbfe))
+* new wind direction cardinal sensor ([c430c48](https://github.com/figorr/meteocat/commit/c430c48a0621dbd1270a040ef017aff2c6dadc28))
+
+## [1.0.2](https://github.com/figorr/meteocat/compare/v1.0.1...v1.0.2) (2025-01-05)
+
+
+### Bug Fixes
+
+* 1.0.2 ([8ec865b](https://github.com/figorr/meteocat/commit/8ec865b4d09e802bd489bc527dbfa74de5084cb7))
+* include CONFIG_SCHEMA ([8911de2](https://github.com/figorr/meteocat/commit/8911de29c1804c63b79780f0bb057fdf3681eaec))
+
 ## [1.0.1](https://github.com/figorr/meteocat/compare/v1.0.0...v1.0.1) (2025-01-04)
 
 

package/custom_components/meteocat/__init__.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
 import logging
+import voluptuous as vol
 from pathlib import Path
 from homeassistant import core
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import async_get_platforms
+from homeassistant.helpers import config_validation as cv
 
 from .coordinator import (
     MeteocatSensorCoordinator,
@@ -25,7 +27,28 @@ from .const import DOMAIN, PLATFORMS
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "1.0.1"
+__version__ = "1.1.0"
+
+# Definir el esquema de configuración CONFIG_SCHEMA
+CONFIG_SCHEMA = vol.Schema(
+    {
+        DOMAIN: vol.Schema(
+            {
+                vol.Required("api_key"): cv.string,
+                vol.Required("town_name"): cv.string,
+                vol.Required("town_id"): cv.string,
+                vol.Optional("variable_name", default="temperature"): cv.string,
+                vol.Optional("station_name"): cv.string,
+                vol.Optional("station_id"): cv.string,
+                vol.Optional("province_name"): cv.string,
+                vol.Optional("province_id"): cv.string,
+                vol.Optional("region_name"): cv.string,
+                vol.Optional("region_id"): cv.string,
+            }
+        )
+    },
+    extra=vol.ALLOW_EXTRA,
+)
 
 def safe_remove(path: Path, is_folder: bool = False):
     """Elimina de forma segura un archivo o carpeta si existe."""

package/custom_components/meteocat/const.py

@@ -35,6 +35,7 @@ DEFAULT_VALIDITY_MINUTES = 0 # Minutos a partir de los cuales la API tiene la in
 # Códigos de sensores de la API
 WIND_SPEED = "wind_speed"  # Velocidad del viento
 WIND_DIRECTION = "wind_direction"  # Dirección del viento
+WIND_DIRECTION_CARDINAL = "wind_direction_cardinal"  # Dirección del viento en cardinal
 TEMPERATURE = "temperature"  # Temperatura
 HUMIDITY = "humidity"  # Humedad relativa
 PRESSURE = "pressure"  # Presión atmosférica

package/custom_components/meteocat/manifest.json

@@ -9,5 +9,5 @@
     "issue_tracker": "https://github.com/figorr/meteocat/issues",
     "loggers": ["meteocatpy"],
     "requirements": ["meteocatpy==0.0.17", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "1.0.1"
+    "version": "1.1.0"
 }

package/custom_components/meteocat/sensor.py

@@ -36,6 +36,7 @@ from .const import (
     STATION_ID,
     WIND_SPEED,
     WIND_DIRECTION,
+    WIND_DIRECTION_CARDINAL,
     TEMPERATURE,
     HUMIDITY,
     PRESSURE,
@@ -107,6 +108,12 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
         icon="mdi:compass",
         device_class=None,
     ),
+    MeteocatSensorEntityDescription(
+        key=WIND_DIRECTION_CARDINAL,
+        translation_key="wind_direction_cardinal",
+        icon="mdi:compass",
+        device_class=None,
+    ),
     MeteocatSensorEntityDescription(
         key=TEMPERATURE,
         translation_key="temperature",
@@ -290,7 +297,7 @@ async def async_setup_entry(hass, entry, async_add_entities: AddEntitiesCallback
     async_add_entities(
         MeteocatSensor(sensor_coordinator, description, entry_data)
         for description in SENSOR_TYPES
-        if description.key in {WIND_SPEED, WIND_DIRECTION, TEMPERATURE, HUMIDITY, PRESSURE, PRECIPITATION, PRECIPITATION_ACCUMULATED, SOLAR_GLOBAL_IRRADIANCE, MAX_TEMPERATURE, MIN_TEMPERATURE, FEELS_LIKE, WIND_GUST, STATION_TIMESTAMP}  # Incluir sensores generales en el coordinador SENSOR COORDINATOR
+        if description.key in {WIND_SPEED, WIND_DIRECTION, WIND_DIRECTION_CARDINAL, TEMPERATURE, HUMIDITY, PRESSURE, PRECIPITATION, PRECIPITATION_ACCUMULATED, SOLAR_GLOBAL_IRRADIANCE, MAX_TEMPERATURE, MIN_TEMPERATURE, FEELS_LIKE, WIND_GUST, STATION_TIMESTAMP}  # Incluir sensores generales en el coordinador SENSOR COORDINATOR
     )
 
     # Sensores estáticos
@@ -657,12 +664,29 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
                         latest_reading = lectures[-1]
                         value = latest_reading.get("valor")
 
-                        # Convertimos grados a dirección cardinal para WIND_DIRECTION
-                        if self.entity_description.key == WIND_DIRECTION and isinstance(value, (int, float)):
-                            return self._convert_degrees_to_cardinal(value)
-
                         return value
                     
+        # Para el sensor WIND_DIRECTION_CARDINAL, convertir grados a dirección cardinal
+        if self.entity_description.key == WIND_DIRECTION_CARDINAL:
+            stations = self.coordinator.data or []
+            for station in stations:
+                variables = station.get("variables", [])
+
+                # Filtramos por código
+                variable_data = next(
+                    (var for var in variables if var.get("codi") == WIND_DIRECTION_CODE),
+                    None,
+                )
+
+                if variable_data:
+                    # Obtenemos la última lectura
+                    lectures = variable_data.get("lectures", [])
+                    if lectures:
+                        latest_reading = lectures[-1]
+                        value = latest_reading.get("valor")
+
+                        return self._convert_degrees_to_cardinal(value)
+                    
         # Lógica específica para el sensor de timestamp
         if self.entity_description.key == STATION_TIMESTAMP:
             stations = self.coordinator.data or []
@@ -711,7 +735,7 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
             return total_precipitation
         
         return None
-        
+    
     @staticmethod
     def _convert_degrees_to_cardinal(degree: float) -> str:
         """Convert degrees to cardinal direction."""
@@ -720,45 +744,10 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
 
         directions = [
         "north", "north_northeast", "northeast", "east_northeast", "east", "east_southeast", "southeast", "south_southeast",
-        "south", "south_southwest", "southwest", "west_southwest", "west", "west_northwest", "northwest", "north_northwest", "north",
+        "south", "south_southwest", "southwest", "west_southwest", "west", "west_northwest", "northwest", "north_northwest"
         ]
         index = round(degree / 22.5) % 16
         return directions[index]
-    
-    @property
-    def extra_state_attributes(self):
-        """Return additional attributes of the sensor."""
-        attributes = super().extra_state_attributes or {}
-
-        # Agregar grados como atributo solo para WIND_DIRECTION
-        if self.entity_description.key == WIND_DIRECTION:
-            # Obtener el código del sensor desde CODE_MAPPING
-            sensor_code = self.CODE_MAPPING.get(self.entity_description.key)
-
-            if sensor_code is not None:
-                # Acceder a los datos de la estación desde el coordinator
-                stations = self.coordinator.data or []
-                degrees_value = None
-
-                for station in stations:
-                    variables = station.get("variables", [])
-                    # Buscar la variable correspondiente al código
-                    variable_data = next(
-                        (var for var in variables if var.get("codi") == sensor_code),
-                        None,
-                    )
-                    if variable_data:
-                        # Obtener la última lectura de grados
-                        lectures = variable_data.get("lectures", [])
-                        if lectures:
-                            degrees_value = lectures[-1].get("valor")
-                            break
-
-                # Asignar el valor al atributo
-                if degrees_value is not None:
-                    attributes["degrees"] = degrees_value
-
-        return attributes
 
     @property
     def device_info(self) -> DeviceInfo:

package/custom_components/meteocat/strings.json

@@ -29,7 +29,10 @@
         "name": "Wind Speed"
       },
       "wind_direction": {
-        "name": "Wind Direction",
+        "name": "Wind Direction"
+      },
+      "wind_direction_cardinal": {
+        "name": "Wind Direction Cardinal",
         "state": {
           "north": "N",
           "north_northeast": "NNE",
@@ -48,11 +51,6 @@
           "northwest": "NW",
           "north_northwest": "NNW",
           "unknown": "Unknown"
-        },
-        "state_attributes": {
-          "degrees": {
-            "name": "Degrees"
-          }
         }
       },
       "temperature": {

package/custom_components/meteocat/translations/ca.json

@@ -29,7 +29,10 @@
         "name": "Vent Velocitat"
       },
       "wind_direction": {
-        "name": "Vent Direcció",
+        "name": "Vent Direcció"
+      },
+      "wind_direction_cardinal": {
+        "name": "Vent Direcció Cardinal",
         "state": {
           "north": "N",
           "north_northeast": "NNE",
@@ -48,11 +51,6 @@
           "northwest": "NO",
           "north_northwest": "NNO",
           "unknown": "Desconegut"
-        },
-        "state_attributes": {
-          "degrees": {
-            "name": "Graus"
-          }
         }
       },
       "temperature": {

package/custom_components/meteocat/translations/en.json

@@ -29,7 +29,10 @@
         "name": "Wind Speed"
       },
       "wind_direction": {
-        "name": "Wind Direction",
+        "name": "Wind Direction"
+      },
+      "wind_direction_cardinal": {
+        "name": "Wind Direction Cardinal",
         "state": {
           "north": "N",
           "north_northeast": "NNE",
@@ -48,11 +51,6 @@
           "northwest": "NW",
           "north_northwest": "NNW",
           "unknown": "Unknown"
-        },
-        "state_attributes": {
-          "degrees": {
-            "name": "Degrees"
-          }
         }
       },
       "temperature": {

package/custom_components/meteocat/translations/es.json

@@ -29,7 +29,10 @@
         "name": "Viento Velocidad"
       },
       "wind_direction": {
-        "name": "Viento Dirección",
+        "name": "Viento Dirección"
+      },
+      "wind_direction_cardinal": {
+        "name": "Viento Dirección Cardinal",
         "state": {
           "north": "N",
           "north_northeast": "NNE",
@@ -48,11 +51,6 @@
           "northwest": "NO",
           "north_northwest": "NNO",
           "unknown": "Desconocido"
-        },
-        "state_attributes": {
-          "degrees": {
-            "name": "Grados"
-          }
         }
       },
       "temperature": {

package/custom_components/meteocat/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "1.0.1"
+__version__ = "1.1.0"

package/custom_components/meteocat/weather.py

@@ -153,6 +153,10 @@ class MeteocatWeatherEntity(CoordinatorEntity, WeatherEntity):
     @property
     def native_wind_gust_speed(self) -> Optional[float]:
         return self._get_latest_sensor_value(WIND_GUST_CODE)
+    
+    @property
+    def wind_bearing(self) -> Optional[float]:
+        return self._get_latest_sensor_value(WIND_DIRECTION_CODE)
 
     @property
     def uv_index(self) -> Optional[float]:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocat",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)\r [![Python version compatibility](https://img.shields.io/pypi/pyversions/meteocat)](https://pypi.org/project/meteocat)\r [![pipeline status](https://gitlab.com/figorr/meteocat/badges/master/pipeline.svg)](https://gitlab.com/figorr/meteocat/commits/master)",
   "main": "index.js",
   "directories": {

package/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meteocat"
-version = "1.0.1"
+version = "1.1.0"
 description = "Script para obtener datos meteorológicos de la API de Meteocat"
 authors = ["figorr <jdcuartero@yahoo.es>"]
 license = "Apache-2.0"