Skip to content

Commit

Permalink
Themes(narrowboat): more work on locks and access
Browse files Browse the repository at this point in the history
  • Loading branch information
@pietervdvn
pietervdvn committed Oct 3, 2024
1 parent a238e9b commit 6909f56
Show file tree
Hide file tree
Showing 8 changed files with 162 additions and 90 deletions.
15 changes: 1 addition & 14 deletions assets/layers/piers_and_quays/piers_and_quays.json
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
{
"credits": "Pieter Vander Vennet",
"minzoom": 15,
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "circle",
"color": "white"
}
]
}
],
"pointRendering": null,
"tagRenderings": [
"images",
{
Expand Down
49 changes: 46 additions & 3 deletions assets/layers/waterway/waterway.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"and": [
"motorboat!=no",
"boat!=no",
"type=",
{
"or": [
"waterway=river",
Expand Down Expand Up @@ -63,6 +64,18 @@
],
"tagRenderings": [
"images",
{
"id": "name",
"question": {
"en": "What is the name of this waterway?"
},
"render": {
"en": "This waterway is named {name}"
},
"freeform": {
"key": "name"
}
},
"wikipedia",
{
"id": "type",
Expand Down Expand Up @@ -94,7 +107,10 @@
"question": {
"en": "Are boats allowed on this waterway?"
},
"id": "3_vyksl7ofya7m97l",
"label": [
"access"
],
"id": "boats_allowed",
"questionHint": {
"en": "A boat is a floating craft of which the hull is less then 20 meter long (without rudder or bowsprit)"
},
Expand All @@ -117,11 +133,15 @@
}
]
},

{
"question": {
"en": "Are motorboats allowed on this waterway?"
},
"id": "4_yuodfwdyocflwg8",
"id": "motorboats_allowed",
"label": [
"access"
],
"mappings": [
{
"if": "motorboat=yes",
Expand All @@ -136,9 +156,32 @@
}
}
]
},
{
"question": {
"en": "Are canoes, kayaks and other small, manually powered craft allowed on this waterway?"
},
"id": "canoes_allowed",
"label": [
"access"
],
"mappings": [
{
"if": "canoe=yes",
"then": {
"en": "Canoes, kayaks and manually powered craft are allowed here"
}
},
{
"if": "canoe=no",
"then": {
"en": "Canoes, kayaks and other manually powered craft are <b>not</b> allowed"
}
}
]
}
],
"allowMove": false,
"credits": "Pieter Vander Vennet",
"credits:uid": 3818858
}
}
104 changes: 57 additions & 47 deletions assets/layers/waterway_lock/waterway_lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,39 @@
],
"tagRenderings": [
"images",
"opening_hours_24_7",
{
"question": {
"en": "What VHF channel should be used to communicate with the control room of this lock?"
},
"id": "vhf",
"render": {
"en": "The VHF channel is {vhf}"
},
"freeform": {
"key": "vhf"
},
"condition": {
"or": [
"automated=yes",
"automated="
]
}
},
"phone",
{
"builtin": "website",
"override": {
"question": {
"en": "On what website can one find more information about this lock?"
}
}
},
{
"question": {
"en": "What is the maximum width (beam) of boats using this lock?"
},
"id": "max_length",
"id": "max_width",
"render": {
"en": "This lock permits boats with a maximum width of {maxwidth}"
},
Expand All @@ -86,7 +114,7 @@
"question": {
"en": "What is the maximum length of boats that may use this lock?"
},
"id": "2_qyvwk0kx77jcmh2",
"id": "maxlength",
"multiAnswer": false,
"freeform": {
"key": "maxlength"
Expand All @@ -99,11 +127,29 @@
},
"condition": "waterway!=derelict_canal"
},
{
"question": {
"en": "What is the maximum draft of boats using this lock?",
"nl": "Wat is de maximale toegestane diepgang in deze sluis?"
},
"id": "max_depth",
"questionHint": {
"en": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks."
},
"multiAnswer": false,
"render": {
"en": "The maximum draft of boats using this lock is {draft}."
},
"freeform": {
"key": "draft"
},
"condition": "waterway!=derelict_canal"
},
{
"question": {
"en": "How far does this lock raise or lower a boat?"
},
"id": "3_sm4v6ow91r2i4kd",
"id": "lock_height_difference",
"questionHint": {
"en": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks."
},
Expand All @@ -121,7 +167,7 @@
"question": {
"en": "Is this lock automated?"
},
"id": "4_pwnx07go36rzk54",
"id": "automated",
"mappings": [
{
"if": "automated=yes",
Expand All @@ -147,20 +193,15 @@
},
{
"question": {
"en": "What is the maximum draft of boats using this lock?"
},
"id": "5_1sz01guflvjeyx7",
"questionHint": {
"en": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks."
"en": "What is the name of the waterway that this lock is on?"
},
"multiAnswer": false,
"id": "lock_waterway_name",
"render": {
"en": "The maximum draft of boats using this lock is {draft}."
"en": "The waterway is name <b>{name}</b>"
},
"freeform": {
"key": "draft"
},
"condition": "waterway!=derelict_canal"
"key": "name"
}
},
{
"question": {
Expand Down Expand Up @@ -191,40 +232,9 @@
"key": "lock_ref"
}
},
{
"question": {
"en": "What VHF channel should be used to communicate with the control room of this lock?"
},
"id": "vhf",
"render": {
"en": "The VHF channelnis {vhf}"
},
"freeform": {
"key": "vhf"
},
"condition": {
"or": [
"automated=yes",
"automated="
]
}
},
"opening_hours_24_7",
"phone",
{
"question": {
"en": "What is the name of the waterway that this lock is on?"
},
"id": "waterway_name",
"render": {
"en": "The waterway is name <b>{name}</b>"
},
"freeform": {
"key": "name"
}
}
"waterway.access"
],
"allowMove": false,
"credits": "Pieter Vander Vennet",
"credits:uid": 3818858
}
}
64 changes: 42 additions & 22 deletions langs/layers/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6664,7 +6664,7 @@
"render": "Item in MapRoulette"
}
},
"marinas": {
"marina": {
"description": "Marinas and yacht havens for small craft.",
"name": "Marinas",
"presets": {
Expand Down Expand Up @@ -12565,7 +12565,7 @@
"description": "Waterways which are navigable by small boats, yachts, ...",
"name": "Navigable waterways",
"tagRenderings": {
"3_vyksl7ofya7m97l": {
"boats_allowed": {
"mappings": {
"0": {
"then": "Boats (<20m) are allowed on this waterway"
Expand All @@ -12577,7 +12577,18 @@
"question": "Are boats allowed on this waterway?",
"questionHint": "A boat is a floating craft of which the hull is less then 20 meter long (without rudder or bowsprit)"
},
"4_yuodfwdyocflwg8": {
"canoes_allowed": {
"mappings": {
"0": {
"then": "Canoes, kayaks and manually powered craft are allowed here"
},
"1": {
"then": "Canoes, kayaks and other manually powered craft are <b>not</b> allowed"
}
},
"question": "Are canoes, kayaks and other small, manually powered craft allowed on this waterway?"
},
"motorboats_allowed": {
"mappings": {
"0": {
"then": "Motorized boats are allowed"
Expand All @@ -12588,6 +12599,10 @@
},
"question": "Are motorboats allowed on this waterway?"
},
"name": {
"question": "What is the name of this waterway?",
"render": "This waterway is named {name}"
},
"type": {
"mappings": {
"0": {
Expand Down Expand Up @@ -12623,17 +12638,7 @@
}
},
"tagRenderings": {
"2_qyvwk0kx77jcmh2": {
"question": "What is the maximum length of boats that may use this lock?",
"questionHint": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks.",
"render": "Boats with a maximum length of {maxlength} may use this lock."
},
"3_sm4v6ow91r2i4kd": {
"question": "How far does this lock raise or lower a boat?",
"questionHint": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks.",
"render": "This lock has a drop height of {lock:height}"
},
"4_pwnx07go36rzk54": {
"automated": {
"mappings": {
"0": {
"then": "This lock is automated (operated from control panel or control room)"
Expand All @@ -12644,32 +12649,47 @@
},
"question": "Is this lock automated?"
},
"5_1sz01guflvjeyx7": {
"question": "What is the maximum draft of boats using this lock?",
"lock_height_difference": {
"question": "How far does this lock raise or lower a boat?",
"questionHint": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks.",
"render": "The maximum draft of boats using this lock is {draft}."
"render": "This lock has a drop height of {lock:height}"
},
"lock_name": {
"question": "What is the name of this lock?",
"questionHint": "The numerical reference code can be added in a follow-up question ",
"render": "This lock is named {lock_name}"
},
"max_length": {
"lock_waterway_name": {
"question": "What is the name of the waterway that this lock is on?",
"render": "The waterway is name <b>{name}</b>"
},
"max_depth": {
"question": "What is the maximum draft of boats using this lock?",
"questionHint": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks.",
"render": "The maximum draft of boats using this lock is {draft}."
},
"max_width": {
"question": "What is the maximum width (beam) of boats using this lock?",
"questionHint": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks.",
"render": "This lock permits boats with a maximum width of {maxwidth}"
},
"maxlength": {
"question": "What is the maximum length of boats that may use this lock?",
"questionHint": "Omit units if designated in meters. Feet and inches maybe indicated with apostrophes and quotation marks.",
"render": "Boats with a maximum length of {maxlength} may use this lock."
},
"ref": {
"question": "Does this lock have a reference number/code?",
"render": "This is lock {lock_ref}"
},
"vhf": {
"question": "What VHF channel should be used to communicate with the control room of this lock?",
"render": "The VHF channelnis {vhf}"
"render": "The VHF channel is {vhf}"
},
"waterway_name": {
"question": "What is the name of the waterway that this lock is on?",
"render": "The waterway is name <b>{name}</b>"
"website": {
"override": {
"question": "On what website can one find more information about this lock?"
}
}
},
"title": {
Expand Down
Loading

0 comments on commit 6909f56

Please sign in to comment.