Merge remote-tracking branch 'upstream/main'

This commit is contained in:
tiptoptom 2025-06-19 10:31:21 +02:00
commit ada654df8a
392 changed files with 271817 additions and 23374 deletions

View file

@ -786,10 +786,6 @@
"old": {"highway": "footway", "foot": "no"},
"replace": {"highway": "path", "foot": "no"}
},
{
"old": {"highway": "ford"},
"replace": {"ford": "*"}
},
{
"old": {"highway": "path", "ladder": "yes"},
"replace": {"highway": "ladder"}
@ -1134,6 +1130,14 @@
"old": {"man_made": "winery"},
"replace": {"craft": "winery"}
},
{
"old": {"map_type": "tactile_map", "information": "map"},
"replace": {"information": "tactile_map"}
},
{
"old": {"map_type": "tactile_model", "information": "map"},
"replace": {"information": "tactile_model"}
},
{
"old": {"maxage": "*"},
"replace": {"max_age": "$1"}
@ -1253,6 +1257,102 @@
"old": {"parking": "street"},
"replace": {"parking": "lane"}
},
{
"old": {"parking:lane:both": "no"},
"replace": {"parking:both": "no"}
},
{
"old": {"parking:lane:both": "no_parking"},
"replace": {"parking:both": "no", "parking:both:restriction": "no_parking"}
},
{
"old": {"parking:lane:both": "no_stopping"},
"replace": {"parking:both": "no", "parking:both:restriction": "no_stopping"}
},
{
"old": {"parking:lane:both": "fire_lane"},
"replace": {"parking:both": "no", "parking:both:restriction": "no_stopping", "parking:both:restriction:reason": "fire_lane"}
},
{
"old": {"parking:lane:both": "separate"},
"replace": {"parking:both": "separate"}
},
{
"old": {"parking:lane:both": "diagonal"},
"replace": {"parking:both": "yes", "parking:both:orientation": "diagonal"}
},
{
"old": {"parking:lane:both": "parallel"},
"replace": {"parking:both": "yes", "parking:both:orientation": "parallel"}
},
{
"old": {"parking:lane:both": "perpendicular"},
"replace": {"parking:both": "yes", "parking:both:orientation": "perpendicular"}
},
{
"old": {"parking:lane:both:parallel": "on_street"},
"replace": {"parking:both": "lane"}
},
{
"old": {"parking:lane:left": "no"},
"replace": {"parking:left": "no"}
},
{
"old": {"parking:lane:left": "no_parking"},
"replace": {"parking:left": "no", "parking:left:restriction": "no_parking"}
},
{
"old": {"parking:lane:left": "no_stopping"},
"replace": {"parking:left": "no", "parking:left:restriction": "no_stopping"}
},
{
"old": {"parking:lane:left": "separate"},
"replace": {"parking:left": "separate"}
},
{
"old": {"parking:lane:left": "diagonal"},
"replace": {"parking:left": "yes", "parking:left:orientation": "diagonal"}
},
{
"old": {"parking:lane:left": "parallel"},
"replace": {"parking:left": "yes", "parking:left:orientation": "parallel"}
},
{
"old": {"parking:lane:left": "perpendicular"},
"replace": {"parking:left": "yes", "parking:left:orientation": "perpendicular"}
},
{
"old": {"parking:lane:right": "no"},
"replace": {"parking:right": "no"}
},
{
"old": {"parking:lane:right": "no_parking"},
"replace": {"parking:right": "no", "parking:right:restriction": "no_parking"}
},
{
"old": {"parking:lane:right": "no_stopping"},
"replace": {"parking:right": "no", "parking:right:restriction": "no_stopping"}
},
{
"old": {"parking:lane:right": "separate"},
"replace": {"parking:right": "separate"}
},
{
"old": {"parking:lane:right": "diagonal"},
"replace": {"parking:right": "yes", "parking:right:orientation": "diagonal"}
},
{
"old": {"parking:lane:right": "parallel"},
"replace": {"parking:right": "yes", "parking:right:orientation": "parallel"}
},
{
"old": {"parking:lane:right": "perpendicular"},
"replace": {"parking:right": "yes", "parking:right:orientation": "perpendicular"}
},
{
"old": {"parking:lane:right:parallel": "on_street"},
"replace": {"parking:right": "lane"}
},
{
"old": {"parking:orientation": "*"},
"replace": {"orientation": "$1"}
@ -1528,10 +1628,6 @@
"old": {"shop": "perfume"},
"replace": {"shop": "perfumery"}
},
{
"old": {"shop": "photo_studio"},
"replace": {"craft": "photographer"}
},
{
"old": {"shop": "real_estate"},
"replace": {"office": "estate_agent"}
@ -1999,5 +2095,13 @@
{
"old": {"industrial": "brickworks"},
"replace": {"industrial": "brickyard"}
},
{
"old": {"cycleway": "opposite"},
"replace": {"oneway:bicycle": "no", "cycleway:both": "no"}
},
{
"old": {"cycleway:left": "opposite"},
"replace": {"oneway:bicycle": "no", "cycleway:left": "no"}
}
]

