meteocat 3.0.0 → 3.2.0

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,8 +6,14 @@ labels: bug
 assignees: ""
 ---
 
-**IMPORTANT: Please search the issues (including closed ones) *and* check the [Wiki - Troubleshooting](https://github.com/figorr/meteocat/wiki/Troubleshooting) page before opening a new issue. 
-The template is mandatory; failure to use it will result in issue closure.**
+⚠️ **IMPORTANT:**  
+- This template is **only** for reporting bugs, errors, or malfunctions.  
+- Do **not** use it for improvements → use the ♻️ Improvement request template.  
+- Do **not** use it for new features or new API data → use the 🆕 New function template.  
+
+❌ The template is mandatory; failure to follow it will result in the issue being **closed without assistance**.
+
+Before opening a bug report, please search existing issues (including closed ones) and check the [Wiki - Troubleshooting](https://github.com/figorr/meteocat/wiki/Troubleshooting) page.
 
 ---
 

package/.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,8 @@
 blank_issues_enabled: false
+contact_links:
+  - name: 📖 Wiki - Troubleshooting
+    url: https://github.com/figorr/meteocat/wiki/Troubleshooting
+    about: Please check the Wiki before opening an issue.
+  - name: 💬 Discussions
+    url: https://github.com/figorr/meteocat/discussions
+    about: Ask questions, share ideas, or get help from the community.

package/.github/ISSUE_TEMPLATE/improvement.md

@@ -0,0 +1,39 @@
+---
+name: "♻️ Improvement request"
+about: Suggest an improvement or change to the current behavior of the integration
+title: "[Improvement] "
+labels: enhancement
+assignees: ""
+---
+
+⚠️ **NOTE:** This template is for improvements or changes to the **current behavior of the integration**.  
+
+- It is **not** for bugs, errors, or malfunctions → use the 🐞 Bug report template.  
+- It is **not** for requesting new features or new API data → use the 🆕 New function template.  
+
+❌ Any request that does not follow these rules (e.g. bug reports or feature requests submitted here) will be **closed without assistance**.
+
+---
+
+### Current behavior
+<!-- Describe the current behavior of the integration. -->
+
+### Expected behavior
+<!-- Describe what you would expect instead. -->
+
+### Suggested solution
+<!-- If you have an idea of how it could be improved, describe it here. -->
+
+### Alternatives considered
+<!-- Mention other approaches you thought about. -->
+
+### Additional context
+<!-- Add any other context, screenshots, or examples related to your request. -->
+
+---
+
+### Checklist
+- [ ] I have searched existing issues (including closed ones).
+- [ ] I have checked the [Wiki](https://github.com/figorr/meteocat/wiki).
+- [ ] **I confirm this is not a bug or malfunction, but a request for improvement.**
+- [ ] This request is not a duplicate.

package/.github/ISSUE_TEMPLATE/new_function.md

@@ -0,0 +1,41 @@
+---
+name: "🆕 New function (API-based)"
+about: Suggest a new function that uses data available from the Meteocat API
+title: "[Function] "
+labels: enhancement
+assignees: ""
+---
+
+**IMPORTANT: Please check that the data you are requesting is available in the [Meteocat API Reference](https://apidocs.meteocat.gencat.cat/documentacio/).** 
+
+⚠️ **NOTE:** This template is for new functions or new API data for the **integration**.  
+
+- It is **not** for bugs, errors, or malfunctions → use the 🐞 Bug report template.  
+- It is **not** for requesting improvements or changes to the current behavior of the integration → use the ♻️ Improvement request template.  
+
+❌ Any request that does not follow these rules (e.g. bug reports or improvements requests submitted here) will be **closed without assistance**.
+
+⚠️ **Note on API limits:** Each additional call to retrieve new or extra resources may cause the monthly API quota to be exhausted earlier than expected.  
+Keep in mind that the available limits are relatively low, especially with the basic plan.
+
+---
+
+### Describe the function
+<!-- Clear and concise description of the new function you want to add. -->
+
+### API endpoint / resource
+<!-- Indicate which API endpoint/resource provides this data. -->
+
+### Why is it useful?
+<!-- Explain the value of this function for Home Assistant users. -->
+
+### Additional context
+<!-- Add any other context, screenshots, or examples related to your request. -->
+
+---
+
+### Checklist
+- [ ] I have searched existing issues (including closed ones).
+- [ ] I have checked the [Wiki](https://github.com/figorr/meteocat/wiki).
+- [ ] **I have verified that the requested data is available in the [Meteocat API Reference](https://apidocs.meteocat.gencat.cat/documentacio/).**
+- [ ] This request is not a duplicate.

package/.github/labels.yml

@@ -0,0 +1,63 @@
+- name: breaking-change
+  color: d73a4a
+  description: Indicates a breaking change affecting upgrade or usage.
+
+- name: bug
+  color: d73a4a
+  description: Something isn't working.
+
+- name: documentation
+  color: 0075ca
+  description: Improvements or additions to documentation.
+
+- name: duplicate
+  color: cfd3d7
+  description: This issue or pull request already exists.
+
+- name: enhancement
+  color: a2eeef
+  description: New feature or request.
+
+- name: first read
+  color: 0052cc
+  description: Mandatory reading before opening issues.
+
+- name: good first issue
+  color: 7057ff
+  description: Good for newcomers.
+
+- name: help wanted
+  color: 008672
+  description: Extra attention is needed.
+
+- name: invalid
+  color: e4e669
+  description: This doesn't seem right.
+
+- name: logs required
+  color: b60205
+  description: Logs are required.
+
+- name: merged
+  color: b337b8
+  description: Solution merged.
+
+- name: question
+  color: d876e3
+  description: Further information is requested.
+
+- name: solved
+  color: 0e8a16
+  description: Solved issue.
+
+- name: stale
+  color: ededed
+  description: Marked as stale due to inactivity.
+
+- name: wiki
+  color: fbca04
+  description: Documented at Wiki.
+
+- name: wontfix
+  color: ffffff
+  description: This will not be worked on.

package/.github/workflows/autocloser.yaml

@@ -3,23 +3,25 @@ name: Autocloser
 on:
   issues:
     types: [opened, edited, reopened]
-  issue_comment:
-    types: [created]
 
 jobs:
   autoclose:
     runs-on: ubuntu-latest
     steps:
-      - name: Autoclose issues that did not follow issue template
+      - name: Autoclose issues that did not follow any template
         uses: roots/issue-closer@v1.1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-close-message: >
-            👋 @${{ github.event.issue.user.login }} this issue was automatically closed because it did not follow the 
-            [issue template](https://github.com/figorr/meteocat/issues/new/choose).  
+            👋 @${{ github.event.issue.user.login }} this issue was automatically closed because it did not follow any of the required templates.
 
-            ⚠️ Reminder:  
-            **IMPORTANT: Please search the issues, including closed issues before opening a new issue.  
-            The template is mandatory; failure to use it will result in issue closure.**
+            ⚠️ Reminder:
+            - Use the [🐞 Bug report template](https://github.com/figorr/meteocat/issues/new?template=bug_report.md) for errors or malfunctions.  
+            - Use the [♻️ Improvement request template](https://github.com/figorr/meteocat/issues/new?template=improvement.md) for changes to current behavior.  
+            - Use the [🆕 New function template](https://github.com/figorr/meteocat/issues/new?template=new_function.md) for API-based new features.  
+
+            The template is mandatory; failure to use it will result in issue closure.
           issue-pattern: >
-            (Describe the bug|To Reproduce|Expected behavior|System details|Debug Logs)
+            (### Describe the bug|### To Reproduce|### Expected behavior|### System details|### Debug Logs|
+            I confirm this is not a bug or malfunction, but a request for improvement|
+            I have verified that the requested data is available)

package/.github/workflows/close-on-label.yml

@@ -0,0 +1,48 @@
+name: Close on labels
+
+on:
+  issues:
+    types:
+      - labeled
+
+jobs:
+  close-and-comment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Filter relevant labels
+        if: ${{ contains('wiki,solved,merged,duplicate', github.event.label.name) }}
+        id: check
+        run: echo "label=${{ github.event.label.name }}" >> $GITHUB_OUTPUT
+
+      - name: Determine message based on label
+        if: ${{ steps.check.outputs.label }}
+        id: message
+        run: |
+          case "${{ github.event.label.name }}" in
+            wiki)
+              echo "message=👋 This issue is covered in the [Meteocat Wiki](https://github.com/figorr/meteocat/wiki). Please check the documentation there for guidance." >> $GITHUB_OUTPUT
+              ;;
+            solved)
+              echo "message=✅ This issue has been solved. Closing now." >> $GITHUB_OUTPUT
+              ;;
+            merged)
+              echo "message=🔀 This issue has been merged manually. 'Merged manually in master [commit_hash]'." >> $GITHUB_OUTPUT
+              ;;
+            duplicate)
+            echo "message=📄 This issue is marked as a duplicate. 'Closed as duplicate of #<issue_number>'." >> $GITHUB_OUTPUT
+            ;;
+          esac
+
+      - name: Add comment
+        if: ${{ steps.check.outputs.label }}
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: ${{ steps.message.outputs.message }}
+
+      - name: Close issue if open
+        if: ${{ github.event.issue.state == 'open' && steps.check.outputs.label }}
+        uses: peter-evans/close-issue@v2
+        with:
+          issue-number: ${{ github.event.issue.number }}

package/.github/workflows/force-sync-labels.yml

@@ -0,0 +1,18 @@
+name: Force sync labels
+
+on:
+  workflow_dispatch:   # solo se ejecuta manualmente
+
+jobs:
+  labels:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Force sync GitHub labels
+        uses: crazy-max/ghaction-github-labeler@v5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          yaml-file: .github/labels.yml
+          skip-delete: false  # elimina labels que no estén en el YAML
+          dry-run: false      # aplica cambios realmente

package/.github/workflows/sync-gitlab.yml

@@ -33,10 +33,21 @@ jobs:
       # Paso 4: Comprobar divergencias en master
       - name: Check for diverging commits
         run: |
-          git fetch gitlab master
-          if ! git merge-base --is-ancestor gitlab/master master; then
-            echo "❌ GitLab master tiene commits que GitHub no tiene. Revisar antes de sincronizar."
-            exit 1
+          # Trae todas las ramas del remoto GitLab y crea referencias locales
+          git fetch gitlab +refs/heads/*:refs/remotes/gitlab/*
+      
+          # Comprueba que la rama gitlab/master exista
+          if git show-ref --verify --quiet refs/remotes/gitlab/master; then
+              # Comprueba si GitLab master tiene commits que GitHub no tiene
+              if ! git merge-base --is-ancestor gitlab/master master; then
+                  echo "❌ GitLab master tiene commits que GitHub no tiene. Revisar antes de sincronizar."
+                  exit 1
+              else
+                  echo "GitLab master está alineado con GitHub master ✅"
+              fi
+          else
+              echo "❌ La rama gitlab/master no se pudo encontrar localmente. Abortando."
+              exit 1
           fi
 
       # Paso 5: Push de commits y tags a GitLab

package/.github/workflows/sync-labels.yml

@@ -0,0 +1,21 @@
+name: Sync labels
+
+on:
+  push:
+    paths:
+      - .github/labels.yml
+  workflow_dispatch:
+
+jobs:
+  labels:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Sync GitHub labels (safe)
+        uses: crazy-max/ghaction-github-labeler@v5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          yaml-file: .github/labels.yml
+          skip-delete: true   # no elimina labels que no estén en el YAML
+          dry-run: false      # aplica cambios realmente

package/CHANGELOG.md

@@ -1,23 +1,92 @@
-# [3.0.0](https://github.com/figorr/meteocat/compare/v2.3.0...v3.0.0) (2025-09-14)
+# [3.2.0](https://github.com/figorr/meteocat/compare/v3.1.0...v3.2.0) (2025-11-07)
+
+
+### Bug Fixes
+
+* add validation date for moon coordinator ([8644f56](https://github.com/figorr/meteocat/commit/8644f56d8f8b6b607ba8809499afbfb81eb70b28))
+* adjust moon update interval ([ea51d90](https://github.com/figorr/meteocat/commit/ea51d905a232ab947607333ea4abaf449cd2e786))
+* fix friendly time translation ([9081a34](https://github.com/figorr/meteocat/commit/9081a343fd1562cb001f8a4b69948be3e26cbe00))
+* fix reset data moon file coordinator ([f3cf22f](https://github.com/figorr/meteocat/commit/f3cf22f1fb1d1a19d6ee9fefd2be304850be1180))
+* more accurate moon calculation ([dcee6e0](https://github.com/figorr/meteocat/commit/dcee6e0040d1cf77860fc7cbd06a5518145d3a72))
 
 
 ### Features
 
-* change unique_id to use town_id ([3a048ce](https://github.com/figorr/meteocat/commit/3a048ce48a0e1f3ee7642c28bbe7ac6e6e3fc298))
+* add new moon day data ([77edf68](https://github.com/figorr/meteocat/commit/77edf681af037f00748b2b3cf2d281655d225718))
+* add new moon day data ([d2be96e](https://github.com/figorr/meteocat/commit/d2be96ec7f4f9d48c1f018ba2c642f29558d05fe))
+* add translations for lunation attribute ([10e3409](https://github.com/figorr/meteocat/commit/10e3409f82fa6530f0edf81c5e8406d019aeeaf1))
+* bump solarmoonpy to v1.0.0 ([65c2a04](https://github.com/figorr/meteocat/commit/65c2a0495250bac284c060b575256f95f4fb0be0))
+* bump solarmoonpy to v1.0.1 ([aa86747](https://github.com/figorr/meteocat/commit/aa86747ed41d69a80ac009b75b596746762548fe))
+* bump solarmoonpy to v1.0.3 ([246bd83](https://github.com/figorr/meteocat/commit/246bd835589978940efc11722b79e420f838ecab))
+* include latitude, longitude and altitude as new required variables ([5ef864c](https://github.com/figorr/meteocat/commit/5ef864ca38fa17ed05b36a19a96b8c7182f66be7))
+* new latitude, longitude and altitude update options setup ([1aeb968](https://github.com/figorr/meteocat/commit/1aeb9682c8e65b3cb0b29a7b7467edcc455304c9))
+* new lunation attribute for moon and moon phase name code ([60c7129](https://github.com/figorr/meteocat/commit/60c7129757916908baf26439819458ea3a173ad4))
+* new lunation attribute for moon sensor ([9bb32ff](https://github.com/figorr/meteocat/commit/9bb32ff03bd7eba291a1ee1aa578e2838dcf9bd5))
+* new lunation data and moon phase name rework ([0616401](https://github.com/figorr/meteocat/commit/0616401243334c21736d0877e5e50e435279e002))
+* new moon day attribute ([86ec6e3](https://github.com/figorr/meteocat/commit/86ec6e311fc098174027f17d3502e8be740d7e86))
+* new moon sensors ([7c7c1d3](https://github.com/figorr/meteocat/commit/7c7c1d38393a40fd2e69eeba2c24bb185ae349ef))
+* new solarmoonpy requirement for sun and moon events calculation ([1d25a62](https://github.com/figorr/meteocat/commit/1d25a6252cf568e1242f654c389aeada2b5d73f6))
+* new sun and moon coordinators ([af2290e](https://github.com/figorr/meteocat/commit/af2290e7384a9ad5416afdf4d6767ad69099813c))
+* new sun and moon files ([b489d7a](https://github.com/figorr/meteocat/commit/b489d7a9abc5af747fc50a2e0d7b0d661408b824))
+* new sun and moon sensors ([91265f3](https://github.com/figorr/meteocat/commit/91265f3c6cbd512b3706c29d466f9bb01df6d45e))
+* translation for new moon day attribute ([162859e](https://github.com/figorr/meteocat/commit/162859e2822374b81835cb1af07325dceaf5a55e))
+* translations for the new moon and sun sensors ([91a33b6](https://github.com/figorr/meteocat/commit/91a33b6b52e34ed69eed4eb5fbfaf9dffd20df57))
+
+# [3.1.0](https://github.com/figorr/meteocat/compare/v3.0.0...v3.1.0) (2025-09-27)
+
+
+### Bug Fixes
+
+* fix unknown threshold translation ([6fa7964](https://github.com/figorr/meteocat/commit/6fa79644e3ebbdf9a44826f6071af6009cd2d02d))
+* include Meteocat Card ([513d9ed](https://github.com/figorr/meteocat/commit/513d9ed50fcd9127ac64f0388ed1017db938f378))
+
+
+### Features
+
+* ✨ Add native sunrise and sunset sensors to Meteocat integration ([7bb70c6](https://github.com/figorr/meteocat/commit/7bb70c681c90773275e496f938f455c3688fb4c0))
 
+## [3.0.0](https://github.com/figorr/meteocat/compare/v2.3.0...v3.0.0) (2025-09-14)
 
-### BREAKING CHANGES
 
-* Entities now use town_id instead of region_id in their unique_id.
-This change enables multiple integration entries that share the same region_id but different towns.
+### ⚠️ BREAKING CHANGES
+
+* Version **3.0.0 and later** introduces a **breaking change** in how entities are identified.
+
+## ⚠️ What this affects
+- This affects any update **from a version prior to 3.0.0** to **any version 3.x or later**. 
+- Entities now use **`town_id`** instead of `region_id` in their `unique_id`.  
+- This change allows multiple integration entries that share the same `region_id` but different towns.  
+
+### ✅ Recommended upgrade procedure
+To avoid issues with duplicated or unavailable entities:
+
+1. **Uninstall** the existing integration (v2.x).  
+2. **Restart** Home Assistant.  
+3. **Install v3.0.0 or later** and configure the integration again.  
+
+### 🚨 If you update directly
+If you update without uninstalling first:
+
+- Old entities will remain as **Unavailable**.  
+- New entities will be created (sometimes with a suffix like `2`).  
+- You may need to manually **remove old entities** and update your automations, dashboards, or scripts to point to the new entities.
+
+### 📑 Additional notes
+
+- This change affects all entity types, including **sensors, diagnostic sensors, and alerts**.  
+- Always backup your **Home Assistant configuration** before performing major upgrades.
+
+ℹ️ More details:  
+- [README – Breaking changes](https://github.com/figorr/meteocat#-breaking-changes---upgrade-to-3x)  
+- [Wiki – Breaking changes](https://github.com/figorr/meteocat/wiki/Breaking-Changes)
+
+### Features
+
+* change unique_id to use town_id ([3a048ce](https://github.com/figorr/meteocat/commit/3a048ce48a0e1f3ee7642c28bbe7ac6e6e3fc298))
 
-Recommended upgrade path:
-1. Uninstall the existing integration (v2.x).
-2. Restart Home Assistant.
-3. Install v3.0.0 and reconfigure the integration.
+### Contributors:  
+- [mcasellas](https://github.com/mcasellas) – contributed [c505f27](https://github.com/figorr/meteocat/commit/c505f27) - Improve Catalan translations
 
-If you update directly without uninstalling first, old entities will remain as 'unavailable' and new entities will be created (possibly with a suffix like '2').
-In that case, you may need to manually remove the old entities and update your automations or dashboards.
 
 ## [2.3.0](https://github.com/figorr/meteocat/compare/v2.2.7...v2.3.0) (2025-09-10)
 

package/README.md

@@ -26,7 +26,7 @@ This is a personal project.
 - [Figorr](https://github.com/figorr)
 
 **Contributors:**  
-- [mcasellas](https://github.com/mcasellas) – contributed [c505f27](https://github.com/figorr/meteocat/commit/c505f27)
+- [mcasellas](https://github.com/mcasellas) – contributed [c505f27](https://github.com/figorr/meteocat/commit/c505f27) - Improve Catalan translations
 
 ## ⚠️ Breaking changes - Upgrade to 3.0.0 or later coming from prior versions
 
@@ -40,7 +40,8 @@ Version **3.0.0 and later** introduces a **breaking change** in how entities are
 ### ✅ Recommended upgrade procedure
 To avoid issues with duplicated or unavailable entities:
 
-1. **Uninstall** the existing integration (v2.x).  
+1. **Uninstall** the existing integration (v2.x).<br>
+  🔗 See [Uninstallation Guide](https://github.com/figorr/meteocat/wiki/Uninstallation) for the proper way of removing prior versions.  
 2. **Restart** Home Assistant.  
 3. **Install v3.0.0 or later** and configure the integration again.  
 
@@ -134,6 +135,9 @@ You will see three available options:
   If for any reason some files in the `assets` folder (`towns.json`, `stations.json`, `variables.json`, `symbols.json`, or `stations_<town_id>.json`) are missing or outdated, you can regenerate them directly from the options menu.  
   > ℹ️ If the Meteocat API is not available at that moment, the integration will still start, and you can retry regeneration later.
 
+- **Update coordinates and elevation**  
+  Change the default station coordinates and elevation that were set during the first setup. So you can use your location coordinates and elevation for more accurate sun and moon data.
+
 ### Accessing the Options Menu
 
 You can access the Options Menu in two ways, both inside the integration:
@@ -146,9 +150,9 @@ You can access the Options Menu in two ways, both inside the integration:
 
   ![System Options menu](images/system_options.png)
 
-Once inside, you will see the following options:  
+  Once you are inside, you will see the following options:  
 
-![Available Options](images/options.png)
+  ![Available Options](images/options.png)
 
 
 ## Uninstallation
@@ -161,6 +165,14 @@ To correctly uninstall the integration:
 
 👉 For detailed steps with screenshots, check the [Uninstallation Guide](https://github.com/figorr/meteocat/wiki/Uninstallation).
 
+## Custom Meteocat Card available
+
+Meteocat integration has its own weather card.
+
+To install the card, please follow the instructions from its own repository, [🎫 Meteocat Card](https://github.com/figorr/meteocat-card).
+
+![Meteocat Card](images/daily_forecast_no_alerts.png)
+
 # Documentation
 
 For more detailed information about:

package/custom_components/meteocat/__init__.py

@@ -5,6 +5,7 @@ import voluptuous as vol
 from pathlib import Path
 import aiofiles
 import json
+import importlib  # Para importaciones lazy
 
 from homeassistant import core
 from homeassistant.config_entries import ConfigEntry
@@ -14,24 +15,6 @@ from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers import config_validation as cv
 
 from .helpers import get_storage_dir
-from .coordinator import (
-    MeteocatSensorCoordinator,
-    MeteocatStaticSensorCoordinator,
-    MeteocatEntityCoordinator,
-    MeteocatUviCoordinator,
-    MeteocatUviFileCoordinator,
-    HourlyForecastCoordinator,
-    DailyForecastCoordinator,
-    MeteocatConditionCoordinator,
-    MeteocatTempForecastCoordinator,
-    MeteocatAlertsCoordinator,
-    MeteocatAlertsRegionCoordinator,
-    MeteocatQuotesCoordinator,
-    MeteocatQuotesFileCoordinator,
-    MeteocatLightningCoordinator,
-    MeteocatLightningFileCoordinator,
-)
-
 from meteocatpy.town import MeteocatTown
 from meteocatpy.symbols import MeteocatSymbols
 from meteocatpy.variables import MeteocatVariables
@@ -41,7 +24,7 @@ from .const import DOMAIN, PLATFORMS
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "3.0.0"
+__version__ = "3.2.0"
 
 # Definir el esquema de configuración CONFIG_SCHEMA
 CONFIG_SCHEMA = vol.Schema(
@@ -59,6 +42,9 @@ CONFIG_SCHEMA = vol.Schema(
                 vol.Optional("province_id"): cv.string,
                 vol.Optional("region_name"): cv.string,
                 vol.Optional("region_id"): cv.string,
+                vol.Required("latitude"): cv.latitude,
+                vol.Required("longitude"): cv.longitude,
+                vol.Required("altitude"): vol.Coerce(float),
             }
         )
     },
@@ -119,6 +105,11 @@ async def async_setup(hass: core.HomeAssistant, config: dict) -> bool:
     """Configuración inicial del componente Meteocat."""
     return True
 
+def _get_coordinator_module(cls_name: str):
+    """Importa dinámicamente un coordinador para evitar blocking imports."""
+    module = importlib.import_module(".coordinator", "custom_components.meteocat")
+    return getattr(module, cls_name)
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configura una entrada de configuración para Meteocat."""
     _LOGGER.info("Configurando la integración de Meteocat...")
@@ -129,14 +120,28 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Validar campos requeridos
     required_fields = [
         "api_key", "town_name", "town_id", "variable_name",
-        "variable_id", "station_name", "station_id", "province_name", 
-        "province_id", "region_name", "region_id"
+        "variable_id", "station_name", "station_id", "province_name",
+        "province_id", "region_name", "region_id", "latitude", "longitude", "altitude"
     ]
     missing_fields = [field for field in required_fields if field not in entry_data]
     if missing_fields:
         _LOGGER.error(f"Faltan los siguientes campos en la configuración: {missing_fields}")
         return False
-    
+
+    # Validar coordenadas válidas para Cataluña
+    latitude = entry_data.get("latitude")
+    longitude = entry_data.get("longitude")
+    if not (40.5 <= latitude <= 42.5 and 0.1 <= longitude <= 3.3):  # Rango aproximado para Cataluña
+        _LOGGER.warning(
+            "Coordenadas inválidas (latitude: %s, longitude: %s). Usando coordenadas de Barcelona por defecto para MeteocatSunCoordinator.",
+            latitude, longitude
+        )
+        entry_data = {
+            **entry_data,
+            "latitude": 41.38879,
+            "longitude": 2.15899
+        }
+
     # Crear los assets básicos si faltan
     await ensure_assets_exist(
         hass,
@@ -150,33 +155,41 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         f"Variable '{entry_data['variable_name']}' (ID: {entry_data['variable_id']}), "
         f"Estación '{entry_data['station_name']}' (ID: {entry_data['station_id']}), "
         f"Provincia '{entry_data['province_name']}' (ID: {entry_data['province_id']}), "
-        f"Comarca '{entry_data['region_name']}' (ID: {entry_data['region_id']})."
+        f"Comarca '{entry_data['region_name']}' (ID: {entry_data['region_id']}), "
+        f"Coordenadas: ({entry_data['latitude']}, {entry_data['longitude']})."
+        f"Altitud: ({entry_data['altitude']})."
     )
 
-    # Inicializar coordinadores
-    coordinators = [
-        ("sensor_coordinator", MeteocatSensorCoordinator),
-        ("static_sensor_coordinator", MeteocatStaticSensorCoordinator),
-        ("entity_coordinator", MeteocatEntityCoordinator),
-        ("uvi_coordinator", MeteocatUviCoordinator),
-        ("uvi_file_coordinator", MeteocatUviFileCoordinator),
-        ("hourly_forecast_coordinator", HourlyForecastCoordinator),
-        ("daily_forecast_coordinator", DailyForecastCoordinator),
-        ("condition_coordinator", MeteocatConditionCoordinator),
-        ("temp_forecast_coordinator", MeteocatTempForecastCoordinator),
-        ("alerts_coordinator", MeteocatAlertsCoordinator),
-        ("alerts_region_coordinator", MeteocatAlertsRegionCoordinator),
-        ("quotes_coordinator", MeteocatQuotesCoordinator),
-        ("quotes_file_coordinator", MeteocatQuotesFileCoordinator),
-        ("lightning_coordinator", MeteocatLightningCoordinator),
-        ("lightning_file_coordinator", MeteocatLightningFileCoordinator),
+    # Lista de coordinadores con sus clases
+    coordinator_configs = [
+        ("sensor_coordinator", "MeteocatSensorCoordinator"),
+        ("static_sensor_coordinator", "MeteocatStaticSensorCoordinator"),
+        ("entity_coordinator", "MeteocatEntityCoordinator"),
+        ("uvi_coordinator", "MeteocatUviCoordinator"),
+        ("uvi_file_coordinator", "MeteocatUviFileCoordinator"),
+        ("hourly_forecast_coordinator", "HourlyForecastCoordinator"),
+        ("daily_forecast_coordinator", "DailyForecastCoordinator"),
+        ("condition_coordinator", "MeteocatConditionCoordinator"),
+        ("temp_forecast_coordinator", "MeteocatTempForecastCoordinator"),
+        ("alerts_coordinator", "MeteocatAlertsCoordinator"),
+        ("alerts_region_coordinator", "MeteocatAlertsRegionCoordinator"),
+        ("quotes_coordinator", "MeteocatQuotesCoordinator"),
+        ("quotes_file_coordinator", "MeteocatQuotesFileCoordinator"),
+        ("lightning_coordinator", "MeteocatLightningCoordinator"),
+        ("lightning_file_coordinator", "MeteocatLightningFileCoordinator"),
+        ("sun_coordinator", "MeteocatSunCoordinator"),
+        ("sun_file_coordinator", "MeteocatSunFileCoordinator"),
+        ("moon_coordinator", "MeteocatMoonCoordinator"),
+        ("moon_file_coordinator", "MeteocatMoonFileCoordinator"),
     ]
 
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {}
 
     try:
-        for key, cls in coordinators:
+        for key, cls_name in coordinator_configs:
+            # Importación lazy: importa la clase solo cuando sea necesario
+            cls = await hass.async_add_executor_job(_get_coordinator_module, cls_name)
             coordinator = cls(hass=hass, entry_data=entry_data)
             await coordinator.async_config_entry_first_refresh()
             hass.data[DOMAIN][entry.entry_id][key] = coordinator
@@ -251,6 +264,8 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
                 files_folder / f"uvi_{town_id.lower()}_data.json",
                 files_folder / f"forecast_{town_id.lower()}_hourly_data.json",
                 files_folder / f"forecast_{town_id.lower()}_daily_data.json",
+                files_folder / f"sun_{town_id.lower()}_data.json",
+                files_folder / f"moon_{town_id.lower()}_data.json",
             ])
 
     # 3. Archivos de comarca (region_id)
@@ -280,4 +295,4 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
 
         # Intentar eliminar carpetas vacías
         for folder in [assets_folder, files_folder, base_folder]:
-            safe_remove(folder, is_folder=True)
+            safe_remove(folder, is_folder=True)