From b46962aea001e06eaaa2a1b65c8ab9224ad2f1e8 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Thu, 6 Mar 2025 12:56:43 +0100
Subject: [PATCH] Forecast: add common parameter set (#19474)

---
 .../definition/tariff/forecast-solar.yaml     | 28 +--------------
 templates/definition/tariff/open-meteo.yaml   | 32 +----------------
 util/templates/defaults.yaml                  | 34 +++++++++++++++++++
 3 files changed, 36 insertions(+), 58 deletions(-)

diff --git a/templates/definition/tariff/forecast-solar.yaml b/templates/definition/tariff/forecast-solar.yaml
index 27bfb2ad9..4a33c1254 100644
--- a/templates/definition/tariff/forecast-solar.yaml
+++ b/templates/definition/tariff/forecast-solar.yaml
@@ -8,27 +8,7 @@ requirements:
   evcc: ["skiptest"]
 group: solar
 params:
-  - name: lat
-    description:
-      en: Latitude
-      de: Breitengrad
-    example: "55.7351"
-    required: true
-  - name: lon
-    description:
-      en: Longitude
-      de: Längengrad
-    example: "9.1275"
-    required: true
-  - name: dec
-    description:
-      en: Decline
-      de: Neigung
-    help:
-      en: 0 = horizontal, 90 = vertical
-      de: 0 = horizontal, 90 = vertikal
-    example: 25
-    required: true
+  - preset: forecast-base
   - name: az
     description:
       en: Azimuth
@@ -38,12 +18,6 @@ params:
       de: -180 = Norden, -90 = Osten, 0 = Süden, 90 = Westen, 180 = Norden
     example: 180
     required: true
-  - name: kwp
-    description:
-      en: Maximum generator power [kWp]
-      de: Maximale Generatorleistung [kWp]
-    example: 9.8
-    required: true
   - name: horizon
     description:
       en: Horizon
diff --git a/templates/definition/tariff/open-meteo.yaml b/templates/definition/tariff/open-meteo.yaml
index 0c05a03c4..b4af12141 100644
--- a/templates/definition/tariff/open-meteo.yaml
+++ b/templates/definition/tariff/open-meteo.yaml
@@ -8,30 +8,7 @@ requirements:
   evcc: ["skiptest"]
 group: solar
 params:
-  - name: lat
-    description:
-      en: Latitude
-      de: Breitengrad
-    type: float
-    example: 55.7351
-    required: true
-  - name: lon
-    description:
-      en: Longitude
-      de: Längengrad
-    type: float
-    example: 9.1275
-    required: true
-  - name: dec
-    description:
-      en: Decline
-      de: Neigung
-    help:
-      en: 0 = horizontal, 90 = vertical
-      de: 0 = horizontal, 90 = vertikal
-    type: int
-    example: 25
-    required: true
+  - preset: forecast-base
   - name: az
     description:
       en: Azimuth
@@ -42,13 +19,6 @@ params:
     type: int
     example: 0
     required: true
-  - name: kwp
-    description:
-      en: Maximum generator power [kWp]
-      de: Maximale Generatorleistung [kWp]
-    type: float
-    example: 9.8
-    required: true
   - name: ac
     description:
       en: AC Power [kW]
diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
index 682ad7288..d1a1c2652 100644
--- a/util/templates/defaults.yaml
+++ b/util/templates/defaults.yaml
@@ -417,6 +417,40 @@ presets:
           de: Individuelle Formel zur Berechnung des Preises
           en: Individual formula for calculating the price
         example: "math.Max((price + charges) * (1 + tax), 0.0)"
+  forecast-base:
+    params:
+      - name: lat
+        description:
+          en: Latitude
+          de: Breitengrad
+        type: float
+        example: 55.7351
+        required: true
+      - name: lon
+        description:
+          en: Longitude
+          de: Längengrad
+        type: float
+        example: 9.1275
+        required: true
+      - name: dec
+        description:
+          en: Decline
+          de: Neigung
+        help:
+          en: 0 = horizontal, 90 = vertical
+          de: 0 = horizontal, 90 = vertikal
+        type: int
+        example: 25
+        required: true
+      - name: kwp
+        description:
+          en: Maximum generator power [kWp]
+          de: Maximale Generatorleistung [kWp]
+        type: float
+        example: 9.8
+        required: true
+
   eebus:
     params:
       - name: ski