Skip to content

Commit 994ccbc

Browse files
ricloyricloy
authored
add fuel:biodiesel (and other very rare fuels) in the Italian fuel analyser (#2648)
1 parent 76d3116 commit 994ccbc

File tree

1 file changed

+72
-49
lines changed

1 file changed

+72
-49
lines changed

‎analysers/analyser_merge_fuel_IT.py‎

Lines changed: 72 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,18 @@
2828
import datetime
2929

3030

31-
OCTANE_95 = 1 << 0# fuel:octane_95=yes
32-
OCTANE_98 = 1 << 1# fuel:octane_98=yes
33-
OCTANE_100 = 1 << 2# fuel:octane_100=yes
34-
DIESEL = 1 << 3# fuel:diesel=yes
35-
DIESEL_CL2 = 1 << 4# fuel:diesel:class2=yes
36-
GTL_DIESEL = 1 << 5# fuel:GTL_diesel=yes
37-
HGV_DIESEL = 1 << 6# fuel:HGV_diesel=yes
38-
LNG = 1 << 7# fuel:lng=yes
39-
LPG = 1 << 8# fuel:lpg=yes
40-
CNG = 1 << 9# fuel:cng=yes
31+
OCTANE_95 = 1 << 0 # fuel:octane_95=yes
32+
OCTANE_98 = 1 << 1 # fuel:octane_98=yes
33+
OCTANE_100 = 1 << 2 # fuel:octane_100=yes
34+
DIESEL = 1 << 3 # fuel:diesel=yes
35+
DIESEL_CL2 = 1 << 4 # fuel:diesel:class2=yes
36+
GTL_DIESEL = 1 << 5 # fuel:GTL_diesel=yes
37+
HGV_DIESEL = 1 << 6 # fuel:HGV_diesel=yes
38+
LNG = 1 << 7 # fuel:lng=yes
39+
LPG = 1 << 8 # fuel:lpg=yes
40+
CNG = 1 << 9 # fuel:cng=yes
41+
BIODIESEL = 1 << 10# fuel:biodiesel=yes
42+
OCTANE_102 = 1 << 11# fuel:octane_102=yes
4143

4244

4345
class Analyser_Merge_Fuel_IT(Analyser_Merge_Point):
@@ -75,13 +77,15 @@ def __init__(self, config, logger = None):
7577
'fuel:octane_95': lambda res: 'yes' if (int(res['Carburanti']) & OCTANE_95) != 0 else Mapping.delete_tag,
7678
'fuel:octane_98': lambda res: 'yes' if (int(res['Carburanti']) & OCTANE_98) != 0 else Mapping.delete_tag,
7779
'fuel:octane_100': lambda res: 'yes' if (int(res['Carburanti']) & OCTANE_100) != 0 else Mapping.delete_tag,
80+
'fuel:octane_102': lambda res: 'yes' if (int(res['Carburanti']) & OCTANE_102) != 0 else Mapping.delete_tag,
7881
'fuel:diesel': lambda res: 'yes' if (int(res['Carburanti']) & DIESEL) != 0 else Mapping.delete_tag,
7982
'fuel:diesel:class2': lambda res: 'yes' if (int(res['Carburanti']) & DIESEL_CL2) != 0 else Mapping.delete_tag,
8083
'fuel:GTL_diesel': lambda res: 'yes' if (int(res['Carburanti']) & GTL_DIESEL) != 0 else Mapping.delete_tag,
8184
'fuel:HGV_diesel': lambda res: 'yes' if (int(res['Carburanti']) & HGV_DIESEL) != 0 else Mapping.delete_tag,
8285
'fuel:lng': lambda res: 'yes' if (int(res['Carburanti']) & LNG) != 0 else Mapping.delete_tag,
8386
'fuel:lpg': lambda res: 'yes' if (int(res['Carburanti']) & LPG) != 0 else Mapping.delete_tag,
8487
'fuel:cng': lambda res: 'yes' if (int(res['Carburanti']) & CNG) != 0 else Mapping.delete_tag,
88+
'fuel:biodiesel': lambda res: 'yes' if (int(res['Carburanti']) & BIODIESEL) != 0 else Mapping.delete_tag,
8589
},
8690
mapping2 = {
8791
'operator': lambda res: italian_strings.normalize_common(res['Gestore']).replace(' % ', ' - ') if res['Gestore'] else None,
@@ -141,45 +145,64 @@ def fetch(self, url, tmp_file, date_string=None):
141145

142146

143147
FUEL_TYPE_MAP = {
144-
'BENZINA': OCTANE_95,
145-
'BENZINA 100 OTTANI': OCTANE_100,
146-
'BENZINA ENERGY 98 OTTANI': OCTANE_98,
147-
'BENZINA PLUS 98': OCTANE_98,
148-
'BENZINA SHELL V POWER': OCTANE_100,
149-
'BENZINA SPECIALE': OCTANE_100,
150-
'BENZINA WR 100': OCTANE_100,
151-
'BLU DIESEL ALPINO': DIESEL_CL2,
152-
'BLUE DIESEL': GTL_DIESEL,
153-
'BLUE SUPER': OCTANE_100,
154-
'DIESEL E+10': GTL_DIESEL,# repsol
155-
'DIESELMAX': GTL_DIESEL,
156-
'DIESEL SHELL V POWER': GTL_DIESEL,
157-
'E-DIESEL': HGV_DIESEL,# esso
158-
'EXCELLIUM DIESEL': GTL_DIESEL,
159-
'F101': OCTANE_100,
160-
'GASOLIO': DIESEL,
161-
'GASOLIO ALPINO': DIESEL_CL2,
162-
'GASOLIO ARTICO': DIESEL_CL2,
163-
'GASOLIO ECOPLUS': DIESEL,
164-
'GASOLIO ENERGY D': HGV_DIESEL,
165-
'GASOLIO GELO': DIESEL_CL2,
166-
'GASOLIO ORO DIESEL': GTL_DIESEL,
167-
'GASOLIO PREMIUM': GTL_DIESEL,
168-
'GASOLIO SPECIALE': GTL_DIESEL,
169-
'GNL': LNG,
170-
'GP DIESEL': GTL_DIESEL,
171-
'GPL': LPG,
172-
'HI-Q DIESEL': GTL_DIESEL,
173-
'HIQ PERFORM+': OCTANE_100,
174-
'L-GNC': LNG,
175-
'MAGIC DIESEL': HGV_DIESEL,
176-
'METANO': CNG,
177-
'R100': OCTANE_100,# repsol
178-
'S-DIESEL': GTL_DIESEL,# ?
179-
'SSP98': OCTANE_98,# ?
180-
'SUPREME DIESEL': GTL_DIESEL,# esso
181-
'V-POWER': OCTANE_100,
182-
'V-POWER DIESEL': GTL_DIESEL,
148+
'BCHVO': BIODIESEL,
149+
'BENZINA': OCTANE_95,
150+
'BENZINA 100 OTTANI': OCTANE_100,
151+
'BENZINA 102 OTTANI': OCTANE_102,
152+
'BENZINA ENERGY 98 OTTANI': OCTANE_98,
153+
'BENZINA PLUS 98': OCTANE_98,
154+
'BENZINA SHELL V POWER': OCTANE_100,
155+
'BENZINA SPECIALE': OCTANE_100,
156+
'BENZINA SPECIALE 98 OTTANI': OCTANE_98,
157+
'BENZINA WR 100': OCTANE_100,
158+
'BLU DIESEL ALPINO': DIESEL_CL2,
159+
'BLUE DIESEL': GTL_DIESEL,
160+
'BLUE SUPER': OCTANE_100,
161+
'DIESEL E+10': GTL_DIESEL,# repsol
162+
'DIESEL HVO': BIODIESEL,
163+
'DIESEL HVO ENERGY': BIODIESEL,
164+
'DIESELMAX': GTL_DIESEL,
165+
'DIESEL SHELL V POWER': GTL_DIESEL,
166+
'E-DIESEL': HGV_DIESEL,# esso
167+
'EXCELLIUM DIESEL': GTL_DIESEL,
168+
'F101': OCTANE_100,
169+
'F-101': OCTANE_100,
170+
'GASOLIO': DIESEL,
171+
'GASOLIO ALPINO': DIESEL_CL2,
172+
'GASOLIO ARTICO': DIESEL_CL2,
173+
'GASOLIO ARTICO IGLOO': DIESEL_CL2,
174+
'GASOLIO BIO HVO': BIODIESEL,
175+
'GASOLIO ECOPLUS': DIESEL,
176+
'GASOLIO ENERGY D': HGV_DIESEL,
177+
'GASOLIO GELO': DIESEL_CL2,
178+
'GASOLIO HVO': BIODIESEL,
179+
'GASOLIO ORO DIESEL': GTL_DIESEL,
180+
'GASOLIO PLUS': GTL_DIESEL,
181+
'GASOLIO PREMIUM': GTL_DIESEL,
182+
'GASOLIO PRESTAZIONALE': GTL_DIESEL,
183+
'GASOLIO SPECIALE': GTL_DIESEL,
184+
'GNL': LNG,
185+
'GP DIESEL': GTL_DIESEL,
186+
'GPL': LPG,
187+
'HI-Q DIESEL': GTL_DIESEL,
188+
'HIQ PERFORM+': OCTANE_100,
189+
'HVO': BIODIESEL,
190+
'HVO100': BIODIESEL,
191+
'HVO ECO DIESEL': BIODIESEL,
192+
'HVO FUTURE': BIODIESEL,
193+
'HVOLUTION': BIODIESEL,
194+
'HVOVOLUTION': BIODIESEL,
195+
'L-GNC': LNG,
196+
'MAGIC DIESEL': HGV_DIESEL,
197+
'METANO': CNG,
198+
'R100': OCTANE_100,# repsol
199+
'REHVO': BIODIESEL,
200+
'S-DIESEL': GTL_DIESEL,# ?
201+
'SSP98': OCTANE_98,# ?
202+
'SUPREME DIESEL': GTL_DIESEL,# esso
203+
'VERDE SPECIALE': OCTANE_100,
204+
'V-POWER': OCTANE_100,
205+
'V-POWER DIESEL': GTL_DIESEL,
183206
}
184207

185208

0 commit comments

Comments
 (0)