View file

@ -1,6 +1,5 @@
{
"created_by": true,
"converted_by": true,
"odbl": true,
"odbl:note": true,
@ -53,5 +52,17 @@
"yh:TOTYUMONO": true,
"yh:TYPE": true,
"yh:WIDTH": true,
"yh:WIDTH_RANK": true
"yh:WIDTH_RANK": true,
"LINZ2OSM:dataset": true,
"LINZ2OSM:layer": true,
"LINZ2OSM:source_version": true,
"LINZ:dataset": true,
"LINZ:layer": true,
"LINZ:source_version": true,
"linz2osm:objectid": true,
"fid": true,
"import_uuid": true,
"gnis:import_uuid": true
}

View file

@ -1,12 +1,14 @@
{
"type": "address",
"key": "addr",
"reference": {
"key": "addr:*"
},
"keys": [
"addr:block_number",
"addr:city",
"addr:block_number",
"addr:conscriptionnumber",
"addr:county",
"addr:country",
"addr:county",
"addr:district",
@ -23,6 +25,7 @@
"addr:street",
"addr:subdistrict",
"addr:suburb",
"addr:town",
"addr:unit"
],
"label": "Address",
@ -61,6 +64,7 @@
"subdistrict!vn": "Ward/Commune/Townlet",
"suburb": "Suburb",
"suburb!jp": "Ward (政令市)",
"town": "Town",
"unit": "Unit"
}
},

View file

@ -0,0 +1,16 @@
{
"key": "aircraft:type",
"type": "semiCombo",
"label": "Type",
"strings": {
"options": {
"military": "Military",
"helicopter": "Helicopter",
"airliner": "Airliner",
"jet": "Jet",
"fixed_wing": "Fixed Wing",
"cargo": "Cargo",
"glider": "Glider"
}
}
}

View file

@ -12,7 +12,9 @@
"bust": "Bust",
"painting": "Painting",
"mosaic": "Mosaic",
"relief": "Relief"
"relief": "Relief",
"stone": "Artistically Worked Stone",
"tilework": "Tile Work"
}
}
}

View file

@ -3,5 +3,6 @@
"type": "typeCombo",
"label": "Type",
"usage": "group",
"placeholder": "Default"
"placeholder": "Default",
"stringsCrossReference": "{bridge_combo}"
}

View file

@ -0,0 +1,10 @@
{
"key": "climbing:bolts",
"type": "number",
"minValue": 0,
"label": "Number of Bolts",
"prerequisiteTag": {
"key": "climbing:sport",
"value": "yes"
}
}

View file

@ -0,0 +1,48 @@
{
"key": "climbing:grade:french",
"type": "combo",
"label": "Grade (French)",
"placeholder": "5c",
"caseSensitive": false,
"customValues": true,
"autoSuggestions": false,
"options": [
"1",
"2",
"3-",
"3",
"3+",
"4a",
"4b",
"4c",
"5a",
"5b",
"5c",
"5c+",
"6a",
"6a+",
"6b",
"6b+",
"6c",
"6c+",
"7a",
"7a+",
"7b",
"7b+",
"7c",
"7c+",
"8a",
"8a+",
"8b",
"8b+",
"8c",
"8c+",
"9a",
"9a+",
"9b",
"9b+",
"9c",
"9c+",
"10a"
]
}

View file

@ -0,0 +1,39 @@
{
"key": "climbing:grade:saxon",
"type": "combo",
"label": "Grade (Saxon)",
"placeholder": "VIIa",
"caseSensitive": true,
"customValues": true,
"autoSuggestions": false,
"options": [
"I",
"II",
"III",
"IV",
"V",
"VI",
"VIIa",
"VIIb",
"VII",
"VIIc",
"VIIIa",
"VIIIb",
"VIIIc",
"IXa",
"IXb",
"IXc",
"Xa",
"Xb",
"Xc",
"XIa",
"XIb",
"XIc",
"XIIa",
"XIIb",
"XIIc",
"XIIIa",
"XIIIb",
"XIIIc"
]
}

View file

@ -0,0 +1,51 @@
{
"key": "climbing:grade:uiaa",
"type": "combo",
"label": "Grade (UIAA)",
"placeholder": "6-",
"caseSensitive": false,
"customValues": true,
"autoSuggestions": false,
"options": [
"1-",
"1",
"1+",
"2-",
"2",
"2+",
"3-",
"3",
"3+",
"4-",
"4",
"4+",
"5-",
"5",
"5+",
"6-",
"6",
"6+",
"7-",
"7",
"7+",
"8-",
"8",
"8+",
"9-",
"9",
"9+",
"10-",
"10",
"10+",
"11-",
"11",
"11+",
"12-",
"12",
"12+",
"13-",
"13",
"13+",
"14-"
]
}

