Commit a8295e97 authored by Tom MacWright's avatar Tom MacWright

Merge master

parents e30d5f32 e4ccf116
......@@ -47,7 +47,7 @@ MODULE_TARGETS = \
js/lib/id/services.js \
js/lib/id/svg.js
js/lib/id/index.js: $(shell find modules/index.js -type f)
js/lib/id/index.js: $(shell find modules -type f)
@rm -f $@
node_modules/.bin/rollup -c rollup.config.js -f umd -n iD modules/index.js --no-strict -o $@
......
......@@ -2056,6 +2056,10 @@ en:
name: Ambulance Station
# 'terms: EMS,EMT,rescue'
terms: '<translate with synonyms or related terms for ''Ambulance Station'', separated by commas>'
emergency/defibrillator:
# emergency=defibrillator
name: Defibrillator
terms: '<translate with synonyms or related terms for ''Defibrillator'', separated by commas>'
emergency/fire_hydrant:
# emergency=fire_hydrant
name: Fire Hydrant
......@@ -2609,6 +2613,10 @@ en:
# man_made=breakwater
name: Breakwater
terms: '<translate with synonyms or related terms for ''Breakwater'', separated by commas>'
man_made/bridge:
# man_made=bridge
name: Bridge
terms: '<translate with synonyms or related terms for ''Bridge'', separated by commas>'
man_made/chimney:
# man_made=chimney
name: Chimney
......
{
"access_simple": {
"key": "access",
"type": "combo",
"label": "Allowed Access",
"placeholder": "yes",
"options": [
"permissive",
"private",
"customers",
"no"
]
},
"access_toilets": {
"key": "access",
"type": "combo",
"label": "Access",
"options": [
"yes",
"permissive",
"private",
"customers"
]
},
"access": {
"keys": [
"access",
......@@ -76,6 +53,29 @@
}
}
},
"access_simple": {
"key": "access",
"type": "combo",
"label": "Allowed Access",
"placeholder": "yes",
"options": [
"permissive",
"private",
"customers",
"no"
]
},
"access_toilets": {
"key": "access",
"type": "combo",
"label": "Access",
"options": [
"yes",
"permissive",
"private",
"customers"
]
},
"address": {
"type": "address",
"keys": [
......@@ -246,16 +246,16 @@
"type": "text",
"label": "Brand"
},
"building_area": {
"building": {
"key": "building",
"type": "combo",
"default": "yes",
"geometry": "area",
"label": "Building"
},
"building": {
"building_area": {
"key": "building",
"type": "combo",
"default": "yes",
"geometry": "area",
"label": "Building"
},
"capacity": {
......@@ -510,16 +510,16 @@
"label": "Fix Me",
"universal": true
},
"fuel_multi": {
"key": "fuel:",
"type": "multiCombo",
"label": "Fuel Types"
},
"fuel": {
"key": "fuel",
"type": "combo",
"label": "Fuel"
},
"fuel_multi": {
"key": "fuel:",
"type": "multiCombo",
"label": "Fuel Types"
},
"gauge": {
"key": "gauge",
"type": "combo",
......@@ -600,6 +600,11 @@
"type": "text",
"label": "ICAO"
},
"incline": {
"key": "incline",
"type": "combo",
"label": "Incline"
},
"incline_steps": {
"key": "incline",
"type": "combo",
......@@ -611,11 +616,6 @@
}
}
},
"incline": {
"key": "incline",
"type": "combo",
"label": "Incline"
},
"information": {
"key": "information",
"type": "typeCombo",
......@@ -666,7 +666,7 @@
"type": "combo",
"label": "Layer"
},
"leaf_cycle_singular": {
"leaf_cycle": {
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
......@@ -675,11 +675,12 @@
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous"
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
}
}
},
"leaf_cycle": {
"leaf_cycle_singular": {
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
......@@ -688,12 +689,11 @@
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
"semi_deciduous": "Semi-Deciduous"
}
}
},
"leaf_type_singular": {
"leaf_type": {
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
......@@ -701,11 +701,12 @@
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
}
},
"leaf_type": {
"leaf_type_singular": {
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
......@@ -713,7 +714,6 @@
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
}
......@@ -856,25 +856,25 @@
"type": "typeCombo",
"label": "Type"
},
"oneway_yes": {
"oneway": {
"key": "oneway",
"type": "check",
"label": "One Way",
"strings": {
"options": {
"undefined": "Assumed to be Yes",
"undefined": "Assumed to be No",
"yes": "Yes",
"no": "No"
}
}
},
"oneway": {
"oneway_yes": {
"key": "oneway",
"type": "check",
"label": "One Way",
"strings": {
"options": {
"undefined": "Assumed to be No",
"undefined": "Assumed to be Yes",
"yes": "Yes",
"no": "No"
}
......@@ -1001,16 +1001,16 @@
"type": "text",
"label": "Population"
},
"power_supply": {
"key": "power_supply",
"type": "check",
"label": "Power Supply"
},
"power": {
"key": "power",
"type": "typeCombo",
"label": "Type"
},
"power_supply": {
"key": "power_supply",
"type": "check",
"label": "Power Supply"
},
"railway": {
"key": "railway",
"type": "typeCombo",
......@@ -1055,13 +1055,13 @@
"type": "number",
"label": "Rooms"
},
"route_master": {
"key": "route_master",
"route": {
"key": "route",
"type": "combo",
"label": "Type"
},
"route": {
"key": "route",
"route_master": {
"key": "route_master",
"type": "combo",
"label": "Type"
},
......@@ -1091,19 +1091,6 @@
"type": "check",
"label": "Seasonal"
},
"service_rail": {
"key": "service",
"type": "combo",
"label": "Service Type",
"strings": {
"options": {
"spur": "Spur",
"yard": "Yard",
"siding": "Siding",
"crossover": "Crossover"
}
}
},
"service": {
"key": "service",
"type": "combo",
......@@ -1140,16 +1127,29 @@
}
}
},
"shelter_type": {
"key": "shelter_type",
"service_rail": {
"key": "service",
"type": "combo",
"label": "Type"
"label": "Service Type",
"strings": {
"options": {
"spur": "Spur",
"yard": "Yard",
"siding": "Siding",
"crossover": "Crossover"
}
}
},
"shelter": {
"key": "shelter",
"type": "check",
"label": "Shelter"
},
"shelter_type": {
"key": "shelter_type",
"type": "combo",
"label": "Type"
},
"shop": {
"key": "shop",
"type": "typeCombo",
......@@ -1223,6 +1223,11 @@
"universal": true,
"label": "Source"
},
"sport": {
"key": "sport",
"type": "combo",
"label": "Sport"
},
"sport_ice": {
"key": "sport",
"type": "combo",
......@@ -1249,11 +1254,6 @@
"running"
]
},
"sport": {
"key": "sport",
"type": "combo",
"label": "Sport"
},
"stars": {
"key": "stars",
"type": "number",
......@@ -1404,16 +1404,16 @@
"type": "combo",
"label": "Type of Goods"
},
"water_point": {
"key": "water_point",
"type": "check",
"label": "Water Point"
},
"water": {
"key": "water",
"type": "combo",
"label": "Type"
},
"water_point": {
"key": "water_point",
"type": "check",
"label": "Water Point"
},
"waterway": {
"key": "waterway",
"type": "typeCombo",
......
This diff is collapsed.
{
"fields": [
"access",
"opening_hours",
"phone"
],
"geometry": [
"point"
],
"tags": {
"emergency": "defibrillator"
},
"name": "Defibrillator"
}
{
"geometry": [
"area"
],
"tags": {
"man_made": "bridge"
},
"name": "Bridge"
}
......@@ -278,15 +278,15 @@
},
{
"key": "amenity",
"value": "parking_entrance"
"value": "parking"
},
{
"key": "amenity",
"value": "parking_space"
"value": "parking_entrance"
},
{
"key": "amenity",
"value": "parking"
"value": "parking_space"
},
{
"key": "amenity",
......@@ -884,6 +884,10 @@
"key": "emergency",
"value": "ambulance_station"
},
{
"key": "emergency",
"value": "defibrillator"
},
{
"key": "emergency",
"value": "fire_hydrant"
......@@ -988,15 +992,15 @@
},
{
"key": "highway",
"value": "motorway_junction"
"value": "motorway"
},
{
"key": "highway",
"value": "motorway_link"
"value": "motorway_junction"
},
{
"key": "highway",
"value": "motorway"
"value": "motorway_link"
},
{
"key": "highway",
......@@ -1008,11 +1012,11 @@
},
{
"key": "highway",
"value": "primary_link"
"value": "primary"
},
{
"key": "highway",
"value": "primary"
"value": "primary_link"
},
{
"key": "highway",
......@@ -1032,11 +1036,11 @@
},
{
"key": "highway",
"value": "secondary_link"
"value": "secondary"
},
{
"key": "highway",
"value": "secondary"
"value": "secondary_link"
},
{
"key": "highway",
......@@ -1080,11 +1084,11 @@
},
{
"key": "highway",
"value": "tertiary_link"
"value": "tertiary"
},
{
"key": "highway",
"value": "tertiary"
"value": "tertiary_link"
},
{
"key": "highway",
......@@ -1096,11 +1100,11 @@
},
{
"key": "highway",
"value": "trunk_link"
"value": "trunk"
},
{
"key": "highway",
"value": "trunk"
"value": "trunk_link"
},
{
"key": "highway",
......@@ -1382,6 +1386,10 @@
"key": "man_made",
"value": "breakwater"
},
{
"key": "man_made",
"value": "bridge"
},
{
"key": "man_made",
"value": "chimney"
......@@ -1567,11 +1575,11 @@
},
{
"key": "natural",
"value": "tree_row"
"value": "tree"
},
{
"key": "natural",
"value": "tree"
"value": "tree_row"
},
{
"key": "natural",
......@@ -1818,11 +1826,11 @@
},
{
"key": "railway",
"value": "subway_entrance"
"value": "subway"
},
{
"key": "railway",
"value": "subway"
"value": "subway_entrance"
},
{
"key": "railway",
......@@ -1909,15 +1917,15 @@
},
{
"key": "shop",
"value": "car_parts"
"value": "car"
},
{
"key": "shop",
"value": "car_repair"
"value": "car_parts"
},
{
"key": "shop",
"value": "car"
"value": "car_repair"
},
{
"key": "shop",
......@@ -2261,11 +2269,11 @@
},
{
"key": "shop",
"value": "video_games"
"value": "video"
},
{
"key": "shop",
"value": "video"
"value": "video_games"
},
{
"key": "shop",
......@@ -2414,10 +2422,6 @@
"key": "restriction",
"value": "only_straight_on"
},
{
"key": "type",
"value": "route_master"
},
{
"key": "type",
"value": "route"
......@@ -2470,6 +2474,10 @@
"key": "route",
"value": "tram"
},
{
"key": "type",
"value": "route_master"
},
{
"key": "type",
"value": "site"
......
This diff is collapsed.
This diff is collapsed.
{
"presets": {
"fields": {
"address": {
"label": "주소",
"placeholders": {
"city": "도시",
"street": "길"
}
},
"aeroway": {
"label": "종류"
},
"amenity": {
"label": "종류"
},
"atm": {
"label": "ATM"
},
"bicycle_parking": {
"label": "종류"
},
"building": {
"label": "건물"
},
"building_area": {
"label": "건물"
},
"construction": {
"label": "종류"
},
"crossing": {
"label": "종류"
},
"entrance": {
"label": "종류"
},
"fax": {
"label": "Fax"
},
"highway": {
"label": "종류"
},
"historic": {
"label": "종류"
},
"internet_access": {
"label": "인터넷 이용 가능 여부",
"options": {
"terminal": "터미널",
"wlan": "Wifi"
}
},
"landuse": {
"label": "종류"
},
"leisure": {
"label": "종류"
},
"maxspeed": {
"label": "속도 제한"
},
"office": {
"label": "종류"
},
"oneway": {
"label": "일방통행"
},
"opening_hours": {
"label": "말"
},
"place": {
"label": "종류"
},
"railway": {
"label": "종류"
},
"religion": {
"label": "종교"
},
"service": {
"label": "종류"
},
"shop": {
"label": "종류"
},
"sport": {
"label": "운동"
},
"tourism": {
"label": "종류"
},
"water": {
"label": "종류"
},
"waterway": {
"label": "종류"
},
"website": {
"label": "웹사이트"
},
"wetland": {
"label": "종류"
},
"wikipedia": {
"label": "위키페디아"
}
},
"presets": {
"aeroway/helipad": {
"name": "헬기 이착륙장"
},
"amenity/bank": {
"name": "은행"
},
"amenity/bar": {
"name": "바"
},
"amenity/bicycle_parking": {
"name": "자전거 보관소"
},
"amenity/bicycle_rental": {
"name": "자전거 대여소"
},
"amenity/cafe": {
"name": "카페"
},
"amenity/cinema": {
"name": "극장"
},
"amenity/fast_food": {
"name": "패스트 푸드"
},
"amenity/fire_station": {
"name": "소방소"