diff --git a/data/fields/entrance.json b/data/fields/entrance.json index 16d04b3f..724eb105 100644 --- a/data/fields/entrance.json +++ b/data/fields/entrance.json @@ -1,5 +1,19 @@ { "key": "entrance", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "yes": "Unspecified", + "main": "Main", + "secondary": "Secondary", + "service": "Service", + "exit": "Exit Only", + "entrance": "Entrance Only", + "emergency": "Emergency Exit", + "staircase": "Staircase", + "home": "Private House or Apartment", + "garage": "Garage Door" + } + } } diff --git a/data/fields/fuel/fuel_multi-RU.json b/data/fields/fuel/fuel_multi-RU.json new file mode 100644 index 00000000..4e2a4047 --- /dev/null +++ b/data/fields/fuel/fuel_multi-RU.json @@ -0,0 +1,22 @@ +{ + "key": "fuel:", + "type": "multiCombo", + "label": "{fuel/fuel_multi}", + "stringsCrossReference": "{fuel/fuel_multi}", + "options": [ + "diesel", + "octane_80", + "octane_92", + "octane_95", + "octane_98", + "octane_100", + "lpg", + "cng" + ], + "autoSuggestions": false, + "locationSet": { + "include": [ + "RU" + ] + } +} diff --git a/data/fields/fuel/fuel_multi.json b/data/fields/fuel/fuel_multi.json new file mode 100644 index 00000000..e0b8bf6d --- /dev/null +++ b/data/fields/fuel/fuel_multi.json @@ -0,0 +1,53 @@ +{ + "key": "fuel:", + "type": "multiCombo", + "label": "Fuel Types", + "strings": { + "options": { + "diesel": "Diesel", + "GTL_diesel": "GTL Diesel", + "HGV_diesel": "HGV Diesel", + "biodiesel": "Bio Diesel", + "octane_80": "Gasoline (80 Octane)", + "octane_87": "Gasoline (87 Octane)", + "octane_89": "Gasoline (89 Octane)", + "octane_91": "Gasoline (91 Octane)", + "octane_92": "Gasoline (92 Octane)", + "octane_95": "Gasoline (95 Octane)", + "octane_98": "Gasoline (98 Octane)", + "octane_100": "Gasoline (100 Octane)", + "e10": "E10 Gasoline", + "e85": "E85 Gasoline", + "lpg": "Liquefied Natural Gas (LPG)", + "cng": "Compressed Natural Gas (CNG)", + "propane": "Propane", + "LH2": "Liquid Hydrogen", + "h70": "Gaseous Hydrogen (700 bar)", + "adblue": "AdBlue / AUS 32", + "adblue:canister": "AdBlue / AUS 32 (sold in canisters)" + } + }, + "autoSuggestions": true, + "caseSensitive": true, + "terms": [ + "diesel", + "gas", + "gasoline", + "petrol", + "ethanol", + "biodiesel", + "bioethanol", + "fuel", + "fuel mix", + "mixture", + "propane", + "lpg", + "cng", + "lng" + ], + "locationSet": { + "exclude": [ + "RU" + ] + } +} diff --git a/data/fields/fuel_multi.json b/data/fields/fuel_multi.json deleted file mode 100644 index bb76d9ab..00000000 --- a/data/fields/fuel_multi.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "key": "fuel:", - "type": "multiCombo", - "label": "Fuel Types" -} diff --git a/data/fields/substation.json b/data/fields/substation.json index b83834b8..6b4ae9cc 100644 --- a/data/fields/substation.json +++ b/data/fields/substation.json @@ -1,5 +1,19 @@ { "key": "substation", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "transmission": "High Voltage Transmission", + "distribution": "Regional Distribution", + "minor_distribution": "Local Distribution", + "industrial": "Industrial", + "generation": "Generation", + "transition": "Overground/Underground Transition", + "traction": "Traction System Supply", + "converter": "High Voltage AC/DC Converter", + "compensation": "Reactive Power Compensation" + } + }, + "autoSuggestions": false } diff --git a/data/presets/amenity/fuel.json b/data/presets/amenity/fuel.json index 3aa5f363..8ac84cf5 100644 --- a/data/presets/amenity/fuel.json +++ b/data/presets/amenity/fuel.json @@ -5,7 +5,8 @@ "brand", "operator", "address", - "fuel_multi", + "fuel/fuel_multi", + "fuel/fuel_multi-RU", "self_service", "building_area" ], diff --git a/data/presets/shop/fuel.json b/data/presets/shop/fuel.json index 3e7012f9..d32e2157 100644 --- a/data/presets/shop/fuel.json +++ b/data/presets/shop/fuel.json @@ -2,7 +2,7 @@ "icon": "temaki-propane_tank", "fields": [ "{shop}", - "fuel_multi" + "fuel/fuel_multi" ], "geometry": [ "point", diff --git a/data/presets/waterway/fuel.json b/data/presets/waterway/fuel.json index 2b81d9d2..07c1fe52 100644 --- a/data/presets/waterway/fuel.json +++ b/data/presets/waterway/fuel.json @@ -5,7 +5,7 @@ "operator", "address", "opening_hours", - "fuel_multi" + "fuel/fuel_multi" ], "moreFields": [ "branch_brand", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index b7734a06..0a671e28 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1240,6 +1240,27 @@ en: entrance: # entrance=* label: Type + options: + # entrance=emergency + emergency: Emergency Exit + # entrance=entrance + entrance: Entrance Only + # entrance=exit + exit: Exit Only + # entrance=garage + garage: Garage Door + # entrance=home + home: Private House or Apartment + # entrance=main + main: Main + # entrance=secondary + secondary: Secondary + # entrance=service + service: Service + # entrance=staircase + staircase: Staircase + # entrance=yes + 'yes': Unspecified terms: '[translate with synonyms or related terms for ''Type'', separated by commas]' except: # except=* @@ -1381,9 +1402,54 @@ en: fuel: # fuel=* label: Fuel - fuel_multi: + fuel/fuel_multi: # fuel:=* label: Fuel Types + options: + # fuel:=GTL_diesel + GTL_diesel: GTL Diesel + # fuel:=HGV_diesel + HGV_diesel: HGV Diesel + # fuel:=LH2 + LH2: Liquid Hydrogen + # fuel:=adblue + adblue: AdBlue / AUS 32 + #canister': fuel:=adblue:canister + adblue:canister: AdBlue / AUS 32 (sold in canisters) + # fuel:=biodiesel + biodiesel: Bio Diesel + # fuel:=cng + cng: Compressed Natural Gas (CNG) + # fuel:=diesel + diesel: Diesel + # fuel:=e10 + e10: E10 Gasoline + # fuel:=e85 + e85: E85 Gasoline + # fuel:=h70 + h70: Gaseous Hydrogen (700 bar) + # fuel:=lpg + lpg: Liquefied Natural Gas (LPG) + # fuel:=octane_100 + octane_100: Gasoline (100 Octane) + # fuel:=octane_80 + octane_80: Gasoline (80 Octane) + # fuel:=octane_87 + octane_87: Gasoline (87 Octane) + # fuel:=octane_89 + octane_89: Gasoline (89 Octane) + # fuel:=octane_91 + octane_91: Gasoline (91 Octane) + # fuel:=octane_92 + octane_92: Gasoline (92 Octane) + # fuel:=octane_95 + octane_95: Gasoline (95 Octane) + # fuel:=octane_98 + octane_98: Gasoline (98 Octane) + # fuel:=propane + propane: Propane + fuel/fuel_multi-RU: + # fuel:=* gambling: # gambling=* label: Games @@ -3464,6 +3530,25 @@ en: substation: # substation=* label: Type + options: + # substation=compensation + compensation: Reactive Power Compensation + # substation=converter + converter: High Voltage AC/DC Converter + # substation=distribution + distribution: Regional Distribution + # substation=generation + generation: Generation + # substation=industrial + industrial: Industrial + # substation=minor_distribution + minor_distribution: Local Distribution + # substation=traction + traction: Traction System Supply + # substation=transition + transition: Overground/Underground Transition + # substation=transmission + transmission: High Voltage Transmission supervised: # supervised=* label: Supervised