View file

@ -0,0 +1,45 @@
{
"key": "climbing:grade:yds_class",
"type": "combo",
"label": "Grade (YDS)",
"placeholder": "5.10a",
"caseSensitive": false,
"customValues": true,
"autoSuggestions": false,
"options": [
"5",
"5.1",
"5.2",
"5.3",
"5.4",
"5.5",
"5.6",
"5.7",
"5.8",
"5.9",
"5.10a",
"5.10b",
"5.10c",
"5.10d",
"5.11a",
"5.11b",
"5.11c",
"5.11d",
"5.12a",
"5.12b",
"5.12c",
"5.12d",
"5.13a",
"5.13b",
"5.13c",
"5.13d",
"5.14a",
"5.14b",
"5.14c",
"5.14d",
"5.15a",
"5.15b",
"5.15c",
"5.15d"
]
}

View file

@ -0,0 +1,6 @@
{
"key": "climbing:length",
"type": "number",
"minValue": 0,
"label": "Length (Meters)"
}

View file

@ -0,0 +1,5 @@
{
"key": "climbing:sport",
"type": "check",
"label": "Sport climbing (bolted climbing)"
}

View file

@ -0,0 +1,5 @@
{
"key": "climbing:trad",
"type": "check",
"label": "Traditional climbing"
}

View file

@ -2,6 +2,7 @@
"key": "crossing:markings",
"type": "combo",
"label": "{crossing/markings}",
"autoSuggestions": false,
"stringsCrossReference": "{crossing/markings}",
"iconsCrossReference": "{crossing/markings}",
"options": [
@ -15,6 +16,5 @@
"include": [
"BG"
]
},
"autoSuggestions": false
}
}

View file

@ -2,6 +2,9 @@
"key": "crossing:markings",
"type": "combo",
"label": "{crossing/markings}",
"autoSuggestions": false,
"stringsCrossReference": "{crossing/markings}",
"iconsCrossReference": "{crossing/markings}",
"options": [
"zebra",
"yes",
@ -10,9 +13,6 @@
"dashes",
"surface"
],
"autoSuggestions": false,
"iconsCrossReference": "{crossing/markings}",
"stringsCrossReference": "{crossing/markings}",
"locationSet": {
"include": [
"DE",

View file

@ -2,6 +2,9 @@
"key": "crossing:markings",
"type": "combo",
"label": "{crossing/markings}",
"autoSuggestions": false,
"stringsCrossReference": "{crossing/markings}",
"iconsCrossReference": "{crossing/markings}",
"options": [
"zebra",
"dots",
@ -9,9 +12,6 @@
"yes",
"no"
],
"autoSuggestions": false,
"iconsCrossReference": "{crossing/markings}",
"stringsCrossReference": "{crossing/markings}",
"locationSet": {
"include": [
"PL"

View file

@ -2,9 +2,10 @@
"key": "crossing:markings",
"type": "combo",
"label": "{crossing/markings}",
"autoSuggestions": false,
"default": "yes",
"stringsCrossReference": "{crossing/markings}",
"iconsCrossReference": "{crossing/markings}",
"default": "yes",
"options": [
"zebra",
"no",
@ -16,6 +17,5 @@
"include": [
"BG"
]
},
"autoSuggestions": false
}
}

View file

@ -2,6 +2,10 @@
"key": "crossing:markings",
"type": "combo",
"label": "{crossing/markings}",
"autoSuggestions": false,
"default": "yes",
"stringsCrossReference": "{crossing/markings}",
"iconsCrossReference": "{crossing/markings}",
"options": [
"zebra",
"yes",
@ -10,15 +14,11 @@
"dashes",
"surface"
],
"autoSuggestions": false,
"iconsCrossReference": "{crossing/markings}",
"stringsCrossReference": "{crossing/markings}",
"locationSet": {
"include": [
"DE",
"AT",
"CH"
]
},
"default": "yes"
}
}

View file

@ -2,6 +2,10 @@
"key": "crossing:markings",
"type": "combo",
"label": "{crossing/markings}",
"autoSuggestions": false,
"default": "yes",
"stringsCrossReference": "{crossing/markings}",
"iconsCrossReference": "{crossing/markings}",
"options": [
"zebra",
"dots",
@ -9,13 +13,9 @@
"yes",
"no"
],
"autoSuggestions": false,
"iconsCrossReference": "{crossing/markings}",
"stringsCrossReference": "{crossing/markings}",
"locationSet": {
"include": [
"PL"
]
},
"default": "yes"
}
}

View file

