Update gismeteo_ru.ini (thx to Dimtr)

1 files changed, 237 insertions, 116 deletions

diff --git a/protocols/Weather/docs/weather/gismeteo_ru.ini b/protocols/Weather/docs/weather/gismeteo_ru.ini
index 48a4b75011..43a8886c74 100644
--- a/protocols/Weather/docs/weather/gismeteo_ru.ini
+++ b/protocols/Weather/docs/weather/gismeteo_ru.ini
@@ -55,7 +55,7 @@ Update URL3=https://www.gismeteo.ru/weather-%s/10-days/
 ;-----------------------------------------------------

 

 [Condition]

-Start=data-text="

+Start=<div class="weathertab is-active" data-tooltip="

 End="

 Unit=Cond

 Url=1

@@ -66,8 +66,8 @@ End=</div>
 Url=1

 

 [TempNow]

-Start=<span class="sign">

-End=<span class="unit

+Start=<temperature-value value="

+End="

 Url=1

 Hidden=true

 

@@ -75,8 +75,8 @@ Hidden=true
 Set Data=[TempNow] & " °C"

 

 [TempFeel]

-Start=<span class="sign">

-End=<span class="unit

+Start=<temperature-value value="

+End="

 Url=1

 Hidden=true

 

@@ -84,20 +84,20 @@ Hidden=true
 Set Data=[TempFeel] & " °C"

 

 [Low]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=1

 

 [High]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=1

 

 [WS]

-Start=<div class="unit unit_wind_m_s">

-End=<div

+Start=<speed-value value="

+End="

 ;Unit=m/s

 Url=1

 Hidden=true

@@ -109,14 +109,19 @@ Set Data=[WS] & " " & "m/s"
 ;Set Data=[Condition]

 ;[/Visibility]

 

+[Ignore]

+Start=<speed-value reactive show-units></speed-value>

+End=>

+Url=1

+

 [Wind direction]

-Start=</div><div>

+Start=

 End=</div>

 Url=1

 

 [Pressure]

-Start=<div class="unit unit_pressure_mm_hg_atm">

-End=<div

+Start=<pressure-value value="

+End="

 Unit=mm

 Url=1

 

@@ -126,9 +131,14 @@ End=</div>
 Unit=%

 Url=1

 

+[Geo]

+Start=<div class="item-value">

+End=</div>

+Url=1

+

 [TempWater]

-Start=<span class="sign">

-End=<span class="unit

+Start=<temperature-value value="

+End="

 Url=1

 Hidden=true

 

@@ -335,70 +345,70 @@ Hidden=true
 ; CONDITION

 

 [FD0C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD1C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD2C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD3C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD4C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD5C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD6C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD7C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD8C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

 Hidden=true

 

 [FD9C]

-Start=data-text="

+Start=data-tooltip="

 End="

 Unit=Cond

 Url=3

@@ -407,141 +417,141 @@ Hidden=true
 ;temperature

 

 [FD0TH]

-Start=<div class="maxt"><span class="unit unit_temperature_c">

-End=</span>

+Start=<div class="maxt"><temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD0L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD1TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD1L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD2TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD2L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD3TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD3L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD4TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD4L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD5TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD5L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD6TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD6L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD7TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD7L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD8TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD8L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD9TH]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

 

 [FD9L]

-Start=<span class="unit unit_temperature_c">

-End=</span>

+Start=<temperature-value value="

+End="

 Unit=C

 Url=3

 Hidden=true

