forked from MapComplete/MapComplete
		
	Merge pull request #493 from tordans/fix-answer-with-image-style-#491
Fix label display issue when label contains SVG image #491
This commit is contained in:
		
						commit
						20a0444a27
					
				
					 9 changed files with 91 additions and 89 deletions
				
			
		|  | @ -106,84 +106,84 @@ | |||
|     }, | ||||
|     { | ||||
|       "key": "socket:schuko", | ||||
|       "description": "Layer 'Charging stations' shows socket:schuko=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:schuko=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:schuko", | ||||
|       "description": "Layer 'Charging stations' shows socket:schuko~^..*$&socket:schuko!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:schuko~^..*$&socket:schuko!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:typee", | ||||
|       "description": "Layer 'Charging stations' shows socket:typee=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:typee=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:typee", | ||||
|       "description": "Layer 'Charging stations' shows socket:typee~^..*$&socket:typee!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:typee~^..*$&socket:typee!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:chademo", | ||||
|       "description": "Layer 'Charging stations' shows socket:chademo=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:chademo=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:chademo", | ||||
|       "description": "Layer 'Charging stations' shows socket:chademo~^..*$&socket:chademo!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:chademo~^..*$&socket:chademo!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type1_cable", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_cable=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_cable=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type1_cable", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_cable~^..*$&socket:type1_cable!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_cable~^..*$&socket:type1_cable!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type1", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type1", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1~^..*$&socket:type1!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:type1~^..*$&socket:type1!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type1_combo", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_combo=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_combo=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type1_combo", | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_combo~^..*$&socket:type1_combo!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:type1_combo~^..*$&socket:type1_combo!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:tesla_supercharger", | ||||
|       "description": "Layer 'Charging stations' shows socket:tesla_supercharger=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:tesla_supercharger=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:tesla_supercharger", | ||||
|       "description": "Layer 'Charging stations' shows socket:tesla_supercharger~^..*$&socket:tesla_supercharger!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:tesla_supercharger~^..*$&socket:tesla_supercharger!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type2", | ||||
|       "description": "Layer 'Charging stations' shows socket:type2=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:type2=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type2", | ||||
|       "description": "Layer 'Charging stations' shows socket:type2~^..*$&socket:type2!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:type2~^..*$&socket:type2!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type2_combo", | ||||
|       "description": "Layer 'Charging stations' shows socket:type2_combo=1 with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "description": "Layer 'Charging stations' shows socket:type2_combo=1 with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')", | ||||
|       "value": "1" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:type2_combo", | ||||
|       "description": "Layer 'Charging stations' shows socket:type2_combo~^..*$&socket:type2_combo!~^1$ with a fixed text, namely '<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|       "description": "Layer 'Charging stations' shows socket:type2_combo~^..*$&socket:type2_combo!~^1$ with a fixed text, namely '<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')" | ||||
|     }, | ||||
|     { | ||||
|       "key": "socket:schuko", | ||||
|  | @ -793,4 +793,4 @@ | |||
|       "value": "yes" | ||||
|     } | ||||
|   ] | ||||
| } | ||||
| } | ||||
|  |  | |||
|  | @ -99,6 +99,8 @@ export default abstract class BaseUIElement { | |||
|         if (this.InnerConstructElement === undefined) { | ||||
|             throw "ERROR! This is not a correct baseUIElement: " + this.constructor.name | ||||
|         } | ||||
| 
 | ||||
| 
 | ||||
|         try { | ||||
|             const el = this.InnerConstructElement(); | ||||
| 
 | ||||
|  | @ -130,8 +132,7 @@ export default abstract class BaseUIElement { | |||
|                     // @ts-ignore
 | ||||
|                     e.consumed = true; | ||||
|                 } | ||||
|                 el.style.pointerEvents = "all"; | ||||
|                 el.style.cursor = "pointer"; | ||||
|                 el.classList.add("pointer-events-none", "cursor-pointer"); | ||||
|             } | ||||
| 
 | ||||
|             if (this._onHover !== undefined) { | ||||
|  | @ -161,4 +162,4 @@ export default abstract class BaseUIElement { | |||
|     } | ||||
| 
 | ||||
|     protected abstract InnerConstructElement(): HTMLElement; | ||||
| } | ||||
| } | ||||
|  |  | |||
|  | @ -31,7 +31,7 @@ export default class CheckBoxes extends InputElement<number[]> { | |||
|     } | ||||
| 
 | ||||