@ -2,9 +2,9 @@
"key": "crossing:markings",
"type": "combo",
"label": "{crossing/markings}",
"default": "yes",
"stringsCrossReference": "{crossing/markings}",
"iconsCrossReference": "{crossing/markings}",
"default": "yes",
"locationSet": {
"exclude": [
"BG",

View file

@ -0,0 +1,16 @@
{
"key": "cycle_barrier",
"type": "combo",
"label": "Type",
"customValues": false,
"autoSuggestions": false,
"strings": {
"options": {
"single": "Single",
"double": "Double",
"triple": "Triple",
"diagonal": "Diagonal",
"tilted": "Tilted"
}
}
}

View file

@ -0,0 +1,14 @@
{
"key": "cycle_barrier:installation",
"type": "combo",
"label": "Installation",
"customValues": false,
"autoSuggestions": false,
"strings": {
"options": {
"fixed": "Fixed",
"openable": "Openable",
"removable": "Removable"
}
}
}

View file

@ -36,17 +36,17 @@
"title": "Bike Lane Shared With Bus",
"description": "A bike lane shared with a bus lane"
},
"opposite_lane": {
"title": "Opposite Bike Lane",
"description": "A bike lane that travels in the opposite direction of traffic"
},
"opposite": {
"title": "Contraflow Bike Lane",
"description": "A bike lane that travels in both directions on a one-way street"
},
"separate": {
"title": "Cycleway Mapped Separately",
"description": "Indicates that cycleway was mapped as a separate geometry"
},
"opposite_lane": {
"title": "(Deprecated) Opposite Bike Lane",
"description": "Please update with oneway, oneway:bicycle, and cycleway:left/right=lane etc."
},
"opposite": {
"title": "(Deprecated) Contraflow Bike Lane",
"description": "Please update with oneway=yes, oneway:bicycle=no, and cycleway:both=no etc."
}
}
},

View file

@ -0,0 +1,10 @@
{
"key": "deflection",
"type": "number",
"label": "Angle",
"increment": 5,
"prerequisiteTag": {
"key": "cycle_barrier",
"value": "diagonal"
}
}

View file

@ -0,0 +1,5 @@
{
"key": "dog",
"type": "check",
"label": "Suitable For Dogs"
}

View file

@ -8,6 +8,7 @@
"main": "Main",
"secondary": "Secondary",
"service": "Service",
"shop": "Shop Entrance",
"exit": "Exit Only",
"entrance": "Entrance Only",
"emergency": "Emergency Exit",

View file

@ -4,5 +4,6 @@
"label": "Hashtags",
"usage": "changeset",
"placeholder": "#example",
"autoSuggestions": false,
"caseSensitive": true
}

View file

