CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-14 05:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.15' into 215_highlight_edits

Browse Source 
# Conflicts:
#	modules/svg/areas.js
This commit is contained in:
Quincy Morgan
2019-10-07 10:49:52 +02:00
parent ad5025de3e 7e3e7409cd
commit c031f2dd33
409 changed files with 3823 additions and 2179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FAQ.md
+1 -1
View File
@@ -11,7 +11,7 @@ Please see [CONTRIBUTING.md](https://github.com/openstreetmap/iD/blob/master/CON
## How can I report an issue with background imagery?
To report an issue with missing or cloudy imagery:
* _For Mapbox Satellite layer:_ Use [this imagery request tool](https://www.mapbox.com/bites/00240/#3/0.00/0.00) to zoom to the location with the issue and draw a box around it.
* _For Mapbox Satellite layer:_ Zoom into the location in [this imagery feedback tool](https://apps.mapbox.com/feedback/satellite/) and describe the problem.
* _For Bing Satellite layer:_ Open the location in [Bing Maps](https://www.bing.com/maps), click the "Feedback" button and choose "Report a map problem" option.
* _For Esri World Imagery:_ You can open a new issue using the [Imagery Map Feedback tool](https://www.arcgis.com/home/item.html?id=ebdfa4146680410bb952c7d532ea5407).
build_data.js
+26 -24
View File
@@ -437,10 +437,8 @@ function generateTaginfo(presets, fields) {
'description': 'Online editor for OSM data.',
'project_url': 'https://github.com/openstreetmap/iD',
'doc_url': 'https://github.com/openstreetmap/iD/blob/master/data/presets/README.md',
'icon_url': 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/dist/img/logo.png',
'keywords': [
'editor'
]
'icon_url': 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@release/dist/img/logo.png',
'keywords': ['editor']
},
'tags': []
};
@@ -474,13 +472,13 @@ function generateTaginfo(presets, fields) {
tag.icon_url = 'https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/' +
preset.icon.replace(/^temaki-/, '') + '.svg';
} else if (/^fa[srb]-/.test(preset.icon)) {
tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/' +
tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/' +
preset.icon + '.svg';
} else if (/^iD-/.test(preset.icon)) {
tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/' +
tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/' +
preset.icon.replace(/^iD-/, '') + '.svg';
} else if (/^tnp-/.test(preset.icon)) {
tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/' +
tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/' +
preset.icon.replace(/^tnp-/, '') + '.svg';
}
@@ -601,8 +599,12 @@ function generateTerritoryLanguages() {
if (!territoryLangInfo) return;
var langCodes = Object.keys(territoryLangInfo);
territoryLanguages[territoryCode.toLowerCase()] = langCodes.sort(function(langCode1, langCode2) {
return parseFloat(territoryLangInfo[langCode2]._populationPercent) -
parseFloat(territoryLangInfo[langCode1]._populationPercent);
var popPercent1 = parseFloat(territoryLangInfo[langCode1]._populationPercent);
var popPercent2 = parseFloat(territoryLangInfo[langCode2]._populationPercent);
if (popPercent1 === popPercent2) {
return langCode1.localeCompare(langCode2, 'en', { sensitivity: 'base' });
}
return popPercent2 - popPercent1;
}).map(function(langCode) {
return langCode.replace('_', '-');
});
@@ -648,22 +650,22 @@ function validatePresetFields(presets, fields) {
var fieldKeys = ['fields', 'moreFields'];
for (var fieldsKeyIndex in fieldKeys) {
var fieldsKey = fieldKeys[fieldsKeyIndex];
if (preset[fieldsKey]) {
for (var fieldIndex in preset[fieldsKey]) {
var field = preset[fieldsKey][fieldIndex];
if (fields[field] === undefined) {
var regexResult = betweenBracketsRegex.exec(field);
if (regexResult) {
var foreignPresetID = regexResult[0];
if (presets[foreignPresetID] === undefined) {
console.error('Unknown preset "' + foreignPresetID + '" referenced in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
} else {
console.error('Unknown preset field "' + field + '" in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
if (!preset[fieldsKey]) continue; // no fields are referenced, okay
for (var fieldIndex in preset[fieldsKey]) {
var field = preset[fieldsKey][fieldIndex];
if (fields[field] !== undefined) continue; // field found, okay
var regexResult = betweenBracketsRegex.exec(field);
if (regexResult) {
var foreignPresetID = regexResult[0];
if (presets[foreignPresetID] === undefined) {
console.error('Unknown preset "' + foreignPresetID + '" referenced in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
} else {
console.error('Unknown preset field "' + field + '" in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
}
}
css/20_map.css
+1 -1
View File
@@ -5,7 +5,7 @@
/* IE/Edge needs these overrides for markers to show up */
.layer-osm path.oneway-marker-path { fill: #000; }
.layer-osm path.sided-marker-natural-path { fill: rgb(140, 208, 95); }
.layer-osm path.sided-marker-natural-path { fill: rgb(170, 170, 170); }
.layer-osm path.sided-marker-coastline-path { fill: #77dede; }
.layer-osm path.sided-marker-barrier-path { fill: #ddd; }
.layer-osm path.sided-marker-man_made-path { fill: #fff; }
css/25_areas.css
+2 -1
View File
@@ -141,7 +141,8 @@ path.stroke.tag-landuse-residential,
path.stroke.tag-status-construction {
stroke: rgb(196, 189, 25);
}
path.fill.tag-landuse-residential {
path.fill.tag-landuse-residential,
path.fill.tag-status-construction {
stroke: rgba(196, 189, 25, 0.3);
fill: rgba(196, 189, 25, 0.3);
}
css/50_misc.css
+18 -4
View File
@@ -187,26 +187,26 @@ path.line.casing.tag-boundary-national_park {
/* barriers and similar */
path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
path.line.stroke.tag-barrier:not(.tag-barrier-hedge):not(.tag-waterway) {
stroke: #ddd;
}
.preset-icon-container path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
stroke: rgb(170, 170, 170);
}
path.line.casing.tag-natural,
path.line.casing.tag-barrier,
path.line.casing.tag-barrier:not(.tag-waterway),
path.line.casing.tag-man_made-groyne,
path.line.casing.tag-man_made-breakwater {
stroke: none;
}
path.line.stroke.tag-barrier,
path.line.stroke.tag-barrier:not(.tag-waterway),
path.line.stroke.tag-man_made-groyne,
path.line.stroke.tag-man_made-breakwater {
stroke-width: 3px;
stroke-linecap: round;
stroke-dasharray: 15, 5, 1, 5;
}
.low-zoom path.line.stroke.tag-barrier,
.low-zoom path.line.stroke.tag-barrier:not(.tag-waterway),
.low-zoom path.line.stroke.tag-man_made-groyne,
.low-zoom path.line.stroke.tag-man_made-breakwater {
stroke-width: 2px;
@@ -218,6 +218,20 @@ path.line.stroke.tag-man_made-breakwater {
.preset-icon-container path.line.stroke.tag-man_made-breakwater {
stroke-dasharray: 1, 4, 6, 4;
}
path.line.stroke.tag-barrier.tag-barrier-wall,
path.line.stroke.tag-barrier.tag-barrier-retaining_wall,
path.line.stroke.tag-barrier.tag-barrier-city_wall {
stroke-linecap: butt;
stroke-dasharray: 16, 3, 9, 3;
}
.low-zoom path.line.stroke.tag-barrier.tag-barrier-wall,
.low-zoom path.line.stroke.tag-barrier.tag-barrier-retaining_wall,
.low-zoom path.line.stroke.tag-barrier.tag-barrier-city_wall,
.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-wall,
.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-retaining_wall,
.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-city_wall {
stroke-dasharray: 8, 1, 4, 1;
}
/* bridges */
css/80_app.css
+7 -3
View File
@@ -2977,8 +2977,8 @@ input.key-trap {
border-radius: 0;
}
.map-control > button:hover,
.map-control > button:focus {
.map-control > button:not(.disabled):hover,
.map-control > button:not(.disabled):focus {
background: rgba(0, 0, 0, .8);
}
@@ -2987,6 +2987,10 @@ input.key-trap {
background: #7092ff;
}
.map-control > button.disabled .icon {
color: rgba(255, 255, 255, 0.5);
}
/* Fullscreen Button (disabled)
------------------------------------------------------- */
@@ -5696,4 +5700,4 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
.list-item-photos.list-item-mapillary-map-features .request-data-link {
float: right;
margin-top: -20px;
}
}
data/core.yaml
+38 -14
View File
@@ -306,9 +306,19 @@ en:
multiple: These features can't be rotated because parts of them have not yet been downloaded.
reverse:
title: Reverse
description: Make this line go in the opposite direction.
description:
point: Flip the direction of this point.
points: Flip the direction of these points.
line: Make this line go in the opposite direction.
lines: Make these lines go in the opposite direction.
features: Flip the directions of these features.
key: V
annotation: Reversed a line.
annotation:
point: Reversed a point.
points: Reversed multiple points.
line: Reversed a line.
lines: Reversed multiple lines.
features: Reversed multiple features.
split:
title: Split
description:
@@ -1407,9 +1417,8 @@ en:
tip: 'Find features with "fixme" tags'
reference: 'A "fixme" tag indicates that a mapper has requested help with a feature.'
generic_name:
title: Suspicious Names
message: '{feature} has the suspicious name "{name}"'
tip: "Find features with generic or suspicious names"
message_language: '{feature} has the suspicious name "{name}" in {language}'
reference: "Names should be the actual, on-the-ground names of features."
incompatible_source:
title: Suspicious Sources
@@ -1418,17 +1427,19 @@ en:
feature:
message: '{feature} lists Google as a data source'
reference: "Google products are proprietary and must not be used as references."
incorrect_name:
message: '{feature} has the mistaken name "{name}"'
message_language: '{feature} has the mistaken name "{name}" in {language}'
invalid_format:
title: Invalid Formatting
tip: Find tags with unexpected formats
email:
message: '{feature} has an invalid email address.'
message_multi: '{feature} has multiple invalid email addresses.'
message: '{feature} has an invalid email address'
message_multi: '{feature} has multiple invalid email addresses'
reference: 'Email addresses must look like "user@example.com".'
website:
message: '{feature} has an invalid website.'
message_multi: '{feature} has multiple invalid websites.'
reference: 'Websites should start with "http" or "https".'
mismatched_geometry:
title: Mismatched Geometry
tip: "Find features with conflicting tags and geometry"
missing_role:
title: Missing Roles
message: "{member} has no role within {relation}"
@@ -1458,17 +1469,22 @@ en:
reference: "Some features should have additional tags."
noncanonical_brand:
message: "{feature} looks like a brand with nonstandard tags"
message_incomplete: "{feature} looks like a brand with incomplete tags"
reference: "All features of the same brand should be tagged the same way."
point_as_vertex:
message: '{feature} should be a standalone point based on its tags'
reference: "Some features shouldn't be part of lines or areas."
private_data:
title: Private Information
tip: "Find features that may contain private information"
reference: "Sensitive data like personal phone numbers should not be tagged."
contact:
message: '{feature} might be tagged with private contact information'
suspicious_name:
title: Suspicious Names
tip: "Find features with generic or suspicious names"
tag_suggests_area:
title: Lines Tagged as Areas
message: '{feature} should be a closed area based on the tag "{tag}"'
tip: "Find features that are tagged as lines and should possibly be tagged as areas"
reference: "Areas must have connected endpoints."
unknown_road:
message: "{feature} has no classification"
@@ -1496,6 +1512,9 @@ en:
tip: "Find features with unsquare corners that can be drawn better"
buildings:
reference: "Buildings with unsquare corners can often be drawn more accurately."
vertex_as_point:
message: '{feature} should be part of a line or area based on its tags'
reference: "Some features shouldn't be standalone points."
fix:
connect_almost_junction:
annotation: Connected very close features.
@@ -1516,6 +1535,8 @@ en:
title: Continue drawing from end
delete_feature:
title: Delete this feature
extract_point:
title: Extract this point
ignore_issue:
title: Ignore this issue
merge_close_vertices:
@@ -1530,8 +1551,9 @@ en:
remove_from_relation:
title: Remove from relation
remove_generic_name:
title: Remove the name
annotation: Removed a generic name.
remove_mistaken_name:
annotation: Removed a mistaken name.
remove_private_info:
annotation: Removed private information.
remove_proprietary_data:
@@ -1541,6 +1563,8 @@ en:
annotation: Removed tag.
remove_tags:
title: Remove the tags
remove_the_name:
title: Remove the name
reposition_features:
title: Reposition the features
reverse_feature:
@@ -1903,7 +1927,7 @@ en:
disconnect: "Disconnect features at the selected node"
extract: "Extract a point from a feature"
split: "Split a line into two at the selected node"
reverse: "Reverse a line"
reverse: "Reverse selected features"
move: "Move selected features"
rotate: "Rotate selected features"
orthogonalize: "Square corners of a line or area"
data/deprecated.json
+95 -7
View File
@@ -6,7 +6,7 @@
},
{
"old": {"aeroway": "aerobridge"},
"replace": {"aeroway": "jet_bridge"}
"replace": {"aeroway": "jet_bridge", "highway": "corridor"}
},
{
"old": {"access": "public"},
@@ -148,6 +148,10 @@
"old": {"amenity": "vending_machine", "vending": "news_papers"},
"replace": {"amenity": "vending_machine", "vending": "newspapers"}
},
{
"old": {"amenity": "weigh_bridge"},
"replace": {"amenity": "weighbridge"}
},
{
"old": {"amenity": "winery"},
"replace": {"craft": "winery"}
@@ -284,6 +288,46 @@
"old": {"diaper": "yes"},
"replace": {"changing_table": "yes"}
},
{
"old": {"direction": "all"},
"replace": {"direction": "both"}
},
{
"old": {"direction": "down", "highway": "*"},
"replace": {"incline": "down", "highway": "$1"}
},
{
"old": {"direction": "downhill"},
"replace": {"incline": "down"}
},
{
"old": {"direction": "East"},
"replace": {"direction": "E"}
},
{
"old": {"direction": "forward;backward"},
"replace": {"direction": "both"}
},
{
"old": {"direction": "North"},
"replace": {"direction": "N"}
},
{
"old": {"direction": "South"},
"replace": {"direction": "S"}
},
{
"old": {"direction": "up", "highway": "*"},
"replace": {"incline": "up", "highway": "$1"}
},
{
"old": {"direction": "uphill"},
"replace": {"incline": "up"}
},
{
"old": {"direction": "West"},
"replace": {"direction": "W"}
},
{
"old": {"drinkable": "*"},
"replace": {"drinking_water": "$1"}
@@ -292,6 +336,22 @@
"old": {"dropped_kerb": "*"},
"replace": {"kerb": "lowered"}
},
{
"old": {"embankment": "1"},
"replace": {"embankment": "yes"}
},
{
"old": {"embankment": "false"},
"replace": {"embankment": "no"}
},
{
"old": {"embankment": "right", "man_made": "embankment"},
"replace": {"man_made": "embankment"}
},
{
"old": {"embankment": "true"},
"replace": {"embankment": "yes"}
},
{
"old": {"escalator": "*"},
"replace": {"highway": "steps", "conveying": "$1"}
@@ -366,27 +426,27 @@
},
{
"old": {"golf": "faiway"},
"replace": {"golf": "fairway"}
"replace": {"golf": "fairway", "landuse": "grass"}
},
{
"old": {"golf": "putting_green"},
"replace": {"golf": "green"}
"replace": {"golf": "green", "landuse": "grass"}
},
{
"old": {"golf": "sand_trap"},
"replace": {"golf": "bunker"}
"replace": {"golf": "bunker", "natural": "sand"}
},
{
"old": {"golf": "tee_area"},
"replace": {"golf": "tee"}
"replace": {"golf": "tee", "landuse": "grass"}
},
{
"old": {"golf": "tee_box"},
"replace": {"golf": "tee"}
"replace": {"golf": "tee", "landuse": "grass"}
},
{
"old": {"golf": "teebox"},
"replace": {"golf": "tee"}
"replace": {"golf": "tee", "landuse": "grass"}
},
{
"old": {"highway": "abandoned"},
@@ -400,6 +460,10 @@
"old": {"highway": "cycleway", "bicycle": "no"},
"replace": {"highway": "path", "bicycle": "no"}
},
{
"old": {"highway": "cycleway", "cycleway": "track"},
"replace": {"highway": "cycleway"}
},
{
"old": {"highway": "footway", "foot": "no"},
"replace": {"highway": "path", "foot": "no"}
@@ -567,6 +631,30 @@
"old": {"man_made": "water_tank"},
"replace": {"man_made": "storage_tank", "content": "water"}
},
{
"old": {"man_made": "weigh_bridge"},
"replace": {"amenity": "weighbridge"}
},
{
"old": {"man_made": "weighbridge"},
"replace": {"amenity": "weighbridge"}
},
{
"old": {"man_made": "weighing_machine"},
"replace": {"amenity": "weighbridge"}
},
{
"old": {"man_made": "weighing_scale"},
"replace": {"amenity": "weighbridge"}
},
{
"old": {"man_made": "weighting machine"},
"replace": {"amenity": "weighbridge"}
},
{
"old": {"man_made": "weighting_machine"},
"replace": {"amenity": "weighbridge"}
},
{
"old": {"man_made": "well"},
"replace": {"man_made": "water_well"}
data/locales.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/presets.yaml
+138 -11
View File
@@ -277,6 +277,18 @@ en:
label: Waste Bin
# 'terms: garbage can,trash can'
terms: '[translate with synonyms or related terms for ''Waste Bin'', separated by commas]'
blind:
# blind=*
label: Blind Person Access
options:
# blind=limited
limited: Limited
# blind=no
'no': 'No'
# blind=yes
'yes': 'Yes'
# 'terms: sight impairment,vision impairment'
terms: '[translate with synonyms or related terms for ''Blind Person Access'', separated by commas]'
blood_components:
# 'blood:=*'
label: Blood Components
@@ -292,6 +304,9 @@ en:
board_type:
# board_type=*
label: Type
bollard:
# bollard=*
label: Type
booth:
# booth=*
label: Booth
@@ -445,6 +460,9 @@ en:
forward: Forward
# conveying=reversible
reversible: Reversible
conveying_escalator:
# conveying=*
label: Escalator
country:
# country=*
label: Country
@@ -879,6 +897,7 @@ en:
handrail:
# handrail=*
label: Handrail
terms: '[translate with synonyms or related terms for ''Handrail'', separated by commas]'
hashtags:
# hashtags=*
label: Suggested Hashtags
@@ -996,6 +1015,10 @@ en:
industrial:
# industrial=*
label: Type
informal:
# informal=*
label: Informal
terms: '[translate with synonyms or related terms for ''Informal'', separated by commas]'
information:
# information=*
label: Type
@@ -1144,6 +1167,11 @@ en:
label: Level
# 'terms: building floor,deck,storey,story'
terms: '[translate with synonyms or related terms for ''Level'', separated by commas]'
level_semi:
# level=*
label: Levels
# 'terms: building floors,decks,stories,storeys,storys'
terms: '[translate with synonyms or related terms for ''Levels'', separated by commas]'
levels:
# 'building:levels=*'
label: Levels
@@ -1178,6 +1206,10 @@ en:
lock:
# lock=*
label: Lock
lockable:
# lockable=*
label: Lockable
terms: '[translate with synonyms or related terms for ''Lockable'', separated by commas]'
man_made:
# man_made=*
label: Type
@@ -1645,6 +1677,9 @@ en:
playground:
# playground=*
label: Type
playground/theme:
# 'playground:theme=*'
label: Theme
polling_station:
# polling_station=*
label: Polling Place
@@ -1775,6 +1810,9 @@ en:
# reservation=yes
'yes': Accepted
terms: '[translate with synonyms or related terms for ''Reservations'', separated by commas]'
residential:
# residential=*
label: Type
resort:
# resort=*
label: Type
@@ -2111,6 +2149,10 @@ en:
step_count:
# step_count=*
label: Number of Steps
terms: '[translate with synonyms or related terms for ''Number of Steps'', separated by commas]'
stile:
# stile=*
label: Type
stop:
# stop=*
label: Stop Type
@@ -2125,6 +2167,13 @@ en:
stroller:
# stroller=*
label: Stroller Access
options:
# stroller=limited
limited: Limited
# stroller=no
'no': 'No'
# stroller=yes
'yes': 'Yes'
# 'terms: baby carriage,perambulator,pram,pushchair'
terms: '[translate with synonyms or related terms for ''Stroller Access'', separated by commas]'
structure:
@@ -2143,6 +2192,7 @@ en:
tunnel: Tunnel
# structure field placeholder
placeholder: Unknown
terms: '[translate with synonyms or related terms for ''Structure'', separated by commas]'
structure_waterway:
# tunnel=*
label: Structure
@@ -2171,6 +2221,7 @@ en:
surface:
# surface=*
label: Surface
terms: '[translate with synonyms or related terms for ''Surface'', separated by commas]'
surveillance:
# surveillance=*
label: Surveillance Kind
@@ -2481,6 +2532,13 @@ en:
wheelchair:
# wheelchair=*
label: Wheelchair Access
options:
# wheelchair=limited
limited: Limited
# wheelchair=no
'no': 'No'
# wheelchair=yes
'yes': 'Yes'
# 'terms: handicap access'
terms: '[translate with synonyms or related terms for ''Wheelchair Access'', separated by commas]'
wholesale:
@@ -2647,6 +2705,11 @@ en:
name: Runway
# 'terms: landing strip'
terms: '<translate with synonyms or related terms for ''Runway'', separated by commas>'
aeroway/spaceport:
# aeroway=spaceport
name: Spaceport
# 'terms: cosmodrome,rocket launch center,rocket launch complex,rocket launch site,rocket range,space port'
terms: '<translate with synonyms or related terms for ''Spaceport'', separated by commas>'
aeroway/taxiway:
# aeroway=taxiway
name: Taxiway
@@ -2719,32 +2782,32 @@ en:
amenity/bicycle_parking:
# amenity=bicycle_parking
name: Bicycle Parking
# 'terms: bike'
# 'terms: bike,cycle parking,cycling'
terms: '<translate with synonyms or related terms for ''Bicycle Parking'', separated by commas>'
amenity/bicycle_parking/building:
# 'amenity=bicycle_parking, bicycle_parking=building'
name: Bicycle Parking Garage
# 'terms: Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station'
# 'terms: Bike Parking Station,cycle parking,cycling,Multi-Storey Bicycle Park,Multi-Storey Bike Park'
terms: '<translate with synonyms or related terms for ''Bicycle Parking Garage'', separated by commas>'
amenity/bicycle_parking/lockers:
# 'amenity=bicycle_parking, bicycle_parking=lockers'
name: Bicycle Lockers
# 'terms: Bike Lockers'
# 'terms: cycle locker,cycling,Bike Lockers'
terms: '<translate with synonyms or related terms for ''Bicycle Lockers'', separated by commas>'
amenity/bicycle_parking/shed:
# 'amenity=bicycle_parking, bicycle_parking=shed'
name: Bicycle Shed
# 'terms: Bike Shed'
# 'terms: cycle shed,cycling,Bike Shed'
terms: '<translate with synonyms or related terms for ''Bicycle Shed'', separated by commas>'
amenity/bicycle_rental:
# amenity=bicycle_rental
name: Bicycle Rental
# 'terms: bike,bicycle,bikeshare,bike share,bicycle share,hub,dock'
# 'terms: bike,bicycle,bikeshare,bike share,bicycle share,cycle dock,cycle hub,cycleshare,cycling'
terms: '<translate with synonyms or related terms for ''Bicycle Rental'', separated by commas>'
amenity/bicycle_repair_station:
# amenity=bicycle_repair_station
name: Bicycle Repair Tool Stand
# 'terms: bike,repair,chain,pump,tools,stand,multitool'
# 'terms: bike chain,bike multitool,bike repair,bike tools,cycle pump,cycle repair,cycling'
terms: '<translate with synonyms or related terms for ''Bicycle Repair Tool Stand'', separated by commas>'
amenity/biergarten:
# amenity=biergarten
@@ -2931,6 +2994,11 @@ en:
name: Fish & Chips Fast Food
# 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries'
terms: '<translate with synonyms or related terms for ''Fish & Chips Fast Food'', separated by commas>'
amenity/fast_food/hot_dog:
# 'amenity=fast_food, cuisine=hot_dog'
name: Hot Dog Fast Food
# 'terms: ballpark,frankfurter,frank,hotdog stand,sandwich,sausage,wiener'
terms: '<translate with synonyms or related terms for ''Hot Dog Fast Food'', separated by commas>'
amenity/fast_food/ice_cream:
# 'amenity=fast_food, cuisine=ice_cream'
name: Ice Cream Fast Food
@@ -3029,6 +3097,11 @@ en:
name: Library
# 'terms: book'
terms: '<translate with synonyms or related terms for ''Library'', separated by commas>'
amenity/loading_dock:
# amenity=loading_dock
name: Loading Dock
# 'terms: door,loading bay,shipping,unloading,warehouse'
terms: '<translate with synonyms or related terms for ''Loading Dock'', separated by commas>'
amenity/love_hotel:
# amenity=love_hotel
name: Love Hotel
@@ -3450,6 +3523,26 @@ en:
name: Studio
# 'terms: recording,radio,television'
terms: '<translate with synonyms or related terms for ''Studio'', separated by commas>'
amenity/studio/audio:
# 'amenity=studio, studio=audio'
name: Recording Studio
# 'terms: audio mixing,audio production,audio recording,audio studio'
terms: '<translate with synonyms or related terms for ''Recording Studio'', separated by commas>'
amenity/studio/radio:
# 'amenity=studio, studio=radio'
name: Radio Station
# 'terms: am radio,fm radio,radio broadcast,radio studio'
terms: '<translate with synonyms or related terms for ''Radio Station'', separated by commas>'
amenity/studio/television:
# 'amenity=studio, studio=television'
name: Television Station
# 'terms: television broadcast,television studio,tv broadcast,tv station,tv studio'
terms: '<translate with synonyms or related terms for ''Television Station'', separated by commas>'
amenity/studio/video:
# 'amenity=studio, studio=video'
name: Film Studio
# 'terms: movie production,movie studio,video production,video recording,video studio'
terms: '<translate with synonyms or related terms for ''Film Studio'', separated by commas>'
amenity/swimming_pool:
# amenity=swimming_pool
name: Swimming Pool
@@ -3640,6 +3733,11 @@ en:
# amenity=watering_place
name: Animal Watering Place
terms: '<translate with synonyms or related terms for ''Animal Watering Place'', separated by commas>'
amenity/weighbridge:
# amenity=weighbridge
name: Truck Scale
# 'terms: weigh station,weighbridge'
terms: '<translate with synonyms or related terms for ''Truck Scale'', separated by commas>'
area:
# area=yes
name: Area
@@ -3670,9 +3768,9 @@ en:
terms: '<translate with synonyms or related terms for ''Big Wheel'', separated by commas>'
attraction/bumper_car:
# attraction=bumper_car
name: Bumper Car
name: Bumper Cars
# 'terms: theme park,dodgem cars,autoscooter'
terms: '<translate with synonyms or related terms for ''Bumper Car'', separated by commas>'
terms: '<translate with synonyms or related terms for ''Bumper Cars'', separated by commas>'
attraction/bungee_jumping:
# attraction=bungee_jumping
name: Bungee Jumping
@@ -3740,6 +3838,10 @@ en:
# barrier=bollard
name: Bollard
terms: '<translate with synonyms or related terms for ''Bollard'', separated by commas>'
barrier/bollard_line:
# barrier=bollard
name: Bollard Row
terms: '<translate with synonyms or related terms for ''Bollard Row'', separated by commas>'
barrier/border_control:
# barrier=border_control
name: Border Control
@@ -4609,7 +4711,7 @@ en:
highway/cycleway:
# highway=cycleway
name: Cycle Path
# 'terms: bike path,bicyle path'
# 'terms: bicyle path,bike path,cycling path'
terms: '<translate with synonyms or related terms for ''Cycle Path'', separated by commas>'
highway/cycleway/bicycle_foot:
# 'highway=cycleway, foot=designated'
@@ -4727,6 +4829,11 @@ en:
name: Path
# 'terms: hike,hiking,trackway,trail,walk'
terms: '<translate with synonyms or related terms for ''Path'', separated by commas>'
highway/path/informal:
# 'highway=path, informal=yes'
name: Informal Path
# 'terms: bootleg trail,cow path,desire line,desire path,desireline,desirepath,elephant path,game trail,goat track,herd path,pig trail,shortcut,social trail,use trail'
terms: '<translate with synonyms or related terms for ''Informal Path'', separated by commas>'
highway/pedestrian_area:
# 'highway=pedestrian, area=yes'
name: Pedestrian Area
@@ -4998,11 +5105,21 @@ en:
name: Indoor Door
# 'terms: doorframe,doorway,portal,room access,threshold'
terms: '<translate with synonyms or related terms for ''Indoor Door'', separated by commas>'
indoor/elevator:
# 'indoor=room, elevator=yes'
name: Indoor Elevator Shaft
# 'terms: elevator,lift'
terms: '<translate with synonyms or related terms for ''Indoor Elevator Shaft'', separated by commas>'
indoor/room:
# indoor=room
name: Room
# 'terms: antechamber,anteroom,atrium,cell,chamber,concourse,foyer,indoor room,lobby,vestibule'
terms: '<translate with synonyms or related terms for ''Room'', separated by commas>'
indoor/stairs:
# 'indoor=room, stairs=yes'
name: Indoor Stairwell
# 'terms: stair,stairs,staircase,stairway,stairwell,steps'
terms: '<translate with synonyms or related terms for ''Indoor Stairwell'', separated by commas>'
indoor/wall:
# indoor=wall
name: Indoor Wall
@@ -5870,6 +5987,10 @@ en:
name: Tunnel
# 'terms: bore,dig,shaft,underground passage,underpass'
terms: '<translate with synonyms or related terms for ''Tunnel'', separated by commas>'
man_made/utility_pole:
# man_made=utility_pole
name: Utility Pole
terms: '<translate with synonyms or related terms for ''Utility Pole'', separated by commas>'
man_made/wastewater_plant:
# man_made=wastewater_plant
name: Wastewater Plant
@@ -6314,6 +6435,7 @@ en:
office/research:
# office=research
name: Research Office
# 'terms: R and D,research and development,research lab'
terms: '<translate with synonyms or related terms for ''Research Office'', separated by commas>'
office/surveyor:
# office=surveyor
@@ -7212,7 +7334,7 @@ en:
shop/farm:
# shop=farm
name: Produce Stand
# 'terms: farm shop,farm stand'
# 'terms: baked goods,farm shop,farm stand,fresh food,fruits,greengrocer,organics,vegetables'
terms: '<translate with synonyms or related terms for ''Produce Stand'', separated by commas>'
shop/fashion:
# shop=fashion
@@ -7284,7 +7406,7 @@ en:
shop/general:
# shop=general
name: General Store
# 'terms: Village Shop'
# 'terms: village shop'
terms: '<translate with synonyms or related terms for ''General Store'', separated by commas>'
shop/gift:
# shop=gift
@@ -7505,6 +7627,11 @@ en:
name: Printer Ink Store
# 'terms: copier ink,fax ink,ink cartridges,toner'
terms: '<translate with synonyms or related terms for ''Printer Ink Store'', separated by commas>'
shop/psychic:
# shop=psychic
name: Psychic
# 'terms: astrology,crystal ball,divination,fortune teller,seer,spirit'
terms: '<translate with synonyms or related terms for ''Psychic'', separated by commas>'
shop/pyrotechnics:
# shop=pyrotechnics
name: Fireworks Store
data/presets/README.md
+12 -4
View File
@@ -189,10 +189,14 @@ The default is `1.0`.
##### `countryCodes`
An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. The preset will only be searchable when the user is editing over the specified countries. The locale and language of iD are not factors, just the position of the map.
An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. The preset will only be searchable when the user is editing over the specified, whitelisted countries. The locale and language of iD are not factors, just the position of the map.
By default, presets are available everywhere.
##### `notCountryCodes`
An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blacklist instead of a whitelist.
##### `replacement`
The ID of a preset that is preferable to this one. iD's validator will flag features matching this preset and recommend that the user upgrade the tags.
@@ -203,7 +207,7 @@ When possible, use `deprecated.json` instead to specify upgrade paths for old ta
A key and optionally a value to link to the wiki documentation for this preset. Only necessary if the preset consists of several tags.
For example,
For example,
```javascript
"reference": {
"key": "tower:type",
@@ -384,15 +388,19 @@ For number fields, the greatest valid value. There is no default.
##### `prerequisiteTag`
An object defining the tags the feature needs before this field will be displayed. It must have this property:
An object defining the tags the feature needs before this field will be displayed. It may have this property:
- `key`: The key for the required tag.
And may optionally have one of these properties:
And may optionally be combined with one of these properties:
- `value`: The value that the key must have.
- `valueNot`: The value that the key must not have.
Alternatively, the object may contain a single property:
- `keyNot`: The key that must not be present.
For example, this is how we show the Internet Access Fee field only if the feature has an `internet_access` tag not equal to `no`.
```js
data/presets/fields.json
+12 -3
View File
@@ -38,8 +38,10 @@
"bench": {"key": "bench", "type": "check", "label": "Bench", "terms": ["seating"]},
"bicycle_parking": {"key": "bicycle_parking", "type": "combo", "label": "Type"},
"bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]},
"blind": {"key": "blind", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Blind Person Access", "terms": ["sight impairment", "vision impairment"]},
"blood_components": {"key": "blood:", "type": "multiCombo", "label": "Blood Components", "strings": {"options": {"whole": "whole blood", "plasma": "plasma", "platelets": "platelets", "stemcells": "stem cell samples"}}},
"board_type": {"key": "board_type", "type": "typeCombo", "label": "Type"},
"bollard": {"key": "bollard", "type": "combo", "label": "Type"},
"booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true},
"boules": {"key": "boules", "type": "typeCombo", "label": "Type"},
"boundary": {"key": "boundary", "type": "combo", "label": "Type"},
@@ -74,6 +76,7 @@
"consulate": {"key": "consulate", "type": "combo", "label": "Type"},
"contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
"content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
"conveying_escalator": {"key": "conveying", "type": "check", "label": "Escalator"},
"conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
"country": {"key": "country", "type": "combo", "label": "Country"},
"couplings": {"key": "couplings", "type": "number", "minValue": 1, "label": "Couplings", "placeholder": "1, 2, 3..."},
@@ -182,6 +185,7 @@
"indoor_type": {"key": "indoor", "type": "typeCombo", "label": "Type"},
"indoor": {"key": "indoor", "type": "check", "label": "Indoor"},
"industrial": {"key": "industrial", "type": "combo", "label": "Type"},
"informal": {"key": "informal", "type": "check", "label": "Informal"},
"information": {"key": "information", "type": "typeCombo", "label": "Type"},
"inscription": {"key": "inscription", "type": "textarea", "label": "Inscription"},
"intermittent_yes": {"key": "intermittent", "type": "check", "label": "Intermittent", "default": "yes"},
@@ -206,7 +210,8 @@
"leaf_type": {"key": "leaf_type", "type": "combo", "label": "Leaf Type", "strings": {"options": {"broadleaved": "Broadleaved", "needleleaved": "Needleleaved", "mixed": "Mixed", "leafless": "Leafless"}}},
"leisure": {"key": "leisure", "type": "typeCombo", "label": "Type"},
"length": {"key": "length", "type": "number", "minValue": 0, "label": "Length (Meters)"},
"level": {"key": "level", "type": "combo", "label": "Level", "universal": true, "terms": ["building floor", "deck", "storey", "story"]},
"level_semi": {"key": "level", "type": "semiCombo", "label": "Levels", "terms": ["building floors", "decks", "stories", "storeys", "storys"]},
"level": {"key": "level", "type": "combo", "label": "Level", "terms": ["building floor", "deck", "storey", "story"], "prerequisiteTag": {"keyNot": "building"}},
"levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
"liaison": {"key": "liaison", "type": "combo", "label": "Type"},
"line_attachment": {"key": "line_attachment", "type": "combo", "label": "Line Attachment"},
@@ -214,6 +219,7 @@
"location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
"location": {"key": "location", "type": "combo", "label": "Location"},
"lock": {"key": "lock", "type": "check", "label": "Lock"},
"lockable": {"key": "lockable", "type": "check", "label": "Lockable"},
"man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
"manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
"manufacturer": {"key": "manufacturer", "type": "combo", "snake_case": false, "caseSensitive": true, "label": "Manufacturer"},
@@ -273,6 +279,7 @@
"plant": {"key": "plant", "type": "combo", "label": "Plant"},
"plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."},
"playground": {"key": "playground", "type": "combo", "label": "Type"},
"playground/theme": {"key": "playground:theme", "type": "combo", "label": "Theme"},
"polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
"population": {"key": "population", "type": "text", "label": "Population"},
"post": {"type": "address", "key": "post", "keys": ["post:block_number", "post:city", "post:block_number", "post:conscriptionnumber", "post:county", "post:country", "post:county", "post:district", "post:floor", "post:hamlet", "post:housename", "post:housenumber", "post:neighbourhood", "post:place", "post:postcode", "post:province", "post:quarter", "post:state", "post:street", "post:subdistrict", "post:suburb", "post:unit"], "label": "Delivery Address"},
@@ -303,6 +310,7 @@
"relation": {"key": "type", "type": "combo", "label": "Type"},
"religion": {"key": "religion", "type": "combo", "label": "Religion"},
"reservation": {"key": "reservation", "type": "combo", "label": "Reservations", "strings": {"options": {"yes": "Accepted", "no": "Not Accepted", "required": "Required", "recommended": "Recommended"}}},
"residential": {"key": "residential", "type": "combo", "label": "Type"},
"resort": {"key": "resort", "type": "combo", "label": "Type"},
"resource": {"key": "resource", "type": "semiCombo", "label": "Resources"},
"restriction": {"key": "restriction", "type": "combo", "label": "Type"},
@@ -358,9 +366,10 @@
"stars": {"key": "stars", "type": "combo", "label": "Stars", "terms": ["rating"]},
"start_date": {"key": "start_date", "type": "text", "universal": true, "label": "Start Date", "terms": ["inception"]},
"step_count": {"key": "step_count", "type": "number", "minValue": 0, "label": "Number of Steps"},
"stile": {"key": "stile", "type": "combo", "label": "Type"},
"stop": {"key": "stop", "type": "combo", "label": "Stop Type", "strings": {"options": {"all": "All Ways", "minor": "Minor Road"}}},
"street_cabinet": {"key": "street_cabinet", "type": "combo", "label": "Type"},
"stroller": {"key": "stroller", "type": "radio", "options": ["yes", "limited", "no"], "label": "Stroller Access", "terms": ["baby carriage", "perambulator", "pram", "pushchair"]},
"stroller": {"key": "stroller", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Stroller Access", "terms": ["baby carriage", "perambulator", "pram", "pushchair"]},
"structure_waterway": {"type": "structureRadio", "keys": ["tunnel"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"tunnel": "Tunnel"}}},
"structure": {"type": "structureRadio", "keys": ["bridge", "tunnel", "embankment", "cutting", "ford"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"bridge": "Bridge", "tunnel": "Tunnel", "embankment": "Embankment", "cutting": "Cutting", "ford": "Ford"}}},
"studio": {"key": "studio", "type": "combo", "label": "Type"},
@@ -421,7 +430,7 @@
"waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
"website": {"key": "website", "type": "url", "icon": "website", "placeholder": "https://example.com", "label": "Website", "terms": ["internet presence", "uri", "url", "webpage"]},
"wetland": {"key": "wetland", "type": "combo", "label": "Type"},
"wheelchair": {"key": "wheelchair", "type": "radio", "options": ["yes", "limited", "no"], "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": ["handicap access"]},
"wheelchair": {"key": "wheelchair", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": ["handicap access"]},
"wholesale": {"key": "wholesale", "type": "typeCombo", "label": "Wholesale"},
"width": {"key": "width", "type": "number", "minValue": 0, "label": "Width (Meters)"},
"wikidata": {"key": "wikidata", "keys": ["wikidata", "wikipedia"], "type": "wikidata", "icon": "wikipedia", "universal": true, "label": "Wikidata"},
data/presets/fields/blind.json
+16
View File
@@ -0,0 +1,16 @@
{
"key": "blind",
"type": "radio",
"strings": {
"options": {
"yes": "Yes",
"limited": "Limited",
"no": "No"
}
},
"label": "Blind Person Access",
"terms": [
"sight impairment",
"vision impairment"
]
}
data/presets/fields/bollard.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "bollard",
"type": "combo",
"label": "Type"
}
data/presets/fields/conveying_escalator.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "conveying",
"type": "check",
"label": "Escalator"
}
data/presets/fields/informal.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "informal",
"type": "check",
"label": "Informal"
}
data/presets/fields/level.json
+4 -2
View File
@@ -2,11 +2,13 @@
"key": "level",
"type": "combo",
"label": "Level",
"universal": true,
"terms": [
"building floor",
"deck",
"storey",
"story"
]
],
"prerequisiteTag": {
"keyNot": "building"
}
}
data/presets/fields/level_semi.json
+12
View File
@@ -0,0 +1,12 @@
{
"key": "level",
"type": "semiCombo",
"label": "Levels",
"terms": [
"building floors",
"decks",
"stories",
"storeys",
"storys"
]
}
data/presets/fields/lockable.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "lockable",
"type": "check",
"label": "Lockable"
}
data/presets/fields/playground/theme.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "playground:theme",
"type": "combo",
"label": "Theme"
}
data/presets/fields/residential.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "residential",
"type": "combo",
"label": "Type"
}
data/presets/fields/stile.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "stile",
"type": "combo",
"label": "Type"
}
data/presets/fields/stroller.json
+7 -5
View File
@@ -1,11 +1,13 @@
{
"key": "stroller",
"type": "radio",
"options": [
"yes",
"limited",
"no"
],
"strings": {
"options": {
"yes": "Yes",
"limited": "Limited",
"no": "No"
}
},
"label": "Stroller Access",
"terms": [
"baby carriage",
data/presets/fields/wheelchair.json
+7 -5
View File
@@ -1,11 +1,13 @@
{
"key": "wheelchair",
"type": "radio",
"options": [
"yes",
"limited",
"no"
],
"strings": {
"options": {
"yes": "Yes",
"limited": "Limited",
"no": "No"
}
},
"icon": "maki-wheelchair",
"label": "Wheelchair Access",
"terms": [
data/presets/presets.json
+460 -446
View File
File diff suppressed because it is too large Load Diff
data/presets/presets/_playground.json
+7
View File
@@ -2,11 +2,18 @@
"icon": "maki-playground",
"fields": [
"playground",
"playground/theme",
"min_age",
"max_age",
"wheelchair",
"blind",
"height"
],
"moreFields": [
"access_simple",
"colour",
"ref"
],
"geometry": [
"point",
"vertex",
data/presets/presets/advertising/billboard.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"fields": [
"direction",
"lit"
"direction",
"lit"
],
"geometry": [
"point",
data/presets/presets/advertising/column.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"icon": "temaki-storage_tank",
"fields": [
"lit"
"lit"
],
"geometry": [
"point",
data/presets/presets/aerialway/mixed_lift.json
+7 -7
View File
@@ -3,13 +3,13 @@
"line"
],
"fields": [
"name",
"oneway_yes",
"aerialway/occupancy",
"aerialway/capacity",
"aerialway/duration",
"aerialway/bubble",
"aerialway/heating"
"name",
"oneway_yes",
"aerialway/occupancy",
"aerialway/capacity",
"aerialway/duration",
"aerialway/bubble",
"aerialway/heating"
],
"tags": {
"aerialway": "mixed_lift"
data/presets/presets/aeroway/spaceport.json
+34
View File
@@ -0,0 +1,34 @@
{
"icon": "fas-space-shuttle",
"geometry": [
"area",
"point"
],
"fields": [
"name",
"operator",
"access_simple",
"website",
"wikidata"
],
"moreFields": [
"email",
"fax",
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"phone"
],
"terms": [
"cosmodrome",
"rocket launch center",
"rocket launch complex",
"rocket launch site",
"rocket range",
"space port"
],
"tags": {
"aeroway": "spaceport"
},
"name": "Spaceport"
}
data/presets/presets/aeroway/terminal.json
+2 -2
View File
@@ -14,8 +14,8 @@
"building_area"
],
"moreFields": [
"wheelchair",
"smoking"
"smoking",
"wheelchair"
],
"tags": {
"aeroway": "terminal"
data/presets/presets/amenity/_embassy.json
+2 -2
View File
@@ -7,10 +7,10 @@
"building_area"
],
"moreFields": [
"website",
"phone",
"email",
"fax",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/animal_boarding.json
+4 -3
View File
@@ -9,11 +9,12 @@
"animal_boarding"
],
"moreFields": [
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/animal_breeding.json
+3 -2
View File
@@ -9,10 +9,11 @@
"animal_breeding"
],
"moreFields": [
"website",
"phone",
"email",
"fax",
"level",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/animal_shelter.json
+3 -2
View File
@@ -9,10 +9,11 @@
"animal_shelter"
],
"moreFields": [
"website",
"phone",
"email",
"fax",
"level",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/arts_centre.json
+2 -2
View File
@@ -15,6 +15,7 @@
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"level",
"payment_multi",
"phone",
"website",
@@ -24,8 +25,7 @@
"point",
"area"
],
"terms": [
],
"terms": [],
"tags": {
"amenity": "arts_centre"
},
data/presets/presets/amenity/atm.json
+1
View File
@@ -12,6 +12,7 @@
"covered",
"height",
"indoor",
"level",
"lit",
"manufacturer",
"name",
data/presets/presets/amenity/bank.json
+2 -1
View File
@@ -1,7 +1,7 @@
{
"icon": "maki-bank",
"fields": [
"name",
"name",
"operator",
"address",
"building_area",
@@ -16,6 +16,7 @@
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"level",
"opening_hours",
"phone",
"website",
data/presets/presets/amenity/bar.json
+1
View File
@@ -15,6 +15,7 @@
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"level",
"microbrewery",
"opening_hours",
"payment_multi",
data/presets/presets/amenity/bench.json
+1
View File
@@ -10,6 +10,7 @@
"access_simple",
"height",
"inscription",
"level",
"lit",
"manufacturer",
"operator"
data/presets/presets/amenity/bicycle_parking.json
+4 -1
View File
@@ -14,6 +14,7 @@
"moreFields": [
"colour",
"indoor",
"level",
"lit"
],
"geometry": [
@@ -22,7 +23,9 @@
"area"
],
"terms": [
"bike"
"bike",
"cycle parking",
"cycling"
],
"tags": {
"amenity": "bicycle_parking"
data/presets/presets/amenity/bicycle_parking/building.json
+4 -2
View File
@@ -18,9 +18,11 @@
"key": "bicycle_parking"
},
"terms": [
"Bike Parking Station",
"cycle parking",
"cycling",
"Multi-Storey Bicycle Park",
"Multi-Storey Bike Park",
"Bike Parking Station"
"Multi-Storey Bike Park"
],
"name": "Bicycle Parking Garage"
}
data/presets/presets/amenity/bicycle_parking/lockers.json
+2
View File
@@ -13,6 +13,8 @@
"key": "bicycle_parking"
},
"terms": [
"cycle locker",
"cycling",
"Bike Lockers"
],
"name": "Bicycle Lockers"
data/presets/presets/amenity/bicycle_parking/shed.json
+2
View File
@@ -17,6 +17,8 @@
"key": "bicycle_parking"
},
"terms": [
"cycle shed",
"cycling",
"Bike Shed"
],
"name": "Bicycle Shed"
data/presets/presets/amenity/bicycle_rental.json
+6 -3
View File
@@ -10,9 +10,10 @@
],
"moreFields": [
"address",
"email",
"covered",
"email",
"fax",
"level",
"opening_hours",
"phone",
"website",
@@ -29,8 +30,10 @@
"bikeshare",
"bike share",
"bicycle share",
"hub",
"dock"
"cycle dock",
"cycle hub",
"cycleshare",
"cycling"
],
"tags": {
"amenity": "bicycle_rental"
data/presets/presets/amenity/bicycle_repair_station.json
+8 -7
View File
@@ -13,6 +13,7 @@
"colour",
"covered",
"indoor",
"level",
"manufacturer"
],
"geometry": [
@@ -20,13 +21,13 @@
"vertex"
],
"terms": [
"bike",
"repair",
"chain",
"pump",
"tools",
"stand",
"multitool"
"bike chain",
"bike multitool",
"bike repair",
"bike tools",
"cycle pump",
"cycle repair",
"cycling"
],
"tags": {
"amenity": "bicycle_repair_station"
data/presets/presets/amenity/boat_rental.json
+2 -2
View File
@@ -10,10 +10,10 @@
],
"moreFields": [
"address",
"website",
"phone",
"email",
"fax",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/bureau_de_change.json
+5 -4
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-bank",
"icon": "temaki-money_hand",
"fields": [
"name",
"operator",
@@ -9,11 +9,12 @@
"building_area"
],
"moreFields": [
"opening_hours",
"website",
"phone",
"email",
"fax",
"level",
"opening_hours",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/cafe.json
+1
View File
@@ -18,6 +18,7 @@
"email",
"fax",
"internet_access/ssid",
"level",
"min_age",
"not/name",
"opening_hours",
data/presets/presets/amenity/car_pooling.json
+2 -2
View File
@@ -10,10 +10,10 @@
"lit"
],
"moreFields": [
"website",
"phone",
"email",
"fax",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/car_rental.json
+2 -2
View File
@@ -9,10 +9,10 @@
],
"moreFields": [
"brand",
"website",
"phone",
"email",
"fax",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/car_sharing.json
+3 -3
View File
@@ -10,11 +10,11 @@
"supervised"
],
"moreFields": [
"lit",
"website",
"phone",
"email",
"fax",
"lit",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/car_wash.json
+2 -2
View File
@@ -10,10 +10,10 @@
"self_service"
],
"moreFields": [
"website",
"phone",
"email",
"fax",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/casino.json
+1
View File
@@ -15,6 +15,7 @@
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"level",
"min_age",
"payment_multi",
"phone",
data/presets/presets/amenity/charging_station.json
+1
View File
@@ -12,6 +12,7 @@
"moreFields": [
"brand",
"covered",
"level",
"manufacturer"
],
"geometry": [
data/presets/presets/amenity/childcare.json
+2 -1
View File
@@ -11,8 +11,9 @@
"moreFields": [
"email",
"fax",
"min_age",
"level",
"max_age",
"min_age",
"payment_multi",
"phone",
"website",
data/presets/presets/amenity/cinema.json
+1
View File
@@ -12,6 +12,7 @@
"air_conditioning",
"email",
"fax",
"level",
"min_age",
"phone",
"website",
data/presets/presets/amenity/clinic.json
+4 -3
View File
@@ -11,11 +11,12 @@
],
"moreFields": [
"air_conditioning",
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/clinic/abortion.json
+1 -2
View File
@@ -4,8 +4,7 @@
"point",
"area"
],
"terms": [
],
"terms": [],
"tags": {
"amenity": "clinic",
"healthcare": "clinic",
data/presets/presets/amenity/clock.json
+2 -1
View File
@@ -12,6 +12,7 @@
"covered",
"height",
"indoor",
"level",
"lit",
"manufacturer"
],
@@ -19,7 +20,7 @@
"point",
"vertex"
],
"terms":[
"terms": [
"time"
],
"tags": {
data/presets/presets/amenity/college.json
+3 -3
View File
@@ -10,12 +10,12 @@
"internet_access/fee"
],
"moreFields": [
"religion",
"denomination",
"internet_access/ssid",
"phone",
"email",
"fax",
"internet_access/ssid",
"phone",
"religion",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/compressed_air.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-car",
"icon": "fas-tachometer-alt",
"fields": [
"operator",
"access_simple",
data/presets/presets/amenity/conference_centre.json
+1 -1
View File
@@ -8,7 +8,7 @@
"website",
"internet_access"
],
"moreFields" : [
"moreFields": [
"air_conditioning",
"email",
"fax",
data/presets/presets/amenity/courthouse.json
+1
View File
@@ -9,6 +9,7 @@
"moreFields": [
"email",
"fax",
"level",
"phone",
"polling_station",
"smoking",
data/presets/presets/amenity/crematorium.json
+3 -2
View File
@@ -9,10 +9,11 @@
],
"moreFields": [
"address",
"website",
"phone",
"email",
"fax",
"level",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/dentist.json
+4 -3
View File
@@ -9,11 +9,12 @@
"opening_hours"
],
"moreFields": [
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/dive_centre.json
+4 -3
View File
@@ -9,11 +9,12 @@
"scuba_diving"
],
"moreFields": [
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/doctors.json
+4 -3
View File
@@ -9,11 +9,12 @@
"opening_hours"
],
"moreFields": [
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/dojo.json
+5 -4
View File
@@ -8,14 +8,15 @@
"opening_hours"
],
"moreFields": [
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry" : [
"geometry": [
"point",
"area"
],
data/presets/presets/amenity/dressing_room.json
+1
View File
@@ -10,6 +10,7 @@
"moreFields": [
"charge_fee",
"fee",
"level",
"opening_hours",
"payment_multi_fee",
"ref"
data/presets/presets/amenity/drinking_water.json
+1
View File
@@ -11,6 +11,7 @@
"moreFields": [
"covered",
"indoor",
"level",
"lit"
],
"geometry": [
data/presets/presets/amenity/driving_school.json
+4 -3
View File
@@ -9,11 +9,12 @@
"opening_hours"
],
"moreFields": [
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/events_venue.json
+2 -1
View File
@@ -10,10 +10,11 @@
"internet_access/fee",
"internet_access/ssid"
],
"moreFields" : [
"moreFields": [
"air_conditioning",
"email",
"fax",
"level",
"min_age",
"phone",
"smoking",
data/presets/presets/amenity/fast_food.json
+10 -9
View File
@@ -10,21 +10,22 @@
],
"moreFields": [
"air_conditioning",
"opening_hours",
"diet_multi",
"takeaway",
"delivery",
"smoking",
"capacity",
"outdoor_seating",
"delivery",
"diet_multi",
"email",
"fax",
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"level",
"opening_hours",
"outdoor_seating",
"payment_multi",
"website",
"phone",
"email",
"fax",
"smoking",
"takeaway",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/fast_food/hot_dog.json
+25
View File
@@ -0,0 +1,25 @@
{
"icon": "fas-hotdog",
"geometry": [
"point",
"area"
],
"terms": [
"ballpark",
"frankfurter",
"frank",
"hotdog stand",
"sandwich",
"sausage",
"wiener"
],
"tags": {
"amenity": "fast_food",
"cuisine": "hot_dog"
},
"reference": {
"key": "cuisine",
"value": "hot_dog"
},
"name": "Hot Dog Fast Food"
}
data/presets/presets/amenity/food_court.json
+7 -6
View File
@@ -8,17 +8,18 @@
"opening_hours"
],
"moreFields": [
"smoking",
"outdoor_seating",
"capacity",
"diet_multi",
"email",
"fax",
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"diet_multi",
"website",
"level",
"outdoor_seating",
"phone",
"email",
"fax",
"smoking",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/fountain.json
+1
View File
@@ -9,6 +9,7 @@
"moreFields": [
"covered",
"indoor",
"level",
"manufacturer"
],
"geometry": [
data/presets/presets/amenity/fuel.json
+4 -4
View File
@@ -9,13 +9,13 @@
"self_service"
],
"moreFields": [
"opening_hours",
"payment_multi",
"building",
"website",
"phone",
"email",
"fax",
"opening_hours",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/grave_yard.json
+3 -3
View File
@@ -5,10 +5,10 @@
"address"
],
"moreFields": [
"website",
"phone",
"email",
"fax"
"fax",
"phone",
"website"
],
"geometry": [
"point",
data/presets/presets/amenity/hospital.json
+3 -3
View File
@@ -9,13 +9,13 @@
"emergency"
],
"moreFields": [
"email",
"fax",
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"website",
"phone",
"email",
"fax",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/hunting_stand.json
+2 -1
View File
@@ -1,7 +1,8 @@
{
"icon": "temaki-binoculars",
"fields": [
"access_simple"
"access_simple",
"lockable"
],
"geometry": [
"point",
data/presets/presets/amenity/ice_cream.json
+6 -5
View File
@@ -8,18 +8,19 @@
"outdoor_seating"
],
"moreFields": [
"takeaway",
"delivery",
"diet_multi",
"drive_through",
"email",
"fax",
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"diet_multi",
"level",
"payment_multi",
"website",
"phone",
"email",
"fax",
"takeaway",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/internet_cafe.json
+3 -1
View File
@@ -14,6 +14,8 @@
"air_conditioning",
"email",
"fax",
"level",
"min_age",
"opening_hours",
"outdoor_seating",
"payment_multi",
@@ -34,7 +36,7 @@
"cafe",
"net",
"lanhouse"
],
],
"tags": {
"amenity": "internet_cafe"
},
data/presets/presets/amenity/karaoke.json
+1
View File
@@ -12,6 +12,7 @@
"air_conditioning",
"email",
"fax",
"level",
"min_age",
"payment_multi",
"phone",
data/presets/presets/amenity/kindergarten.json
+3 -2
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-school",
"icon": "temaki-school",
"fields": [
"name",
"operator",
@@ -10,8 +10,9 @@
"moreFields": [
"email",
"fax",
"min_age",
"level",
"max_age",
"min_age",
"opening_hours",
"payment_multi",
"website",
data/presets/presets/amenity/language_school.json
+2 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-school",
"icon": "temaki-school",
"fields": [
"name",
"operator",
@@ -15,6 +15,7 @@
"internet_access",
"internet_access/fee",
"internet_access/ssid",
"level",
"payment_multi",
"phone",
"website",
data/presets/presets/amenity/letter_box.json
+2
View File
@@ -9,7 +9,9 @@
"moreFields": [
"covered",
"indoor",
"level",
"lit",
"lockable",
"manufacturer",
"material",
"operator",
data/presets/presets/amenity/library.json
+2 -1
View File
@@ -11,11 +11,12 @@
"internet_access/fee",
"internet_access/ssid"
],
"moreFields" : [
"moreFields": [
"access_simple",
"air_conditioning",
"email",
"fax",
"level",
"opening_hours",
"payment_multi",
"phone",
data/presets/presets/amenity/loading_dock.json
+32
View File
@@ -0,0 +1,32 @@
{
"icon": "fas-truck-loading",
"fields": [
"ref",
"operator",
"access_simple",
"door",
"width",
"height"
],
"moreFields": [
"address",
"colour",
"level",
"lit",
"wheelchair"
],
"geometry": [
"vertex"
],
"terms": [
"door",
"loading bay",
"shipping",
"unloading",
"warehouse"
],
"tags": {
"amenity": "loading_dock"
},
"name": "Loading Dock"
}
data/presets/presets/amenity/love_hotel.json
+1 -1
View File
@@ -10,7 +10,7 @@
"internet_access/fee",
"internet_access/ssid"
],
"moreFields" : [
"moreFields": [
"email",
"fax",
"min_age",
data/presets/presets/amenity/marketplace.json
+2 -2
View File
@@ -8,10 +8,10 @@
"opening_hours"
],
"moreFields": [
"website",
"phone",
"email",
"fax",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/monastery.json
+2 -2
View File
@@ -8,10 +8,10 @@
"building_area"
],
"moreFields": [
"website",
"phone",
"email",
"fax",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/money_transfer.json
+6 -5
View File
@@ -1,7 +1,7 @@
{
"icon": "maki-bank",
"icon": "temaki-money_hand",
"fields": [
"name",
"name",
"brand",
"address",
"building_area",
@@ -9,11 +9,12 @@
"currency_multi"
],
"moreFields": [
"opening_hours",
"website",
"phone",
"email",
"fax",
"level",
"opening_hours",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/music_school.json
+5 -4
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-school",
"icon": "fas-music",
"fields": [
"name",
"operator",
@@ -8,11 +8,12 @@
"opening_hours"
],
"moreFields": [
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/nightclub.json
+5 -4
View File
@@ -13,6 +13,7 @@
"air_conditioning",
"email",
"fax",
"level",
"payment_multi",
"phone",
"website",
@@ -26,10 +27,10 @@
"amenity": "nightclub"
},
"terms": [
"disco*",
"night club",
"dancing",
"dance club"
"disco*",
"night club",
"dancing",
"dance club"
],
"name": "Nightclub"
}
data/presets/presets/amenity/parking/multi-storey.json
+2 -2
View File
@@ -7,8 +7,8 @@
],
"moreFields": [
"{amenity/parking}",
"levels",
"height"
"height",
"levels"
],
"geometry": [
"area"
data/presets/presets/amenity/parking_entrance.json
+3 -1
View File
@@ -1,8 +1,10 @@
{
"icon": "maki-entrance-alt1",
"fields": [
"ref",
"access_simple",
"ref"
"address",
"level"
],
"geometry": [
"vertex"
data/presets/presets/amenity/payment_centre.json
+5 -4
View File
@@ -1,7 +1,7 @@
{
"icon": "maki-bank",
"icon": "temaki-money_hand",
"fields": [
"name",
"name",
"brand",
"address",
"building_area",
@@ -10,10 +10,11 @@
],
"moreFields": [
"currency_multi",
"website",
"phone",
"email",
"fax",
"level",
"phone",
"website",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/payment_terminal.json
+4 -1
View File
@@ -1,14 +1,17 @@
{
"icon": "far-credit-card",
"fields": [
"name",
"name",
"brand",
"address",
"opening_hours",
"payment_multi"
],
"moreFields": [
"covered",
"currency_multi",
"indoor",
"level",
"wheelchair"
],
"geometry": [
data/presets/presets/amenity/pharmacy.json
+5 -4
View File
@@ -9,12 +9,13 @@
"dispensing"
],
"moreFields": [
"opening_hours",
"payment_multi",
"website",
"phone",
"email",
"fax",
"level",
"opening_hours",
"payment_multi",
"phone",
"website",
"wheelchair"
],
"geometry": [

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