@@ -549,71 +559,71 @@ Hidden=true
 ; WIND: H - Hidden data D - direction, S - Speed

 

 [FD0WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD1WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD2WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD3WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD4WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD5WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD6WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD7WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD8WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

 

 [FD9WS]

-Start=<span class="wind-unit unit unit_wind_m_s">

-End=</span>

+Start=<speed-value value="

+End="

 Unit=m/s

 Url=3

 Hidden=true

@@ -835,71 +845,71 @@ Hidden=true
 

 ; PRESSURE

 [FD0P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD1P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD2P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD3P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD4P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD5P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD6P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD7P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD8P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

 

 [FD9P]

-Start=<div class="maxt"><span class="unit unit_pressure_mm_hg_atm">

-End=</span>

+Start=<div class="maxt"><pressure-value value="

+End="

 Unit=mm

 Url=3

 Hidden=true

@@ -1137,39 +1147,150 @@ End=</div>
 Url=3

 Hidden=true

 

+; Geo Magnetism

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD0GM]

+Start=

+End=</div>

+Url=3

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD1GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD2GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD3GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD4GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD5GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD6GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD7GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD8GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

+[Ignore]

+Start=<div class="row-item

+End=">

+Url=3

+

+[FD9GM]

+Start=

+End=</div>

+Url=3

+Hidden=true

+

 ;================================================

 ;====================3===========================

 ;================================================

 

 [Forecast Day 0]

-Set Data=[FD0D] & ": (" & [FD0TH] & "/" & [FD0L] & ")" & ", " & [FD0C] & ", " & "Precipitation" & ": " & [Prec] & " " & "mm" & ", \n" & "Wind" & ": " & [FD0W] & ", " & "Pressure" & ": " & [FD0P] & ", " & "Humidity" & ": " & [FD0H] & ", " & "UV Index" & ": " & [UV Index]

+Set Data=[FD0D] & ": (" & [FD0TH] & "/" & [FD0L] & ")" & ", " & [FD0C] & ", " & "Precipitation" & ": " & [Prec] & " " & "mm" & ", \n" & "Wind" & ": " & [FD0W] & ", " & "Pressure" & ": " & [FD0P] & ", " & "Humidity" & ": " & [FD0H] & ", " & "UV Index" & ": " & [UV Index] & ", " & "G/M" & ": " & [FD0GM]

 

 [Forecast Day 1]

-Set Data=[FD1D] & ": (" & [FD1TH] & "/" & [FD1L] & ")" & ", " & [FD1C] & ", " & "Precipitation" & ": " & [FD1PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD1W] & ", " & "Pressure" & ": " & [FD1P] & ", " & "Humidity" & ": " & [FD1H] & ", " & "UV Index" & ": " & [FD1UV]

+Set Data=[FD1D] & ": (" & [FD1TH] & "/" & [FD1L] & ")" & ", " & [FD1C] & ", " & "Precipitation" & ": " & [FD1PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD1W] & ", " & "Pressure" & ": " & [FD1P] & ", " & "Humidity" & ": " & [FD1H] & ", " & "UV Index" & ": " & [FD1UV] & ", " & "G/M" & ": " & [FD1GM]

 

 [Forecast Day 2]

-Set Data=[FD2D] & ": (" & [FD2TH] & "/" & [FD2L] & ")" & ", " & [FD2C] & ", " & "Precipitation" & ": " & [FD2PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD2W] & ", " & "Pressure" & ": " & [FD2P] & ", " & "Humidity" & ": " & [FD2H] & ", " & "UV Index" & ": " & [FD2UV]

+Set Data=[FD2D] & ": (" & [FD2TH] & "/" & [FD2L] & ")" & ", " & [FD2C] & ", " & "Precipitation" & ": " & [FD2PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD2W] & ", " & "Pressure" & ": " & [FD2P] & ", " & "Humidity" & ": " & [FD2H] & ", " & "UV Index" & ": " & [FD2UV] & ", " & "G/M" & ": " & [FD2GM]

 

 [Forecast Day 3]

-Set Data=[FD3D] & ": (" & [FD3TH] & "/" & [FD3L] & ")" & ", " & [FD3C] & ", " & "Precipitation" & ": " & [FD3PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD3W] & ", " & "Pressure" & ": " & [FD3P] & ", " & "Humidity" & ": " & [FD3H] & ", " & "UV Index" & ": " & [FD3UV]

+Set Data=[FD3D] & ": (" & [FD3TH] & "/" & [FD3L] & ")" & ", " & [FD3C] & ", " & "Precipitation" & ": " & [FD3PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD3W] & ", " & "Pressure" & ": " & [FD3P] & ", " & "Humidity" & ": " & [FD3H] & ", " & "UV Index" & ": " & [FD3UV] & ", " & "G/M" & ": " & [FD3GM]

 

 [Forecast Day 4]

-Set Data=[FD4D] & ": (" & [FD4TH] & "/" & [FD4L] & ")" & ", " & [FD4C] & ", " & "Precipitation" & ": " & [FD4PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD4W] & ", " & "Pressure" & ": " & [FD4P] & ", " & "Humidity" & ": " & [FD4H] & ", " & "UV Index" & ": " & [FD4UV]

+Set Data=[FD4D] & ": (" & [FD4TH] & "/" & [FD4L] & ")" & ", " & [FD4C] & ", " & "Precipitation" & ": " & [FD4PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD4W] & ", " & "Pressure" & ": " & [FD4P] & ", " & "Humidity" & ": " & [FD4H] & ", " & "UV Index" & ": " & [FD4UV] & ", " & "G/M" & ": " & [FD4GM]

 

 [Forecast Day 5]

-Set Data=[FD5D] & ": (" & [FD5TH] & "/" & [FD5L] & ")" & ", " & [FD5C] & ", " & "Precipitation" & ": " & [FD5PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD5W] & ", " & "Pressure" & ": " & [FD5P] & ", " & "Humidity" & ": " & [FD5H] & ", " & "UV Index" & ": " & [FD5UV]

+Set Data=[FD5D] & ": (" & [FD5TH] & "/" & [FD5L] & ")" & ", " & [FD5C] & ", " & "Precipitation" & ": " & [FD5PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD5W] & ", " & "Pressure" & ": " & [FD5P] & ", " & "Humidity" & ": " & [FD5H] & ", " & "UV Index" & ": " & [FD5UV] & ", " & "G/M" & ": " & [FD5GM]

 

 [Forecast Day 6]

-Set Data=[FD6D] & ": (" & [FD6TH] & "/" & [FD6L] & ")" & ", " & [FD6C] & ", " & "Precipitation" & ": " & [FD6PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD6W] & ", " & "Pressure" & ": " & [FD6P] & ", " & "Humidity" & ": " & [FD6H] & ", " & "UV Index" & ": " & [FD6UV]

+Set Data=[FD6D] & ": (" & [FD6TH] & "/" & [FD6L] & ")" & ", " & [FD6C] & ", " & "Precipitation" & ": " & [FD6PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD6W] & ", " & "Pressure" & ": " & [FD6P] & ", " & "Humidity" & ": " & [FD6H] & ", " & "UV Index" & ": " & [FD6UV] & ", " & "G/M" & ": " & [FD6GM]

 

 [Forecast Day 7]

-Set Data=[FD7D] & ": (" & [FD7TH] & "/" & [FD7L] & ")" & ", " & [FD7C] & ", " & "Precipitation" & ": " & [FD7PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD7W] & ", " & "Pressure" & ": " & [FD7P] & ", " & "Humidity" & ": " & [FD7H] & ", " & "UV Index" & ": " & [FD7UV]

+Set Data=[FD7D] & ": (" & [FD7TH] & "/" & [FD7L] & ")" & ", " & [FD7C] & ", " & "Precipitation" & ": " & [FD7PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD7W] & ", " & "Pressure" & ": " & [FD7P] & ", " & "Humidity" & ": " & [FD7H] & ", " & "UV Index" & ": " & [FD7UV] & ", " & "G/M" & ": " & [FD7GM]

 

 [Forecast Day 8]

-Set Data=[FD8D] & ": (" & [FD8TH] & "/" & [FD8L] & ")" & ", " & [FD8C] & ", " & "Precipitation" & ": " & [FD8PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD8W] & ", " & "Pressure" & ": " & [FD8P] & ", " & "Humidity" & ": " & [FD8H] & ", " & "UV Index" & ": " & [FD8UV]

+Set Data=[FD8D] & ": (" & [FD8TH] & "/" & [FD8L] & ")" & ", " & [FD8C] & ", " & "Precipitation" & ": " & [FD8PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD8W] & ", " & "Pressure" & ": " & [FD8P] & ", " & "Humidity" & ": " & [FD8H] & ", " & "UV Index" & ": " & [FD8UV] & ", " & "G/M" & ": " & [FD8GM]

 

 [Forecast Day 9]

-Set Data=[FD9D] & ": (" & [FD9TH] & "/" & [FD9L] & ")" & ", " & [FD9C] & ", " & "Precipitation" & ": " & [FD9PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD9W] & ", " & "Pressure" & ": " & [FD9P] & ", " & "Humidity" & ": " & [FD9H] & ", " & "UV Index" & ": " & [FD9UV]

+Set Data=[FD9D] & ": (" & [FD9TH] & "/" & [FD9L] & ")" & ", " & [FD9C] & ", " & "Precipitation" & ": " & [FD9PR] & " " & "mm" & ", \n" & "Wind" & ": " & [FD9W] & ", " & "Pressure" & ": " & [FD9P] & ", " & "Humidity" & ": " & [FD9H] & ", " & "UV Index" & ": " & [FD9UV] & ", " & "G/M" & ": " & [FD9GM]

 

 ;--------------------------------------------