@ -1,7 +1,7 @@
{
"key": "internet_access:fee",
"type": "combo",
"label": "Internet Access",
"label": "Internet Access Fee",
"strings": {
"options": {
"no": "Free",

View file

@ -0,0 +1,16 @@
{
"key": "irrigation",
"type": "defaultCheck",
"label": "Center-Pivot Irrigation",
"terms": [
"central pivot irrigation",
"water wheel",
"circle irrigation"
],
"strings": {
"options": {
"undefined": "No",
"pivot": "Yes"
}
}
}

7
data/fields/layer_1.json Normal file
View file

@ -0,0 +1,7 @@
{
"key": "layer",
"type": "number",
"label": "{layer}",
"placeholder": "0",
"default": "1"
}

View file

@ -0,0 +1,9 @@
{
"key": "manufacturer:wikidata",
"keys": [
"manufacturer:wikidata",
"manufacturer:wikipedia"
],
"type": "wikidata",
"label": "Manufacturer Wikidata"
}

View file

@ -1,5 +1,15 @@
{
"key": "map_type",
"type": "typeCombo",
"label": "Type"
"label": "Type",
"strings": {
"options": {
"topo": "Topographical Map",
"street": "Road Map",
"scheme": "Schematic Map",
"toposcope": "Toposcope"
}
},
"autoSuggestions": false,
"customValues": false
}

View file

@ -0,0 +1,6 @@
{
"key": "maxwidth:physical",
"type": "roadheight",
"label": "Width Limit",
"snake_case": false
}

View file

@ -0,0 +1,9 @@
{
"key": "model:wikidata",
"keys": [
"model:wikidata",
"model:wikipedia"
],
"type": "wikidata",
"label": "Model Wikidata"
}

10
data/fields/opening.json Normal file
View file

@ -0,0 +1,10 @@
{
"key": "opening",
"type": "number",
"label": "Opening Width (Meters)",
"snake_case": false,
"prerequisiteTag": {
"key": "cycle_barrier",
"valueNot": "single"
}
}

10
data/fields/overlap.json Normal file
View file

@ -0,0 +1,10 @@
{
"key": "overlap",
"type": "number",
"label": "Overlap Width (Meters)",
"snake_case": false,
"prerequisiteTag": {
"key": "cycle_barrier",
"valueNot": "single"
}
}

View file

@ -0,0 +1,8 @@
{
"key": "panoramax",
"type": "identifier",
"label": "Panoramax Image ID",
"urlFormat": "https://api.panoramax.xyz/#focus=pic&pic={value}",
"pattern": "^[a-zA-Z0-9-]{36,}$",
"universal": true
}

View file

@ -4,19 +4,58 @@
"label": "Type",
"strings": {
"options": {
"surface": "Surface",
"underground": "Underground",
"multi-storey": "Multilevel",
"street_side": "Street-Side",
"lane": "Roadside Lane",
"carports": "Carports",
"garage_boxes": "Garage Boxes",
"rooftop": "Rooftop",
"sheds": "Sheds",
"layby": "Turnout / Lay-By",
"on_kerb": "On Kerb",
"half_on_kerb": "Half On Kerb",
"shoulder": "Shoulder"
"surface": {
"title": "Surface",
"description": "One level of parking on the ground."
},
"street_side": {
"title": "Street-Side",
"description": "Parking directly adjacent to the street (but not on it)."
},
"lane": {
"title": "Roadside Lane",
"description": "Parking on the street (which could be easily converted to a travel lane)."
},
"underground": {
"title": "Underground",
"description": "Underground parking."
},
"multi-storey": {
"title": "Multilevel",
"description": "Two or more levels of parking decks in a building structure."
},
"rooftop": {
"title": "Rooftop",
"description": "One level of a parking deck on top of a building."
},
"carports": {
"title": "Carports",
"description": "Structure used to offer limited protection to vehicles, typically without walls."
},
"garage_boxes": {
"title": "Garage Boxes",
"description": "Private garage with multiple individual boxes for one car each."
},
"sheds": {
"title": "Sheds",
"description": "Private hangars for vehicles."
},
"layby": {
"title": "Turnout / Lay-By",
"description": "Parking at a rest area, alongside a road."
},
"on_kerb": {
"title": "On Kerb",
"description": "Parking on the sidewalk."
},
"half_on_kerb": {
"title": "Half On Kerb",
"description": "Parking partially on the sidewalk."
},
"shoulder": {
"title": "Shoulder",
"description": "Parking on the shoulder."
}
}
},
"autoSuggestions": false,

View file

@ -3,7 +3,7 @@
"type": "identifier",
"label": "SIRET Number",
"urlFormat": "https://annuaire-entreprises.data.gouv.fr/etablissement/{value}",
"pattern": "^[0-9]{9}([1-7][0-9]{3}|0[1-9][0-9]{2}|00[1-9][0-9]|000[1-9])[0-9]$",
"pattern": "^MONACO[A-Z\\d]{5}001|\\d{9}([1-7]\\d{3}|0[1-9]\\d{2}|00[1-9]\\d|000[1-9])\\d$",
"locationSet": {
"include": [
"fr"

View file

@ -0,0 +1,6 @@
{
"key": "roof:height",
"minValue": 0,
"type": "number",
"label": "Roof Height (Meters)"
}

View file

@ -0,0 +1,23 @@
{
"key": "roof:shape",
"type": "combo",
"label": "Roof Shape",
"strings": {
"options": {
"flat": "Flat",
"gabled": "Gabled",
"skillion": "Skillion",
"hipped": "Hipped",
"half-hipped": "Half-Hipped",
"mansard": "Mansard",
"gambrel": "Gambrel",
"pyramidal": "Pyramidal",
"cone": "Cone",
"dome": "Dome",
"onion": "Onion",
"round": "Round"
}
},
"autoSuggestions": true,
"customValues": false
}

View file

@ -5,6 +5,7 @@
"placeholder": "Mountain Hiking, Alpine Hiking...",
"strings": {
"options": {
"strolling": "Strolling",
"hiking": "T1: Hiking",
"mountain_hiking": "T2: Mountain Hiking",
"demanding_mountain_hiking": "T3: Demanding Mountain Hiking",

View file

@ -1,8 +1,8 @@
{
"key": "source",
"type": "semiCombo",
"universal": true,
"label": "Sources",
"usage": "changeset",
"snake_case": false,
"caseSensitive": true,
"strings": {

10
data/fields/spacing.json Normal file
View file

@ -0,0 +1,10 @@
{
"key": "spacing",
"type": "number",
"label": "Distance Between Barriers (Meters)",
"snake_case": false,
"prerequisiteTag": {
"key": "cycle_barrier",
"valueNot": "single"
}
}

View file

@ -3,5 +3,6 @@
"type": "typeCombo",
"label": "Type",
"usage": "group",
"placeholder": "Default"
"placeholder": "Default",
"stringsCrossReference": "{tunnel_combo}"
}

View file

@ -10,6 +10,7 @@
"coffee": "Coffee",
"condoms": "Condoms",
"drinks": "Drinks",
"e-cigarettes": "E-Cigarettes",
"eggs": "Eggs",
"electronics": "Electronics",
"elongated_coin": "Souvenir Coins",

View file

@ -0,0 +1,13 @@
# About `@templates`
Presets in `@templates` are a convention for a _virtual_ presets that are only used from inside other presets.
The only property that really matter for these special presets are the `fields`.
All other properties can be copied from existing template presets and ignored. They are default values that are meant to match all cases where they might be referenced.
## How to use
Inside another preset, reference the template or any other preset - like `"{@templates/internet_access}"` in `fields` or `moreFields`. This will "copy" all the listed fields from the file `data/presets/@templates/internet_access.json`.
You can only "copy" (template) `fields` to (preset) `fields` and (template) `moreFields` to (preset) `moreFields`.

View file

@ -0,0 +1,23 @@
{
"moreFields": [
"oneway",
"access",
"segregated"
],
"geometry": [
"line"
],
"tags": {
"@template": "crossing/bicycle_more"
},
"searchable": false,
"locationSet": {
"include": [
"999"
],
"exclude": [
"999"
]
},
"name": "{point}"
}

View file

@ -0,0 +1,23 @@
{
"fields": [
"crossing/island",
"crossing_raised"
],
"geometry": [
"point",
"line"
],
"tags": {
"@template": "crossing/defaults"
},
"searchable": false,
"locationSet": {
"include": [
"999"
],
"exclude": [
"999"
]
},
"name": "{point}"
}

View file

@ -0,0 +1,22 @@
{
"moreFields": [
"smoothness",
"lit"
],
"geometry": [
"line"
],
"tags": {
"@template": "crossing/geometry_way_more"
},
"searchable": false,
"locationSet": {
"include": [
"999"
],
"exclude": [
"999"
]
},
"name": "{point}"
}

View file

@ -6,7 +6,8 @@
"crossing/markings-PL"
],
"geometry": [
"point"
"point",
"line"
],
"tags": {
"@template": "crossing/markings"

View file

@ -6,7 +6,8 @@
"crossing/markings_yes-PL"
],
"geometry": [
"point"
"point",
"line"
],
"tags": {
"@template": "crossing/markings_yes"

View file

@ -0,0 +1,22 @@
{
"fields": [
"surface",
"smoothness"
],
"geometry": [
"line"
],
"tags": {
"@template": "crossing/surfacequality"
},
"searchable": false,
"locationSet": {
"include": [
"999"
],
"exclude": [
"999"
]
},
"name": "{point}"
}

View file

@ -0,0 +1,24 @@
{
"fields": [
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration"
],
"geometry": [
"point",
"line"
],
"tags": {
"@template": "crossing/traffic_signal"
},
"searchable": false,
"locationSet": {
"include": [
"999"
],
"exclude": [
"999"
]
},
"name": "{point}"
}

View file

@ -0,0 +1,24 @@
{
"moreFields": [
"traffic_signals/arrow",
"traffic_signals/countdown",
"traffic_signals/minimap"
],
"geometry": [
"point",
"line"
],
"tags": {
"@template": "crossing/traffic_signal_more"
},
"searchable": false,
"locationSet": {
"include": [
"999"
],
"exclude": [
"999"
]
},
"name": "{point}"
}

View file

@ -12,7 +12,8 @@
"moreFields": [
"{@templates/poi}",
"address",
"covered"
"covered",
"ref"
],
"geometry": [
"point",

View file

@ -21,5 +21,8 @@
"tags": {
"amenity": "boat_rental"
},
"terms": [
"boat hire"
],
"name": "Boat Rental"
}

View file

@ -0,0 +1,30 @@
{
"icon": "maki-cafe",
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "cafe",
"cuisine": "tea"
},
"reference": {
"key": "amenity",
"value": "cafe"
},
"terms": [
"teahouse",
"tea house",
"tearoom",
"tea room",
"tea",
"tea drink",
"black tea",
"green tea",
"yellow tea",
"white tea",
"oolong tea",
"hot drinks"
],
"name": "Teahouse"
}

View file

@ -11,6 +11,7 @@
"moreFields": [
"bottle",
"covered",
"dog_check",
"indoor",
"level",
"lit"

View file

@ -26,6 +26,7 @@
"outdoor_seating",
"smoking",
"takeaway",
"toilets",
"fhrs/id-GB",
"website/menu"
],

View file

@ -1,5 +1,5 @@
{
"icon": "maki-shop",
"icon": "fas-store",
"fields": [
"name",
"operator",

View file

@ -14,5 +14,8 @@
"tags": {
"amenity": "motorcycle_parking"
},
"terms": [
"motorbike parking"
],
"name": "Motorcycle Parking"
}

View file

@ -32,9 +32,12 @@
"area"
],
"terms": [
"book sharing",
"bookcrossing",
"book exchange shelf",
"book sharing",
"book swap",
"library",
"little free library",
"share a book",
"sharing books"
],

View file

@ -36,7 +36,7 @@
},
"reference": {
"key": "recycling_type",
"value": "*"
"value": "centre"
},
"name": "Recycling Center"
}

View file

@ -34,8 +34,8 @@
"recycling_type": "container"
},
"reference": {
"key": "amenity",
"value": "recycling"
"key": "recycling_type",
"value": "container"
},
"aliases": [
"Recycling Container"

View file

@ -24,6 +24,8 @@
},
"terms": [
"community",
"group home",
"halfway house",
"nonprofit",
"social services"
],

View file

@ -27,7 +27,12 @@
"amenity": "telephone"
},
"terms": [
"phone"
"payphone",
"pay phone",
"phone booth",
"phone",
"public phone",
"public telephone"
],
"name": "Telephone"
}

View file

@ -20,5 +20,5 @@
"amenity": "theatre",
"theatre:type": "amphi"
},
"name": "Amphitheatre"
"name": "Amphitheater"
}