|     protected InnerConstructElement(): HTMLElement { | ||||
|         const el = document.createElement("form"); | ||||
|         const formTag = document.createElement("form"); | ||||
| 
 | ||||
|         const value = this.value; | ||||
|         const elements = this._elements; | ||||
|  | @ -57,18 +57,18 @@ export default class CheckBoxes extends InputElement<number[]> { | |||
|                 "bg-red" | ||||
|             ); | ||||
| 
 | ||||
|             const wrapper = document.createElement("span"); | ||||
|             const wrapper = document.createElement("div"); | ||||
|             wrapper.classList.add( | ||||
|                 "wrapper", | ||||
|                 "flex", | ||||
|                 "w-full", | ||||
|                 "border", | ||||
|                 "border-gray-400", | ||||
|                 "m-1" | ||||
|                 "mb-1" | ||||
|             ); | ||||
|             wrapper.appendChild(input); | ||||
|             wrapper.appendChild(label); | ||||
|             el.appendChild(wrapper); | ||||
|             formTag.appendChild(wrapper); | ||||
| 
 | ||||
|             value.addCallbackAndRunD((selectedValues) => { | ||||
|                 if (selectedValues.indexOf(i) >= 0) { | ||||
|  | @ -97,6 +97,6 @@ export default class CheckBoxes extends InputElement<number[]> { | |||
|             }; | ||||
|         } | ||||
| 
 | ||||
|         return el; | ||||
|         return formTag; | ||||
|     } | ||||
| } | ||||
|  |  | |||
|  | @ -41,6 +41,4 @@ export class FixedInputElement<T> extends InputElement<T> { | |||
|     protected InnerConstructElement(): HTMLElement { | ||||
|         return this._el; | ||||
|     } | ||||
| 
 | ||||
| 
 | ||||
| } | ||||
| } | ||||
|  |  | |||
|  | @ -10,4 +10,3 @@ export abstract class InputElement<T> extends BaseUIElement { | |||
|     abstract IsValid(t: T): boolean; | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -68,8 +68,8 @@ function run(file, protojson) { | |||
|     for (let i = 0; i < entries.length; i++){ | ||||
|         const e = entries[i]; | ||||
|         const txt = { | ||||
|             en: `<div class='flex'><img style='width:3rem; margin-left: 1rem; margin-right: 0.5rem' src='./assets/layers/charging_station/${e.image}'/> <span>${e.description.get("en")}</span></div>`, | ||||
|             nl: `<div class='flex'><img style='width:3rem; margin-left: 1rem; margin-right: 0.5rem' src='./assets/layers/charging_station/${e.image}'/> <span>${e.description.get("nl")}</span></div` | ||||
|             en: `<div class='flex'><img class='w-12 mx-4' src='./assets/layers/charging_station/${e.image}'/> <span>${e.description.get("en")}</span></div>`, | ||||
|             nl: `<div class='flex'><img class='w-12 mx-4' src='./assets/layers/charging_station/${e.image}'/> <span>${e.description.get("nl")}</span></div>` | ||||
|         } | ||||
|         const json = { | ||||
|             if: `${e.key}=1`, | ||||
|  | @ -258,8 +258,8 @@ function run(file, protojson) { | |||
|         options: filterOptions | ||||
|     }) | ||||
| 
 | ||||
|    | ||||
|      | ||||
| 
 | ||||
| 
 | ||||
|     const extraUnits = [ | ||||
|         { | ||||
|             appliesToKey: entries.map(e => e.key + ":voltage"), | ||||
|  | @ -311,10 +311,7 @@ function run(file, protojson) { | |||
|         proto["units"] = [] | ||||
|     } | ||||
|     proto["units"].push(...extraUnits) | ||||
|      | ||||
|    // mergeTranslations("charging_station.json",proto)
 | ||||
|      | ||||
|     writeFileSync("charging_station.json", JSON.stringify(proto, undefined, "    ")) | ||||
|     writeFileSync("charging_station.json", JSON.stringify(proto, undefined, "  ")) | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -839,6 +839,11 @@ video { | |||
|   margin-bottom: 0.75rem; | ||||
| } | ||||
| 
 | ||||
| .mx-4 { | ||||
|   margin-left: 1rem; | ||||
|   margin-right: 1rem; | ||||
| } | ||||
| 
 | ||||
| .-ml-1 { | ||||
|   margin-left: -0.25rem; | ||||
| } | ||||
|  | @ -907,6 +912,10 @@ video { | |||
|   margin-right: 0px; | ||||
| } | ||||
| 
 | ||||
| .mb-1 { | ||||
|   margin-bottom: 0.25rem; | ||||
| } | ||||
| 
 | ||||
| .mb-4 { | ||||
|   margin-bottom: 1rem; | ||||
| } | ||||
|  | @ -1147,14 +1156,14 @@ video { | |||
|           animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; | ||||
| } | ||||
| 
 | ||||
| .cursor-wait { | ||||
|   cursor: wait; | ||||
| } | ||||
| 
 | ||||
| .cursor-pointer { | ||||
|   cursor: pointer; | ||||
| } | ||||
| 
 | ||||
| .cursor-wait { | ||||
|   cursor: wait; | ||||
| } | ||||
| 
 | ||||
| .resize { | ||||
|   resize: both; | ||||
| } | ||||
|  |  | |||
|  | @ -888,7 +888,7 @@ | |||
|                         "question": "Has a <b><b>European wall plug</b> with ground pin (CEE7/4 type E)</b> <img style='width:1rem;' src='./assets/layers/charging_station/TypeE.svg'/> connector" | ||||
|                     }, | ||||
|                     "3": { | ||||
|                         "question": "Has a <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> connector" | ||||
|                         "question": "Has a <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> connector" | ||||
|                     }, | ||||
|                     "4": { | ||||
|                         "question": "Has a <b><b>Type 1 with cable</b> (J1772)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type1_J1772.svg'/> connector" | ||||
|  | @ -900,7 +900,7 @@ | |||
|                         "question": "Has a <b><b>Type 1 CCS</b> (aka Type 1 Combo)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type1-ccs.svg'/> connector" | ||||
|                     }, | ||||
|                     "7": { | ||||
|                         "question": "Has a <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> connector" | ||||
|                         "question": "Has a <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> connector" | ||||
|                     }, | ||||
|                     "8": { | ||||
|                         "question": "Has a <b><b>Type 2</b> (mennekes)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type2_socket.svg'/> connector" | ||||
|  | @ -966,55 +966,55 @@ | |||
|             "Available_charging_stations (generated)": { | ||||
|                 "mappings": { | ||||
|                     "0": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</p></div>" | ||||
|                     }, | ||||
|                     "1": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</p></div>" | ||||
|                     }, | ||||
|                     "2": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>European wall plug</b> with ground pin (CEE7/4 type E)</p></div>" | ||||
|                     }, | ||||
|                     "3": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>European wall plug</b> with ground pin (CEE7/4 type E)</p></div>" | ||||
|                     }, | ||||
|                     "4": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p><b>Chademo</b></p></div>" | ||||
|                     }, | ||||
|                     "5": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p><b>Chademo</b></p></div>" | ||||
|                     }, | ||||
|                     "6": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 with cable</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "7": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 with cable</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "8": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>without</i> cable</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "9": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>without</i> cable</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "10": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p><b>Type 1 CCS</b> (aka Type 1 Combo)</p></div>" | ||||
|                     }, | ||||
|                     "11": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p><b>Type 1 CCS</b> (aka Type 1 Combo)</p></div>" | ||||
|                     }, | ||||
|                     "12": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p><b>Tesla Supercharger</b></p></div>" | ||||
|                     }, | ||||
|                     "13": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p><b>Tesla Supercharger</b></p></div>" | ||||
|                     }, | ||||
|                     "14": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p><b>Type 2</b> (mennekes)</p></div>" | ||||
|                     }, | ||||
|                     "15": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p><b>Type 2</b> (mennekes)</p></div>" | ||||
|                     }, | ||||
|                     "16": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p><b>Type 2 CCS</b> (mennekes)</p></div>" | ||||
|                     }, | ||||
|                     "17": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)" | ||||
|  | @ -1042,6 +1042,7 @@ | |||
|                     }, | ||||
|                     "25": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_tethered.svg'/> <b>Tesla supercharger (destination</b> (A Type 2 with cable branded as tesla)" | ||||
| 
 | ||||
