From 861d144879ccdc090714c5c843642816a0b79f60 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 21 Feb 2024 11:22:22 +0100
Subject: [PATCH] Sync version in master with version in zg1/zone1.

---
 etc/psa_tariff/tariff01.json | 80 ++++++++++++------------------------
 1 file changed, 26 insertions(+), 54 deletions(-)

diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index fb1f840..bb30375 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,6 +1,6 @@
 {
   "Project" :   "Kirchdorf",
-  "Version" :   "1.0.0",
+  "Version" :   "1.1.0",
   "Info"    :   "",
   "Currency": [
     {
@@ -49,51 +49,11 @@
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 2,
       "time_range_from": 0,
-      "time_range_to": 5,
-      "time_range_comment": "[from, to[ in minutes"
-    },
-    {
-      "time_range_id": 2,
-      "time_range_tbase_id": 1,
-      "time_range_payment_rate_id": 2,
-      "time_range_from": 5,
-      "time_range_to": 10,
-      "time_range_comment": "[from, to[ in minutes"
-    },
-    {
-      "time_range_id": 3,
-      "time_range_tbase_id": 1,
-      "time_range_payment_rate_id": 2,
-      "time_range_from": 10,
-      "time_range_to": 15,
-      "time_range_comment": "[from, to[ in minutes"
-    },
-    {
-      "time_range_id": 4,
-      "time_range_tbase_id": 1,
-      "time_range_payment_rate_id": 2,
-      "time_range_from": 15,
-      "time_range_to": 20,
-      "time_range_comment": "[from, to[ in minutes"
-    },
-    {
-      "time_range_id": 5,
-      "time_range_tbase_id": 1,
-      "time_range_payment_rate_id": 2,
-      "time_range_from": 20,
-      "time_range_to": 25,
-      "time_range_comment": "[from, to[ in minutes"
-    },
-    {
-      "time_range_id": 6,
-      "time_range_tbase_id": 1,
-      "time_range_payment_rate_id": 2,
-      "time_range_from": 25,
       "time_range_to": 30,
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 7,
+      "time_range_id": 2,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 30,
@@ -101,7 +61,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 8,
+      "time_range_id": 3,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 35,
@@ -109,7 +69,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 9,
+      "time_range_id": 4,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 40,
@@ -117,7 +77,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 10,
+      "time_range_id": 5,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 45,
@@ -125,7 +85,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 11,
+      "time_range_id": 6,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 50,
@@ -133,7 +93,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 12,
+      "time_range_id": 7,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 55,
@@ -141,7 +101,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 13,
+      "time_range_id": 8,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 60,
@@ -149,7 +109,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 14,
+      "time_range_id": 9,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 65,
@@ -157,7 +117,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 15,
+      "time_range_id": 10,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 70,
@@ -165,7 +125,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 16,
+      "time_range_id": 11,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 75,
@@ -173,7 +133,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 17,
+      "time_range_id": 12,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 80,
@@ -181,7 +141,7 @@
       "time_range_comment": "[from, to[ in minutes"
     },
     {
-      "time_range_id": 18,
+      "time_range_id": 13,
       "time_range_tbase_id": 1,
       "time_range_payment_rate_id": 1,
       "time_range_from": 85,
@@ -189,6 +149,18 @@
       "time_range_comment": "[from, to[ in minutes"
     }
   ],
+  "TimeStepConfig" : [
+    {	
+      "tsconfig_id" : 1,
+      "tsconfig_label" : "static",
+      "tsconfig_comment" : "read time steps as given in jsonfiles"		
+    },
+    {
+      "tsconfig_id" : 2,
+      "tsconfig_label" : "dynamic",
+      "tsconfig_comment" : "determine timesteps at runtime"		
+    }
+  ],
   "PaymentOption": [
     {
       "pop_id": 1049,
@@ -214,7 +186,7 @@
     {
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 2,
-      "pra_price": 5
+      "pra_price": 30 
     }
   ],
   "Duration": [