View file

@ -1,5 +1,5 @@
{
"icon": "temaki-vending_machine",
"icon": "temaki-vending_tickets",
"fields": [
"ref",
"operator"

View file

@ -30,6 +30,8 @@
"privy",
"head",
"latrine",
"public toilet",
"public restroom",
"WC",
"W.C."
],

View file

@ -0,0 +1,34 @@
{
"icon": "temaki-veterinary_care",
"fields": [
"{amenity/pharmacy}"
],
"moreFields": [
"{amenity/pharmacy}"
],
"geometry": [
"point",
"area"
],
"terms": [
"animal medication",
"animal pharmacy",
"pet clinic",
"pet doctor",
"pet meds",
"pet pharmacy",
"pet prescriptions",
"veterinarian",
"veterinary compounding",
"veterinary pharmacy",
"veterinary supplies",
"vet pharmacy"
],
"aliases": [
"Animal Pharmacy"
],
"tags": {
"amenity": "veterinary_pharmacy"
},
"name": "Veterinary Pharmacy"
}

View file

@ -1,7 +1,17 @@
{
"icon": "temaki-cycle_barrier",
"fields": [
"access"
"access",
"wheelchair",
"cycle_barrier",
"maxwidth/physical",
"opening",
"spacing",
"overlap",
"deflection"
],
"moreFields": [
"cycle_barrier/installation"
],
"geometry": [
"vertex"
@ -10,6 +20,9 @@
"barrier": "cycle_barrier"
},
"terms": [
"chicane",
"bike chicane",
"bike barrier",
"bicycle barrier",
"bicycling barrier",
"bike gates",

View file

@ -16,6 +16,7 @@
"height barrier",
"height restriction barrier",
"maxheight",
"max height",
"maximum height measurer"
],
"name": "Height Restrictor"

View file

@ -12,5 +12,8 @@
"tags": {
"barrier": "motorcycle_barrier"
},
"terms": [
"motorbike barrier"
],
"name": "Motorcycle Barrier"
}

View file

@ -19,6 +19,8 @@
"not/name",
"operator",
"roof/colour",
"roof/shape",
"roof/height",
"smoking",
"wheelchair"
],