|                     } | ||||
|                 }, | ||||
|                 "question": "Which charging stations are available here?" | ||||
|  | @ -1126,22 +1127,18 @@ | |||
|                 }, | ||||
|                 "question": "Which vehicles are allowed to charge here?" | ||||
|             }, | ||||
|             "access": { | ||||
|                 "question": "Who is allowed to use this charging station?", | ||||
|                 "render": "Access is {access}" | ||||
|             }, | ||||
|             "capacity": { | ||||
|                 "question": "How much vehicles can be charged here at the same time?", | ||||
|                 "render": "{capacity} vehicles can be charged here at the same time" | ||||
|             "13": { | ||||
|                 "question": "How much plugs of type <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> are available here?", | ||||
|                 "render": "There are <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> plugs of type <b>Chademo</b> available here" | ||||
|             }, | ||||
|             "current-0": { | ||||
|                 "mappings": { | ||||
|                     "0": { | ||||
|                         "then": "<b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem;' src='./assets/layers/charging_station/CEE7_4F.svg'/> outputs at most 16 A" | ||||
|                         "then": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs 500 volt" | ||||
|                     } | ||||
|                 }, | ||||
|                 "question": "What current do the plugs with <b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem;' src='./assets/layers/charging_station/CEE7_4F.svg'/> offer?", | ||||
|                 "render": "<b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem;' src='./assets/layers/charging_station/CEE7_4F.svg'/> outputs at most {socket:schuko:current}A" | ||||
|                 "question": "What voltage do the plugs with <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?", | ||||
|                 "render": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs {socket:chademo:voltage} volt" | ||||
|             }, | ||||
|             "current-1": { | ||||
|                 "mappings": { | ||||
|  | @ -1155,6 +1152,7 @@ | |||
|             "current-10": { | ||||
|                 "mappings": { | ||||
|                     "0": { | ||||
| 
 | ||||
|                         "then": "<b><b>Tesla Supercharger CCS</b> (a branded type2_css)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type2_CCS.svg'/> outputs at most 125 A" | ||||
|                     }, | ||||
|                     "1": { | ||||
|  |  | |||
|  | @ -1029,55 +1029,55 @@ | |||
|             "Available_charging_stations (generated)": { | ||||
|                 "mappings": { | ||||
|                     "0": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</p></div>" | ||||
|                     }, | ||||
|                     "1": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</p></div>" | ||||
|                     }, | ||||
|                     "2": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/TypeE.svg'/> <b>Europese stekker</b> met aardingspin (CEE7/4 type E)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>Europese stekker</b> met aardingspin (CEE7/4 type E)</p></div>" | ||||
|                     }, | ||||
|                     "3": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/TypeE.svg'/> <b>Europese stekker</b> met aardingspin (CEE7/4 type E)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>Europese stekker</b> met aardingspin (CEE7/4 type E)</p></div>" | ||||
|                     }, | ||||
|                     "4": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Chademo_type4.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "5": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Chademo_type4.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "6": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 met kabel</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 met kabel</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "7": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 met kabel</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 met kabel</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "8": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>zonder</i> kabel</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>zonder</i> kabel</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "9": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>zonder</i> kabel</b> (J1772)" | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>zonder</i> kabel</b> (J1772)</p></div>" | ||||
|                     }, | ||||
|                     "10": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1-ccs.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "11": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type1-ccs.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "12": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "13": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "14": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_socket.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "15": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_socket.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "16": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_CCS.svg'/> " | ||||
|                         "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p> </p></div>" | ||||
|                     }, | ||||
|                     "17": { | ||||
|                         "then": "<img style='width:3rem; margin-left: 1rem; margin-right: 1rem' src='./assets/layers/charging_station/Type2_CCS.svg'/> " | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue