Robin-van-der-Linde/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Minor changes to base layer | Fixes some typos

Browse source
This commit is contained in:
pgm-chardelv1 2021-07-22 10:00:24 +02:00
parent 95de6c7055
commit 8660f73ac1
5 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.vscode/settings.json vendored
View file

@ -1,3 +1,8 @@
{ {
"files.eol": "\n" "files.eol": "\n",
"workbench.colorCustomizations": {
"activityBar.background": "#551907",
"titleBar.activeBackground": "#78230A",
"titleBar.activeForeground": "#FFFBFA"
}
} }

16
Customizations/JSON/LayerConfigJson.ts
View file

@ -54,7 +54,7 @@ export interface LayerConfigJson {
* Note that both geojson-options might set a flag 'isOsmCache' indicating that the data originally comes from OSM too * Note that both geojson-options might set a flag 'isOsmCache' indicating that the data originally comes from OSM too
* *
* *
* NOTE: the previous format was 'overpassTags: AndOrTagCOnfigJson | string', which is interpreted as a shorthand for source: {osmTags: "key=value"} * NOTE: the previous format was 'overpassTags: AndOrTagConfigJson | string', which is interpreted as a shorthand for source: {osmTags: "key=value"}
* While still supported, this is considered deprecated * While still supported, this is considered deprecated
*/ */
source: { osmTags: AndOrTagConfigJson | string } | source: { osmTags: AndOrTagConfigJson | string } |
@ -81,7 +81,7 @@ export interface LayerConfigJson {
doNotDownload?: boolean; doNotDownload?: boolean;
/** /**
* This tagrendering should either be 'yes' or 'no'. If 'no' is returned, then the feature will be hidden from view. * This tag rendering should either be 'yes' or 'no'. If 'no' is returned, then the feature will be hidden from view.
* This is useful to hide certain features from view. Important: hiding features does not work dynamically, but is only calculated when the data is first renders. * This is useful to hide certain features from view. Important: hiding features does not work dynamically, but is only calculated when the data is first renders.
* This implies that it is not possible to hide a feature after a tagging change * This implies that it is not possible to hide a feature after a tagging change
* *
@ -91,13 +91,13 @@ export interface LayerConfigJson {
/** /**
* The zoomlevel at which point the data is shown and loaded. * The zoom level at which point the data is shown and loaded.
* Default: 0 * Default: 0
*/ */
minzoom?: number; minzoom?: number;
/** /**
* The zoomlevel at which point the data is hidden again * The zoom level at which point the data is hidden again
* Default: 100 (thus: always visible * Default: 100 (thus: always visible
*/ */
maxzoom?: number; maxzoom?: number;
@ -120,9 +120,9 @@ export interface LayerConfigJson {
* Note that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets. * Note that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets.
* *
* The result of the icon is rendered as follows: * The result of the icon is rendered as follows:
* the resulting string is interpreted as a _list_ of items, seperated by ";". The bottommost layer is the first layer. * the resulting string is interpreted as a _list_ of items, separated by ";". The bottommost layer is the first layer.
* As a result, on could use a generic pin, then overlay it with a specific icon. * As a result, on could use a generic pin, then overlay it with a specific icon.
* To make things even more practical, one can use all svgs from the folder "assets/svg" and _substitute the color_ in it. * To make things even more practical, one can use all SVG's from the folder "assets/svg" and _substitute the color_ in it.
* E.g. to draw a red pin, use "pin:#f00", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>` * E.g. to draw a red pin, use "pin:#f00", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>`
* *
*/ */
@ -220,7 +220,7 @@ export interface LayerConfigJson {
/** /**
* If set, the user will prompted to confirm the location before actually adding the data. * If set, the user will prompted to confirm the location before actually adding the data.
* THis will be with a 'drag crosshair'-method. * This will be with a 'drag crosshair'-method.
* *
* If 'preferredBackgroundCategory' is set, the element will attempt to pick a background layer of that category. * If 'preferredBackgroundCategory' is set, the element will attempt to pick a background layer of that category.
*/ */
@ -235,7 +235,7 @@ export interface LayerConfigJson {
* *
* Refer to the class `TagRenderingConfigJson` to see the possibilities. * Refer to the class `TagRenderingConfigJson` to see the possibilities.
* *
* Note that we can also use a string here - where the string refers to a tagrenering defined in `assets/questions/questions.json`, * Note that we can also use a string here - where the string refers to a tag rendering defined in `assets/questions/questions.json`,
* where a few very general questions are defined e.g. website, phone number, ... * where a few very general questions are defined e.g. website, phone number, ...
* *
* A special value is 'questions', which indicates the location of the questions box. If not specified, it'll be appended to the bottom of the featureInfobox. * A special value is 'questions', which indicates the location of the questions box. If not specified, it'll be appended to the bottom of the featureInfobox.

36
assets/themes/cycle_infra/cycle_infra.json
View file

@ -9,21 +9,22 @@
"nl": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken." "nl": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken."
}, },
"description": { "description": {
"en": "A map where you can view and edit things related to the bicycle infrastructure made during osoc21.", "en": "A map where you can view and edit things related to the bicycle infrastructure. Made during #osoc21.",
"nl": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken gemaakt tijdens osoc21." "nl": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken. Gemaakt tijdens #osoc21."
}, },
"language": [ "language": [
"en", "en",
"nl" "nl"
], ],
"maintainer": "", "maintainer": "",
"defaultBackgroundId": "CartoDB.Positron",
"icon": "./assets/svg/cycle-infra.svg", "icon": "./assets/svg/cycle-infra.svg",
"version": "0", "version": "0",
"startLat": 51, "startLat": 51,
"startLon": 3.75, "startLon": 3.75,
"startZoom": 11, "startZoom": 11,
"widenFactor": 0.05, "widenFactor": 0.05,
"socialImage": "", "socialImage": "./assets/svg/cycle-infra.svg",
"enableDownload": true, "enableDownload": true,
"layers": [ "layers": [
{ {
@ -120,7 +121,7 @@
"if": "cycleway=shared_lane", "if": "cycleway=shared_lane",
"then": { "then": {
"en": "There is a shared lane", "en": "There is a shared lane",
"nl": "Er is een fietssugestiestrook" "nl": "Er is een fietssuggestiestrook"
} }
}, },
{ {
@ -583,7 +584,12 @@
"nl": "Hoe breed is de ruimte tussen het fietspad en de weg?" "nl": "Hoe breed is de ruimte tussen het fietspad en de weg?"
}, },
"condition": { "condition": {
"or": ["cycleway=track", "cycleway=lane", "highway=cycleway", "highway=path"] "or": [
"cycleway=track",
"cycleway=lane",
"highway=cycleway",
"highway=path"
]
}, },
"freeform": { "freeform": {
"key": "cycleway:buffer", "key": "cycleway:buffer",
@ -631,7 +637,21 @@
} }
] ]
}, },
"presets": [] "dashArray": {
"mappings": [
{
"if": {
"or": [
"highway=cycleway",
"highway=path"
]
},
"then": "25 15"
}
]
},
"presets": [
]
}, },
{ {
"id": "all_streets", "id": "all_streets",
@ -904,14 +924,14 @@
{ {
"if": "cycle_barrier:type=triple", "if": "cycle_barrier:type=triple",
"then": { "then": {
"en": "Triple, three barier behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>", "en": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
"nl": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>" "nl": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
} }
}, },
{ {
"if": "cycle_barrier:type=squeeze", "if": "cycle_barrier:type=squeeze",
"then": { "then": {
"en": "Squeeze gate, gap is smaller at top, then at bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>" "en": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
} }
} }
] ]

4
langs/themes/en.json
View file

@ -904,6 +904,10 @@
"then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>'" "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>'"
} }
} }
},
"10": {
"render": "The buffer besides this cycleway is {cycleway:buffer} m",
"question": "How wide is the gap between the cycleway and the road?"
} }
} }
}, },

4
langs/themes/nl.json
View file

@ -708,6 +708,10 @@
"then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>'" "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>'"
} }
} }
},
"10": {
"render": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
"question": "Hoe breed is de ruimte tussen het fietspad en de weg?"
} }
} }
}, },