View file

@ -1,8 +1,25 @@
{
"icon": "maki-shelter",
"fields": [
"{building}",
"layer"
"building",
"height",
"layer_1"
],
"moreFields": [
"address",
"architect",
"building/colour",
"building/levels",
"building/levels/underground",
"building/material",
"building/prefabricated",
"ele",
"gnis/feature_id-US",
"not/name",
"operator",
"roof/colour",
"roof/shape",
"roof/height"
],
"geometry": [
"area"
@ -10,10 +27,6 @@
"tags": {
"building": "roof"
},
"addTags": {
"building": "roof",
"layer": "1"
},
"matchScore": 0.5,
"name": "Roof"
}

View file

@ -6,7 +6,9 @@
"height",
"building/material",
"building/colour",
"roof/colour"
"roof/colour",
"roof/height",
"roof/shape"
],
"moreFields": [
"layer"

View file

@ -0,0 +1,39 @@
{
"icon": "temaki-abseiling",
"geometry": [
"point",
"vertex"
],
"fields": [
"name",
"climbing/sport",
"climbing/trad",
"climbing/bolts"
],
"moreFields": [
"climbing/grade/uiaa",
"climbing/grade/french",
"climbing/grade/saxon",
"climbing/grade/yds_class",
"website",
"climbing/length",
"description"
],
"terms": [
"rock climbing route",
"sport climbing",
"route bottom",
"climbing point",
"route start",
"climbing area",
"climbing crag"
],
"tags": {
"climbing": "route_bottom"
},
"addTags": {
"sport": "climbing",
"climbing": "route_bottom"
},
"name": "Climbing Route Start"
}

View file

@ -1,5 +1,5 @@
{
"icon": "temaki-tools",
"icon": "fas-couch",
"geometry": [
"point",
"area"

View file

@ -4,13 +4,13 @@
"ref",
"fire_hydrant/type",
"colour",
"fire_hydrant/position",
"water_source",
"couplings"
],
"moreFields": [
"fire_hydrant/diameter",
"fire_hydrant/pressure",
"fire_hydrant/position",
"level",
"survey/date"
],

View file

@ -9,6 +9,7 @@
"vertex"
],
"terms": [
"lifering",
"life buoy",
"kisby ring",
"kisbie ring",

View file

@ -17,5 +17,10 @@
"tags": {
"emergency": "phone"
},
"terms": [
"sos",
"help",
"call point"
],
"name": "Emergency Phone"
}

View file

@ -0,0 +1,13 @@
{
"icon": "maki-entrance-alt1",
"geometry": [
"vertex"
],
"tags": {
"entrance": "shop"
},
"terms": [
"door"
],
"name": "Shop Entrance"
}

View file

@ -1,15 +1,13 @@
{
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"flashing_lights",
"kerb",
"oneway"
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -0,0 +1,25 @@
# About the crossing presets
## General
These presets use fields `@templates` to make sure all have a similar structure.
Some presets like `traffic_signals` have additional fields and use a different field order.
Try to keep the file structure very similar so they can be easily compared.
## nodes `highway=crossing + crossing=*`
Crossing nodes are handled by `highway/crossing.json` and `highway/crossing/*.json` (as geometry type `vertex`).
Crossing nodes and crossing ways have a big overlap.
However, there are a few tags that should _only_ be expected on the crossing node. When crossing ways are present, this also means there are separate ways attached with additional nodes that may hold these additional tags.
There are places in OSM that follow a different tagging style where only crossing ways are used (without the vertex nodes). Those regions might use other conventions on where to place each tag.
## ways `highway=footway|cycleway|path + *=crossing + crossing=*`
Crossing way presets are duplicated per highway class:
- `/highway/footway/crossing.json` + `/highway/footway/crossing/*.json`
- `/highway/cycleway/crossing.json` + `/highway/cycleway/crossing/*.json`
- `/highway/path/crossing.json` + `/highway/path/crossing/*.json`
The crossing presets for `/cycleway*` and `/path*` are considered to be relevant for bike traffic and have additional fields that target bike vs. foot traffic.

View file

@ -0,0 +1,23 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing"
],
"geometry": [
"vertex"
],
"tags": {
"crossing": "informal"
},
"terms": [
"informal crosswalk",
"informal foot path crossing",
"informal pedestrian crossing"
],
"reference": {
"key": "crossing",
"value": "informal"
},
"name": "Informal Crossing",
"searchable": false
}

View file

@ -2,10 +2,13 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"
@ -23,11 +26,6 @@
"key": "crossing",
"value": "marked"
},
"terms": [
"zebra crossing",
"marked crossing",
"crosswalk"
],
"name": "{highway/crossing/uncontrolled}",
"searchable": false
}

View file

@ -2,10 +2,13 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,19 +2,15 @@
"icon": "temaki-railway_signals",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/traffic_signal}",
"{@templates/crossing/markings}",
"crossing_raised",
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"{@templates/crossing/traffic_signal_more}",
"kerb",
"traffic_signals/arrow",
"traffic_signals/countdown",
"traffic_signals/minimap"
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,10 +2,13 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings_yes}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,9 +2,12 @@
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,11 +2,13 @@
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -2,12 +2,13 @@
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -4,6 +4,7 @@
"fr",
"lt",
"pl",
"de",
"il",
"ps"
]
@ -11,13 +12,13 @@
"icon": "temaki-ped_cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"smoothness",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -1,19 +1,16 @@
{
"icon": "fas-biking",
"fields": [
"oneway",
"crossing",
"surface",
"crossing/island",
"{@templates/crossing/traffic_signal}",
"{@templates/crossing/markings}",
"crossing_raised",
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"tactile_paving"
"{@templates/crossing/traffic_signal_more}",
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -1,14 +1,14 @@
{
"icon": "temaki-cyclist_crosswalk",
"fields": [
"oneway",
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/defaults}",
"{@templates/crossing/markings_yes}",
"crossing_raised",
"access"
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -2,11 +2,12 @@
"icon": "fas-biking",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -0,0 +1,23 @@
{
"icon": "fas-biking",
"geometry": [
"line"
],
"tags": {
"highway": "cycleway",
"cycleway": "traffic_island"
},
"reference": {
"key": "cycleway",
"value": "traffic_island"
},
"terms": [
"crossing island"
],
"aliases": [
"Crosswalk Island",
"Traffic Island",
"Pedestrian Island"
],
"name": "Cycle Refuge Island"
}

View file

@ -0,0 +1,35 @@
{
"locationSet": {
"exclude": [
"fr",
"lt",
"pl",
"de",
"il",
"ps"
]
},
"icon": "temaki-pedestrian_and_cyclist",
"geometry": [
"line"
],
"tags": {
"highway": "cycleway",
"cycleway": "traffic_island",
"foot": "designated",
"bicycle": "designated"
},
"reference": {
"key": "cycleway",
"value": "traffic_island"
},
"terms": [
"crossing island"
],
"aliases": [
"Crosswalk Island",
"Traffic Island",
"Pedestrian Island"
],
"name": "Cycle & Foot Refuge Island"
}

Some files were not shown because too many files have changed in this diff Show more