diff --git a/.editorconfig b/.editorconfig index e46085531..a3f6ab3b0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,10 +4,16 @@ root = true trim_trailing_whitespace = true insert_final_newline = false -# for ESLint -[*.js] -end_of_line = lf [*.{js,json,css,html}] indent_style = space -indent_size = 4 \ No newline at end of file +indent_size = 4 + + +# EOL for ESLint +# newline follows Airbnb style guide +# mix of indent size between ES5 and ES6 syntax files +[*.js] +end_of_line = lf +insert_final_newline = true +indent_size = tab_width \ No newline at end of file diff --git a/css/80_app.css b/css/80_app.css index 2a871b75c..09b854e97 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -1157,6 +1157,9 @@ a.hide-toggle { text-overflow: ellipsis; overflow: hidden; } +.preset-list-button .label-inner .namepart:nth-child(2) { + font-weight: normal; +} .preset-list-button:hover .label, .preset-list-button:focus .label, diff --git a/data/address-formats.json b/data/address-formats.json index ec30fb291..ffa861db1 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -161,6 +161,24 @@ "neighbourhood": 0.5, "city": 0.5 } + }, + { + "countryCodes": ["pe"], + "format": [ + ["street", "housenumber"], + ["neighbourhood"], + ["city", "state", "postcode"] + ], + "dropdowns": [ + "street", "neighbourhood", "city", "state", "postcode" + ], + "widths": { + "street": 0.7, + "housenumber": 0.3, + "city": 0.4, + "state": 0.4, + "postcode": 0.2 + } } ] } diff --git a/data/deprecated.json b/data/deprecated.json index cdd0f5fce..19b2f3440 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -236,6 +236,10 @@ "old": {"camp_site": "camp_pitch"}, "replace": {"tourism": "camp_pitch"} }, + { + "old": {"shop": "clothes", "clothes": "second_hand"}, + "replace": {"shop": "clothes", "second_hand": "yes"} + }, { "old": {"color": "*"}, "replace": {"colour": "$1"} @@ -372,6 +376,26 @@ "old": {"embankment": "true"}, "replace": {"embankment": "yes"} }, + { + "old": {"entrance": "emergency_exit"}, + "replace": {"entrance": "emergency"} + }, + { + "old": {"entrance": "fire_exit"}, + "replace": {"entrance": "emergency"} + }, + { + "old": {"entrance": "loading_dock"}, + "replace": {"amenity": "loading_dock"} + }, + { + "old": {"entrance": "main_entrance"}, + "replace": {"entrance": "main"} + }, + { + "old": {"entrance": "private"}, + "replace": {"entrance": "yes", "access": "private"} + }, { "old": {"escalator": "*"}, "replace": {"highway": "steps", "conveying": "$1"} @@ -440,6 +464,18 @@ "old": {"footway": "separate"}, "replace": {"sidewalk": "separate"} }, + { + "old": {"amenity": "gambling", "gambling": "casino"}, + "replace": {"amenity": "casino"} + }, + { + "old": {"leisure": "amusement_arcade", "gambling": "*"}, + "replace": {"leisure": "adult_gaming_centre", "gambling": "$1"} + }, + { + "old": {"gambling": "slot_machine"}, + "replace": {"gambling": "slot_machines"} + }, { "old": {"generator:source": "photovoltaic"}, "replace": {"generator:source": "solar", "generator:method": "photovoltaic"} @@ -711,6 +747,22 @@ "old": {"mining_resource": "*"}, "replace": {"resource": "$1"} }, + { + "old": {"museum_type": "art"}, + "replace": {"museum": "art"} + }, + { + "old": {"museum_type": "history"}, + "replace": {"museum": "history"} + }, + { + "old": {"museum_type": "private"}, + "replace": {"operator:type": "private"} + }, + { + "old": {"museum_type": "public"}, + "replace": {"operator:type": "public"} + }, { "old": {"natural": "marsh"}, "replace": {"natural": "wetland", "wetland": "marsh"} @@ -757,6 +809,29 @@ { "old": {"oneway": "unknown"} }, + { + "old": {"operator:type": "goverment"}, + "replace": {"operator:type": "government"} + }, + { + "old": {"operator:type": "Privado"}, + "replace": {"operator:type": "private"} + }, + { + "old": {"operator:type": "Private"}, + "replace": {"operator:type": "private"} + }, + { + "old": {"operator:type": "Public"}, + "replace": {"operator:type": "public"} + }, + { + "old": {"operator:type": "Publico"}, + "replace": {"operator:type": "public"} + }, + { + "old": {"operator:type": "unknown"} + }, { "old": {"place_name": "*"}, "replace": {"name": "$1"} diff --git a/data/phone-formats.json b/data/phone-formats.json index b4bdda5cc..4acf74753 100644 --- a/data/phone-formats.json +++ b/data/phone-formats.json @@ -40,6 +40,7 @@ "ms": "+1-664-555-1234", "nl": "+31 42 123 4567", "no": "+47 22 12 34 56", + "pe": "+51 1 1234567", "pl": "+48 42 123 4567", "pr": "+1-787-555-1234", "pt": "+351 211 123456", diff --git a/data/presets.yaml b/data/presets.yaml index 69af5e796..ebf3c4455 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -235,6 +235,18 @@ en: attraction: # attraction=* label: Type + baby_feeding: + # baby_feeding=* + label: Baby Nursing Area + options: + # baby_feeding=no + 'no': None + # baby_feeding=room + room: Dedicated Room + # baby_feeding=yes + 'yes': Marked Space + # 'terms: baby feeding,breastfeeding,lactation,mothers,nursing' + terms: '[translate with synonyms or related terms for ''Baby Nursing Area'', separated by commas]' baby_seat: # baby=* label: Baby Seat @@ -371,6 +383,7 @@ en: building_area: # building=* label: Building + terms: '[translate with synonyms or related terms for ''Building'', separated by commas]' bunker_type: # bunker_type=* label: Type @@ -522,6 +535,8 @@ en: cuisine: # cuisine=* label: Cuisines + # 'terms: fare,food types' + terms: '[translate with synonyms or related terms for ''Cuisines'', separated by commas]' currency_multi: # 'currency:=*' label: Currency Types @@ -885,6 +900,9 @@ en: fuel_multi: # 'fuel:=*' label: Fuel Types + gambling: + # gambling=* + label: Games gauge: # gauge=* label: Gauge @@ -1402,6 +1420,9 @@ en: # mtb/scale/uphill field placeholder placeholder: '0, 1, 2, 3...' terms: '[translate with synonyms or related terms for ''Mountain Biking Uphill Difficulty'', separated by commas]' + museum: + # museum=* + label: Type name: # name=* label: Name @@ -3171,6 +3192,7 @@ en: amenity/grave_yard: # amenity=grave_yard name: Graveyard + # 'terms: burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb' terms: '' amenity/grit_bin: # amenity=grit_bin @@ -4107,6 +4129,10 @@ en: # barrier=stile name: Stile terms: '' + barrier/swing_gate: + # barrier=swing_gate + name: Swing Gate + terms: '' barrier/toll_booth: # barrier=toll_booth name: Toll Booth @@ -4701,6 +4727,11 @@ en: name: Entrance/Exit # 'terms: entrance,exit,door' terms: '' + entrance/emergency: + # entrance=emergency + name: Emergency Exit + # 'terms: fire exit,door' + terms: '' ford: # ford=yes name: Ford @@ -5203,6 +5234,10 @@ en: # historic=boundary_stone name: Boundary Stone terms: '' + historic/building: + # historic=building + name: Historic Building + terms: '' historic/castle: # historic=castle name: Castle @@ -5345,11 +5380,11 @@ en: landuse/cemetery: # landuse=cemetery name: Cemetery + # 'terms: burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb' terms: '' landuse/churchyard: # landuse=churchyard name: Churchyard - terms: '' landuse/commercial: # landuse=commercial name: Commercial Area @@ -5498,6 +5533,7 @@ en: landuse/religious: # landuse=religious name: Religious Area + # 'terms: christian,churchyard,hindu,jewish,mosque,muslim,place of worship,shinto,sikh,taoist,temple,shrine,synagogue' terms: '' landuse/reservoir: # landuse=reservoir @@ -6604,6 +6640,11 @@ en: # office=government name: Government Office terms: '' + office/government/prosecutor: + # 'office=government, government=prosecutor' + name: Public Prosecutor's Office + # 'terms: attorney general,district attorney,prosecution' + terms: '' office/government/register_office: # 'office=government, government=register_office' name: Register Office @@ -6631,6 +6672,7 @@ en: office/lawyer: # office=lawyer name: Law Office + # 'terms: advocate,attorney,barrister,counsellor,counselor,defender,lawyer,legal,prosecutor' terms: '' office/lawyer/notary: # 'office=lawyer, lawyer=notary' @@ -7449,6 +7491,11 @@ en: name: Car Dealership # 'terms: automobile,automotive' terms: '' + shop/car/second_hand: + # 'shop=car, second_hand=only' + name: Used Car Dealership + # 'terms: automobile,automotive' + terms: '' shop/car_parts: # shop=car_parts name: Car Parts Store @@ -7497,6 +7544,11 @@ en: name: Clothing Store # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' terms: '' + shop/clothes/second_hand: + # 'shop=clothes, second_hand=only' + name: Secondhand Clothing Store + # 'terms: blouses,clothes,consignment,dresses,pants,second hand,shirts,shorts,skirts,slacks,suits,used' + terms: '' shop/clothes/underwear: # 'shop=clothes, clothes=underwear' name: Underwear Store @@ -7562,6 +7614,10 @@ en: # shop=doityourself name: DIY Store terms: '' + shop/doors: + # shop=doors + name: Door Shop + terms: '' shop/dry_cleaning: # shop=dry_cleaning name: Dry Cleaner @@ -8237,6 +8293,16 @@ en: name: Museum # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*' terms: '' + tourism/museum/art: + # 'tourism=museum, museum=art' + name: Art Museum + # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*' + terms: '' + tourism/museum/history: + # 'tourism=museum, museum=history' + name: History Museum + # 'terms: artifacts,dioramas,exhibits,exhibitions,foundation,hall,institution' + terms: '' tourism/picnic_site: # tourism=picnic_site name: Picnic Site diff --git a/data/presets/README.md b/data/presets/README.md index 787218d76..c5ab684fd 100644 --- a/data/presets/README.md +++ b/data/presets/README.md @@ -150,8 +150,8 @@ preset are generally not inherited. E.g. the `shop` field is not inherited by `s The name of a local SVG icon file. You can use icons from any of the following icon sets. When specifying an icon, use the prefixed version of the name, for example `"icon": "maki-park"` or `"icon": "tnp-2009223"`. * [iD's spritesheet](https://github.com/openstreetmap/iD/tree/master/svg/iD-sprite/presets) (`iD-`) -* [Maki](http://www.mapbox.com/maki/) (`maki-`), map-specific icons from Mapbox -* [Temaki](http://bhousel.github.io/temaki/docs/) (`temaki-`), an expansion pack for Maki +* [Maki](https://labs.mapbox.com/maki-icons/) (`maki-`), map-specific icons from Mapbox +* [Temaki](https://ideditor.github.io/temaki/docs/) (`temaki-`), an expansion pack for Maki * This is the best place to submit a PR if you want to create a preset icon! * [Font Awesome](https://fontawesome.com/icons?d=gallery&m=free), thousands of general-purpose icons * There is a free and pro tier. You can use any icon from the free tier in the following styles: @@ -508,4 +508,4 @@ A "name" field must be included: "label": "Name", "placeholder": "Common name (if any)" } -``` +``` \ No newline at end of file diff --git a/data/presets/categories.json b/data/presets/categories.json index bcbfdead0..7d78b4eac 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -79,8 +79,7 @@ "natural/coastline", "natural/tree_row", "natural/peak", - "natural/cliff", - "natural/beach" + "natural/cliff" ] }, "category-path": { diff --git a/data/presets/categories/natural.json b/data/presets/categories/natural.json index a05ebc224..c7d2f27e0 100644 --- a/data/presets/categories/natural.json +++ b/data/presets/categories/natural.json @@ -15,7 +15,6 @@ "natural/coastline", "natural/tree_row", "natural/peak", - "natural/cliff", - "natural/beach" + "natural/cliff" ] } diff --git a/data/presets/fields.json b/data/presets/fields.json index c9b9f4207..4eb9d9ea3 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -27,6 +27,7 @@ "artwork_type": {"key": "artwork_type", "type": "combo", "label": "Type"}, "atm": {"key": "atm", "type": "check", "label": "ATM"}, "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"}, + "baby_feeding": {"key": "baby_feeding", "type": "combo", "label": "Baby Nursing Area", "strings": {"options": {"room": "Dedicated Room", "yes": "Marked Space", "no": "None"}}, "terms": ["baby feeding", "breastfeeding", "lactation", "mothers", "nursing"]}, "baby_seat": {"key": "baby", "type": "check", "label": "Baby Seat"}, "backcountry": {"key": "backcountry", "type": "check", "label": "Backcountry"}, "backrest": {"key": "backrest", "type": "check", "label": "Backrest"}, @@ -92,7 +93,7 @@ "crop": {"key": "crop", "type": "semiCombo", "label": "Crops"}, "crossing": {"key": "crossing", "type": "combo", "label": "Type"}, "crossing/island": {"key": "crossing:island", "type": "check", "label": "Refuge Island"}, - "cuisine": {"key": "cuisine", "type": "semiCombo", "label": "Cuisines"}, + "cuisine": {"key": "cuisine", "type": "semiCombo", "label": "Cuisines", "terms": ["fare", "food types"]}, "currency_multi": {"key": "currency:", "type": "multiCombo", "label": "Currency Types", "terms": ["bills", "cash", "coins", "money"]}, "cutting": {"key": "cutting", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "cycle_network": {"key": "cycle_network", "type": "networkCombo", "label": "Network"}, @@ -160,6 +161,7 @@ "from": {"key": "from", "type": "text", "label": "From"}, "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"}, "fuel": {"key": "fuel", "type": "combo", "label": "Fuel"}, + "gambling": {"key": "gambling", "type": "semiCombo", "label": "Games"}, "gauge": {"key": "gauge", "type": "combo", "label": "Gauge"}, "gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}, "terms": ["access", "female", "male", "unisex"]}, "generator/method": {"key": "generator:method", "type": "combo", "label": "Method"}, @@ -257,6 +259,7 @@ "mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}}, "mtb/scale/imba": {"key": "mtb:scale:imba", "type": "combo", "label": "IMBA Trail Difficulty", "placeholder": "Easy, Medium, Difficult...", "strings": {"options": {"0": "Easiest (white circle)", "1": "Easy (green circle)", "2": "Medium (blue square)", "3": "Difficult (black diamond)", "4": "Extremely Difficult (double black diamond)"}}}, "mtb/scale/uphill": {"key": "mtb:scale:uphill", "type": "combo", "label": "Mountain Biking Uphill Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", "4": "4: Avg. incline <30%, poor condition, big rocks/branches", "5": "5: Very steep, bike generally needs to be pushed or carried"}}}, + "museum": {"key": "museum", "type": "combo", "label": "Type"}, "name": {"key": "name", "type": "localized", "label": "Name", "universal": true, "placeholder": "Common name (if any)", "terms": ["label", "title"]}, "natural": {"key": "natural", "type": "typeCombo", "label": "Natural"}, "network_bicycle": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}}, diff --git a/data/presets/fields/baby_feeding.json b/data/presets/fields/baby_feeding.json new file mode 100644 index 000000000..f974d23a1 --- /dev/null +++ b/data/presets/fields/baby_feeding.json @@ -0,0 +1,19 @@ +{ + "key": "baby_feeding", + "type": "combo", + "label": "Baby Nursing Area", + "strings": { + "options": { + "room": "Dedicated Room", + "yes": "Marked Space", + "no": "None" + } + }, + "terms": [ + "baby feeding", + "breastfeeding", + "lactation", + "mothers", + "nursing" + ] +} diff --git a/data/presets/fields/cuisine.json b/data/presets/fields/cuisine.json index e555fde4a..6f4d5e1d5 100644 --- a/data/presets/fields/cuisine.json +++ b/data/presets/fields/cuisine.json @@ -1,5 +1,9 @@ { "key": "cuisine", "type": "semiCombo", - "label": "Cuisines" + "label": "Cuisines", + "terms": [ + "fare", + "food types" + ] } diff --git a/data/presets/fields/gambling.json b/data/presets/fields/gambling.json new file mode 100644 index 000000000..ebe999d13 --- /dev/null +++ b/data/presets/fields/gambling.json @@ -0,0 +1,5 @@ +{ + "key": "gambling", + "type": "semiCombo", + "label": "Games" +} diff --git a/data/presets/fields/museum.json b/data/presets/fields/museum.json new file mode 100644 index 000000000..defc585de --- /dev/null +++ b/data/presets/fields/museum.json @@ -0,0 +1,5 @@ +{ + "key": "museum", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index a0cc63009..1f7c6ad41 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -53,7 +53,7 @@ "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"}, "aeroway/spaceport": {"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"}, "aeroway/taxiway": {"icon": "fas-plane", "geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"}, - "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area"], "moreFields": ["smoking", "wheelchair"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"}, + "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area", "wheelchair", "baby_feeding"], "moreFields": ["smoking"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"}, "aeroway/windsock": {"icon": "fas-wind", "geometry": ["point", "vertex"], "fields": ["ref", "lit", "height"], "moreFields": ["manufacturer"], "tags": {"aeroway": "windsock"}, "name": "Windsock"}, "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"}, "amenity/bus_station": {"icon": "maki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"}, @@ -71,7 +71,7 @@ "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"}, "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "level", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"}, "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "brand", "currency_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"}, - "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"}, + "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "operator", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"}, "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"}, "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"}, "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"}, @@ -81,7 +81,7 @@ "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle shed", "cycling", "Bike Shed"], "name": "Bicycle Shed"}, "amenity/bicycle_rental": {"icon": "temaki-bicycle_rental", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"}, "amenity/bicycle_repair_station": {"icon": "temaki-bicycle_repair", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike chain", "bike multitool", "bike repair", "bike tools", "cycle pump", "cycle repair", "cycling"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"}, - "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"}, + "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "opening_hours", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}", "building_area", "cuisine"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"}, "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"}, "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"}, "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access/ssid", "level", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"}, @@ -89,9 +89,9 @@ "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"}, "amenity/car_sharing": {"icon": "temaki-sign_and_car", "fields": ["name", "operator", "operator/type", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["brand", "email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing Station"}, "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"}, - "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"}, + "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "gambling", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"}, "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "level", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"}, - "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"}, + "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"}, "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "email", "fax", "gnis/feature_id", "level", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"}, "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "brand", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"}, "amenity/clinic/abortion": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "abortion"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Abortion Clinic"}, @@ -99,7 +99,7 @@ "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["covered", "height", "indoor", "level", "lit", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"}, "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"}, "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["denomination", "email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "religion", "wheelchair"], "geometry": ["area", "point"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"}, - "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"}, + "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"}, "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"}, "amenity/compressed_air": {"icon": "fas-tachometer-alt", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "covered", "lit"], "moreFields": ["brand", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"}, "amenity/conference_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "conference_centre"}, "terms": ["auditorium", "conference", "exhibition", "exposition", "lecture"], "name": "Convention Center"}, @@ -128,7 +128,7 @@ "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "outdoor_seating", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"}, "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "fountain", "drinking_water", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "terms": ["basin", "water"], "name": "Fountain"}, "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["brand", "building", "email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"}, - "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"}, + "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "terms": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "name": "Graveyard"}, "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"}, "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"}, "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"}, @@ -138,7 +138,7 @@ "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"}, "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"}, "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"}, - "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"}, + "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"}, "amenity/loading_dock": {"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"}, "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "gnis/feature_id", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"}, "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"}, @@ -156,9 +156,9 @@ "amenity/parking/underground": {"icon": "temaki-car_structure", "fields": ["{amenity/parking}", "layer"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "name": "Underground Parking"}, "amenity/payment_centre": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"}, "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["covered", "currency_multi", "indoor", "level", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"}, - "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"}, + "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "opening_hours", "dispensing", "drive_through"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"}, "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "moreFields": ["brand", "indoor", "level"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"}, - "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "opening_hours", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"}, + "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "opening_hours", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"}, "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"}, "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"}, "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"}, @@ -178,7 +178,7 @@ "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"}, "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "SAT", "homework", "math", "reading", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"}, "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"}, - "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"}, + "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "cuisine", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"}, "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"}, "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"}, "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"}, @@ -189,7 +189,7 @@ "amenity/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"}, "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"}, "amenity/research_institute": {"icon": "fas-flask", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["applied research", "experimentation", "r&d", "r & d", "r and d", "research and development", "research institution", "research laboratory", "research labs"], "tags": {"amenity": "research_institute"}, "name": "Research Institute Grounds"}, - "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"}, + "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"}, "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"}, "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"}, "amenity/restaurant/chinese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"}, @@ -217,8 +217,8 @@ "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"}, "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "hot_water", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"}, "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["covered", "level", "lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"}, - "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"}, - "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"}, + "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"}, + "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"}, "amenity/social_facility/ambulatory_care": {"icon": "maki-wheelchair", "geometry": ["point", "area"], "tags": {"amenity": "social_facility", "social_facility": "ambulatory_care"}, "reference": {"key": "social_facility", "value": "ambulatory_care"}, "name": "Ambulatory Care"}, "amenity/social_facility/food_bank": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility", "social_facility": "food_bank"}, "reference": {"key": "social_facility", "value": "food_bank"}, "name": "Food Bank"}, "amenity/social_facility/group_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["old", "senior", "living", "care home", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "group_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "group_home"}, "name": "Elderly Group Home"}, @@ -236,7 +236,7 @@ "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"}, "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"}, "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"}, - "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"}, + "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"}, "amenity/townhall/city": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "name": "City Hall"}, "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"}, "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["area", "point"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"}, @@ -305,7 +305,7 @@ "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25}, "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height", "material"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25}, "barrier/fence/railing": {"icon": "temaki-railing", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "terms": ["railing", "handrail", "guard rail"], "name": "Railing", "matchScore": 0.5}, - "barrier/gate": {"icon": "temaki-gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"}, + "barrier/gate": {"icon": "temaki-gate", "fields": ["access", "wheelchair", "opening_hours", "height", "material"], "moreFields": ["colour", "manufacturer", "operator", "ref"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"}, "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75}, "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25}, "barrier/height_restrictor": {"icon": "temaki-height_restrictor", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"}, @@ -315,10 +315,11 @@ "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "raised"}, "addTags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "matchScore": 0.55, "name": "Raised Curb"}, "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "rolled"}, "addTags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "matchScore": 0.55, "name": "Rolled Curb"}, "barrier/kissing_gate": {"icon": "temaki-gate", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"}, - "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, + "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"}, "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, + "barrier/swing_gate": {"icon": "temaki-gate", "fields": ["{barrier/gate}"], "moreFields": ["{barrier/gate}"], "geometry": ["vertex"], "tags": {"barrier": "swing_gate"}, "name": "Swing Gate"}, "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, "barrier/turnstile": {"icon": "temaki-turnstile", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"}, "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, @@ -337,11 +338,11 @@ "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"}, "building/cabin": {"icon": "temaki-cabin", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"}, "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"}, - "building/cathedral": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"}, + "building/cathedral": {"icon": "fas-church", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"}, "building/chapel": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"}, - "building/church": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"}, + "building/church": {"icon": "fas-church", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"}, "building/civic": {"icon": "maki-building", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "tags": {"building": "civic"}, "matchScore": 0.5, "name": "Civic Building"}, - "building/college": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["university"], "tags": {"building": "college"}, "matchScore": 0.5, "name": "College Building"}, + "building/college": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["university"], "tags": {"building": "college"}, "matchScore": 0.5, "name": "College Building"}, "building/commercial": {"icon": "maki-suitcase", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "commercial"}, "matchScore": 0.5, "name": "Commercial Building"}, "building/construction": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "construction"}, "matchScore": 0.5, "name": "Building Under Construction"}, "building/detached": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "detached"}, "terms": ["home", "single", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Detached House"}, @@ -353,21 +354,21 @@ "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"}, "building/greenhouse": {"icon": "maki-garden-centre", "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"}, "building/hangar": {"icon": "fas-warehouse", "fields": ["name"], "geometry": ["area"], "tags": {"building": "hangar"}, "matchScore": 0.5, "name": "Hangar Building"}, - "building/hospital": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"}, - "building/hotel": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"}, + "building/hospital": {"icon": "fas-hospital-alt", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"}, + "building/hotel": {"icon": "fas-hotel", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"}, "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"}, "building/houseboat": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "houseboat"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Houseboat"}, "building/hut": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"}, "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"}, - "building/kindergarten": {"icon": "maki-building", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"}, - "building/mosque": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"}, + "building/kindergarten": {"icon": "fas-school", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"}, + "building/mosque": {"icon": "fas-mosque", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"}, "building/pavilion": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "terms": ["sports"], "tags": {"building": "pavilion"}, "matchScore": 0.5, "name": "Pavilion Building"}, "building/public": {"icon": "maki-building", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "tags": {"building": "public"}, "matchScore": 0.5, "name": "Public Building"}, "building/residential": {"icon": "maki-residential-community", "geometry": ["area"], "tags": {"building": "residential"}, "matchScore": 0.5, "name": "Residential Building"}, "building/retail": {"icon": "maki-commercial", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"}, "building/roof": {"icon": "maki-shelter", "fields": ["{building}", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"}, "building/ruins": {"icon": "temaki-ruins", "geometry": ["area"], "tags": {"building": "ruins"}, "matchScore": 0.5, "name": "Building Ruins"}, - "building/school": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"}, + "building/school": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"}, "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"}, "building/service": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "service"}, "matchScore": 0.5, "name": "Service Building"}, "building/shed": {"icon": "fas-warehouse", "fields": ["{building}", "lockable"], "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"}, @@ -377,7 +378,7 @@ "building/temple": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "temple"}, "matchScore": 0.5, "name": "Temple Building"}, "building/terrace": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "terrace"}, "terms": ["home", "terrace", "brownstone", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Row Houses"}, "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"}, - "building/university": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"}, + "building/university": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"}, "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"}, "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"}, "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"}, @@ -435,7 +436,7 @@ "craft/window_construction": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass"], "tags": {"craft": "window_construction"}, "name": "Window Construction"}, "craft/winery": {"icon": "maki-alcohol-shop", "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"}, "cycleway/asl": {"icon": "maki-bicycle", "fields": ["ref", "direction_vertex", "width"], "geometry": ["vertex"], "tags": {"cycleway": "asl"}, "terms": ["advanced stop box", "asl", "bicycle box", "bike box", "bikebox", "cycle box", "cycle stop marking"], "name": "Advanced Stop Line"}, - "demolished/building": {"fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false}, + "demolished/building": {"icon": "fas-house-damage", "fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false}, "disused/railway": {"fields": ["disused/railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"disused:railway": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Railway Feature"}, "emergency/designated": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "designated"}, "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01}, "emergency/destination": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "destination"}, "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01}, @@ -455,7 +456,8 @@ "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"}, "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"}, "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"}, - "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "level", "address"], "matchScore": 0.8, "name": "Entrance/Exit"}, + "entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "entrance", "door", "access_simple", "wheelchair", "level", "address"], "geometry": ["vertex"], "tags": {"entrance": "*"}, "terms": ["entrance", "exit", "door"], "matchScore": 0.8, "name": "Entrance/Exit"}, + "entrance/emergency": {"icon": "maki-entrance-alt1", "fields": ["ref", "door", "access_simple", "level"], "geometry": ["vertex"], "tags": {"entrance": "emergency"}, "terms": ["fire exit", "door"], "matchScore": 0.8, "name": "Emergency Exit"}, "ford": {"icon": "temaki-pedestrian", "fields": ["name", "access", "seasonal"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"}, "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"}, "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "name": "Golf Cartpath"}, @@ -560,9 +562,10 @@ "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"}, "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"}, "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"}, - "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"historic": "*"}, "name": "Historic Site"}, + "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"historic": "*"}, "matchScore": 0.5, "name": "Historic Site"}, "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "site_type", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"}, "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["{historic}", "material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, + "historic/building": {"icon": "maki-home", "fields": ["{building}", "start_date"], "moreFields": ["{building}", "access_simple"], "geometry": ["area"], "tags": {"historic": "building"}, "addTags": {"historic": "building", "building": "*"}, "reference": {"key": "historic", "value": "building"}, "matchScore": 0.5, "name": "Historic Building"}, "historic/castle": {"icon": "maki-castle", "fields": ["name", "castle_type", "building_area", "historic/civilization", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "castle"}, "name": "Castle"}, "historic/castle/fortress": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "fortress"}, "tags": {"historic": "castle", "castle_type": "fortress"}, "terms": ["citadel", "military"], "name": "Historic Fortress"}, "historic/castle/palace": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "palace"}, "tags": {"historic": "castle", "castle_type": "palace"}, "terms": ["Royal Residence", "royal", "king", "queen"], "name": "Palace"}, @@ -589,14 +592,14 @@ "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/ssid", "internet_access/fee"], "moreFields": ["level"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"}, "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"}, "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false}, + "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["{landuse/religious}"], "moreFields": ["{landuse/religious}"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "searchable": false, "name": "Churchyard"}, "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false}, "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false}, "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false}, "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"}, "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"}, "landuse/brownfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"}, - "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"}, - "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"}, + "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "name": "Cemetery"}, "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"}, "landuse/construction": {"icon": "temaki-bulldozer", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": ["building", "bulldozer", "construction site", "construction zone", "crane", "demolition", "development", "infrastructure"], "name": "Construction Area"}, "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"}, @@ -626,28 +629,28 @@ "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"}, "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"}, "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"}, - "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"}, - "landuse/residential": {"icon": "maki-building", "fields": ["name", "residential"], "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"}, - "landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"}, + "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": ["christian", "churchyard", "hindu", "jewish", "mosque", "muslim", "place of worship", "shinto", "sikh", "taoist", "temple", "shrine", "synagogue"], "name": "Religious Area"}, + "landuse/residential": {"icon": "maki-residential-community", "fields": ["name", "residential"], "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"}, + "landuse/residential/apartments": {"icon": "maki-residential-community", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"}, "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"}, "landuse/vineyard": {"icon": "temaki-grapes", "fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"}, "landuse/winter_sports": {"icon": "fas-skiing", "geometry": ["area"], "fields": ["name", "operator"], "moreFields": ["access_simple", "address", "opening_hours"], "tags": {"landuse": "winter_sports"}, "terms": ["piste area", "ski area", "ski hill", "ski mountain", "ski resort", "snow board area", "snowboard area"], "name": "Winter Sports Area"}, "leisure/adult_gaming_centre": {"icon": "temaki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"}, - "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"}, + "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"}, "leisure/bandstand": {"icon": "fas-music", "fields": ["name", "building_area", "operator"], "moreFields": ["gnis/feature_id", "website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"}, "leisure/beach_resort": {"icon": "fas-umbrella-beach", "fields": ["name", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "smoking", "website"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"}, "leisure/bird_hide": {"icon": "temaki-binoculars", "fields": ["name", "building_area", "address", "opening_hours"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bird_hide"}, "terms": ["machan", "ornithology"], "name": "Bird Hide"}, "leisure/bleachers": {"icon": "temaki-bleachers", "geometry": ["area"], "tags": {"leisure": "bleachers"}, "terms": ["crowd", "bench", "sports", "stand", "stands", "seat", "seating"], "name": "Bleachers"}, - "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"}, + "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"}, "leisure/common": {"icon": "temaki-pedestrian", "fields": ["name", "access_simple"], "moreFields": ["gnis/feature_id", "website"], "geometry": ["area", "point"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"}, "leisure/dance": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"}, "leisure/dancing_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"}, "leisure/disc_golf_course": {"icon": "temaki-disc_golf_basket", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["address", "dog", "email", "fax", "gnis/feature_id", "lit", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"leisure": "disc_golf_course"}, "addTags": {"leisure": "disc_golf_course", "sport": "disc_golf"}, "terms": ["disk golf", "frisbee golf", "flying disc golf", "frolf", "ultimate"], "name": "Disc Golf Course"}, - "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"}, + "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name", "operator", "operator/type", "address", "access_simple", "website"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "ref"], "geometry": ["area", "point"], "tags": {"leisure": "dog_park"}, "terms": [], "name": "Dog Park"}, "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"}, "leisure/firepit": {"icon": "temaki-campfire", "fields": ["access_simple", "seasonal", "width"], "moreFields": ["ref"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["bonfire", "campfire", "fire circle", "fire hole", "fire place", "fire ring", "firepit", "fireplace", "firering"], "name": "Fire Pit"}, "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"}, - "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"}, + "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area", "opening_hours", "phone", "website"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"}, "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["asanas", "meditation", "modern yoga", "studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"}, "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "wheelchair", "blind"], "moreFields": ["access_simple", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"}, "leisure/fitness_station/balance_beam": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "balance_beam"}, "addTags": {"leisure": "fitness_station", "fitness_station": "balance_beam", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["balance", "exercise", "fitness", "gym", "trim trail"], "name": "Exercise Balance Beam"}, @@ -665,7 +668,7 @@ "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"}, "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"}, "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"}, - "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"}, + "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"}, "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "website"], "geometry": ["area", "point", "vertex"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"}, "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"}, "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["area", "point"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"}, @@ -705,7 +708,7 @@ "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"}, "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"}, "leisure/sports_centre/swimming": {"icon": "fas-swimmer", "geometry": ["area", "point"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"}, - "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"}, + "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "operator", "sport", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"}, "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "charge_fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"}, "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "gnis/feature_id", "opening_hours", "operator"], "geometry": ["area", "point"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"}, "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "moreFields": ["access", "covered", "gnis/feature_id", "indoor", "level"], "geometry": ["line", "point", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"}, @@ -833,7 +836,7 @@ "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["area", "point"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"}, "network/type/node_network": {"fields": ["name", "rwn_ref", "rcn_ref"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"}, "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"}, - "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"}, + "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"}, "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "searchable": false, "name": "Administrative Office"}, "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"}, "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "name": "Travel Agency", "searchable": false}, @@ -860,12 +863,13 @@ "office/forestry": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "forestry"}, "terms": ["forest", "ranger"], "name": "Forestry Office"}, "office/foundation": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "foundation"}, "terms": [], "name": "Foundation Office"}, "office/government": {"icon": "maki-town-hall", "fields": ["name", "government", "{office}"], "geometry": ["point", "area"], "tags": {"office": "government"}, "terms": [], "name": "Government Office"}, + "office/government/prosecutor": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["attorney general", "district attorney", "prosecution"], "tags": {"office": "government", "government": "prosecutor"}, "reference": {"key": "government", "value": "prosecutor"}, "name": "Public Prosecutor's Office"}, "office/government/register_office": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["clerk", "marriage", "death", "birth", "certificate"], "tags": {"office": "government", "government": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office"}, "office/government/tax": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["fiscal authorities", "revenue office", "tax office"], "tags": {"office": "government", "government": "tax"}, "reference": {"key": "government", "value": "tax"}, "name": "Tax and Revenue Office"}, "office/guide": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "guide"}, "terms": ["dive guide", "mountain guide", "tour guide"], "name": "Tour Guide Office"}, "office/insurance": {"icon": "temaki-briefcase_shield", "moreFields": ["brand", "{office}"], "geometry": ["point", "area"], "tags": {"office": "insurance"}, "terms": [], "name": "Insurance Office"}, "office/it": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "it"}, "terms": ["computer", "information", "software", "technology"], "name": "Information Technology Office"}, - "office/lawyer": {"icon": "fas-balance-scale", "geometry": ["point", "area"], "tags": {"office": "lawyer"}, "terms": [], "name": "Law Office"}, + "office/lawyer": {"icon": "fas-balance-scale", "geometry": ["point", "area"], "tags": {"office": "lawyer"}, "terms": ["advocate", "attorney", "barrister", "counsellor", "counselor", "defender", "lawyer", "legal", "prosecutor"], "name": "Law Office"}, "office/lawyer/notary": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "lawyer", "lawyer": "notary"}, "reference": {"key": "office", "value": "notary"}, "searchable": false, "name": "Notary Office"}, "office/moving_company": {"icon": "fas-people-carry", "geometry": ["point", "area"], "tags": {"office": "moving_company"}, "terms": ["relocation"], "name": "Moving Company Office"}, "office/newspaper": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"office": "newspaper"}, "terms": [], "name": "Newspaper Office"}, @@ -966,7 +970,7 @@ "public_transport/station_train": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"}, "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"}, "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"}, - "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2}, + "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2}, "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"}, "public_transport/stop_position_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"}, "public_transport/stop_position_bus": {"icon": "maki-bus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"}, @@ -998,7 +1002,7 @@ "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"}, "railway/rail/highspeed": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"}, "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"}, - "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"}, + "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"}, "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"}, "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"}, "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"}, @@ -1045,6 +1049,7 @@ "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"}, "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"}, "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car"}, "name": "Car Dealership"}, + "shop/car/second_hand": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car", "second_hand": "only"}, "name": "Used Car Dealership"}, "shop/caravan": {"icon": "temaki-rv_park", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "tags": {"shop": "caravan"}, "terms": ["auto", "camper", "recreational vehicle"], "name": "RV Dealership"}, "shop/carpet": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"}, "shop/catalogue": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"}, @@ -1053,6 +1058,7 @@ "shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"}, "shop/chocolate": {"icon": "maki-confectionery", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"}, "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"}, + "shop/clothes/second_hand": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "second_hand": "only"}, "terms": ["blouses", "clothes", "consignment", "dresses", "pants", "second hand", "shirts", "shorts", "skirts", "slacks", "suits", "used"], "name": "Secondhand Clothing Store"}, "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"}, "shop/coffee": {"icon": "temaki-coffee", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"}, "shop/computer": {"icon": "fas-laptop", "geometry": ["point", "area"], "tags": {"shop": "computer"}, "terms": ["desktop", "laptop", "hardware", "operating system", "software"], "name": "Computer Store"}, @@ -1067,6 +1073,7 @@ "shop/deli": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"}, "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"}, "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "name": "DIY Store"}, + "shop/doors": {"icon": "fas-door-open", "geometry": ["point", "area"], "tags": {"shop": "doors"}, "name": "Door Shop"}, "shop/dry_cleaning": {"icon": "temaki-clothes_hanger", "geometry": ["point", "area"], "tags": {"shop": "dry_cleaning"}, "name": "Dry Cleaner"}, "shop/e-cigarette": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "e-cigarette"}, "terms": ["electronic", "vape", "vaping", "vapor"], "name": "E-Cigarette Shop"}, "shop/electrical": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["cable", "electric", "fan", "LED", "lighting", "power", "wire"], "tags": {"shop": "electrical"}, "name": "Electrical Equipment Store"}, @@ -1103,7 +1110,7 @@ "shop/hunting": {"icon": "temaki-binoculars", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"}, "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"}, "shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jewellery", "jeweller", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"}, - "shop/kiosk": {"icon": "maki-shop", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"}, + "shop/kiosk": {"icon": "fas-store", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"}, "shop/kitchen": {"icon": "temaki-kitchen_sink", "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "terms": ["cabinets", "countertops", "sinks"], "name": "Kitchen Design Store"}, "shop/laundry": {"icon": "temaki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"}, "shop/laundry/self_service": {"icon": "temaki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"}, @@ -1206,7 +1213,9 @@ "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"}, "tourism/information/terminal": {"icon": "maki-information", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"}, "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "terms": ["lodging", "motor hotel", "overnight accommodations"], "name": "Motel"}, - "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"}, + "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "museum", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"}, + "tourism/museum/art": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum", "museum": "art"}, "reference": {"key": "museum", "value": "art"}, "name": "Art Museum"}, + "tourism/museum/history": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["artifacts", "dioramas", "exhibits", "exhibitions", "foundation", "hall", "institution"], "tags": {"tourism": "museum", "museum": "history"}, "reference": {"key": "museum", "value": "history"}, "name": "History Museum"}, "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"}, "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"}, "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2}, @@ -3367,7 +3376,7 @@ "healthcare/blood_donation/Thai Red Cross Society": {"name": "Thai Red Cross Society", "icon": "maki-blood-bank", "imageURL": "https://graph.facebook.com/ThaiRedCross/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4922087", "healthcare": "blood_donation"}, "addTags": {"brand": "Thai Red Cross Society", "brand:wikidata": "Q4922087", "brand:wikipedia": "en:Thai Red Cross Society", "donation:compensation": "no", "healthcare": "blood_donation", "name": "Thai Red Cross Society", "short_name": "Thai Red Cross"}, "countryCodes": ["th"], "terms": [], "matchScore": 2, "suggestion": true}, "healthcare/counselling/Jenny Craig": {"name": "Jenny Craig", "icon": "fas-comments", "imageURL": "https://graph.facebook.com/jennycraig/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6179221", "healthcare": "counselling"}, "addTags": {"brand": "Jenny Craig", "brand:wikidata": "Q6179221", "brand:wikipedia": "en:Jenny Craig, Inc.", "healthcare": "counselling", "healthcare:counselling": "dietitian", "healthcare:speciality": "weight_loss", "name": "Jenny Craig"}, "countryCodes": ["au", "ca", "nz", "us"], "terms": [], "matchScore": 2, "suggestion": true}, "healthcare/counselling/WW Studio": {"name": "WW Studio", "icon": "fas-comments", "imageURL": "https://graph.facebook.com/WW/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1929466", "healthcare": "counselling"}, "addTags": {"alt_name": "Weight Watchers", "brand": "WW Studio", "brand:wikidata": "Q1929466", "brand:wikipedia": "en:WW International", "healthcare": "counselling", "healthcare:counselling": "dietitian", "healthcare:speciality": "weight_loss", "name": "WW Studio"}, "terms": ["ww"], "matchScore": 2, "suggestion": true}, - "landuse/residential/Avalon": {"name": "Avalon", "icon": "maki-building", "imageURL": "https://pbs.twimg.com/profile_images/859879308940193792/us4WbKaN_bigger.jpg", "geometry": ["area"], "tags": {"brand:wikidata": "Q64665938", "landuse": "residential"}, "addTags": {"brand": "Avalon", "brand:wikidata": "Q64665938", "landuse": "residential", "name": "Avalon", "residential": "apartments"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, + "landuse/residential/Avalon": {"name": "Avalon", "icon": "maki-residential-community", "imageURL": "https://pbs.twimg.com/profile_images/859879308940193792/us4WbKaN_bigger.jpg", "geometry": ["area"], "tags": {"brand:wikidata": "Q64665938", "landuse": "residential"}, "addTags": {"brand": "Avalon", "brand:wikidata": "Q64665938", "landuse": "residential", "name": "Avalon", "residential": "apartments"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "leisure/bowling_alley/Strike Bowling Bar": {"name": "Strike Bowling Bar", "icon": "temaki-bowling", "imageURL": "https://graph.facebook.com/strikebowling/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7623769", "leisure": "bowling_alley"}, "addTags": {"brand": "Strike Bowling Bar", "brand:wikidata": "Q7623769", "brand:wikipedia": "en:Strike Bowling Bar", "leisure": "bowling_alley", "name": "Strike Bowling Bar"}, "countryCodes": ["au"], "terms": [], "matchScore": 2, "suggestion": true}, "leisure/dog_park/Kamp K9": {"name": "Kamp K9", "icon": "maki-dog-park", "imageURL": "https://graph.facebook.com/KOAKampgrounds/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q16988635", "leisure": "dog_park"}, "addTags": {"brand": "KOA", "brand:wikidata": "Q16988635", "brand:wikipedia": "en:Kampgrounds of America", "leisure": "dog_park", "name": "Kamp K9"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true}, "leisure/escape_game/Escapology": {"name": "Escapology", "icon": "fas-puzzle-piece", "imageURL": "https://graph.facebook.com/EscapologySanDiego/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64137163", "leisure": "escape_game"}, "addTags": {"brand": "Escapology", "brand:wikidata": "Q64137163", "leisure": "escape_game", "name": "Escapology"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, @@ -4875,14 +4884,14 @@ "shop/jewelry/Warren James": {"name": "Warren James", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/warrenjamesjewellers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q19604616", "shop": "jewelry"}, "addTags": {"brand": "Warren James", "brand:wikidata": "Q19604616", "brand:wikipedia": "en:Warren James Jewellers", "name": "Warren James", "shop": "jewelry"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/jewelry/Zales": {"name": "Zales", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/Zales/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8065305", "shop": "jewelry"}, "addTags": {"brand": "Zales", "brand:wikidata": "Q8065305", "brand:wikipedia": "en:Zale Corporation", "name": "Zales", "shop": "jewelry"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/jewelry/Адамас": {"name": "Адамас", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/adamas.club/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62393709", "shop": "jewelry"}, "addTags": {"brand": "Адамас", "brand:en": "Adamas", "brand:ru": "Адамас", "brand:wikidata": "Q62393709", "name": "Адамас", "name:en": "Adamas", "name:ru": "Адамас", "shop": "jewelry"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Lietuvos spauda": {"name": "Lietuvos spauda", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "countryCodes": ["lt"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Narvesen": {"name": "Narvesen", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "countryCodes": ["lt", "lv", "no"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Pressbyran/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2489072", "shop": "kiosk"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "countryCodes": ["se"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/R-Kioski": {"name": "R-Kioski", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/rkioski/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1571400", "shop": "kiosk"}, "addTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Ruch": {"name": "Ruch", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/ruch/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1260314", "shop": "kiosk"}, "addTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Tisak": {"name": "Tisak", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/tisakmedia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12643627", "shop": "kiosk"}, "addTags": {"brand": "Tisak", "brand:wikidata": "Q12643627", "brand:wikipedia": "hr:Tisak (tvrtka)", "name": "Tisak", "shop": "kiosk"}, "countryCodes": ["hr"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/k kiosk": {"name": "k kiosk", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/kkiosk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60381703", "shop": "kiosk"}, "addTags": {"brand": "k kiosk", "brand:wikidata": "Q60381703", "brand:wikipedia": "it:K Kiosk", "name": "k kiosk", "shop": "kiosk"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/キヨスク": {"name": "キヨスク", "icon": "maki-shop", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FKiosk%20logos.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1334796", "shop": "kiosk"}, "addTags": {"brand": "キヨスク", "brand:en": "KIOSK", "brand:ja": "キヨスク", "brand:wikidata": "Q1334796", "brand:wikipedia": "ja:キヨスク", "name": "キヨスク", "name:en": "KIOSK", "name:ja": "キヨスク", "shop": "kiosk"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Lietuvos spauda": {"name": "Lietuvos spauda", "icon": "fas-store", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "countryCodes": ["lt"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Narvesen": {"name": "Narvesen", "icon": "fas-store", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "countryCodes": ["lt", "lv", "no"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "fas-store", "imageURL": "https://graph.facebook.com/Pressbyran/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2489072", "shop": "kiosk"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "countryCodes": ["se"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/R-Kioski": {"name": "R-Kioski", "icon": "fas-store", "imageURL": "https://graph.facebook.com/rkioski/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1571400", "shop": "kiosk"}, "addTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Ruch": {"name": "Ruch", "icon": "fas-store", "imageURL": "https://graph.facebook.com/ruch/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1260314", "shop": "kiosk"}, "addTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Tisak": {"name": "Tisak", "icon": "fas-store", "imageURL": "https://graph.facebook.com/tisakmedia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12643627", "shop": "kiosk"}, "addTags": {"brand": "Tisak", "brand:wikidata": "Q12643627", "brand:wikipedia": "hr:Tisak (tvrtka)", "name": "Tisak", "shop": "kiosk"}, "countryCodes": ["hr"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/k kiosk": {"name": "k kiosk", "icon": "fas-store", "imageURL": "https://graph.facebook.com/kkiosk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60381703", "shop": "kiosk"}, "addTags": {"brand": "k kiosk", "brand:wikidata": "Q60381703", "brand:wikipedia": "it:K Kiosk", "name": "k kiosk", "shop": "kiosk"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/キヨスク": {"name": "キヨスク", "icon": "fas-store", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FKiosk%20logos.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1334796", "shop": "kiosk"}, "addTags": {"brand": "キヨスク", "brand:en": "KIOSK", "brand:ja": "キヨスク", "brand:wikidata": "Q1334796", "brand:wikipedia": "ja:キヨスク", "name": "キヨスク", "name:en": "KIOSK", "name:ja": "キヨスク", "shop": "kiosk"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/kitchen/Cuisinella": {"name": "Cuisinella", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/CuisinellaFR/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3007012", "shop": "kitchen"}, "addTags": {"brand": "Cuisinella", "brand:wikidata": "Q3007012", "brand:wikipedia": "fr:Cuisinella", "name": "Cuisinella", "shop": "kitchen"}, "countryCodes": ["fr", "tn"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/kitchen/Ixina": {"name": "Ixina", "icon": "temaki-kitchen_sink", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FIxina.png&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3156424", "shop": "kitchen"}, "addTags": {"brand": "Ixina", "brand:wikidata": "Q3156424", "brand:wikipedia": "fr:Ixina", "name": "Ixina", "shop": "kitchen"}, "countryCodes": ["ae", "au", "be", "bf", "bh", "bj", "ca", "ci", "cm", "cn", "cz", "dz", "ee", "eg", "fr", "gh", "hr", "ke", "kw", "lu", "ly", "ma", "mu", "nl", "pl", "qa", "ro", "ru", "sa", "se", "sn", "tg", "th", "tn", "vn"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/kitchen/Magnet": {"name": "Magnet", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/MagnetKitchens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6731427", "shop": "kitchen"}, "addTags": {"brand": "Magnet", "brand:wikidata": "Q6731427", "brand:wikipedia": "en:Magnet Kitchens", "name": "Magnet", "shop": "kitchen"}, "countryCodes": ["gb"], "terms": ["magnet kitchens"], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/aeroway/terminal.json b/data/presets/presets/aeroway/terminal.json index a86d57be7..bc8ffd60c 100644 --- a/data/presets/presets/aeroway/terminal.json +++ b/data/presets/presets/aeroway/terminal.json @@ -11,11 +11,12 @@ "fields": [ "name", "operator", - "building_area" + "building_area", + "wheelchair", + "baby_feeding" ], "moreFields": [ - "smoking", - "wheelchair" + "smoking" ], "tags": { "aeroway": "terminal" diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json index 292716c8f..f3a0f89a7 100644 --- a/data/presets/presets/amenity/bar.json +++ b/data/presets/presets/amenity/bar.json @@ -19,6 +19,7 @@ "level", "microbrewery", "opening_hours", + "operator", "payment_multi", "phone", "ref/vatin", diff --git a/data/presets/presets/amenity/biergarten.json b/data/presets/presets/amenity/biergarten.json index c1c8e4a51..e3bd40b3e 100644 --- a/data/presets/presets/amenity/biergarten.json +++ b/data/presets/presets/amenity/biergarten.json @@ -3,12 +3,14 @@ "fields": [ "name", "address", - "building", + "opening_hours", "outdoor_seating", "brewery" ], "moreFields": [ - "{amenity/bar}" + "{amenity/bar}", + "building_area", + "cuisine" ], "geometry": [ "point", diff --git a/data/presets/presets/amenity/casino.json b/data/presets/presets/amenity/casino.json index 15461bbdb..22bac255d 100644 --- a/data/presets/presets/amenity/casino.json +++ b/data/presets/presets/amenity/casino.json @@ -6,6 +6,7 @@ "address", "building_area", "opening_hours", + "gambling", "smoking" ], "moreFields": [ diff --git a/data/presets/presets/amenity/childcare.json b/data/presets/presets/amenity/childcare.json index 6bddaae23..bd949d657 100644 --- a/data/presets/presets/amenity/childcare.json +++ b/data/presets/presets/amenity/childcare.json @@ -9,6 +9,7 @@ "opening_hours" ], "moreFields": [ + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/amenity/community_centre.json b/data/presets/presets/amenity/community_centre.json index e0866da62..82d0bf88e 100644 --- a/data/presets/presets/amenity/community_centre.json +++ b/data/presets/presets/amenity/community_centre.json @@ -8,6 +8,7 @@ ], "moreFields": [ "air_conditioning", + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json index 4a1689dbd..d2e578163 100644 --- a/data/presets/presets/amenity/grave_yard.json +++ b/data/presets/presets/amenity/grave_yard.json @@ -18,5 +18,16 @@ "tags": { "amenity": "grave_yard" }, + "terms": [ + "burial ground", + "cemetary", + "cemetery", + "churchyard", + "columbarium", + "grave yard", + "graveyard", + "mausoleum", + "tomb" + ], "name": "Graveyard" } diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json index 278c685ff..8a2dbc7db 100644 --- a/data/presets/presets/amenity/library.json +++ b/data/presets/presets/amenity/library.json @@ -14,6 +14,7 @@ "moreFields": [ "access_simple", "air_conditioning", + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json index d621d9521..aa53e0cba 100644 --- a/data/presets/presets/amenity/pharmacy.json +++ b/data/presets/presets/amenity/pharmacy.json @@ -5,8 +5,9 @@ "operator", "address", "building_area", - "drive_through", - "dispensing" + "opening_hours", + "dispensing", + "drive_through" ], "moreFields": [ "brand", @@ -14,7 +15,6 @@ "fax", "gnis/feature_id", "level", - "opening_hours", "payment_multi", "phone", "website", diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json index a949058bf..568515c1d 100644 --- a/data/presets/presets/amenity/place_of_worship.json +++ b/data/presets/presets/amenity/place_of_worship.json @@ -10,6 +10,7 @@ ], "moreFields": [ "air_conditioning", + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json index e652b65b8..a27fcbccf 100644 --- a/data/presets/presets/amenity/pub.json +++ b/data/presets/presets/amenity/pub.json @@ -10,6 +10,7 @@ ], "moreFields": [ "air_conditioning", + "cuisine", "diet_multi", "email", "fax", diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json index 891c5dc30..fe4951923 100644 --- a/data/presets/presets/amenity/restaurant.json +++ b/data/presets/presets/amenity/restaurant.json @@ -6,7 +6,8 @@ "address", "building_area", "opening_hours", - "phone" + "phone", + "website" ], "moreFields": [ "air_conditioning", @@ -32,7 +33,6 @@ "smoking", "stars", "takeaway", - "website", "wheelchair" ], "geometry": [ diff --git a/data/presets/presets/amenity/social_centre.json b/data/presets/presets/amenity/social_centre.json index b8922533a..2f372e09b 100644 --- a/data/presets/presets/amenity/social_centre.json +++ b/data/presets/presets/amenity/social_centre.json @@ -10,6 +10,7 @@ ], "moreFields": [ "air_conditioning", + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/amenity/social_facility.json b/data/presets/presets/amenity/social_facility.json index e7f92d435..4b61d052a 100644 --- a/data/presets/presets/amenity/social_facility.json +++ b/data/presets/presets/amenity/social_facility.json @@ -10,6 +10,7 @@ "social_facility_for" ], "moreFields": [ + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json index cd5b038ea..198057898 100644 --- a/data/presets/presets/amenity/townhall.json +++ b/data/presets/presets/amenity/townhall.json @@ -8,6 +8,7 @@ "building_area" ], "moreFields": [ + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/barrier/gate.json b/data/presets/presets/barrier/gate.json index 5bcad4b4b..f88f99f44 100644 --- a/data/presets/presets/barrier/gate.json +++ b/data/presets/presets/barrier/gate.json @@ -2,7 +2,16 @@ "icon": "temaki-gate", "fields": [ "access", - "opening_hours" + "wheelchair", + "opening_hours", + "height", + "material" + ], + "moreFields": [ + "colour", + "manufacturer", + "operator", + "ref" ], "geometry": [ "vertex", diff --git a/data/presets/presets/barrier/lift_gate.json b/data/presets/presets/barrier/lift_gate.json index 3b00ff51f..3731b64d5 100644 --- a/data/presets/presets/barrier/lift_gate.json +++ b/data/presets/presets/barrier/lift_gate.json @@ -1,7 +1,8 @@ { "icon": "temaki-lift_gate", "fields": [ - "access" + "access", + "opening_hours" ], "geometry": [ "vertex", diff --git a/data/presets/presets/barrier/swing_gate.json b/data/presets/presets/barrier/swing_gate.json new file mode 100644 index 000000000..1dc67bd9d --- /dev/null +++ b/data/presets/presets/barrier/swing_gate.json @@ -0,0 +1,16 @@ +{ + "icon": "temaki-gate", + "fields": [ + "{barrier/gate}" + ], + "moreFields": [ + "{barrier/gate}" + ], + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "swing_gate" + }, + "name": "Swing Gate" +} diff --git a/data/presets/presets/building/cathedral.json b/data/presets/presets/building/cathedral.json index bbe8c9b46..49fb23743 100644 --- a/data/presets/presets/building/cathedral.json +++ b/data/presets/presets/building/cathedral.json @@ -1,5 +1,5 @@ { - "icon": "maki-place-of-worship", + "icon": "fas-church", "geometry": [ "area" ], diff --git a/data/presets/presets/building/church.json b/data/presets/presets/building/church.json index 925b17a56..ffb066b0f 100644 --- a/data/presets/presets/building/church.json +++ b/data/presets/presets/building/church.json @@ -1,5 +1,5 @@ { - "icon": "maki-place-of-worship", + "icon": "fas-church", "geometry": [ "area" ], diff --git a/data/presets/presets/building/college.json b/data/presets/presets/building/college.json index 04f1c85e7..dfcdebd31 100644 --- a/data/presets/presets/building/college.json +++ b/data/presets/presets/building/college.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "fas-school", "moreFields": [ "{building}", "polling_station" diff --git a/data/presets/presets/building/hospital.json b/data/presets/presets/building/hospital.json index c3591736d..021a16c84 100644 --- a/data/presets/presets/building/hospital.json +++ b/data/presets/presets/building/hospital.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "fas-hospital-alt", "geometry": [ "area" ], diff --git a/data/presets/presets/building/hotel.json b/data/presets/presets/building/hotel.json index 374f410c1..4e03f55ac 100644 --- a/data/presets/presets/building/hotel.json +++ b/data/presets/presets/building/hotel.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "fas-hotel", "fields": [ "{building}", "smoking" diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json index 5992b057c..f5aa65612 100644 --- a/data/presets/presets/building/kindergarten.json +++ b/data/presets/presets/building/kindergarten.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "fas-school", "geometry": [ "area" ], diff --git a/data/presets/presets/building/mosque.json b/data/presets/presets/building/mosque.json index fae5306b8..3847de5a8 100644 --- a/data/presets/presets/building/mosque.json +++ b/data/presets/presets/building/mosque.json @@ -1,5 +1,5 @@ { - "icon": "maki-place-of-worship", + "icon": "fas-mosque", "geometry": [ "area" ], diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json index e2607c44c..daff0625d 100644 --- a/data/presets/presets/building/school.json +++ b/data/presets/presets/building/school.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "fas-school", "moreFields": [ "{building}", "polling_station" diff --git a/data/presets/presets/building/university.json b/data/presets/presets/building/university.json index 3d47ecd80..b16325286 100644 --- a/data/presets/presets/building/university.json +++ b/data/presets/presets/building/university.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "fas-school", "moreFields": [ "{building}", "polling_station" diff --git a/data/presets/presets/demolished/_building.json b/data/presets/presets/demolished/_building.json index 17a4a084c..693b8b663 100644 --- a/data/presets/presets/demolished/_building.json +++ b/data/presets/presets/demolished/_building.json @@ -1,4 +1,5 @@ { + "icon": "fas-house-damage", "fields": [ "name", "address" diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json index 51951e4f3..885b3d90c 100644 --- a/data/presets/presets/entrance.json +++ b/data/presets/presets/entrance.json @@ -1,23 +1,25 @@ { "icon": "maki-entrance-alt1", + "fields": [ + "ref", + "entrance", + "door", + "access_simple", + "wheelchair", + "level", + "address" + ], "geometry": [ "vertex" ], + "tags": { + "entrance": "*" + }, "terms": [ "entrance", "exit", "door" ], - "tags": { - "entrance": "*" - }, - "fields": [ - "entrance", - "door", - "access_simple", - "level", - "address" - ], "matchScore": 0.8, "name": "Entrance/Exit" } diff --git a/data/presets/presets/entrance/emergency.json b/data/presets/presets/entrance/emergency.json new file mode 100644 index 000000000..09ea4859c --- /dev/null +++ b/data/presets/presets/entrance/emergency.json @@ -0,0 +1,21 @@ +{ + "icon": "maki-entrance-alt1", + "fields": [ + "ref", + "door", + "access_simple", + "level" + ], + "geometry": [ + "vertex" + ], + "tags": { + "entrance": "emergency" + }, + "terms": [ + "fire exit", + "door" + ], + "matchScore": 0.8, + "name": "Emergency Exit" +} diff --git a/data/presets/presets/historic.json b/data/presets/presets/historic.json index ef648faab..26ae88cd5 100644 --- a/data/presets/presets/historic.json +++ b/data/presets/presets/historic.json @@ -16,5 +16,6 @@ "tags": { "historic": "*" }, + "matchScore": 0.5, "name": "Historic Site" } diff --git a/data/presets/presets/historic/building.json b/data/presets/presets/historic/building.json new file mode 100644 index 000000000..482e5d5dd --- /dev/null +++ b/data/presets/presets/historic/building.json @@ -0,0 +1,27 @@ +{ + "icon": "maki-home", + "fields": [ + "{building}", + "start_date" + ], + "moreFields": [ + "{building}", + "access_simple" + ], + "geometry": [ + "area" + ], + "tags": { + "historic": "building" + }, + "addTags": { + "historic": "building", + "building": "*" + }, + "reference": { + "key": "historic", + "value": "building" + }, + "matchScore": 0.5, + "name": "Historic Building" +} diff --git a/data/presets/presets/landuse/churchyard.json b/data/presets/presets/landuse/_churchyard.json similarity index 61% rename from data/presets/presets/landuse/churchyard.json rename to data/presets/presets/landuse/_churchyard.json index 1341d70e3..9f3dcf550 100644 --- a/data/presets/presets/landuse/churchyard.json +++ b/data/presets/presets/landuse/_churchyard.json @@ -1,16 +1,10 @@ { "icon": "maki-religious-christian", "fields": [ - "name", - "religion", - "denomination" + "{landuse/religious}" ], "moreFields": [ - "address", - "email", - "fax", - "phone", - "website" + "{landuse/religious}" ], "geometry": [ "area" @@ -19,5 +13,6 @@ "landuse": "churchyard" }, "terms": [], + "searchable": false, "name": "Churchyard" } diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json index b0c457498..a7e192895 100644 --- a/data/presets/presets/landuse/cemetery.json +++ b/data/presets/presets/landuse/cemetery.json @@ -18,6 +18,16 @@ "tags": { "landuse": "cemetery" }, - "terms": [], + "terms": [ + "burial ground", + "cemetary", + "cemetery", + "churchyard", + "columbarium", + "grave yard", + "graveyard", + "mausoleum", + "tomb" + ], "name": "Cemetery" } diff --git a/data/presets/presets/landuse/religious.json b/data/presets/presets/landuse/religious.json index 937829569..7e913efa8 100644 --- a/data/presets/presets/landuse/religious.json +++ b/data/presets/presets/landuse/religious.json @@ -18,6 +18,20 @@ "tags": { "landuse": "religious" }, - "terms": [], + "terms": [ + "christian", + "churchyard", + "hindu", + "jewish", + "mosque", + "muslim", + "place of worship", + "shinto", + "sikh", + "taoist", + "temple", + "shrine", + "synagogue" + ], "name": "Religious Area" } diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json index 99e68d292..7e1753b44 100644 --- a/data/presets/presets/landuse/residential.json +++ b/data/presets/presets/landuse/residential.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "maki-residential-community", "fields": [ "name", "residential" diff --git a/data/presets/presets/landuse/residential/apartments.json b/data/presets/presets/landuse/residential/apartments.json index fdbe619c3..037aaecf0 100644 --- a/data/presets/presets/landuse/residential/apartments.json +++ b/data/presets/presets/landuse/residential/apartments.json @@ -1,5 +1,5 @@ { - "icon": "maki-building", + "icon": "maki-residential-community", "fields": [ "name", "operator", diff --git a/data/presets/presets/leisure/amusement_arcade.json b/data/presets/presets/leisure/amusement_arcade.json index 8ad6e5e5e..f93618cf3 100644 --- a/data/presets/presets/leisure/amusement_arcade.json +++ b/data/presets/presets/leisure/amusement_arcade.json @@ -11,6 +11,9 @@ "email", "fax", "gnis/feature_id", + "internet_access", + "internet_access/fee", + "internet_access/ssid", "level", "max_age", "min_age", diff --git a/data/presets/presets/leisure/bowling_alley.json b/data/presets/presets/leisure/bowling_alley.json index e7cab8e17..bd7ecf047 100644 --- a/data/presets/presets/leisure/bowling_alley.json +++ b/data/presets/presets/leisure/bowling_alley.json @@ -11,6 +11,9 @@ "email", "fax", "gnis/feature_id", + "internet_access", + "internet_access/fee", + "internet_access/ssid", "level", "min_age", "opening_hours", diff --git a/data/presets/presets/leisure/dog_park.json b/data/presets/presets/leisure/dog_park.json index 84e46a888..04e62947a 100644 --- a/data/presets/presets/leisure/dog_park.json +++ b/data/presets/presets/leisure/dog_park.json @@ -1,22 +1,31 @@ { "icon": "maki-dog-park", "fields": [ - "name" + "name", + "operator", + "operator/type", + "address", + "access_simple", + "website" ], "moreFields": [ + "dog", "email", "fax", "gnis/feature_id", + "internet_access", + "internet_access/fee", + "internet_access/ssid", "phone", - "website" + "ref" ], "geometry": [ "area", "point" ], - "terms": [], "tags": { "leisure": "dog_park" }, + "terms": [], "name": "Dog Park" } diff --git a/data/presets/presets/leisure/fitness_centre.json b/data/presets/presets/leisure/fitness_centre.json index 2e1c02e35..8a743236e 100644 --- a/data/presets/presets/leisure/fitness_centre.json +++ b/data/presets/presets/leisure/fitness_centre.json @@ -4,7 +4,10 @@ "name", "sport", "address", - "building_area" + "building_area", + "opening_hours", + "phone", + "website" ], "moreFields": [ "brand", @@ -13,10 +16,10 @@ "fax", "fee", "gnis/feature_id", - "opening_hours", - "payment_multi", - "phone", - "website" + "internet_access", + "internet_access/fee", + "internet_access/ssid", + "payment_multi" ], "geometry": [ "point", diff --git a/data/presets/presets/leisure/ice_rink.json b/data/presets/presets/leisure/ice_rink.json index 776005991..aba85405e 100644 --- a/data/presets/presets/leisure/ice_rink.json +++ b/data/presets/presets/leisure/ice_rink.json @@ -12,6 +12,9 @@ "email", "fax", "gnis/feature_id", + "internet_access", + "internet_access/fee", + "internet_access/ssid", "level", "opening_hours", "payment_multi", diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json index 39e51fbe4..739134b02 100644 --- a/data/presets/presets/leisure/stadium.json +++ b/data/presets/presets/leisure/stadium.json @@ -2,6 +2,7 @@ "icon": "maki-pitch", "fields": [ "name", + "operator", "sport", "address" ], diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json index 3d7bd2d48..bc139e672 100644 --- a/data/presets/presets/office.json +++ b/data/presets/presets/office.json @@ -9,6 +9,7 @@ ], "moreFields": [ "air_conditioning", + "baby_feeding", "building/levels_building", "email", "fax", diff --git a/data/presets/presets/office/government/prosecutor.json b/data/presets/presets/office/government/prosecutor.json new file mode 100644 index 000000000..07775ad51 --- /dev/null +++ b/data/presets/presets/office/government/prosecutor.json @@ -0,0 +1,25 @@ +{ + "icon": "maki-suitcase", + "fields": [ + "{office}", + "operator" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "attorney general", + "district attorney", + "prosecution" + ], + "tags": { + "office": "government", + "government": "prosecutor" + }, + "reference": { + "key": "government", + "value": "prosecutor" + }, + "name": "Public Prosecutor's Office" +} diff --git a/data/presets/presets/office/lawyer.json b/data/presets/presets/office/lawyer.json index 4a39d0988..636fb23ed 100644 --- a/data/presets/presets/office/lawyer.json +++ b/data/presets/presets/office/lawyer.json @@ -7,6 +7,16 @@ "tags": { "office": "lawyer" }, - "terms": [], + "terms": [ + "advocate", + "attorney", + "barrister", + "counsellor", + "counselor", + "defender", + "lawyer", + "legal", + "prosecutor" + ], "name": "Law Office" } diff --git a/data/presets/presets/public_transport/station.json b/data/presets/presets/public_transport/station.json index 07f3ac409..b2bbe2693 100644 --- a/data/presets/presets/public_transport/station.json +++ b/data/presets/presets/public_transport/station.json @@ -10,6 +10,7 @@ ], "moreFields": [ "air_conditioning", + "baby_feeding", "email", "fax", "gnis/feature_id", diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json index b593bd040..2a2e924d8 100644 --- a/data/presets/presets/railway/subway_entrance.json +++ b/data/presets/presets/railway/subway_entrance.json @@ -6,7 +6,8 @@ ], "fields": [ "name", - "level" + "level", + "wheelchair" ], "tags": { "railway": "subway_entrance" diff --git a/data/presets/presets/shop/car/second_hand.json b/data/presets/presets/shop/car/second_hand.json new file mode 100644 index 000000000..5ebfbd87c --- /dev/null +++ b/data/presets/presets/shop/car/second_hand.json @@ -0,0 +1,16 @@ +{ + "icon": "maki-car", + "geometry": [ + "point", + "area" + ], + "terms": [ + "automobile", + "automotive" + ], + "tags": { + "shop": "car", + "second_hand": "only" + }, + "name": "Used Car Dealership" +} diff --git a/data/presets/presets/shop/clothes/second_hand.json b/data/presets/presets/shop/clothes/second_hand.json new file mode 100644 index 000000000..241843671 --- /dev/null +++ b/data/presets/presets/shop/clothes/second_hand.json @@ -0,0 +1,26 @@ +{ + "icon": "maki-clothing-store", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "clothes", + "second_hand": "only" + }, + "terms": [ + "blouses", + "clothes", + "consignment", + "dresses", + "pants", + "second hand", + "shirts", + "shorts", + "skirts", + "slacks", + "suits", + "used" + ], + "name": "Secondhand Clothing Store" +} diff --git a/data/presets/presets/shop/doors.json b/data/presets/presets/shop/doors.json new file mode 100644 index 000000000..f56f21715 --- /dev/null +++ b/data/presets/presets/shop/doors.json @@ -0,0 +1,11 @@ +{ + "icon": "fas-door-open", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "doors" + }, + "name": "Door Shop" +} \ No newline at end of file diff --git a/data/presets/presets/shop/kiosk.json b/data/presets/presets/shop/kiosk.json index d10bb9ae4..ff94a98a0 100644 --- a/data/presets/presets/shop/kiosk.json +++ b/data/presets/presets/shop/kiosk.json @@ -1,5 +1,5 @@ { - "icon": "maki-shop", + "icon": "fas-store", "fields": [ "{shop}", "levels" diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json index eaf8f7ed3..5262e99a4 100644 --- a/data/presets/presets/tourism/museum.json +++ b/data/presets/presets/tourism/museum.json @@ -4,6 +4,7 @@ "name", "operator", "operator/type", + "museum", "address", "building_area", "opening_hours" diff --git a/data/presets/presets/tourism/museum/art.json b/data/presets/presets/tourism/museum/art.json new file mode 100644 index 000000000..50c14d55e --- /dev/null +++ b/data/presets/presets/tourism/museum/art.json @@ -0,0 +1,27 @@ +{ + "icon": "temaki-museum", + "geometry": [ + "point", + "area" + ], + "terms": [ + "art*", + "exhibit*", + "gallery", + "foundation", + "hall", + "institution", + "paint*", + "photo*", + "sculpt*" + ], + "tags": { + "tourism": "museum", + "museum": "art" + }, + "reference": { + "key": "museum", + "value": "art" + }, + "name": "Art Museum" +} diff --git a/data/presets/presets/tourism/museum/history.json b/data/presets/presets/tourism/museum/history.json new file mode 100644 index 000000000..812963296 --- /dev/null +++ b/data/presets/presets/tourism/museum/history.json @@ -0,0 +1,25 @@ +{ + "icon": "temaki-museum", + "geometry": [ + "point", + "area" + ], + "terms": [ + "artifacts", + "dioramas", + "exhibits", + "exhibitions", + "foundation", + "hall", + "institution" + ], + "tags": { + "tourism": "museum", + "museum": "history" + }, + "reference": { + "key": "museum", + "value": "history" + }, + "name": "History Museum" +} diff --git a/data/taginfo.json b/data/taginfo.json index 090b06c1e..bb0715820 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -315,6 +315,7 @@ {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"}, {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dungeon.svg"}, {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, + {"key": "barrier", "value": "swing_gate", "description": "🄿 Swing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/gate.svg"}, {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/turnstile.svg"}, {"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"}, @@ -332,11 +333,11 @@ {"key": "building", "value": "bungalow", "description": "🄿 Bungalow", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, {"key": "building", "value": "cabin", "description": "🄿 Cabin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cabin.svg"}, {"key": "building", "value": "carport", "description": "🄿 Carport", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"}, - {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, + {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-church.svg"}, {"key": "building", "value": "chapel", "description": "🄿 Chapel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, - {"key": "building", "value": "church", "description": "🄿 Church Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, + {"key": "building", "value": "church", "description": "🄿 Church Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-church.svg"}, {"key": "building", "value": "civic", "description": "🄿 Civic Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, - {"key": "building", "value": "college", "description": "🄿 College Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, + {"key": "building", "value": "college", "description": "🄿 College Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"}, {"key": "building", "value": "commercial", "description": "🄿 Commercial Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "building", "value": "construction", "description": "🄿 Building Under Construction", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, {"key": "building", "value": "detached", "description": "🄿 Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, @@ -348,21 +349,21 @@ {"key": "building", "value": "grandstand", "description": "🄿 Grandstand", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, {"key": "building", "value": "greenhouse", "description": "🄿 Greenhouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"}, {"key": "building", "value": "hangar", "description": "🄿 Hangar Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"}, - {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, - {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, + {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hospital-alt.svg"}, + {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hotel.svg"}, {"key": "building", "value": "house", "description": "🄿 House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, {"key": "building", "value": "houseboat", "description": "🄿 Houseboat", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, {"key": "building", "value": "hut", "description": "🄿 Hut", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, {"key": "building", "value": "industrial", "description": "🄿 Industrial Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, - {"key": "building", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, - {"key": "building", "value": "mosque", "description": "🄿 Mosque Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, + {"key": "building", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"}, + {"key": "building", "value": "mosque", "description": "🄿 Mosque Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-mosque.svg"}, {"key": "building", "value": "pavilion", "description": "🄿 Pavilion Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, {"key": "building", "value": "public", "description": "🄿 Public Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, {"key": "building", "value": "residential", "description": "🄿 Residential Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/residential-community-15.svg"}, {"key": "building", "value": "retail", "description": "🄿 Retail Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"}, {"key": "building", "value": "roof", "description": "🄿 Roof", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"}, {"key": "building", "value": "ruins", "description": "🄿 Building Ruins", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"}, - {"key": "building", "value": "school", "description": "🄿 School Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, + {"key": "building", "value": "school", "description": "🄿 School Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"}, {"key": "building", "value": "semidetached_house", "description": "🄿 Semi-Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, {"key": "building", "value": "service", "description": "🄿 Service Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, {"key": "building", "value": "shed", "description": "🄿 Shed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"}, @@ -372,7 +373,7 @@ {"key": "building", "value": "temple", "description": "🄿 Temple Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, {"key": "building", "value": "terrace", "description": "🄿 Row Houses", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, {"key": "building", "value": "transportation", "description": "🄿 Transportation Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, - {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, + {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"}, {"key": "building", "value": "warehouse", "description": "🄿 Warehouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/warehouse-15.svg"}, {"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"}, {"key": "club", "value": "sport", "description": "🄿 Sports Club", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"}, @@ -430,7 +431,7 @@ {"key": "craft", "value": "window_construction", "description": "🄿 Window Construction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/window.svg"}, {"key": "craft", "value": "winery", "description": "🄿 Winery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/alcohol-shop-15.svg"}, {"key": "cycleway", "value": "asl", "description": "🄿 Advanced Stop Line", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"}, - {"key": "demolished:building", "description": "🄿 Recently Demolished Building (unsearchable)", "object_types": ["area"]}, + {"key": "demolished:building", "description": "🄿 Recently Demolished Building (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-house-damage.svg"}, {"key": "disused:railway", "description": "🄿 Disused Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, {"key": "emergency", "value": "designated", "description": "🄿 Emergency Access Designated (unsearchable)", "object_types": ["way"]}, {"key": "emergency", "value": "destination", "description": "🄿 Emergency Access Destination (unsearchable)", "object_types": ["way"]}, @@ -451,6 +452,7 @@ {"key": "emergency", "value": "siren", "description": "🄿 Siren", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-volume-up.svg"}, {"key": "emergency", "value": "water_tank", "description": "🄿 Emergency Water Tank", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"}, + {"key": "entrance", "value": "emergency", "description": "🄿 Emergency Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"}, {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, {"key": "golf", "value": "bunker", "description": "🄿 Sand Trap", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"}, {"key": "golf", "value": "cartpath", "description": "🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/golf_cart.svg"}, @@ -546,6 +548,7 @@ {"key": "historic", "description": "🄿 Historic Site, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"}, {"key": "historic", "value": "archaeological_site", "description": "🄿 Archaeological Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"}, {"key": "historic", "value": "boundary_stone", "description": "🄿 Boundary Stone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/milestone.svg"}, + {"key": "historic", "value": "building", "description": "🄿 Historic Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, {"key": "historic", "value": "castle", "description": "🄿 Castle", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"}, {"key": "castle_type", "value": "fortress", "description": "🄿 Historic Fortress", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"}, {"key": "castle_type", "value": "palace", "description": "🄿 Palace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-crown.svg"}, @@ -571,6 +574,7 @@ {"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Access", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wifi.svg"}, {"key": "junction", "value": "yes", "description": "🄿 Junction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"}, {"key": "landuse", "value": "basin", "description": "🄿 Basin (unsearchable), 🄳 ➜ natural=water + water=basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, + {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"}, {"key": "landuse", "value": "farm", "description": "🄿 Farmland (unsearchable), 🄳 ➜ landuse=farmland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"}, {"key": "landuse", "value": "pond", "description": "🄿 Pond (unsearchable), 🄳 ➜ natural=water + water=pond", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "landuse", "value": "reservoir", "description": "🄿 Reservoir (unsearchable), 🄳 ➜ natural=water + water=reservoir", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, @@ -578,7 +582,6 @@ {"key": "landuse", "value": "aquaculture", "description": "🄿 Aquaculture", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aquarium-15.svg"}, {"key": "landuse", "value": "brownfield", "description": "🄿 Brownfield", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bulldozer.svg"}, {"key": "landuse", "value": "cemetery", "description": "🄿 Cemetery", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"}, - {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"}, {"key": "landuse", "value": "commercial", "description": "🄿 Commercial Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "landuse", "value": "construction", "description": "🄿 Construction Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bulldozer.svg"}, {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tractor.svg"}, @@ -609,8 +612,8 @@ {"key": "landuse", "value": "railway", "description": "🄿 Railway Corridor", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, {"key": "landuse", "value": "recreation_ground", "description": "🄿 Recreation Ground", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"}, {"key": "landuse", "value": "religious", "description": "🄿 Religious Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, - {"key": "landuse", "value": "residential", "description": "🄿 Residential Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, - {"key": "residential", "value": "apartments", "description": "🄿 Apartment Complex", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"}, + {"key": "landuse", "value": "residential", "description": "🄿 Residential Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/residential-community-15.svg"}, + {"key": "residential", "value": "apartments", "description": "🄿 Apartment Complex", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/residential-community-15.svg"}, {"key": "landuse", "value": "retail", "description": "🄿 Retail Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"}, {"key": "landuse", "value": "vineyard", "description": "🄿 Vineyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/grapes.svg"}, {"key": "landuse", "value": "winter_sports", "description": "🄿 Winter Sports Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"}, @@ -835,6 +838,7 @@ {"key": "office", "value": "forestry", "description": "🄿 Forestry Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "foundation", "description": "🄿 Foundation Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "government", "description": "🄿 Government Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, + {"key": "government", "value": "prosecutor", "description": "🄿 Public Prosecutor's Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "government", "value": "register_office", "description": "🄿 Register Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, {"key": "government", "value": "tax", "description": "🄿 Tax and Revenue Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, {"key": "office", "value": "guide", "description": "🄿 Tour Guide Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, @@ -989,6 +993,7 @@ {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-car-battery.svg"}, {"key": "shop", "value": "car_repair", "description": "🄿 Car Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-repair-15.svg"}, {"key": "shop", "value": "car", "description": "🄿 Car Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, + {"key": "second_hand", "value": "only", "description": "🄿 Used Car Dealership, 🄿 Secondhand Clothing Store, 🄵 Sells Used", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, {"key": "shop", "value": "caravan", "description": "🄿 RV Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rv_park.svg"}, {"key": "shop", "value": "carpet", "description": "🄿 Carpet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tape.svg"}, {"key": "shop", "value": "catalogue", "description": "🄿 Catalog Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, @@ -1011,6 +1016,7 @@ {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, {"key": "shop", "value": "department_store", "description": "🄿 Department Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "doityourself", "description": "🄿 DIY Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, + {"key": "shop", "value": "doors", "description": "🄿 Door Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-door-open.svg"}, {"key": "shop", "value": "dry_cleaning", "description": "🄿 Dry Cleaner", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/clothes_hanger.svg"}, {"key": "shop", "value": "e-cigarette", "description": "🄿 E-Cigarette Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "electrical", "description": "🄿 Electrical Equipment Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"}, @@ -1046,7 +1052,7 @@ {"key": "shop", "value": "hunting", "description": "🄿 Hunting Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/binoculars.svg"}, {"key": "shop", "value": "interior_decoration", "description": "🄿 Interior Decoration Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "jewelry", "description": "🄿 Jewelry Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/jewelry-store-15.svg"}, - {"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, + {"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-store.svg"}, {"key": "shop", "value": "kitchen", "description": "🄿 Kitchen Design Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/kitchen_sink.svg"}, {"key": "shop", "value": "laundry", "description": "🄿 Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/laundry.svg"}, {"key": "self_service", "value": "yes", "description": "🄿 Self-Service Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/laundry.svg"}, @@ -1150,6 +1156,8 @@ {"key": "information", "value": "terminal", "description": "🄿 Information Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, {"key": "tourism", "value": "motel", "description": "🄿 Motel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, {"key": "tourism", "value": "museum", "description": "🄿 Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, + {"key": "museum", "value": "art", "description": "🄿 Art Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, + {"key": "museum", "value": "history", "description": "🄿 History Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, {"key": "tourism", "value": "picnic_site", "description": "🄿 Picnic Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/picnic-site-15.svg"}, {"key": "tourism", "value": "theme_park", "description": "🄿 Theme Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"}, {"key": "tourism", "value": "trail_riding_station", "description": "🄿 Trail Riding Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"}, @@ -1308,6 +1316,9 @@ {"key": "artist_name", "description": "🄵 Artist"}, {"key": "artwork_type", "description": "🄵 Type"}, {"key": "atm", "description": "🄵 ATM"}, + {"key": "baby_feeding", "value": "room", "description": "🄵 Baby Nursing Area"}, + {"key": "baby_feeding", "value": "yes", "description": "🄵 Baby Nursing Area"}, + {"key": "baby_feeding", "value": "no", "description": "🄵 Baby Nursing Area"}, {"key": "baby", "description": "🄵 Baby Seat"}, {"key": "backcountry", "description": "🄵 Backcountry"}, {"key": "backrest", "description": "🄵 Backrest"}, @@ -1484,6 +1495,7 @@ {"key": "from", "description": "🄵 From"}, {"key": "fuel:", "description": "🄵 Fuel Types"}, {"key": "fuel", "description": "🄵 Fuel"}, + {"key": "gambling", "description": "🄵 Games"}, {"key": "gauge", "description": "🄵 Gauge"}, {"key": "male", "description": "🄵 Gender"}, {"key": "female", "description": "🄵 Gender"}, @@ -1599,6 +1611,7 @@ {"key": "mtb:scale:uphill", "value": "3", "description": "🄵 Mountain Biking Uphill Difficulty"}, {"key": "mtb:scale:uphill", "value": "4", "description": "🄵 Mountain Biking Uphill Difficulty"}, {"key": "mtb:scale:uphill", "value": "5", "description": "🄵 Mountain Biking Uphill Difficulty"}, + {"key": "museum", "description": "🄵 Type"}, {"key": "name", "description": "🄵 Name"}, {"key": "network", "value": "lcn", "description": "🄵 Network Class"}, {"key": "network", "value": "rcn", "description": "🄵 Network Class"}, @@ -1761,7 +1774,6 @@ {"key": "seats", "description": "🄵 Seats"}, {"key": "second_hand", "value": "yes", "description": "🄵 Sells Used"}, {"key": "second_hand", "value": "no", "description": "🄵 Sells Used"}, - {"key": "second_hand", "value": "only", "description": "🄵 Sells Used"}, {"key": "segregated", "description": "🄵 Bicycle-Pedestrian Separation"}, {"key": "self_service", "description": "🄵 Self-Service"}, {"key": "service", "value": "spur", "description": "🄵 Service Type"}, @@ -2001,6 +2013,11 @@ {"key": "embankment", "value": "1", "description": "🄳 ➜ embankment=yes"}, {"key": "embankment", "value": "false", "description": "🄳 ➜ embankment=no"}, {"key": "embankment", "value": "true", "description": "🄳 ➜ embankment=yes"}, + {"key": "entrance", "value": "emergency_exit", "description": "🄳 ➜ entrance=emergency"}, + {"key": "entrance", "value": "fire_exit", "description": "🄳 ➜ entrance=emergency"}, + {"key": "entrance", "value": "loading_dock", "description": "🄳 ➜ amenity=loading_dock"}, + {"key": "entrance", "value": "main_entrance", "description": "🄳 ➜ entrance=main"}, + {"key": "entrance", "value": "private", "description": "🄳 ➜ entrance=yes + access=private"}, {"key": "escalator", "description": "🄳 ➜ highway=steps + conveying=*"}, {"key": "fee", "value": "0", "description": "🄳 ➜ fee=no"}, {"key": "fee", "value": "free", "description": "🄳 ➜ fee=no"}, @@ -2017,6 +2034,7 @@ {"key": "footway", "value": "none", "description": "🄳 ➜ sidewalk=no"}, {"key": "footway", "value": "right", "description": "🄳 ➜ sidewalk=right"}, {"key": "footway", "value": "separate", "description": "🄳 ➜ sidewalk=separate"}, + {"key": "gambling", "value": "slot_machine", "description": "🄳 ➜ gambling=slot_machines"}, {"key": "generator:source", "value": "photovoltaic", "description": "🄳 ➜ generator:source=solar + generator:method=photovoltaic"}, {"key": "golf", "value": "faiway", "description": "🄳 ➜ golf=fairway + landuse=grass"}, {"key": "golf", "value": "putting_green", "description": "🄳 ➜ golf=green + landuse=grass"}, @@ -2074,6 +2092,10 @@ {"key": "men", "description": "🄳 ➜ male=*"}, {"key": "minage", "description": "🄳 ➜ min_age=*"}, {"key": "mining_resource", "description": "🄳 ➜ resource=*"}, + {"key": "museum_type", "value": "art", "description": "🄳 ➜ museum=art"}, + {"key": "museum_type", "value": "history", "description": "🄳 ➜ museum=history"}, + {"key": "museum_type", "value": "private", "description": "🄳 ➜ operator:type=private"}, + {"key": "museum_type", "value": "public", "description": "🄳 ➜ operator:type=public"}, {"key": "natural", "value": "marsh", "description": "🄳 ➜ natural=wetland + wetland=marsh"}, {"key": "natural", "value": "waterfall", "description": "🄳 ➜ waterway=waterfall"}, {"key": "NOTE", "description": "🄳 ➜ note=*"}, @@ -2085,6 +2107,12 @@ {"key": "oneway", "value": "alternate", "description": "🄳 ➜ oneway=alternating"}, {"key": "oneway", "value": "no;yes", "description": "🄳"}, {"key": "oneway", "value": "unknown", "description": "🄳"}, + {"key": "operator:type", "value": "goverment", "description": "🄳 ➜ operator:type=government"}, + {"key": "operator:type", "value": "Privado", "description": "🄳 ➜ operator:type=private"}, + {"key": "operator:type", "value": "Private", "description": "🄳 ➜ operator:type=private"}, + {"key": "operator:type", "value": "Public", "description": "🄳 ➜ operator:type=public"}, + {"key": "operator:type", "value": "Publico", "description": "🄳 ➜ operator:type=public"}, + {"key": "operator:type", "value": "unknown", "description": "🄳"}, {"key": "place_name", "description": "🄳 ➜ name=*"}, {"key": "pole", "value": "transition", "description": "🄳 ➜ location:transition=yes"}, {"key": "postcode", "description": "🄳 ➜ addr:postcode=*"}, diff --git a/data/update_locales.js b/data/update_locales.js index 2d0510257..9478a334f 100644 --- a/data/update_locales.js +++ b/data/update_locales.js @@ -3,6 +3,7 @@ const fs = require('fs'); const prettyStringify = require('json-stringify-pretty-compact'); const request = require('request').defaults({ maxSockets: 1 }); const YAML = require('js-yaml'); +const colors = require('colors/safe'); const resources = ['core', 'presets', 'imagery', 'community']; const outdir = './dist/locales/'; @@ -27,6 +28,8 @@ const sourcePresets = YAML.load(fs.readFileSync('./data/presets.yaml', 'utf8')); const sourceImagery = YAML.load(fs.readFileSync('./node_modules/editor-layer-index/i18n/en.yaml', 'utf8')); const sourceCommunity = YAML.load(fs.readFileSync('./node_modules/osm-community-index/i18n/en.yaml', 'utf8')); +const dataShortcuts = JSON.parse(fs.readFileSync('./data/shortcuts.json', 'utf8')).dataShortcuts; + const cldrMainDir = './node_modules/cldr-localenames-full/main/'; var referencedScripts = []; @@ -36,6 +39,26 @@ const languageInfo = { }; fs.writeFileSync('data/languages.json', JSON.stringify(languageInfo, null, 4)); +var shortcuts = []; +dataShortcuts.forEach(function(tab) { + tab.columns.forEach(function(col) { + col.rows.forEach(function(row) { + if (!row.shortcuts) return; + row.shortcuts.forEach(function(shortcut) { + if (shortcut.includes('.')) { + var info = { + shortcut: shortcut + }; + if (row.modifiers) { + info.modifier = row.modifiers.join(''); + } + shortcuts.push(info); + } + }); + }); + }); +}); + asyncMap(resources, getResource, function(err, results) { if (err) return console.log(err); @@ -133,6 +156,8 @@ function getResource(resource, callback) { } } } + } else if (resource === 'core') { + checkForDuplicateShortcuts(codes[i], result); } locale[codes[i]] = result; @@ -212,6 +237,36 @@ function asyncMap(inputs, func, callback) { } } +function checkForDuplicateShortcuts(code, coreStrings) { + var usedShortcuts = {}; + + shortcuts.forEach(function(shortcutInfo) { + var shortcutPathString = shortcutInfo.shortcut; + var modifier = shortcutInfo.modifier || ''; + + var path = shortcutPathString + .split('.') + .map(function (s) { return s.replace(//g, '.'); }) + .reverse(); + + var rep = coreStrings; + + while (rep !== undefined && path.length) { + rep = rep[path.pop()]; + } + + if (rep !== undefined) { + var shortcut = modifier + rep; + if (usedShortcuts[shortcut] && usedShortcuts[shortcut] !== shortcutPathString) { + var message = code + ': duplicate shortcut "' + shortcut + '" for "' + usedShortcuts[shortcut] + '" and "' + shortcutPathString + '"'; + console.warn(colors.yellow(message)); + } else { + usedShortcuts[shortcut] = shortcutPathString; + } + } + }); +} + function getLangNamesInNativeLang() { // manually add languages we want that aren't in CLDR var unordered = { diff --git a/dist/locales/da.json b/dist/locales/da.json index ca16dc0ec..4a4b5c670 100644 --- a/dist/locales/da.json +++ b/dist/locales/da.json @@ -535,7 +535,7 @@ "help_translate": "Hjælp med at oversætte", "sidebar": { "key": "`", - "tooltip": "Skift tilstand for sidebaren" + "tooltip": "Åbn/Luk sidebaren." }, "feature_info": { "hidden_warning": "{count} skjulte objekter", @@ -666,7 +666,7 @@ "wiki_reference": "Vis dokumentation", "wiki_en_reference": "Vis dokumentation på engelsk", "hidden_preset": { - "manual": "{features} er skjulte. Aktiver dem i Kortdata-panelet.", + "manual": "{features} er skjulte. Indstil visning i Kortdata-fanen.", "zoom": "{features} er skjulte. Zoom ind for at se dem." }, "back_tooltip": "Ændr objekt", @@ -722,6 +722,9 @@ "tooltip": "Vis et udzommet kort for at hjælpe med at lokalisere det viste område.", "key": "/" }, + "panel": { + "description": "Vis detalje-panel på kortet" + }, "fix_misalignment": "Juster luftfoto-offset", "offset": "Træk et vilkårligt sted i det grå område nedenfor for at justere luftfotoets offset, eller indtast offset-værdien i meter." }, @@ -880,6 +883,14 @@ } } }, + "preferences": { + "title": "Præferencer", + "description": "Præferencer", + "privacy": { + "title": "Privatliv", + "privacy_link": "Se privatlivspolitik for iD" + } + }, "restore": { "heading": "Du har ikke-gemte ændringer", "description": "Vil du gendanne ikke-gemte ændringer fra en tidligere redigeringssession?", @@ -942,6 +953,9 @@ "splash": { "welcome": "Velkommen til OpenStreetMap-redigeringsværktøjet iD.", "text": "iD er et brugervenligt men kraftfuldt værktøj til at bidrage til verdens bedste frie verdenskort. Dette er version {version}. Mere information kan findes på {website}, og fejl kan rapporteres på {github}.", + "privacy_update": "Vores privatlivspolitik er for nylig blevet opdateret.", + "privacy_policy": "privatlivspolitik for iD", + "privacy": "{updateMessage} Ved brug af dette stykke software accepterer du at dette sker i overensstemmelse med {privacyLink}.", "walkthrough": "Start gennemgangen", "start": "Rediger nu" }, @@ -963,7 +977,7 @@ "out": "Zoom ud" }, "cannot_zoom": "Kan ikke zoome længere ud i nuværende tilstand.", - "full_screen": "Skift fuld skærmtilstand", + "full_screen": "Skift fuldskærmstilstand", "QA": { "improveOSM": { "title": "ImproveOSM-detektering" @@ -1122,6 +1136,18 @@ "210": { "title": "Selvkrydsende vej", "description": "Der er et ikke nærmere specificeret problem med selvkrydsende veje." + }, + "280": { + "title": "Afgrænsningsproblem", + "description": "Der er et uspecificeret problem med denne afgrænsning." + }, + "290": { + "title": "Begrænsningsproblem", + "description": "Der er et uspecificeret problem med denne begrænsning." + }, + "310": { + "title": "Rundkørselsproblem", + "description": "Der er et uspecificeret problem med denne rundkørsel." } } } @@ -1330,6 +1356,19 @@ "rules": { "title": "Regler" }, + "user_resolved_issues": "Problemer løst af dine redigeringer", + "no_issues": { + "hidden_issues": { + "none": "Detekterede problemer vil blive vist her", + "elsewhere": "Andre problemer: {count}", + "everything_else": "Problemer med alt andet: {count]", + "everything_else_elsewhere": "Andre problemer med alt andet: {count]", + "disabled_rules": "Problemer fra deaktiverede regler: {count]", + "disabled_rules_elsewhere": "Andre problemer fra deaktiverede regler: {count]", + "ignored_issues": "Ignorerede problemer: {count}", + "ignored_issues_elsewhere": "Andre ignorerede problemer: {count}" + } + }, "options": { "what": { "title": "Kontrollér:", @@ -1367,6 +1406,14 @@ "building-building": { "reference": "Bygninger bør ikke skære hinanden medmindre de er i forskellige lag." } + }, + "impossible_oneway": { + "tip": "Find rutningsproblemer med ensrettede kortobjekter" + }, + "fix": { + "ignore_issue": { + "title": "Ignorer dette problem" + } } }, "intro": { @@ -1663,11 +1710,15 @@ }, "display_options": { "title": "Visnings-muligheder", + "background": "Åbn/luk baggrund-fane", "background_switch": "Skift til forrige anvendte baggrund", + "map_data": "Åbn/luk kortdata-fane", + "issues": "Åbn/luk problemer-fane", + "preferences": "Åbn/luk præferencer-fane", "fullscreen": "Aktiver fuldskærms-tilstand", - "sidebar": "Skift tilstand for sidebar", + "sidebar": "Åbn/luk sidebar", "wireframe": "Skift trådnet-tilstand", - "osm_data": "Skift tilstand for OpenStreetMap-data", + "osm_data": "Vis/skjul OpenStreetMap-data", "minimap": "Åbn/luk minikort" }, "selecting": { @@ -1727,11 +1778,11 @@ "title": "Værktøjer", "info": { "title": "Information", - "all": "Åbn/luk alle informationspaneler", - "background": "Åbn/luk baggrundspanel", - "history": "Åbn/luk historikpanel", - "location": "Åbn/luk lokationspanel", - "measurement": "Åbn/luk opmålingspanel" + "all": "Vis/skjul alle informationspaneler", + "background": "Vis/skjul baggrundspanel", + "history": "Vis/skjul historikpanel", + "location": "Vis/skjul lokationspanel", + "measurement": "Vis/skjul opmålingspanel" } } }, diff --git a/dist/locales/de.json b/dist/locales/de.json index 3f38d9aed..438fe2221 100644 --- a/dist/locales/de.json +++ b/dist/locales/de.json @@ -567,8 +567,8 @@ }, "osm_api_status": { "message": { - "error": "Das OpenStreetMap API ist nicht erreichbar. Deine Bearbeitungen sind lokal gesicherte. Prüfe deine Netzwerkverbindung.", - "offline": "Das OpenStreetMap API ist offline. Deine Bearbeitungen sind lokal gesicherte. Bitte probier es später noch einmal.", + "error": "Das OpenStreetMap API ist nicht erreichbar. Deine Bearbeitungen sind lokal gesichert. Prüfe deine Netzwerkverbindung.", + "offline": "Das OpenStreetMap API ist offline. Deine Bearbeitungen sind lokal gesichert. Bitte probier es später noch einmal.", "readonly": "Das OpenStreetMap API erlaubt aktuell kein Speichern. Du kannst deine Bearbeitungen fortsetzen, aber du kannst erst später speichern.", "rateLimit": "Das OpenStreetMap API limitiert anonyme Verbindungen Du kannst das durch Einloggen ändern." }, @@ -931,7 +931,7 @@ "key": "P", "privacy": { "title": "Datenschutz", - "privacy_link": "Zeige die iD-Datenschutzerklärung an", + "privacy_link": "Zeige die iD Datenschutzerklärung an", "third_party_icons": { "description": "Symbole von Drittanbietern anzeigen", "tooltip": "Deaktiviere diese Feld damit Symbole von Drittanbietern (Wikimedia Commons, Facebook oder Twitter) nicht angezeigt werden." @@ -1004,8 +1004,9 @@ "splash": { "welcome": "Willkommen beim iD OpenStreetMap Editor", "text": "iD ist ein freundliches aber mächtiges Werkzeug um die freie Karte der Welt zu verbessern. Das ist Version {version}. Mehr information findest du auf {website} und du kannst Probleme auf {github} melden.", - "privacy_update": "Unsere Datenschutzrichtlinie wurde kürzlich aktualisiert.", - "privacy": "{updateMessage} Durch die Verwendung dieser Software erklärest du dich damit einverstanden, dies in Übereinstimmung mit den Datenschutzbestimmungen von iD zu tun, die {here} zu finden sind.", + "privacy_update": "Unsere Datenschutzerklärung wurde kürzlich aktualisiert.", + "privacy_policy": "iD Datenschutzerklärung", + "privacy": "{updateMessage} Durch die Verwendung dieser Software erklärst du dich damit einverstanden, dies gemäß diesen {privacyLink} zu tun.", "walkthrough": "Starte den Rundgang", "start": "Jetzt bearbeiten" }, @@ -1421,7 +1422,7 @@ }, "street_light": "Straßenbeleuchtung", "support": { - "utility_pole": "Strommast" + "utility_pole": "Mast (Versorgung allgemein)" }, "traffic_cone": "Verkehrskegel", "traffic_light": { @@ -1700,7 +1701,7 @@ }, "issues": { "title": "Problem", - "key": "P", + "key": "I", "list_title": "Probleme ({count})", "errors": { "list_title": "Fehler ({count})" @@ -2761,6 +2762,10 @@ "baby_seat": { "label": "Kindersitz" }, + "backcountry": { + "label": "Wildnis Campingplatz", + "terms": "Wildnis Campingplatz, Campingplatz ohne Straßenanschluss" + }, "backrest": { "label": "Rückenlehne" }, @@ -2829,6 +2834,9 @@ "booth": { "label": "Kabine" }, + "bottle": { + "label": "Flaschenfüllung" + }, "boules": { "label": "Typ" }, @@ -3352,6 +3360,9 @@ "generator/type": { "label": "Typ" }, + "geyser/height": { + "label": "Eruptionshöhe" + }, "gnis/feature_id": { "label": "GNIS Feature ID", "terms": "GNIS Feature ID" @@ -3362,6 +3373,10 @@ "grape_variety": { "label": "Traubensorten" }, + "group_only": { + "label": "Nur für Gruppen", + "terms": "Nur für Gruppen, Nicht für Einzelgäste" + }, "guest_house": { "label": "Typ" }, @@ -3451,6 +3466,9 @@ "undefined": "Nein" } }, + "hot_water": { + "label": "Heißwasser" + }, "iata": { "label": "IATA Flughafen Code" }, @@ -3844,6 +3862,10 @@ "yes": "Ja" } }, + "openfire": { + "label": "offenes Feuer erlaubt", + "terms": "offenes Feuer erlaubt" + }, "opening_date": { "label": "Erwartetes Öffnungsdatum" }, @@ -4342,6 +4364,10 @@ "shop": { "label": "Typ" }, + "shower": { + "label": "Duschen", + "terms": "Duschen" + }, "siren/purpose": { "label": "Zweck" }, @@ -4544,6 +4570,10 @@ "to": { "label": "Nach" }, + "toilets": { + "label": "Toiletten", + "terms": "Toiletten, WCs" + }, "toilets/disposal": { "label": "Toiletten-Bauart", "options": { @@ -6297,6 +6327,10 @@ "name": "Kaminkehrer", "terms": "Kaminkehrer,Schornsteinfeger,Rauchfangkehrer" }, + "craft/cleaning": { + "name": "Putzerei", + "terms": "Putzerei" + }, "craft/clockmaker": { "name": "Uhrmacher (Standuhr)", "terms": "Uhrmacher (Standuhr)" @@ -6384,6 +6418,10 @@ "name": "Installateur", "terms": "Installateur" }, + "craft/pottery": { + "name": "Töpferei", + "terms": "Keramik, Topf, Vase" + }, "craft/rigger": { "name": "Bühnenarbeiter", "terms": "Bühnenarbeiter, Höhenarbeiter" @@ -7814,7 +7852,7 @@ "terms": "Untergrund, Passage, Unterführung" }, "man_made/utility_pole": { - "name": "Strommast", + "name": "Mast (Versorgung allgemein)", "terms": "Strommast" }, "man_made/wastewater_plant": { @@ -7916,6 +7954,10 @@ "name": "Alpine Tundra", "terms": "Fjell, Fjäll, Fjall, Tunturi, Bergtundra" }, + "natural/geyser": { + "name": "Geysir", + "terms": "Geysir, Heißwasserquelle, Hydrothermale Explosion, Eruptionsquelle" + }, "natural/glacier": { "name": "Gletscher", "terms": "Gletscher" @@ -8853,6 +8895,10 @@ "name": "Metzger", "terms": "Fleischer, Metzger, Schlachter" }, + "shop/camera": { + "name": "Fotofachgeschäft", + "terms": "Kamera, Film, Linse, Foto" + }, "shop/candles": { "name": "Kerzengeschäft", "terms": "Kerzenhandlung" @@ -9011,6 +9057,10 @@ "shop/fishmonger": { "name": "Fischhändler" }, + "shop/flooring": { + "name": "Fußbodengeschäft", + "terms": "Fliese" + }, "shop/florist": { "name": "Blumenhändler", "terms": "Florist, Blumenladen, Blumengeschäft" @@ -9238,6 +9288,10 @@ "name": "Fotofachgeschäft", "terms": "Fotoladen, Fotograf, Fotogeschäft" }, + "shop/pottery": { + "name": "Keramikladen", + "terms": "Keramik, Topf, Vase" + }, "shop/printer_ink": { "name": "Druckertintengeschäft", "terms": "Kopierertinte, Faxtinte, Toner" @@ -9334,6 +9388,10 @@ "name": "Tabakwarengeschäft", "terms": "Traffik,Tabakwarengeschäft,Tabakwarenladen" }, + "shop/tool_hire": { + "name": "Werkzeugverleih", + "terms": "Werkzeug, Verleih" + }, "shop/toys": { "name": "Spielwarengeschäft", "terms": "Spielwarengeschäft, Spielzeughandlung, Spielzeugladen, Spielzeuggeschäft" @@ -9456,6 +9514,14 @@ "name": "Campingplatz", "terms": "Camping Lager, Zeltplatz, Campingplatz" }, + "tourism/camp_site/backcountry": { + "name": "Wildnis Campingplatz", + "terms": "Alpines Camping, Backpacker Camping, Waldcamping, informelles Camping, primitives Camping" + }, + "tourism/camp_site/group_only": { + "name": "Gruppencampinglatz", + "terms": "Jugencampingplatz, Scoutcampingplatz, Camping" + }, "tourism/caravan_site": { "name": "Wohnwagen-Campingplatz", "terms": "Wohnwagenpark, Wohnmobil-Stellplätze" diff --git a/dist/locales/en.json b/dist/locales/en.json index 55a344b7a..0c8a05c8c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2759,6 +2759,15 @@ "attraction": { "label": "Type" }, + "baby_feeding": { + "label": "Baby Nursing Area", + "terms": "baby feeding,breastfeeding,lactation,mothers,nursing", + "options": { + "room": "Dedicated Room", + "yes": "Marked Space", + "no": "None" + } + }, "baby_seat": { "label": "Baby Seat" }, @@ -2859,7 +2868,8 @@ "label": "Type" }, "building_area": { - "label": "Building" + "label": "Building", + "terms": "" }, "building": { "label": "Building", @@ -3014,7 +3024,8 @@ "label": "Refuge Island" }, "cuisine": { - "label": "Cuisines" + "label": "Cuisines", + "terms": "fare,food types" }, "currency_multi": { "label": "Currency Types", @@ -3334,6 +3345,9 @@ "fuel": { "label": "Fuel" }, + "gambling": { + "label": "Games" + }, "gauge": { "label": "Gauge" }, @@ -3778,6 +3792,9 @@ "5": "5: Very steep, bike generally needs to be pushed or carried" } }, + "museum": { + "label": "Type" + }, "name": { "label": "Name", "terms": "label,title", @@ -5324,7 +5341,7 @@ }, "amenity/grave_yard": { "name": "Graveyard", - "terms": "" + "terms": "burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb" }, "amenity/grit_bin": { "name": "Grit Bin", @@ -6085,6 +6102,10 @@ "name": "Stile", "terms": "" }, + "barrier/swing_gate": { + "name": "Swing Gate", + "terms": "" + }, "barrier/toll_booth": { "name": "Toll Booth", "terms": "" @@ -6620,6 +6641,10 @@ "name": "Entrance/Exit", "terms": "entrance,exit,door" }, + "entrance/emergency": { + "name": "Emergency Exit", + "terms": "fire exit,door" + }, "ford": { "name": "Ford", "terms": "" @@ -7040,6 +7065,10 @@ "name": "Boundary Stone", "terms": "" }, + "historic/building": { + "name": "Historic Building", + "terms": "" + }, "historic/castle": { "name": "Castle", "terms": "" @@ -7142,6 +7171,9 @@ "landuse/basin": { "name": "Basin" }, + "landuse/churchyard": { + "name": "Churchyard" + }, "landuse/farm": { "name": "Farmland" }, @@ -7165,11 +7197,7 @@ }, "landuse/cemetery": { "name": "Cemetery", - "terms": "" - }, - "landuse/churchyard": { - "name": "Churchyard", - "terms": "" + "terms": "burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb" }, "landuse/commercial": { "name": "Commercial Area", @@ -7289,7 +7317,7 @@ }, "landuse/religious": { "name": "Religious Area", - "terms": "" + "terms": "christian,churchyard,hindu,jewish,mosque,muslim,place of worship,shinto,sikh,taoist,temple,shrine,synagogue" }, "landuse/residential": { "name": "Residential Area", @@ -8220,6 +8248,10 @@ "name": "Government Office", "terms": "" }, + "office/government/prosecutor": { + "name": "Public Prosecutor's Office", + "terms": "attorney general,district attorney,prosecution" + }, "office/government/register_office": { "name": "Register Office", "terms": "clerk,marriage,death,birth,certificate" @@ -8242,7 +8274,7 @@ }, "office/lawyer": { "name": "Law Office", - "terms": "" + "terms": "advocate,attorney,barrister,counsellor,counselor,defender,lawyer,legal,prosecutor" }, "office/lawyer/notary": { "name": "Notary Office" @@ -8942,6 +8974,10 @@ "name": "Car Dealership", "terms": "automobile,automotive" }, + "shop/car/second_hand": { + "name": "Used Car Dealership", + "terms": "automobile,automotive" + }, "shop/caravan": { "name": "RV Dealership", "terms": "auto,camper,recreational vehicle" @@ -8974,6 +9010,10 @@ "name": "Clothing Store", "terms": "blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear" }, + "shop/clothes/second_hand": { + "name": "Secondhand Clothing Store", + "terms": "blouses,clothes,consignment,dresses,pants,second hand,shirts,shorts,skirts,slacks,suits,used" + }, "shop/clothes/underwear": { "name": "Underwear Store", "terms": "boutique,bras,brassieres,briefs,boxers,fashion,lingerie,panties,slips,socks,stockings,underclothes,undergarments,underpants,undies" @@ -9030,6 +9070,10 @@ "name": "DIY Store", "terms": "" }, + "shop/doors": { + "name": "Door Shop", + "terms": "" + }, "shop/dry_cleaning": { "name": "Dry Cleaner", "terms": "" @@ -9590,6 +9634,14 @@ "name": "Museum", "terms": "art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*" }, + "tourism/museum/art": { + "name": "Art Museum", + "terms": "art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*" + }, + "tourism/museum/history": { + "name": "History Museum", + "terms": "artifacts,dioramas,exhibits,exhibitions,foundation,hall,institution" + }, "tourism/picnic_site": { "name": "Picnic Site", "terms": "camp" diff --git a/dist/locales/eo.json b/dist/locales/eo.json index a093aea6c..d0a92eeb6 100644 --- a/dist/locales/eo.json +++ b/dist/locales/eo.json @@ -1003,7 +1003,8 @@ "welcome": "Bonvenon al la OpenStreetMap-redaktilo “iD”", "text": "La redaktilo “iD” estas afabla, sed potenca ilo por kontribui al la plej bona libera mondmapo. Tio ĉi estas versio {version}. Pliaj informoj estas disponeblaj ĉe {website} kaj eblaj raporti erarojn per {github}.", "privacy_update": "Nia privateca politiko estis lastatempe aktualigita.", - "privacy": "{updateMessage} Per uzi tiun ĉi programon, vi konsentas fari tion laŭ ĝia privateca politiko, kiu troviĝas ĉe {here}.", + "privacy_policy": "privateca politiko de redaktilo iD", + "privacy": "{updateMessage} Per uzi tiun ĉi programon, vi konsentas fari tion laŭ {privacyLink}.", "walkthrough": "Malfermi gvidilon", "start": "Redakti nun" }, diff --git a/dist/locales/es.json b/dist/locales/es.json index 63335f0bc..8d5a51a60 100644 --- a/dist/locales/es.json +++ b/dist/locales/es.json @@ -1005,7 +1005,8 @@ "welcome": "Bienvenido al editor iD OpenStreetMap", "text": "iD es una herramienta amigable pero poderosa para contribuir al mejor mapa libre del mundo. Esta es la versión {versión}. Para obtener más información consulte {website} e informe errores en {github}.", "privacy_update": "Recientemente se actualizó nuestra política de privacidad.", - "privacy": "{updateMessage} Al usar este software, acepta hacerlo de acuerdo con la política de privacidad de iD, que se encuentra {aquí}.", + "privacy_policy": "la política de privacidad de iD", + "privacy": "{updateMessage} Al usar este software, acepta hacerlo de acuerdo con {privacyLink}.", "walkthrough": "Iniciar el tutorial", "start": "Editar ahora" }, @@ -2761,6 +2762,10 @@ "baby_seat": { "label": "Asiento de bebé" }, + "backcountry": { + "label": "Travesía", + "terms": "travesía, travesia, fuera de pista" + }, "backrest": { "label": "Respaldo" }, @@ -2829,6 +2834,9 @@ "booth": { "label": "Cabina" }, + "bottle": { + "label": "Llenado de botellas" + }, "boules": { "label": "Tipo" }, @@ -3352,6 +3360,9 @@ "generator/type": { "label": "Tipo" }, + "geyser/height": { + "label": "Altura de erupción" + }, "gnis/feature_id": { "label": "ID de elemento GNIS", "terms": "Servicio Federal de Información de Nombres Geográficos, Junta de Nombres Geográficos de Estados Unidos, EE. UU." @@ -3362,6 +3373,10 @@ "grape_variety": { "label": "Variedades de uva" }, + "group_only": { + "label": "Solo grupos", + "terms": "grupo, colectivo, agrupación, cuadrilla, agrupar, agruparse, hacer un grupo" + }, "guest_house": { "label": "Tipo" }, @@ -3451,6 +3466,9 @@ "undefined": "No" } }, + "hot_water": { + "label": "Agua caliente" + }, "iata": { "label": "Código de aeropuerto IATA" }, @@ -3844,6 +3862,10 @@ "yes": "Sí" } }, + "openfire": { + "label": "Fuegos al aire libre permitidos", + "terms": "fuego, fogata" + }, "opening_date": { "label": "Fecha de apertura prevista" }, @@ -4342,6 +4364,10 @@ "shop": { "label": "Tipo" }, + "shower": { + "label": "Duchas", + "terms": "ducha, duchador, ducharse" + }, "siren/purpose": { "label": "Propósito" }, @@ -4544,6 +4570,10 @@ "to": { "label": "Hasta" }, + "toilets": { + "label": "Baños", + "terms": "baños, servicios" + }, "toilets/disposal": { "label": "Desecho", "options": { @@ -6296,6 +6326,10 @@ "name": "Deshollinador", "terms": "chimenea, fogón, hollín, limpiachimenea, limpieza de chimeneas" }, + "craft/cleaning": { + "name": "Servicio de limpieza", + "terms": "limpieza, limpiar" + }, "craft/clockmaker": { "name": "Relojero", "terms": "relojero, reloj, relojería" @@ -6383,6 +6417,10 @@ "name": "Fontanero", "terms": "fontanero, fontanería, plomero, plomería, desatascador, tubero" }, + "craft/pottery": { + "name": "Fabricante de cerámica (alfarero)", + "terms": "cerámica, alfarero, alfarera, alfarería, florero, vasija, maceta" + }, "craft/rigger": { "name": "Armador", "terms": "Aparejador" @@ -6536,6 +6574,10 @@ "name": "Entrada/Salida", "terms": "Entrada,Salida" }, + "entrance/emergency": { + "name": "Salida de emergencia", + "terms": "salida de emergencia, puerta, evacuación" + }, "ford": { "name": "Vado", "terms": "Vado, paso, cruce" @@ -7916,6 +7958,10 @@ "name": "Colina", "terms": "colina, páramo, brezal, meseta" }, + "natural/geyser": { + "name": "Géiser", + "terms": "Géiser, geiser, geyser, erupción, geiser, gieser, guyer, agua caliente, hidrogeología, explosión hidrotérmica, vapor" + }, "natural/glacier": { "name": "Glaciar", "terms": "glaciar, glaciares" @@ -8854,6 +8900,10 @@ "name": "Carnicería", "terms": "carnicería, carnicero, carne" }, + "shop/camera": { + "name": "Tienda de equipos de fotografía", + "terms": "cámara, película, lente, foto, fotografía" + }, "shop/candles": { "name": "Tienda de velas", "terms": "velas, vela, cirio, candela" @@ -8962,6 +9012,10 @@ "name": "Tienda de bricolaje / Hágalo usted mismo", "terms": "bricolaje, por ti mismo, diy, hágalo usted mismo" }, + "shop/doors": { + "name": "Tienda de puertas (aberturas)", + "terms": "puertas, aberturas, tienda" + }, "shop/dry_cleaning": { "name": "Tintorería", "terms": "Tintorería" @@ -9012,6 +9066,10 @@ "shop/fishmonger": { "name": "Pescadería -en desuso-" }, + "shop/flooring": { + "name": "Tienda de suministros para pisos", + "terms": "baldosa" + }, "shop/florist": { "name": "Floristería", "terms": "floristería, florista, flores, ramos, plantas, floricultor" @@ -9239,6 +9297,10 @@ "name": "Tienda de fotografía", "terms": "fotografía, fotógrafo, cámara, retratista, revelado, film, rollo, impresión, fotos" }, + "shop/pottery": { + "name": "Tienda de alfarería", + "terms": "cerámica, florero, vasija, maceta" + }, "shop/printer_ink": { "name": "Tienda de tinta para impresora", "terms": "tinta, cartuchos, toner, tóner, copiadora, fax, impresora, laser, chorro de tinta, insumos" @@ -9335,6 +9397,10 @@ "name": "Tienda de tabaco", "terms": "tabaquería, tienda de tabacos, tabaco, cigarillos, cigarros, puros, expendeduría, quiosco, kiosko" }, + "shop/tool_hire": { + "name": "Alquiler de herramientas", + "terms": "alquiler, renta, arriendo, herramientas" + }, "shop/toys": { "name": "Juguetería", "terms": "juguetes, juego, juguetería, tienda de juguetes" @@ -9457,6 +9523,14 @@ "name": "Campamento", "terms": "terreno, área, lugar, camping, cámping, campamento, acampe, tienda, carpa, rv, motorhome, motor home, caravana, autocaravana" }, + "tourism/camp_site/backcountry": { + "name": "Área de campamento de travesía", + "terms": "camping alpino, sitio para mochileros, camping en bosques, terreno para acampar, parcela, camping, , camping informal, camping primitivo" + }, + "tourism/camp_site/group_only": { + "name": "Área de campamento grupal", + "terms": "terreno de campamento, campo de acampada, campamento, campamento de exploración, campamento juvenil" + }, "tourism/caravan_site": { "name": "Parque de autocaravanas", "terms": "caravana, remolque, autocaravana, roulotte" @@ -10093,6 +10167,13 @@ "description": "GSI Kiban 2500 a través de finds.jp. Bueno para rastrear, pero un poco más viejo.", "name": "Japón GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Municipio de Gotemburgo, CC0" + }, + "description": "El mapa de la ciudad es un mapa general que describe Gotemburgo. Contiene información general sobre terrenos, comunicaciones, hidrografía, edificios, números de dirección y nombres de calles, división administrativa y otro texto de orientación.", + "name": "Mapa de la ciudad de Gotemburgo" + }, "gsi.go.jp": { "attribution": { "text": "Japón GSI" @@ -10889,6 +10970,10 @@ "name": "Canal de Telegram de OSM de Albania", "description": "Canal de Telegram de OpenStreetMap de Albania" }, + "al-twitter": { + "name": "Twitter de OpenStreetMap Albania", + "description": "Síganos en Twitter en {url}" + }, "at-forum": { "name": "Foro de OpenStreetMap Austria", "description": "El foro oficial para preguntas sobre OpenStreetMap en y alrededor de Austria" @@ -10901,7 +10986,13 @@ "name": "Twitter OpenStreetMap Austria", "description": "OpenStreetMap Austria en Twitter: {url}" }, + "be-chapter": { + "name": "Capítulo local de OpenStreetMap Bélgica", + "description": "Ayudamos a crecer y mejorar OpenStreetMap en Bélgica.", + "extendedDescription": "Si desea ayudar a mejorar y hacer crecer la comunidad de mapeo en Bélgica, para hacer que aún más personas se vuelvan locas por mapear, ¡OpenStreetMap Belgium es el lugar adecuado para usted!" + }, "be-facebook": { + "name": "Comunidad de Facebook OpenStreetMap BE", "description": "Mapeadores y OpenStreetMap en Facebook en Bélgica" }, "be-forum": { @@ -10931,6 +11022,14 @@ "name": "Twitter OpenStreetMap Bélgica", "description": "OSM Bélgica en Twitter: @osm_be" }, + "bg-forum": { + "name": "Foro de OpenStreetMap Bulgaria", + "description": "Foro de la comunidad OpenStreetMap en Bulgaria" + }, + "bg-wiki": { + "name": "OpenStreetMap Wikiproject Bulgaria", + "description": "Página de Wikiproyecto para Bulgaria" + }, "bw-facebook": { "name": "Mapeo de Botswana en Facebook", "description": "Página de OpenStreetMap en Botswana" @@ -10948,7 +11047,16 @@ "description": "Síguenos en Twitter: {url}", "extendedDescription": "Este es el identificador oficial del capítulo de Jóvenes Cartografistas de la Universidad de Cape Coast, Ghana. Nos encantan los mapas, los datos abiertos y ayudar a las personas vulnerables." }, + "ch-irc": { + "name": "IRC de OpenStreetMap Suiza", + "description": "Únase a #osm-ch en irc.oftc.net (puerto 6667)" + }, + "ch-mailinglist": { + "name": "Lista de correo de Openstreetmap Schweiz / Suisse / Svizzera / Svizra", + "description": "Lista de correo de Suiza" + }, "ch-twitter": { + "name": "Twitter de OpenStreetMap Suiza", "description": "Síguenos en Twitter: {url}" }, "czech-community": { @@ -10975,6 +11083,10 @@ "name": "Foro de OpenStreetMap DE", "description": "Foro web de OpenStreetMap Alemania" }, + "de-hamburg-telegram": { + "name": "OSM Hamburgo en Telegram", + "description": "Chat de Telegram de OpenStreetMap Hamburgo: {url}" + }, "de-irc": { "name": "IRC de OpenStreetMap Alemania", "description": "Únase a #osm-de en irc.oftc.net (puerto 6667)" @@ -10983,6 +11095,10 @@ "name": "Lista de correo Talk-de", "description": "Talk-de es la lista de correo oficial para la comunidad alemana de OSM" }, + "de-matrix": { + "name": "Matrix de OpenStreetMap Alemania", + "description": "Únase a #osm-de: matrix.org en https://riot.im/app/#/room/%23osm-de:matrix.org" + }, "de-ostwestfalen-lippe-mailinglist": { "name": "Lista de correo OWL", "description": "Esta es la lista de correo de la comunidad Ostwestfalen-Lippe de OSM" @@ -11003,6 +11119,10 @@ "name": "Lista de correo Talk-dk", "description": "Una lista de correo para discutir OpenStreetMap en Dinamarca" }, + "es-twitter": { + "name": "Twitter de OpenStreetMap España", + "description": "Síganos en Twitter en {url}" + }, "fi-forum": { "name": "Foro de OpenStreetMap FI", "description": "Foro web de OpenStreetMap Finlandia" @@ -11015,6 +11135,10 @@ "name": "Lista de correo de Talk-fi", "description": "Talk-fi es la lista de correo oficial para la comunidad finlandesa de OSM" }, + "fr-chapter": { + "name": "Capítulo local de OpenStreetMap Francia", + "description": "Ayudamos a crecer y mejorar OpenStreetMap en Francia" + }, "fr-facebook": { "name": "Página de Facebook de OpenStreetMap Francia", "description": "Página de Facebook de OpenStreetMap Francia" @@ -11031,6 +11155,10 @@ "name": "Lista de correo Talk-fr", "description": "Lista de correo Talk-fr" }, + "fr-telegram": { + "name": "OpenStreetMap Francia en Telegram", + "description": "Un grupo de Telegram para la comunidad de OSM Francia: {url}" + }, "fr-twitter": { "name": "OpenStreetMap Francia en Twitter", "description": "OpenStreetMap Francia en Twitter: {url}" @@ -11072,10 +11200,49 @@ "name": "Foro OpenStreetMap HU", "description": "Foro web de OpenStreetMap Hungría" }, + "hu-matrix": { + "name": "Sala de matrix de OpenStreetMap HU", + "description": "Chat de matrix de OpenStreetMap Hungría", + "extendedDescription": "Chat de OpenStreetMap sobre temas del mapa. Uno de los foros de soporte de la comunidad OSM." + }, "hu-meetup": { "name": "Meetup de OpenStreetMap Hungría", "description": "La plataforma para organizar encuentros en Hungría" }, + "il-telegram": { + "name": "OSM Israel en Telegram", + "description": "Un grupo de Telegram para la comunidad OpenStreetMap en Israel: {url}" + }, + "ireland-chapter": { + "name": "Capítulo local de OpenStreetMap Irlanda", + "description": "Ayudamos a crecer y mejorar OpenStreetMap en Irlanda.", + "extendedDescription": "OpenStreetMap Irlanda ofrece una voz de defensa para el proyecto OpenStreetMap en la isla de Irlanda, además de interactuar con otras iniciativas abiertas." + }, + "ireland-facebook": { + "name": "Grupo de Facebook OpenStreetMap Irlanda", + "description": "Página de Facebook de OpenStreetMap Irlanda" + }, + "ireland-irc": { + "name": "IRC de OpenStreetMap Irlanda", + "description": "Únase a #osm-ie en irc.oftc.net (puerto 6667)", + "extendedDescription": "Únase a #osm-ie en irc.oftc.net (puerto 6667), tenga paciencia y espere unos minutos si hace una pregunta" + }, + "ireland-mailinglist": { + "name": "Lista de correo de Talk-ie", + "description": "Talk-ie es la lista de correo de la comunidad irlandesa de OSM" + }, + "ireland-telegram": { + "name": "OSM Irlanda en Telegram", + "description": "Chat de Telegram OpenStreetMap Irlanda" + }, + "ireland-twitter": { + "name": "OpenStreetMap IE en Twitter", + "description": "OpenStreetMap IE en Twitter: {url}" + }, + "is-chapter": { + "name": "Capítulo local de OpenStreetMap Islandia", + "description": "Ayudamos a crecer y mejorar OpenStreetMap en Islandia." + }, "is-facebook": { "name": "OSM Islandia en Facebook", "description": "Página de OpenStreetMap en Islandia" @@ -11088,6 +11255,10 @@ "name": "OSM Islandia en Twitter", "description": "Twitter de OpenStreetMap en Islandia" }, + "it-chapter": { + "name": "Capítulo local de OpenStreetMap Italia", + "description": "Ayudamos a crecer y mejorar OpenStreetMap en Italia." + }, "it-facebook": { "name": "Facebook de OpenStreetMap Italia", "description": "Únase a la comunidad de OpenStreetMap Italia en Facebook" @@ -11108,6 +11279,10 @@ "name": "Twitter de OpenStreetMap Italia", "description": "Síguenos en Twitter en {url}" }, + "kosovo-matrix": { + "name": "OpenStreetMap Kosovo en Matrix (puenteado con el de Telegram)", + "description": "Grupo público semioficial de todo Kosovo. Damos la bienvenida a todos los mapeadores desde cualquier lugar en cualquier idioma." + }, "kosovo-telegram": { "name": "OpenStreetMap Kosovo en Telegram", "description": "Grupo público de Telegram semi-oficial sobre Kosovo. Damos la bienvenida a todos los mapeadores de cualquier lugar en cualquier idioma." @@ -11116,6 +11291,15 @@ "name": "Lista de correo de Talk-lu", "description": "Lista de correo oficial para la comunidad OSM de Luxemburgo" }, + "mailinglist-sk-googlegroups": { + "name": "Lista de correo eslovaca en grupos de google", + "description": "Lista de correo oficial para la comunidad eslovaca" + }, + "map-kibera": { + "name": "Map Kibera Trust", + "description": "Map Kibera es una organización registrada que trabaja en Kenia", + "extendedDescription": "La misión de Map Kibera Trust es aumentar la influencia y la representación de las comunidades marginadas a través del uso creativo de herramientas digitales para la acción." + }, "mappa-mercia-group": { "name": "Grupo local Mappa Mercia", "description": "Un hogar para entusiastas de OpenStreetMap en las Midlands", @@ -11137,6 +11321,14 @@ "name": "Twitter de OpenStreetMap Nicaragua", "description": "OSM Nicaragua en Twitter: @osm_ni" }, + "nl-forum": { + "name": "Foro de OpenStreetMap de los Países Bajos", + "description": "Foro web de OpenStreetMap de los Países Bajos" + }, + "nl-telegram": { + "name": "Telegram de OpenStreetMap de los Países Bajos", + "description": "Un grupo de Telegram para la comunidad OSM de los Países Bajos: {url}" + }, "no-forum": { "name": "Foro web de OpenStreetMap Noruega", "description": "Foro web de OpenStreetMap Noruega" @@ -11169,6 +11361,10 @@ "name": "OpenStreetMap Austria", "description": "La plataforma de información sobre OpenStreetMap en Austria" }, + "osm-ch": { + "name": "OpenStreetMap Suiza", + "description": "La plataforma de información sobre OpenStreetMap en Suiza" + }, "osm-de": { "name": "OpenStreetMap Alemania", "description": "La plataforma de información sobre OpenStreetMap en Alemania" @@ -11178,6 +11374,10 @@ "description": "Grupo de Facebook para personas interesadas en OpenStreetMap.", "extendedDescription": "Mapeadores en la comunidad de Ghana, promocionando los proyectos OpenStreetMap y Humanitarian OpenStreetMap Team (HOT) en Ghana. Únete a nosotros." }, + "osm-gh-telegram": { + "name": "Telegram de OpenStreetMap Ghana", + "description": "Comunidad OpenStreetMap Ghana en Telegram" + }, "osm-gh-twitter": { "name": "OpenStreetMap Ghana en Twitter", "description": "Síguenos en Twitter: {url}" @@ -11220,6 +11420,19 @@ "name": "Telegram de OpenStreetMap Irán", "description": "Le invitamos a unirse a nuestro canal de Telegram en {url}. También tenemos un supergrupo de muchos OSMeros interesados ​​en Irán. Encuentre el enlace en la bio del canal." }, + "osm-kenya": { + "name": "OSM Kenya", + "description": "OSM Kenya es una comunidad de contribuyentes y usuarios de OSM", + "extendedDescription": "OSM es una comunidad local para individuos interesados ​​en OpenStreetMap que incluye organizaciones, desarrolladores y capítulos de YouthMappers en el país." + }, + "osm-kerala-telegram": { + "name": "Telegram de OpenStreetMap Kerala", + "description": "Mapeamos Kerala juntos. Únase a nuestro grupo de telegram. {url}" + }, + "osm-kerala-wiki": { + "name": "OpenStreetMap Kerala", + "description": "Quiere saber más sobre el mapeo de Kerala: {url}" + }, "osm-latam": { "name": "OpenStreetMap Latam", "description": "Soporte de OpenStreetMap en América Latina" @@ -11237,7 +11450,8 @@ "description": "Proporcionar servicios e información OSM para la comunidad local en Suecia" }, "osmcz-facebook": { - "name": "OpenStreetMap CZ en Facebook" + "name": "OpenStreetMap CZ en Facebook", + "description": "¡Siga a la comunidad checa en Facebook, incluido el WeeklyOSM traducido!" }, "osmcz-twitter": { "name": "Twitter checo @osmcz", @@ -11256,8 +11470,17 @@ "description": "Talk-pt es la lista de correo oficial de la comunidad OSM portuguesa" }, "pt-telegram": { + "name": "OpenStreetMap Portugal en Telegram", "description": "Grupo de Telegram de la comunidad portuguesa de OpenStreetMap {url}" }, + "sa-telegram": { + "name": "OSM Arabia Saudita en Telegram", + "description": "Un grupo de Telegram para la comunidad OpenStreetMap en Arabia Saudita: {url}" + }, + "scotland-twitter": { + "name": "OpenStreetMap Alba en Twitter", + "description": "OpenStreetMap Alba en Twitter: {url}" + }, "se-facebook": { "name": "Facebook de OpenStreetMap Suecia", "description": "OpenStreetMap Suecia en Facebook" @@ -11290,6 +11513,22 @@ "name": "Twitter de OpenStreetMap Eslovenia", "description": "Sigue a OpenStreetMap Eslovenia en Twitter: {url}" }, + "sk-facebook": { + "name": "Página de Facebook de la comunidad Freemap.sk Eslovaquia", + "description": "Página de Facebook de la comunidad Freemap.sk Eslovaquia" + }, + "sk-freemap": { + "name": "Web de OpenStreetMap Freemap Eslovaquia", + "description": "OpenStreetMapSitio web de mapas de OpenStreetMap con herramientas en Eslovaquia y regiones circundantes" + }, + "sk-freemap-wiki": { + "name": "Wiki de OpenStreetMap Freemap Eslovaquia", + "description": "Wiki de OpenStreetMap para mapeadores y comunidad eslovaca" + }, + "sk-twitter": { + "name": "OpenStreetMap Freemap Eslovaquia en Twitter", + "description": "OpenStreetMap Freemap Eslovaquia en Twitter: {url}" + }, "talk-au": { "name": "Lista de correo Talk-au", "description": "Lugar para que los mapeadores australianos chateen" @@ -11315,6 +11554,34 @@ "name": "Lista de correo de Talk-nz", "description": "Charla comunitaria OSM de Nueva Zelanda" }, + "ua-facebook": { + "name": "Grupo de Facebook OpenStreetMap Ucrania", + "description": "Únete a la comunidad de OpenStreetMap Ucrania en Facebook" + }, + "ua-forum": { + "name": "Forum de OpenStreetMap Ucrania", + "description": "Foro de la comunidad OpenStreetMap en Ucrania" + }, + "ua-github": { + "name": "OpenStreetMap Ucrania está en GitHub", + "description": "GitHub de OpenStreetMap Ucrania" + }, + "ua-osm": { + "name": "Web de OpenStreetMap Ucrania", + "description": "Sitio web de OpenStreetMap en Ucrania" + }, + "ua-slack": { + "name": "Slack de OpenStreetMap Ucrania", + "description": "Únete a la comunidad OpenStreetMap Ukraine en Slack" + }, + "ua-telegram": { + "name": "@osmUA en Telegram", + "description": "Chat de Telegram de OpenStreetMap Ucrania" + }, + "ua-twitter": { + "name": "Twitter de OpenStreetMap UA", + "description": "OpenStreetMap Ucrania en Twitter: {url}" + }, "uk-localchapter": { "name": "OpenStreetMap Reino Unido", "description": "El Capítulo local oficial para el Reino Unido (incluida Irlanda del Norte)", @@ -11577,6 +11844,7 @@ "extendedDescription": "El Club de SIG de la Universidad de Kenyatta (KUGISC) se fundó el 28 de octubre de 2016, con más de 200 estudiantes y personal de todos los profesores dentro del campus como miembros. Estamos comprometidos a capacitar a los miembros con el conocimiento espacial, las habilidades y la experiencia necesaria para comprender la Tierra. Ayudamos a mapear recursos dentro de la universidad incorporando datos geoespaciales en sus proyectos, así como la recopilación de datos de trabajo de campo." }, "ym-Khulna-University": { + "name": "YouthMappers de Khulna University", "description": "El capítulo de YouthMappers en la Universidad de Khulna", "extendedDescription": "Los estudiantes y profesores de KU de múltiples disciplinas tienen experiencia en la creación de datos abiertos para OSM para abordar los desafíos locales de desarrollo, incluida la seguridad alimentaria y otros temas." }, diff --git a/dist/locales/fi.json b/dist/locales/fi.json index 596dc5fd8..2cb77c8f3 100644 --- a/dist/locales/fi.json +++ b/dist/locales/fi.json @@ -510,8 +510,8 @@ "resolution": "Resoluutio", "accuracy": "Täsmällisyys", "unknown": "Ei tiedossa", - "show_tiles": "Näytä kuvausruutujen rajat", - "hide_tiles": "Piilota karttakuvat" + "show_tiles": "Näytä yksittäisotosten rajat", + "hide_tiles": "Piilota yksittäisotosten rajat" }, "history": { "key": "H", @@ -640,6 +640,7 @@ "switch": "Vaihda takaisin tähän taustaan", "custom": "Mukautettu", "overlays": "Lisänäkymät", + "imagery_problem_faq": "Ilmoita ilmakuvavirheestä", "reset": "Palauta", "reset_all": "Tyhjennä kaikki", "display_options": "Näyttöasetukset", @@ -652,6 +653,10 @@ "tooltip": "Näytä pienoiskartta laajemmalta alueelta nykyisen muokkausnäkymän sijainnin havainnollistamiseksi.", "key": "/" }, + "panel": { + "description": "Näytä lisätietonäkymä", + "tooltip": "Näytä lisätietoja taustakuva-aineistosta" + }, "fix_misalignment": "Korjaa ilmakuvavirhe", "offset": "Korjaa ilmakuvan asemointivirhettä vetämällä hiiren osoitinta harmaan laatikon sisällä tai syöttämällä korjausluvut metreinä" }, @@ -674,7 +679,7 @@ "title": "KeepRight-ilmoitukset" }, "improveOSM": { - "tooltip": "Improveosm.org-palvelun automaattisesti tunnistamat merkintävirheet", + "tooltip": "Improveosm.org-palvelun automaattisesti tunnistamat muokkausvirheet", "title": "ImproveOSM-ilmoitukset" }, "custom": { @@ -683,10 +688,17 @@ "zoom": "Lähennä aineistoon" } }, + "style_options": "Ulkoasu", "map_features": "Karttaominaisuudet", "autohidden": "Nämä kohteet on piilotettu automaattisesti, sillä ne sekoittaisivat karttanäkymää liikaa. Saat ne näkyviin suurentamalla karttaa.", "osmhidden": "Nämä kohteet ovat piilotettu automaattisesti, koska OpenStreetMap taso on piilotettu" }, + "visual_diff": { + "highlight_edits": { + "description": "Korosta muutokset", + "tooltip": "Korosta muokatut karttakohteet" + } + }, "photo_overlays": { "title": "Kuvakerrokset", "traffic_signs": { @@ -799,13 +811,25 @@ "instructions": "Valitse datatiedosto. Tuetut tiedostotyypit:\n .gpx, .kml, .geojson, .json", "label": "Selaa tiedostoja" }, - "or": "Tai", + "or": "tai", "url": { "instructions": "Anna datatiedoston osoite tai vektoritiilien URL-osoitemalli. Sallitut sääntömallit ovat:\n {zoom} tai {z}, {x}, {y} Z/X/Y-asettelua varten", "placeholder": "Syötä osoite" } } }, + "preferences": { + "title": "Asetukset", + "description": "Asetukset", + "privacy": { + "title": "Yksityisyys", + "privacy_link": "iD-ohjelmiston tietosuojakäytäntö", + "third_party_icons": { + "description": "Näytä ulkopuolisten toimijoiden kuvakkeet", + "tooltip": "Näytä muiden toimijoiden, kuten Wikimedian, Facebookin ja Twitterin, tekijänoikeuksien alaisia kuvakkeita" + } + } + }, "restore": { "heading": "Kaikkia muutoksia ei ole tallennettu", "description": "Haluatko palauttaa tallentamattomat muutokset edelliseltä muokkauskerralta?", @@ -872,6 +896,7 @@ "splash": { "welcome": "Tervetuloa iD- OpenStreetMapin kartanmuokkausohjelmaan", "text": "iD on tehokas ja helppokäyttöinen kartanmuokkausohjelma maailman tasokkaimman kartan luomiseen. Tämä on versio {version}. Lisätietoja ohjelmasta on osoitteessa {website}, ja ohjelmistovirheistä voi ilmoittaa osoitteessa {github}.", + "privacy_update": "Tietosuojakäytäntömme on päivitetty.", "walkthrough": "Aloitusopas", "start": "Muokkaa heti" }, @@ -1367,11 +1392,11 @@ }, "qa": { "title": "Laaduntarkkailu", - "intro": "*Laaduntarkkailutoiminto* tarkastaa automaattisesti muokkauksia yleisimpien merkintävirheiden, kuten virheellisten ominaisuustietojen ja risteysmerkintöjen varalta. Kartoittajan on kuitenkin itse korjattava havaitut puutteet. Tarkastele merkintävirhelistaa napsauttamalla {data} **Kartta-aineisto**.", + "intro": "*Laaduntarkkailutoiminto* pyrkii automaattisesti tunnistamaan muokkauksista yleisimpiä virheitä, kuten virheellisiä ominaisuustietoja ja risteysmerkintöjä. Kartoittajan on kuitenkin itse korjattava havaitut puutteet. Tarkastele muokkausvirhelistaa napsauttamalla {data} **Kartta-aineisto**.", "tools_h": "Työkalut", "tools": "iD tukee toistaiseksi ohjelmistoja [KeepRight](https://www.keepright.at/) ja [ImproveOSM](https://improveosm.org/en/) (englanniksi). Kehitteillä on yhteensopivuus [Osmose](https://osmose.openstreetmap.fr/)-ohjelmiston ja mahdollisesti myös muiden toimintojen kanssa.", - "issues_h": "Merkintävirheiden käsittely", - "issues": "Merkintävirheiden käsittely muistuttaa karttailmoitusten käsittelyä. Napsauta sivupalkin painiketta. Käytettävissä olevat toiminnot vaihtelevat, mutta yleensä virheitä voi kommentoida ja merkitä ratkaistuksi." + "issues_h": "Muokkausvirheiden käsittely", + "issues": "Muokkausvirheiden käsittely muistuttaa karttailmoitusten käsittelyä. Napsauta sivupalkin painiketta. Käytettävissä olevat toiminnot vaihtelevat, mutta yleensä virheitä voi kommentoida ja merkitä ratkaistuksi." }, "field": { "restrictions": { @@ -1413,9 +1438,9 @@ } }, "issues": { - "title": "Merkintävirheet", + "title": "Muokkausvirheet", "key": "I", - "list_title": "Merkintävirheet ({count})", + "list_title": "Muokkausvirheet ({count})", "errors": { "list_title": "Virheet ({count})" }, @@ -1423,14 +1448,26 @@ "list_title": "Varoitukset ({count})" }, "rules": { - "title": "Automaattisesti havaittavat merkintävirheet" + "title": "Automaattisesti havaittavat virheet" }, + "user_resolved_issues": "Ratkaisemasi virheet", "no_issues": { "message": { "everything": "Kaikki kunnossa", "everything_in_view": "Tässä näkymässä kaikki on kunnossa", "edits": "Kaikki kunnossa", - "edits_in_view": "Tekemäsi muutokset eivät sisällä virheitä" + "edits_in_view": "Tekemäsi muutokset eivät sisällä virheitä", + "no_edits": "Et ole vielä muokannut mitään" + }, + "hidden_issues": { + "none": "Havaitut ongelmat näytetään tässä", + "elsewhere": "Virheet muualla: {count}", + "everything_else": "Kaikki muut virheet: {count}", + "everything_else_elsewhere": "Kaikki muut virheet kaikkialla: {count}", + "disabled_rules": "Virheet, jotka on piilotettu automaattisesti havaittavista: {count}", + "disabled_rules_elsewhere": "Virheet kaikkialta, jotka on piilotettu automaattisesti havaittavista: {count}", + "ignored_issues": "Ohitetut virheet: {count}", + "ignored_issues_elsewhere": "Ohitetut virheet kaikkialta: {count}" } }, "options": { @@ -1448,13 +1485,23 @@ "suggested": "Korjausehdotus:", "enable_all": "Valitse kaikki", "disable_all": "Poista kaikki", + "fix_all": { + "annotation": "Korjattiin useita muokkausvirheitä." + }, "almost_junction": { "title": "Puuttuva risteysmerkintä", - "message": "{feature} on hyvin lähellä mutta ei yhdistetty kohteeseen {feature2}" + "message": "{feature} on hyvin lähellä mutta ei yhdistetty kohteeseen {feature2}", + "tip": "Korosta toisiin kohteisiin linkitettävät kohteet" + }, + "close_nodes": { + "title": "Liian lähekkäiset pisteet", + "tip": "Korosta liian tiheässä olevat viivapisteet", + "reference": "Liian lähekkäiset pisteet tulisi yhdistää tai siirtää loitommaksi toisistaan." }, "crossing_ways": { "title": "Ylimääräinen risteysmerkintä", "message": "{feature} risteää kohteen {feature2} kanssa", + "tip": "Korosta virheellisesti risteävät kohteet", "indoor-indoor": { "reference": "Risteävät sisäkohteet tulisi merkitä eri korkeustasoihin." }, @@ -1464,6 +1511,7 @@ }, "disconnected_way": { "title": "Yksinäiset tiet", + "tip": "Korosta reititysongelmia aiheuttavat muuhun väyläverkostoon kytkemättömät viivat", "highway": { "message": "{highway} ei ole yhdistetty tieverkostoon" } @@ -1476,6 +1524,10 @@ "message": "{feature} on merkitty epäilyttävällä nimellä {name}", "reference": "Nimien tulisi olla kohteiden voimassaolevia, todellisuudessa käytettäviä nimiä." }, + "help_request": { + "title": "Tarkistuspyynnöt", + "tip": "Korosta toisen käyttäjän tarkistuspyynnöllä merkitsemät kohteet" + }, "incompatible_source": { "title": "Epäilyttävät lähteet", "tip": "Korosta epäilyttävillä lähteillä merkityt karttakohteet", @@ -1486,8 +1538,16 @@ "reference": "Googlen kaupallisten tuotteiden käyttö lähteinä on kielletty." } }, + "invalid_format": { + "title": "Virheelliset ominaisuustiedot", + "tip": "Korosta virheellisesti merkityt ominaisuustiedot" + }, + "mismatched_geometry": { + "title": "Epätyypillinen muoto", + "tip": "Korosta kohteet, joiden muoto ei vastaa karttakohdetyyppiä" + }, "missing_role": { - "title": "Puuttuva relaation rooli-merkintä", + "title": "Puuttuva relaation roolimerkintä", "message": "Jäsenellä {member} ei ole roolia relaatiossa {relation}", "tip": "Korosta virheellisillä tai puuttuvilla relaation rooleilla merkityt kohteet", "multipolygon": { @@ -1530,6 +1590,9 @@ "message": "{feature} sisältää mahdollisesti yksityisiä tietoja" } }, + "suspicious_name": { + "tip": "Korosta kohteet, joiden nimi on liian yleinen tai epäilyttävä" + }, "tag_suggests_area": { "message": "{feature} tulisi merkittynä suljettuna alueena ominaisuustiedolla {tag}", "reference": "Alueen alku- ja päätepiste tulee yhdistää." @@ -1968,17 +2031,22 @@ }, "help": { "title": "Ohjeet", - "help": "Näytä ohje/käyttöopas", + "help": "Näytä käyttöohje", "keyboard": "Näytä pikanäppäimet" }, "display_options": { "title": "Näyttöasetukset", + "background": "Näytä/piilota taustan asetukset", "background_switch": "Vaihda takaisin viimeisimpään taustaan", + "map_data": "Näytä/piilota kartta-aineistoasetukset", + "issues": "Näytä/piilota muokkausvirheiden asetukset", + "preferences": "Näytä/piilota käyttäjäasetukset", "fullscreen": "Siirry koko näytön tilaan", "sidebar": "Näytä/piilota kohdemuokkain", "wireframe": "Muuta alueen taustatäyttö -asetusta", "osm_data": "Vaihda OpenStreetMap-aineistoa", - "minimap": "Ota pienoiskartta käyttöön/pois käytöstä" + "minimap": "Ota pienoiskartta käyttöön/pois käytöstä", + "highlight_edits": "Korosta tallentamattomat muutokset" }, "selecting": { "title": "Kohteiden valitseminen", @@ -1988,7 +2056,9 @@ "search": "Hae kohteen nimellä" }, "with_selected": { - "edit_menu": "Näytä/piilota toimintovalikko" + "title": "Karttakohde valittuna", + "edit_menu": "Näytä/piilota toimintovalikko", + "zoom_to": "Lähennä valittuihin karttakohteisiin" }, "vertex_selected": { "title": "Piste valittuna", @@ -4071,6 +4141,9 @@ "name": "Mainoslieriö", "terms": "mainos, mainonta, tolppa, teline, kyltti, mainoskyltti, säiliö, pyörivä" }, + "advertising/totem": { + "name": "Mainostaulu" + }, "aerialway": { "name": "Ilmarata" }, @@ -4251,7 +4324,7 @@ }, "amenity/charging_station": { "name": "Latauspiste", - "terms": "sähköauto, sähkönlataus, sähköpiste, latauspiste, lataaminen, lataus" + "terms": "sähköauto, sähkönlataus, sähköpiste, latauspiste, lataaminen, lataus, sähkö" }, "amenity/childcare": { "name": "Päiväkoti", @@ -4671,7 +4744,7 @@ "terms": "katos, katettu, kota, kotus, korsu, laavu, maja, koppi, suoja, tauko, taukopaikka, taukokatos, piknik, picnic, retki, lepo, lepääminen, pukukoppi, pukeutuminen, bussi, linja-auto, kalliolippa" }, "amenity/shelter/gazebo": { - "name": "huvimaja" + "name": "Huvimaja" }, "amenity/shelter/lean_to": { "name": "Sääsuoja", @@ -5689,7 +5762,8 @@ "name": "Autokaista" }, "highway/service/driveway": { - "name": "Pihatie" + "name": "Ajoväylä", + "terms": "Pihatie" }, "highway/service/emergency_access": { "name": "Tie hälytysajoneuvoille" @@ -7380,6 +7454,10 @@ "shop/hifi": { "name": "Hifimyymälä" }, + "shop/hobby": { + "name": "Harrastuskauppa", + "terms": "harrastus, harrastukset, harrastaa, kauppa, liike, myymälä, putiikki, puoti" + }, "shop/houseware": { "name": "Kotitarvikekauppa" }, @@ -7767,7 +7845,8 @@ "name": "Lievä hidastustöyssy" }, "traffic_calming/island": { - "name": "Keskisaareke" + "name": "Liikenteenjakaja", + "terms": "saareke,keskisaareke" }, "traffic_calming/rumble_strip": { "name": "Heräteraidat" diff --git a/dist/locales/fr.json b/dist/locales/fr.json index ed1144ca2..45597ac4f 100644 --- a/dist/locales/fr.json +++ b/dist/locales/fr.json @@ -883,6 +883,11 @@ } } }, + "preferences": { + "title": "Préférences", + "description": "Préférences", + "key": "P" + }, "restore": { "heading": "Vous avez des modifications non enregistrées", "description": "Vous avez des modifications non sauvegardées d'une session précédente. Souhaitez-vous restaurer ces changements ?", diff --git a/dist/locales/gl.json b/dist/locales/gl.json index ae97c2d1b..5282ea7f2 100644 --- a/dist/locales/gl.json +++ b/dist/locales/gl.json @@ -931,7 +931,11 @@ "key": "P", "privacy": { "title": "Privacidade", - "privacy_link": "Ollar a política de privacidade do iD" + "privacy_link": "Ollar a política de privacidade do iD", + "third_party_icons": { + "description": "Amosar iconas de terceiros", + "tooltip": "Desmarcar esta cela para evitar cargar iconas de sitios de terceiros coma Wikimedia Commons, Facebook ou Twitter." + } } }, "restore": { @@ -1000,6 +1004,7 @@ "splash": { "welcome": "Benvido ó editor en liña iD do OpenStreetMap", "text": "O iD é unha ferramenta amigábel pero poderosa para contribuír ó mellor mapa libre do mundo. Esta é a versión {versión}. Para obter máis información olla {website} e informa dos erros en {github}.", + "privacy_update": "Recentemente foi actualizada a nosa política de privacidade.", "walkthrough": "Comezar o titorial", "start": "Editar agora" }, diff --git a/dist/locales/he.json b/dist/locales/he.json index 3da515dad..9a158cf53 100644 --- a/dist/locales/he.json +++ b/dist/locales/he.json @@ -1005,7 +1005,8 @@ "welcome": "ברוך בואך לעורך המפות iD מבית OpenStreetMap", "text": "iD הוא כלי ידידותי אך רב עצמה לתרומה למפה החופשית הטובה בעולם. זוהי גרסה {version}. למידע נוסף יש לבקר באתר {website} ולדווח על תקלות תחת {github}.", "privacy_update": "מדיניות הפרטיות שלנו התעדכנה לאחרונה", - "privacy": "{updateMessage} עצם השימוש בתכנית זו מהווה את הסכמתך למדיניות הפרטיות של iD אותה ניתן למצוא {here}.", + "privacy_policy": "מדיניות הפרטיות של iD", + "privacy": "{updateMessage} השימוש בתכנית זו מביע את הסכמתך ל{privacyLink}.", "walkthrough": "להתחיל במדריך", "start": "לערוך כעת" }, @@ -9746,6 +9747,13 @@ "description": "GSI Kiban 2500 via finds.jp. טוב לשרטוט, אבל ישן.", "name": "יפן GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© עיריית גותנבורג, CC0" + }, + "description": "מפת העיר היא מפה סיקורית שמתארת את גותנברת. היא מכילה פרטים כלליים על קרקע, תקשורת, תשתיות מים, בניינים, מספרי כתובות ושמות רחובות, חלוקה מנהלית וטקסט שמסייע בהתמצאות.", + "name": "מפת העיר גותנבורג" + }, "gsi.go.jp": { "attribution": { "text": "GSI יפן" diff --git a/dist/locales/hu.json b/dist/locales/hu.json index 5ab2bbb82..eff2a65f6 100644 --- a/dist/locales/hu.json +++ b/dist/locales/hu.json @@ -1779,6 +1779,7 @@ "title": "Érvénytelen formázás", "tip": "Formailag hibás címkék", "email": { + "message": "{feature} hibás email címmel", "reference": "Egy email címnek valahogy így kell kinéznie: \"felhasznalo@pelda.com\"" } }, @@ -1874,6 +1875,9 @@ } } }, + "unclosed_multipolygon_part": { + "message": "{feature} nem lezárt résszel" + }, "unsquare_way": { "title": "Nem szögletes sarok ({val}-ig)", "message": "{feature} nem rendelkezik szögletes sarkokkal", @@ -2323,7 +2327,8 @@ "search": "Elemek keresése" }, "with_selected": { - "edit_menu": "Menüszerkesztés átkapcsolása" + "edit_menu": "Menüszerkesztés átkapcsolása", + "zoom_to": "Nagyítás a kiválasztott elemekre" }, "vertex_selected": { "title": "A kiválasztott ponttal", @@ -3448,6 +3453,9 @@ "map_type": { "label": "Típus" }, + "mapillary": { + "label": "Mapillary Image ID" + }, "material": { "label": "Anyag", "terms": "anyag, építőanyag, alapanyag, összetevő, alkotóelem" @@ -4470,6 +4478,9 @@ "wikidata": { "label": "Wikidata" }, + "wikimedia_commons": { + "label": "Wikimedia Commons" + }, "wikipedia": { "label": "Wikipédia" }, diff --git a/dist/locales/ja.json b/dist/locales/ja.json index 005bd40fc..848c94695 100644 --- a/dist/locales/ja.json +++ b/dist/locales/ja.json @@ -1005,7 +1005,8 @@ "welcome": "OpenStreetMap エディタの iD へようこそ", "text": "iD はみんなで作る世界地図に貢献するための使いやすくパワフルなツールです。現在のバージョンは {version} です。詳細情報は {website} で、バグレポートは {github} でお願いします。", "privacy_update": "プライバシーポリシーが更新されました。", - "privacy": "{updateMessage} このソフトウェアを使用することで、あなたは {here}にあるIDのプライバシーポリシーに同意したものとみなされます。", + "privacy_policy": "IDのプライバシーポリシー", + "privacy": "{updateMessage} このソフトウェアを使用することで、あなたは {privacyLink}に同意したものとみなされます。", "walkthrough": "ウォークスルーを始める", "start": "今すぐ編集を始める" }, @@ -2758,6 +2759,10 @@ "baby_seat": { "label": "ベビーシート" }, + "backcountry": { + "label": "バックカントリー", + "terms": "バックカントリー" + }, "backrest": { "label": "背もたれ" }, @@ -2826,6 +2831,9 @@ "booth": { "label": "ブース" }, + "bottle": { + "label": "瓶詰め設備有無" + }, "boules": { "label": "種類" }, @@ -3349,6 +3357,9 @@ "generator/type": { "label": "種類" }, + "geyser/height": { + "label": "間欠泉の高さ" + }, "gnis/feature_id": { "label": "GNIS地物ID", "terms": "GNIS地物ID" @@ -3359,6 +3370,10 @@ "grape_variety": { "label": "ブドウの品種" }, + "group_only": { + "label": "団体専用", + "terms": "団体専用, グループ" + }, "guest_house": { "label": "ゲストハウスの種類" }, @@ -3448,6 +3463,9 @@ "undefined": "No" } }, + "hot_water": { + "label": "温水" + }, "iata": { "label": "IATA空港コード" }, @@ -3841,6 +3859,10 @@ "yes": "はい" } }, + "openfire": { + "label": "焚き火可否", + "terms": "焚き火可否, 焚き火, キャンプファイア, キャンプ" + }, "opening_date": { "label": "開始予定日" }, @@ -4339,6 +4361,10 @@ "shop": { "label": "店舗の種類" }, + "shower": { + "label": "シャワー有無", + "terms": "シャワー有無, シャワー" + }, "siren/purpose": { "label": "利用目的" }, @@ -4541,6 +4567,10 @@ "to": { "label": "To" }, + "toilets": { + "label": "トイレ有無", + "terms": "トイレ有無, トイレ, 便所" + }, "toilets/disposal": { "label": "汚物処理", "options": { @@ -6381,6 +6411,10 @@ "name": "配管工", "terms": "配管工, 職人" }, + "craft/pottery": { + "name": "窯元", + "terms": "窯元, 陶器製造業, 職人, 工房, 陶芸, 陶磁器, 焼き物" + }, "craft/rigger": { "name": "艤装者", "terms": "艤装者, 職人, 工房" @@ -6534,6 +6568,10 @@ "name": "出入口（全般）", "terms": "出入口, 入口, 出口, 出入り口, エントランス, 玄関, 正面入口, 裏口" }, + "entrance/emergency": { + "name": "非常口", + "terms": "非常口, 出口, 緊急" + }, "ford": { "name": "洗い越し", "terms": "洗い越し, 浅瀬" @@ -7914,6 +7952,10 @@ "name": "高原", "terms": "高原" }, + "natural/geyser": { + "name": "間欠泉", + "terms": "間欠泉, 温泉" + }, "natural/glacier": { "name": "氷河", "terms": "氷河" @@ -8852,6 +8894,10 @@ "name": "精肉店", "terms": "精肉店, 肉屋, 食品, 食べ物" }, + "shop/camera": { + "name": "カメラ店", + "terms": "カメラ店, カメラ用品, レンズ, 写真" + }, "shop/candles": { "name": "キャンドル専門店", "terms": "キャンドル, ロウソク, 蝋燭, 蠟燭, インテリア" @@ -8960,6 +9006,10 @@ "name": "ホームセンター", "terms": "日曜大工用品店, 工具店, DIY, ホームセンター, 雑貨, 買い物, ショッピング, 園芸, 工芸用品, 家庭菜園, 植木" }, + "shop/doors": { + "name": "ドア販売店", + "terms": "ドア販売店, ドア, 扉" + }, "shop/dry_cleaning": { "name": "クリーニング店", "terms": "クリーニング, ドライクリーニング店, 洗濯屋" @@ -9010,6 +9060,10 @@ "shop/fishmonger": { "name": "魚屋（非推奨）" }, + "shop/flooring": { + "name": "床用品店", + "terms": "床用品店, フロア, フローリング" + }, "shop/florist": { "name": "生花店", "terms": "生花店, 花屋" @@ -9237,6 +9291,10 @@ "name": "写真店", "terms": "写真屋, 写真店, 現像, ビデオ, デジカメ" }, + "shop/pottery": { + "name": "陶磁器店", + "terms": "陶磁器店, 陶器店, 皿, 茶碗, 焼き物" + }, "shop/printer_ink": { "name": "プリンタ用インク店", "terms": "プリンタ用インク店, プリンタ, インクカートリッジ, トナー" @@ -9333,6 +9391,10 @@ "name": "たばこ店", "terms": "たばこ店, たばこ屋, タバコ, たばこ, 嗜好品, タバコ店, タバコ屋, 煙草" }, + "shop/tool_hire": { + "name": "工具レンタル店", + "terms": "工具レンタル店, 工具, レンタル" + }, "shop/toys": { "name": "玩具店", "terms": "玩具店, おもちゃ屋" @@ -9455,6 +9517,14 @@ "name": "キャンプ場", "terms": "キャンプ場, アウトドア" }, + "tourism/camp_site/backcountry": { + "name": "キャンプ場（未整備）", + "terms": "キャンプ場（未整備）, バックカントリー" + }, + "tourism/camp_site/group_only": { + "name": "キャンプ場（団体専用）", + "terms": "キャンプ場（団体専用）" + }, "tourism/caravan_site": { "name": "オートキャンプ場", "terms": "オートキャンプ場, アウトドア, 自動車" @@ -10091,6 +10161,13 @@ "description": "独立行政法人 農研機構(NARO)より配信。ズームレベル15～20。輪郭が鮮明な地図画像なので最もトレースしやすく、概してBingより位置精度が高いが、Bingよりやや古いことが多い。", "name": "国土地理院 基盤地図2500(NARO経由)" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Gothenburg municipality, CC0" + }, + "description": "The city map is an overview map that describes Gothenburg. It contains general information about land, communications, hydrography, buildings, address numbers and street names, administrative division and other orientation text.", + "name": "Gothenburg City map" + }, "gsi.go.jp": { "attribution": { "text": "国土地理院 オルソ" diff --git a/dist/locales/mg.json b/dist/locales/mg.json index 140ca4749..3f8e14d42 100644 --- a/dist/locales/mg.json +++ b/dist/locales/mg.json @@ -1,9 +1,19 @@ { "mg": { "icons": { + "download": "alaina", "information": "fanazavana", "remove": "hanala", - "undo": "hanafoana" + "undo": "hanafoana", + "zoom_to": "hanakely/hanalehibe ho", + "copy": "handika", + "view_on": "jereo ao amin'i (domain)", + "favorite": "ankafizina" + }, + "toolbar": { + "inspect": "hadihadio", + "undo_redo": "Aoka ihany / Avereno", + "favorites": "Ankafizina" }, "modes": { "add_area": { diff --git a/dist/locales/mk.json b/dist/locales/mk.json index 372fd6460..0c4791736 100644 --- a/dist/locales/mk.json +++ b/dist/locales/mk.json @@ -1005,7 +1005,6 @@ "welcome": "Добре дојдовте на уредникот ID за OpenStreetMap", "text": "iD е достапна, но моќна алатка за учество во најдобрата слободна карта на светот. Ова е верзијата {version}. Повеќе информации ќе најдете на {website}. Грешките пријавувајте ги на {github}.", "privacy_update": "Нашите правила за личните податоци неодамна се сменија.", - "privacy": "{updateMessage} Користејќи ја оваа програма, се согласувате дека го правите тоа во скалд со правилата на iD за личните податоци, кои можете да ги најдете {тука}.", "walkthrough": "Започнете ја прошетката", "start": "Уреди сега" }, @@ -2307,6 +2306,10 @@ "baby_seat": { "label": "Бебешко седиште" }, + "backcountry": { + "label": "Зафрлени предели", + "terms": "<преведете со истозначници или сродни поими на „Зафрлени предели“, одделени со запирки>" + }, "backrest": { "label": "Наслон" }, @@ -2375,6 +2378,9 @@ "booth": { "label": "Трафика" }, + "bottle": { + "label": "Полнење шишиња" + }, "boules": { "label": "Вид" }, @@ -2898,6 +2904,9 @@ "generator/type": { "label": "Вид" }, + "geyser/height": { + "label": "Висина на избувот" + }, "gnis/feature_id": { "label": "Назнака на GNIS-елемент", "terms": "<преведете со истозначници или сродни поими на „Назнака на GNIS-елемент“, одделени со запирки>" @@ -2908,6 +2917,10 @@ "grape_variety": { "label": "Сорти грозје" }, + "group_only": { + "label": "Само групи", + "terms": "<преведете со истозначници или сродни поими на „Само групи“, одделени со запирки>" + }, "guest_house": { "label": "Вид" }, @@ -2997,6 +3010,9 @@ "undefined": "Не" } }, + "hot_water": { + "label": "Топла вода" + }, "iata": { "label": "Аеродромски код по IATA" }, @@ -3390,6 +3406,10 @@ "yes": "Да" } }, + "openfire": { + "label": "Дозволени отворени огништа", + "terms": "[преведете со истозначници или сродни поими на „Дозволени отворени огништа“, одделени со запирки]" + }, "opening_date": { "label": "Очекувано пуштање" }, @@ -3888,6 +3908,10 @@ "shop": { "label": "Вид" }, + "shower": { + "label": "Тушеви", + "terms": "<преведете со истозначници или сродни поими на „Тушеви“, одделени со запирки>" + }, "siren/purpose": { "label": "Намена" }, @@ -4090,6 +4114,10 @@ "to": { "label": "До" }, + "toilets": { + "label": "Тушеви", + "terms": "<преведете со истозначници или сродни поими на „Тоалети“, одделени со запирки>" + }, "toilets/disposal": { "label": "Исфрлање", "options": { @@ -5487,6 +5515,9 @@ "craft/chimney_sweeper": { "name": "Оџачар" }, + "craft/cleaning": { + "name": "Служба за чистење" + }, "craft/clockmaker": { "name": "Часовничар" }, @@ -5553,6 +5584,9 @@ "craft/plumber": { "name": "Водоводџија" }, + "craft/pottery": { + "name": "Грнчар" + }, "craft/rigger": { "name": "Подигач" }, @@ -5676,6 +5710,9 @@ "entrance": { "name": "Влез/излез" }, + "entrance/emergency": { + "name": "Итен излез" + }, "ford": { "name": "Брод" }, @@ -6727,6 +6764,9 @@ "natural/fell": { "name": "Фјал" }, + "natural/geyser": { + "name": "Гејзер" + }, "natural/glacier": { "name": "Ледник" }, @@ -7447,6 +7487,9 @@ "shop/butcher": { "name": "Месарница" }, + "shop/camera": { + "name": "Продавница за фотографска опрема" + }, "shop/candles": { "name": "Свеќарница" }, @@ -7528,6 +7571,9 @@ "shop/doityourself": { "name": "Продавница за мајсторисување" }, + "shop/doors": { + "name": "Продавница за врати" + }, "shop/dry_cleaning": { "name": "Хемиско чистење" }, @@ -7567,6 +7613,9 @@ "shop/fishmonger": { "name": "Рибарница" }, + "shop/flooring": { + "name": "Продавница за подови" + }, "shop/florist": { "name": "Цвеќарница" }, @@ -7739,6 +7788,9 @@ "shop/photo": { "name": "Фотографски дуќан" }, + "shop/pottery": { + "name": "Продавница за грнчарија" + }, "shop/printer_ink": { "name": "Продавница за печатарска боја" }, @@ -7811,6 +7863,9 @@ "shop/tobacco": { "name": "Продавница за тутун" }, + "shop/tool_hire": { + "name": "Изнајмување алати" + }, "shop/toys": { "name": "Продавница за играчки" }, @@ -7904,6 +7959,12 @@ "tourism/camp_site": { "name": "Камп" }, + "tourism/camp_site/backcountry": { + "name": "Камп во зафрлен предел" + }, + "tourism/camp_site/group_only": { + "name": "Групен камп" + }, "tourism/caravan_site": { "name": "Трајлерски камп" }, @@ -8448,6 +8509,12 @@ "description": "GSI Kiban 2500 преку finds.jp. Добра за исцртување траги, но малку постара.", "name": "GSI Јапонија KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Општина Гетеборг, CC0" + }, + "name": "Градска карта на Гетеборг" + }, "gsi.go.jp": { "attribution": { "text": "GSI Јапонија" diff --git a/dist/locales/nn.json b/dist/locales/nn.json index 396883543..1d5319d13 100644 --- a/dist/locales/nn.json +++ b/dist/locales/nn.json @@ -16,7 +16,8 @@ }, "modes": { "add_feature": { - "title": "Legg til ein eigenskap" + "title": "Legg til ein eigenskap", + "key": "Fane" }, "add_area": { "title": "Område", @@ -75,6 +76,7 @@ "save": "Last opp", "cancel": "Avbryt", "changes": "{count} endringar", + "errors": "Feil", "warnings": "Åtvaringar", "modified": "Modifisert", "deleted": "Sletta", @@ -104,7 +106,8 @@ "version": "Versjon", "last_edit": "Siste redigering", "edited_by": "Redigert av", - "unknown": "Ukjend" + "unknown": "Ukjend", + "note_comments": "Kommentarar" }, "location": { "key": "P", @@ -116,13 +119,20 @@ "geometry": "Geometri", "length": "Lengde", "area": "Område", - "location": "Plassering" + "location": "Plassering", + "metric": "Metrisk" } }, "geolocate": { "title": "Vis plasseringa mi" }, "inspector": { + "search": "Søk", + "check": { + "yes": "Ja", + "no": "Nei", + "reverser": "Endre retning" + }, "radio": { "structure": { "default": "Standard", @@ -144,6 +154,33 @@ "custom": "Tilpassa", "contrast": "Kontrast" }, + "preferences": { + "title": "Innstillingar", + "description": "Innstillingar" + }, + "save": { + "title": "Lagre", + "no_changes": "Ingen endringar å lagre." + }, + "success": { + "more": "Meir", + "events": "Hendingar" + }, + "confirm": { + "okay": "OK", + "cancel": "Avbryt" + }, + "QA": { + "keepRight": { + "detail_title": "Feil", + "detail_description": "Skildring", + "comment": "Kommentar", + "error_parts": { + "from": "frå", + "to": "til" + } + } + }, "intro": { "graph": { "block_number": "", @@ -833,6 +870,31 @@ } }, "community": { + "Bahia-telegram": { + "name": "OpenStreetMap Bahia Telegram Group", + "description": "Bli med i OpenStreetMap Bahia-samfunnet på Telegram" + }, + "Galicia-Twitter": { + "description": "Følg oss på Twitter på {url}" + }, + "GeoPhilly": { + "name": "GeoPhilly" + }, + "Maptime-Oceania-Slack": { + "description": "Registrer deg på {signupUrl}" + }, + "MaptimeHRVA-twitter": { + "description": "Følg oss på Twitter at {url}" + }, + "OSM-AR-facebook": { + "extendedDescription": "Nyheiter frå det lokale fellesskapet" + }, + "OSM-AR-twitter": { + "description": "Følg oss på Twitter på {url}" + }, + "OSM-CL-twitter": { + "description": "Følg oss på Twitter på {url}" + }, "cape-coast-youthmappers": { "description": "Følg oss på Twitter: {url}" }, diff --git a/dist/locales/pl.json b/dist/locales/pl.json index c49b9363e..cbb968f2a 100644 --- a/dist/locales/pl.json +++ b/dist/locales/pl.json @@ -1005,7 +1005,8 @@ "welcome": "Witaj w edytorze iD map OpenStreetMap", "text": "iD jest przyjaznym, ale i jednocześnie potężnym narzędziem, dzięki któremu możesz przyczynić się do rozwoju najlepszej wolnej mapy świata. To jest wersja {version}. Więcej informacji znajdziesz na {website}, a błędy zgłosisz na {github}.", "privacy_update": "Nasza polityka prywatności została niedawno zaktualizowana.", - "privacy": "{updateMessage} Korzystając z tego oprogramowania, zgadzasz się to robić zgodnie z polityką prywatności iD, którą można znaleźć {here}.", + "privacy_policy": "polityką prywatności iD", + "privacy": "{updateMessage} Korzystając z tego oprogramowania, zgadzasz się to robić zgodnie z {privacyLink}.", "walkthrough": "Rozpocznij samouczek", "start": "Edytuj" }, @@ -2761,6 +2762,10 @@ "baby_seat": { "label": "Dla niemowląt" }, + "backcountry": { + "label": "Dziki kemping bez udogodnień", + "terms": "dziki kemping bez udogodnień" + }, "backrest": { "label": "Oparcie" }, @@ -2829,6 +2834,9 @@ "booth": { "label": "Budka" }, + "bottle": { + "label": "Napełnianie butelek" + }, "boules": { "label": "Rodzaj" }, @@ -3352,6 +3360,9 @@ "generator/type": { "label": "Typ" }, + "geyser/height": { + "label": "Wysokość erupcji" + }, "gnis/feature_id": { "label": "GNIS", "terms": "GNIS" @@ -3362,6 +3373,10 @@ "grape_variety": { "label": "Odmiany winorośli" }, + "group_only": { + "label": "Tylko grupy", + "terms": "tylko grupy" + }, "guest_house": { "label": "Rodzaj" }, @@ -3451,6 +3466,9 @@ "undefined": "Nie" } }, + "hot_water": { + "label": "Ciepła woda" + }, "iata": { "label": "Kod lotniska – IATA" }, @@ -3844,6 +3862,10 @@ "yes": "Tak" } }, + "openfire": { + "label": "Rozpalanie ognia dozwolone?", + "terms": "rozpalanie ognia, ognisko, grill" + }, "opening_date": { "label": "Oczekiwana data otwarcia" }, @@ -4342,6 +4364,10 @@ "shop": { "label": "Rodzaj" }, + "shower": { + "label": "Prysznice", + "terms": "prysznice" + }, "siren/purpose": { "label": "Przeznaczenie" }, @@ -4544,6 +4570,10 @@ "to": { "label": "Do" }, + "toilets": { + "label": "Toalety", + "terms": "toalety" + }, "toilets/disposal": { "label": "Opróżnianie", "options": { @@ -5059,7 +5089,7 @@ }, "amenity/charging_station": { "name": "Stacja ładowania pojazdów", - "terms": "ładowanie samochodów" + "terms": "stacja ładowania pojazdów, stacja ładowania samochodów elektrycznych, ładowanie samochodów, samochody elektryczne, pojazdy elektryczne" }, "amenity/childcare": { "name": "Żłobek", @@ -5130,7 +5160,7 @@ }, "amenity/doctors": { "name": "Gabinet lekarski lub przychodnia", - "terms": "przychodnia, nzoz, lekarz, doktor, gabinet lekarski, centrum medyczne, poradnia, leczenie, medycyna, zdrowie, alergolog, dermatolog, ginekolog, internista, kardiolog, laryngolog, neurolog, okulista, ortopeda, pediatra, psychiatra" + "terms": "przychodnia, nzoz, lekarz, doktor, gabinet lekarski, centrum medyczne, klinika, poradnia, leczenie, medycyna, zdrowie, alergolog, chirurg, dermatolog, endokrynolog, geriatra, ginekolog, hematolog, internista, kardiochirurg, kardiolog, laryngolog, nefrolog, neonatolog, neurolog, okulista, onkolog, ortopeda, otorynolaryngolog, pediatra, psychiatra, reumatolog, seksuolog, urolog" }, "amenity/dojo": { "name": "Dojo/szkoła sztuk walki", @@ -5900,7 +5930,7 @@ "terms": "blok" }, "barrier/bollard": { - "name": "Słupek", + "name": "Słupek drogowy", "terms": "słupek, pachołek" }, "barrier/bollard_line": { @@ -6297,6 +6327,10 @@ "name": "Kominiarz", "terms": "kominiarz, zakład kominiarski, rzemiosło, rzemieślnik, rzemieślnicy" }, + "craft/cleaning": { + "name": "Usługi sprzątania", + "terms": "usługi sprzątania, usługi sprzątające, usługi porządkowe, firma sprzątająca, rzemiosło, rzemieślnik, rzemieślnicy" + }, "craft/clockmaker": { "name": "Zegarmistrz", "terms": "zegarmistrz, rzemiosło, rzemieślnik, rzemieślnicy" @@ -6384,6 +6418,10 @@ "name": "Hydraulik", "terms": "hydraulik, rzemiosło, rzemieślnik, rzemieślnicy" }, + "craft/pottery": { + "name": "Pracownia garncarska", + "terms": "garncarstwo, garncarz, garnki, rzemiosło, rzemieślnik, rzemieślnicy" + }, "craft/rigger": { "name": "Takielarz", "terms": "takielarz, takielunek, rzemiosło, rzemieślnik, rzemieślnicy" @@ -6537,6 +6575,10 @@ "name": "Wejście/wyjście", "terms": "Wejście, Wyjście" }, + "entrance/emergency": { + "name": "Wyjście ewakuacyjne", + "terms": "wyjście ewakuacyjne" + }, "ford": { "name": "Bród", "terms": "bród" @@ -6780,8 +6822,8 @@ "terms": "strefa zamieszkania" }, "highway/milestone": { - "name": "Słupek pikietażowy", - "terms": "słupek kilometrowy,pikietaż" + "name": "Słupek pikietażowy (drogowy)", + "terms": "słupek kilometrowy, kilometraż, kilometracja, pikietaż, droga" }, "highway/mini_roundabout": { "name": "Minirondo", @@ -7305,7 +7347,7 @@ }, "leisure/fitness_centre": { "name": "Siłownia / klub fitness", - "terms": "siłownia, fitness, centrum fitness, klub fitness" + "terms": "siłownia, fitness, centrum fitness, klub fitness, pilates" }, "leisure/fitness_centre/yoga": { "name": "Szkoła jogi", @@ -7852,15 +7894,15 @@ }, "marker": { "name": "Znacznik", - "terms": "znacznik, tabliczka, znak, oznakowanie" + "terms": "znacznik, tabliczka, znak, oznakowanie, słupek" }, "marker/utility": { "name": "Znacznik usługi komunalnej", - "terms": "znacznik usługi komunalnej, usługi komunalne, gospodarka komunalna, gaz, prąd, woda, odprowadzenie ścieków, wodociągi, tabliczka, oznaczenie" + "terms": "znacznik usługi komunalnej, usługi komunalne, gospodarka komunalna, gaz, prąd, woda, odprowadzenie ścieków, wodociągi, tabliczka, oznaczenie, słupek" }, "marker/utility/power": { "name": "Znacznik (elektryczność)", - "terms": "znacznik, elektryczność, tabliczka, oznaczenie" + "terms": "znacznik, elektryczność, tabliczka, oznaczenie, słupek" }, "military/bunker": { "name": "Bunkier wojskowy", @@ -7917,6 +7959,10 @@ "name": "Wzgórza", "terms": "pagórki" }, + "natural/geyser": { + "name": "Gejzer", + "terms": "gejzer, gorące źródło, gorące źródła, erupcja" + }, "natural/glacier": { "name": "Lodowiec", "terms": "lodowiec, lądolód, jęzor lodowcowy" @@ -8669,8 +8715,8 @@ "terms": "kolej miejska,wagon,tramwaj" }, "railway/milestone": { - "name": "Słupek kilometrowy", - "terms": "słupek kilometrowy, pikietaż" + "name": "Słupek kilometrowy (kolej)", + "terms": "słupek kilometrowy, kilometraż, kilometracja, pikietaż, kolej" }, "railway/miniature": { "name": "Minikolejka", @@ -8809,8 +8855,8 @@ "terms": "łazienki" }, "shop/beauty": { - "name": "Salon piękności", - "terms": "kosmetyczka, wizaż" + "name": "Salon urody", + "terms": "salon piękności, salon urody, salon kosmetyczny, gabinet kosmetyczny, zakład kosmetyczny, kosmetyka, kosmetyczka, makijażystka, wizażystka, depilacja, medycyna estetyczna, laseroterapia, spa" }, "shop/beauty/nails": { "name": "Manicure/pedicure", @@ -8855,6 +8901,10 @@ "name": "Sklep mięsny", "terms": "sklep mięsny, rzeźnik, mięso, wędliny" }, + "shop/camera": { + "name": "Sklep z kamerami i aparatami", + "terms": "sklep z kamerami i aparatami fotograficznymi, sprzęt fotograficzny, kamery, aparaty fotograficzne, obiektywy fotograficzne" + }, "shop/candles": { "name": "Sklep ze świecami", "terms": "świece" @@ -8869,7 +8919,7 @@ }, "shop/car_parts": { "name": "Sklep z częściami do samochodów", - "terms": "sklep z częściami samochodowymi" + "terms": "sklep z częściami samochodowymi, części samochodowe, samochody, akumulatory" }, "shop/car_repair": { "name": "Warsztat samochodowy", @@ -8963,6 +9013,10 @@ "name": "Market budowlany/sklep dla majsterkowiczów", "terms": "market budowlany, sklep dla majsterkowiczów, diy, obi, praktiker, leroy merlin" }, + "shop/doors": { + "name": "Sklep z drzwiami", + "terms": "sklep z drzwiami, drzwi" + }, "shop/dry_cleaning": { "name": "Pralnia chemiczna", "terms": "pralnia chemiczna" @@ -9013,6 +9067,10 @@ "shop/fishmonger": { "name": "Sklep rybny" }, + "shop/flooring": { + "name": "Sklep z posadzkami", + "terms": "sklep z posadzkami, posadzki" + }, "shop/florist": { "name": "Kwiaciarnia", "terms": "kwiaciarnia,kwiaty" @@ -9240,6 +9298,10 @@ "name": "Sklep fotograficzny", "terms": "fotografia" }, + "shop/pottery": { + "name": "Sklep garncarski", + "terms": "sklep garncarski, garncarstwo, porcelana, ceramika" + }, "shop/printer_ink": { "name": "Sklep z tuszami do drukarek", "terms": "sklep z tuszami do drukarek, tusze, tonery, drukarki" @@ -9336,6 +9398,10 @@ "name": "Sklep z tytoniem", "terms": "Sklep tytoniowy" }, + "shop/tool_hire": { + "name": "Wypożyczalnia narzędzi", + "terms": "wypożyczalnia narzędzi, wypożyczanie narzędzi, narzędzia" + }, "shop/toys": { "name": "Sklep z zabawkami", "terms": "zabawki, sklep zabawkarski" @@ -9458,6 +9524,14 @@ "name": "Kemping", "terms": "kemping, pole kempingowe, pole namiotowe" }, + "tourism/camp_site/backcountry": { + "name": "Dziki kemping", + "terms": "dziki kemping bez udogodnień, kemping z dala od drogi, nieformalny kemping" + }, + "tourism/camp_site/group_only": { + "name": "Kemping tylko dla grup", + "terms": "kemping dla grup, pole kempingowe dla grup" + }, "tourism/caravan_site": { "name": "Kemping dla kamperów", "terms": "kemping dla samochodów kempingowych" @@ -9504,7 +9578,7 @@ }, "tourism/information/route_marker": { "name": "Znacznik szlaku", - "terms": "znacznik szlaku, znacznik trasy, znacznik ścieżki" + "terms": "znacznik szlaku, znacznik trasy, znacznik ścieżki, słupek" }, "tourism/information/terminal": { "name": "Terminal informacyjny", @@ -9801,8 +9875,8 @@ "terms": "wrota, śluza wodna" }, "waterway/milestone": { - "name": "Słupek pikietażowy", - "terms": "słupek kilometrowy,pikietaż" + "name": "Słupek pikietażowy (dla rzeki)", + "terms": "słupek pikietażowy, słupek kilometrowy, kilometraż, kilometracja, pikietaż, ciek, rzeka, droga wodna" }, "waterway/river": { "name": "Rzeka", @@ -10094,6 +10168,13 @@ "description": "GSI Kiban 2500 przez finds.jp. Dobra do odrysowywania, ale trochę starsza.", "name": "Japońska GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Gmina Göteborg, CC0" + }, + "description": "Mapa miasta to mapa przeglądowa Göteborga. Zawiera ogólne informacje o gruntach, komunikacji, hydrografii, budynkach, adresach, nazwach ulic i podziale administracyjnym.", + "name": "Mapa Göteborga" + }, "gsi.go.jp": { "attribution": { "text": "GSI Japonia" diff --git a/dist/locales/pt-BR.json b/dist/locales/pt-BR.json index e6aec0e7e..e6dd508e1 100644 --- a/dist/locales/pt-BR.json +++ b/dist/locales/pt-BR.json @@ -1005,7 +1005,8 @@ "welcome": "Bem vindo ao editor iD do OpenStreetMap", "text": "O iD é uma ferramenta amigável, mas poderosa, que contribui para o melhor mapa mundial livre do mundo. Esta é a versão {version}. Para mais informações, consulte {website} e relatar erros no {github}.", "privacy_update": "Nossa política de privacidade foi atualizada recentemente.", - "privacy": "{updateMessage} Ao usar este software, você concorda em fazê-lo de acordo com a política de privacidade da iD, que pode ser encontrada {aqui}.", + "privacy_policy": "Política de privacidade do ID", + "privacy": "{updateMessage} Ao usar este software, você concorda em fazê-lo de acordo com a {privacyLink}.", "walkthrough": "Comece o tutorial", "start": "Editar agora" }, @@ -2829,6 +2830,9 @@ "booth": { "label": "Cabine" }, + "bottle": { + "label": "Enchimento de garrafas" + }, "boules": { "label": "Tipo" }, @@ -3351,6 +3355,9 @@ "generator/type": { "label": "Tipo" }, + "geyser/height": { + "label": "Altura da erupção" + }, "gnis/feature_id": { "label": "ID do Recurso GNIS" }, @@ -3360,6 +3367,9 @@ "grape_variety": { "label": "Variedades de Uva" }, + "group_only": { + "label": "Somente grupos" + }, "guest_house": { "label": "Tipo" }, @@ -3448,6 +3458,9 @@ "undefined": "Não" } }, + "hot_water": { + "label": "Água quente" + }, "iata": { "label": "Código do aeroporto IATA" }, @@ -3810,6 +3823,9 @@ "yes": "Sim" } }, + "openfire": { + "label": "Lareiras Permitidas" + }, "opening_date": { "label": "Data de abertura esperada" }, @@ -4287,6 +4303,9 @@ "shop": { "label": "Tipo" }, + "shower": { + "label": "Chuveiros" + }, "siren/purpose": { "label": "Propósito" }, @@ -4473,6 +4492,9 @@ "to": { "label": "Para" }, + "toilets": { + "label": "Banheiros" + }, "toilets/disposal": { "label": "Descarte", "options": { @@ -6201,6 +6223,10 @@ "name": "Limpador de Chaminé", "terms": "limpador de chaminés, limpeza de chaminés, chaminés" }, + "craft/cleaning": { + "name": "Serviço de limpeza", + "terms": "Serviço de limpeza" + }, "craft/clockmaker": { "name": "Relojoeiro", "terms": "Relógios, relojoaria, Conserto de relógios, Reparos de relógios" @@ -9987,6 +10013,13 @@ "description": "GSI Kiban 2500 via finds.jp. Bom para rastrear, mas um pouco mais velho.", "name": "Japão GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Município de Gotemburgo, CC0" + }, + "description": "O mapa da cidade é um mapa geral que descreve Gotemburgo. Ele contém informações gerais sobre terrenos, comunicações, hidrografia, edifícios, números de endereços e nomes de ruas, divisão administrativa e outro texto de orientação.", + "name": "Mapa da cidade de Gotemburgo " + }, "gsi.go.jp": { "attribution": { "text": "GSI Japão" diff --git a/dist/locales/pt.json b/dist/locales/pt.json index de6c5053a..a2d755ac5 100644 --- a/dist/locales/pt.json +++ b/dist/locales/pt.json @@ -1005,7 +1005,8 @@ "welcome": "Bem-vind@ ao editor iD do OpenStreetMap", "text": "Com o editor iD, é fácil contribuir para o melhor mapa livre do mundo. Esta é a versão {version}. Para mais informações, consulta o site {website} e comunica problemas com o editor em {github}.", "privacy_update": "A nossa política de privacidade foi atualizada recentemente.", - "privacy": "{updateMessage} Ao utilizares este software, aceitas fazê-lo em acordo com a política de privacidade do iD, que pode ser consultada {here}.", + "privacy_policy": "Política de privacidade do iD", + "privacy": "{updateMessage} Ao utilizares este software, aceitas fazê-lo em acordo com a {privacyLink}.", "walkthrough": "Iniciar Tutorial", "start": "Editar agora" }, @@ -2020,10 +2021,10 @@ "title": "Ligar com vau" }, "continue_from_start": { - "title": "Continua a desenhar do início" + "title": "Continuar a desenhar do início" }, "continue_from_end": { - "title": "Continua a desenhar do fim" + "title": "Continuar a desenhar do fim" }, "delete_feature": { "title": "Eliminar este elemento" @@ -2655,7 +2656,7 @@ "hamlet": "Aldeia", "housename": "Nome da habitação", "housenumber": "123", - "housenumber!jp": "N.º edifício ou lote", + "housenumber!jp": "N.º do edifício ou lote", "neighbourhood": "Bairro", "neighbourhood!jp": "Chōme/Aza/Koaza", "place": "Localidade", @@ -2737,7 +2738,8 @@ "label": "Para animais" }, "architect": { - "label": "Arquiteto" + "label": "Arquiteto", + "terms": "arquitetura,arquitecto,arquitectura,desenhador" }, "area/highway": { "label": "Tipo" @@ -2757,11 +2759,16 @@ "baby_seat": { "label": "Cadeiras para bebés" }, + "backcountry": { + "label": "Campismo selvagem", + "terms": "acampamento,tendas,trekking,montanhismo" + }, "backrest": { "label": "Encosto" }, "bar": { - "label": "Bar" + "label": "Bar", + "terms": "estabelecimento,bebidas,música ao vivo,consumo,noturno,noite,nocturno" }, "barrier": { "label": "Tipo" @@ -2787,7 +2794,8 @@ "label": "Especialidade" }, "bench": { - "label": "Banco de sentar" + "label": "Banco de sentar", + "terms": "assento,lugar para sentar,descanso,banco de jardim" }, "bicycle_parking": { "label": "Tipo" @@ -2823,6 +2831,9 @@ "booth": { "label": "Cabina" }, + "bottle": { + "label": "Enchimento de garrafas" + }, "boules": { "label": "Tipo" }, @@ -2830,10 +2841,12 @@ "label": "Tipo" }, "brand": { - "label": "Marca" + "label": "Marca", + "terms": "marca,empresa" }, "brewery": { - "label": "Cerveja de pressão (imperial/fino)" + "label": "Cerveja de pressão", + "terms": "cerveja,chopp,chope,fino,imperial,pressão" }, "bridge": { "label": "Tipo", @@ -2843,18 +2856,22 @@ "label": "Tipo" }, "building": { - "label": "Edifício" + "label": "Edifício", + "terms": "estrutura,casa,prédio,moradia,residência,habitação,edificação,edificado,arranha-céus,arranha céus" }, "building/levels/underground": { "label": "Pisos subterrâneos", - "placeholder": "2, 4, 6..." + "placeholder": "2, 4, 6...", + "terms": "cave,subsolo,pisos inferiores,andares inferiores,andares" }, "building/levels_building": { "label": "Pisos do edifício", - "placeholder": "2, 4, 6..." + "placeholder": "2, 4, 6...", + "terms": "andares,pisos" }, "building/material": { - "label": "Material" + "label": "Material", + "terms": "material,matéria-prima" }, "building_area": { "label": "Edifício" @@ -2897,11 +2914,13 @@ }, "charge_fee": { "label": "Taxa", - "placeholder": "1 EUR, 5 USD, 10 JPY…" + "placeholder": "1 EUR, 5 USD, 10 JPY…", + "terms": "preço,custo,valor,taxa,tarifa,montante" }, "charge_toll": { "label": "Valor da portagem", - "placeholder": "1 EUR, 5 USD, 10 JPY…" + "placeholder": "1 EUR, 5 USD, 10 JPY…", + "terms": "pedágio,portagem,tarifa,taxa,custo,valor,montante" }, "check_date": { "label": "Última data de verificação" @@ -2916,14 +2935,19 @@ "label": "Horário de recolha" }, "colour": { - "label": "Cor" + "label": "Cor", + "terms": "cor,coloração" }, "comment": { "label": "Comentário ao conjunto de alterações", "placeholder": "Breve descrição das tuas alterações (obrigatório)" }, "communication_multi": { - "label": "Tipos de comunicações" + "label": "Tipos de comunicações", + "terms": "comunicações,comunicação" + }, + "connectivity": { + "label": "Ligação" }, "construction": { "label": "Tipo" @@ -2931,6 +2955,9 @@ "consulate": { "label": "Tipo" }, + "consulting": { + "label": "Especialidade" + }, "contact/webcam": { "label": "URL da câmara web", "placeholder": "http://exemplo.com/" @@ -2960,7 +2987,8 @@ "placeholder": "1, 2, 3..." }, "covered": { - "label": "Coberto" + "label": "Coberto", + "terms": "Cobertura,com cobertura,proteção" }, "craft": { "label": "Tipo" @@ -2986,7 +3014,8 @@ "label": "Tipos de culinária" }, "currency_multi": { - "label": "Tipos de moeda" + "label": "Tipos de moeda", + "terms": "moedas,euros,dólares,libras,reais,ienes,bitcoins" }, "cutting": { "label": "Tipo", @@ -3028,6 +3057,7 @@ } }, "placeholder": "nenhum", + "terms": "bicicleta,ciclovias", "types": { "cycleway:left": "Lado esquerdo", "cycleway:right": "Lado direito" @@ -3310,12 +3340,23 @@ "generator/type": { "label": "Tipo" }, + "geyser/height": { + "label": "Altura da erupção" + }, + "gnis/feature_id": { + "label": "ID de Elemento GNIS", + "terms": "USGS,Geographic Names Information System,Federal Geographic Names Information Service,United States Board on Geographic Names" + }, "government": { "label": "Tipo" }, "grape_variety": { "label": "Castas de uvas" }, + "group_only": { + "label": "Apenas para grupos", + "terms": "grupos,conjuntos,equipas" + }, "guest_house": { "label": "Tipo" }, @@ -3400,6 +3441,9 @@ "undefined": "Não" } }, + "hot_water": { + "label": "Água quente" + }, "iata": { "label": "Código aeroportuário IATA" }, @@ -3692,6 +3736,7 @@ "label": "Tipo de rede" }, "network_bicycle": { + "label": "Rede", "options": { "icn": "Internacional", "lcn": "Local", @@ -3701,6 +3746,7 @@ "placeholder": "Local, regional, nacional, internacional" }, "network_foot": { + "label": "Rede", "options": { "iwn": "Internacional", "lwn": "Local", @@ -3710,6 +3756,7 @@ "placeholder": "Local, regional, nacional, internacional" }, "network_horse": { + "label": "Rede", "options": { "ihn": "Internacional", "lhn": "Local", @@ -3753,6 +3800,10 @@ "yes": "Sim" } }, + "openfire": { + "label": "Permitido fazer fogueira", + "terms": "fogo,fogueira,labaredas,churrasco,brasas,chamas,fósforos,acendalhas" + }, "opening_date": { "label": "Data de abertura esperada" }, @@ -4232,6 +4283,10 @@ "shop": { "label": "Tipo" }, + "shower": { + "label": "Chuveiros", + "terms": "banhos,água,chuveiro,duche" + }, "siren/purpose": { "label": "Propósito" }, @@ -4422,6 +4477,10 @@ "to": { "label": "Para" }, + "toilets": { + "label": "Casas de banho", + "terms": "WC,lavabos,retretes,banheiros,latrina" + }, "toilets/disposal": { "label": "Método de eliminação de dejetos", "options": { @@ -4548,6 +4607,9 @@ "utility": { "label": "Utilitário" }, + "utility_semi": { + "label": "Serviço" + }, "valve": { "label": "Tipo" }, @@ -4894,10 +4956,18 @@ "name": "Café", "terms": "chá, café, cafetaria, cafeteria" }, + "amenity/car_pooling": { + "name": "Posto de boleia partilhada", + "terms": "boleia,carona,viagem partilhada,carpool,car pool,carpooling" + }, "amenity/car_rental": { "name": "Aluguer de automóveis", "terms": "Aluguer de Automóveis, Área de Aluguer de Automóveis, Zona de Aluguer de Automoveis,rent a car,rent-a-car" }, + "amenity/car_sharing": { + "name": "Posto de partilha de automóvel", + "terms": "Car sharing,partilha,carro,veículos,automóvel,partilhado" + }, "amenity/car_wash": { "name": "Lavagem de veículos", "terms": "lavagem, lavagem automática, mangueira, limpeza, lavar" @@ -5315,6 +5385,10 @@ "amenity/register_office": { "name": "Conservatória do registo civil" }, + "amenity/research_institute": { + "name": "Instituto de pesquisa", + "terms": "Instituição,investigação,desenvolvimento,pesquisar" + }, "amenity/restaurant": { "name": "Restaurante", "terms": "cantina, almoço, jantar, cozinha, culinária, gastronomia, restauração,café,pequeno-almoço,comer,comida,refeição,refeições,menu,cardápio,ementa,almoçar" @@ -6209,6 +6283,10 @@ "name": "Canalizador", "terms": "Plumber, Picheleiro, Pichelaria, Canalização,canos" }, + "craft/pottery": { + "name": "Olaria", + "terms": "oleiro,barro,cerâmica,potes" + }, "craft/rigger": { "name": "Armador", "terms": "construtor de barcos, construtor de navios,velas,aparelhador,cordame,mastros,cordoalha,cordoagem" @@ -7718,6 +7796,10 @@ "name": "Encosta desflorestada", "terms": "Colina,montanha,prado de altitude,área,zona,montanhosos,montanhosas,fell" }, + "natural/geyser": { + "name": "Géiser", + "terms": "géiser,gêiser,geiser,erupção,água termal,hidrotermal,vapor,jato,jacto,água,jorro,jorrar,geyser,água quente" + }, "natural/glacier": { "name": "Glaciar", "terms": "gelo,neve,geleira,glacial" @@ -7802,6 +7884,10 @@ "name": "Bacia artificial", "terms": "bacia artificial, bacia, bacia de infiltração, bacia de detenção, bacia de retardamento, bacia de retenção, bacia de drenagem, reservatório, lagoa artificial, lago artificial, lago feito pelo homem, reservatório artificial" }, + "natural/water/canal": { + "name": "Área de canal", + "terms": "canalete,vala,levada,água,irrigação,irrigagem" + }, "natural/water/lake": { "name": "Lago", "terms": "Jardim de Água, Jardim d'Água, Lagoa, Lagoinha, Pateira,bacia,água" @@ -7818,6 +7904,14 @@ "name": "Reservatório de água", "terms": "Reservatório, artificial,água,acumulação,depósito" }, + "natural/water/river": { + "name": "Área de rio", + "terms": "água,rio,corrente,fluxo,área alagada,margem de rio,estuário,curso de água,ria,afluente,foz,barra,river,delta" + }, + "natural/water/stream": { + "name": "Área de ribeiro", + "terms": "água,ribeiro,corrente,fluxo,área alagada,riacho,arroio,regato,grota,riachinho" + }, "natural/water/wastewater": { "name": "Águas residuais em ETAR", "terms": "wastewater basin, bacia de decantação em ETAR, bacia de decantação, ETAR,esgotos,dejetos" @@ -7873,6 +7967,10 @@ "name": "Empresa", "terms": "escritório, empresa,funcionários,indústria,finanças" }, + "office/consulting": { + "name": "Empresa de consultadoria", + "terms": "consulting,consultor,firma,aconselhamento,peritagem" + }, "office/coworking": { "name": "Coworking", "terms": "Escritórios Partilhados, Trabalho Cooperativo, Coworking, Co-working, Espaço de Trabalho Compartilhado" @@ -8632,6 +8730,10 @@ "name": "Talho", "terms": "Butcher,carne,talhante,açougue,porco,vaca,galinha,borrego,ovelha,vitela,enchidos" }, + "shop/camera": { + "name": "Loja de equipamento fotográfico", + "terms": "câmara,lentes,fotografia,fotográfica,filme,revelação,fotos,foto" + }, "shop/candles": { "name": "Loja de velas", "terms": "Candle Shop,velas,vela,pavios,cera" @@ -8790,6 +8892,10 @@ "shop/fishmonger": { "name": "Peixaria" }, + "shop/flooring": { + "name": "Loja de material de pavimentação", + "terms": "revestimento,pavimento,ladrilho,soalho,piso,soalhar,madeira,ripas,verniz" + }, "shop/florist": { "name": "Florista", "terms": "florista,flor,flores,rosas,buquê,bouquet,ramalhete" @@ -9017,6 +9123,10 @@ "name": "Loja de fotografia", "terms": "photography,fotógrafo,máquina fotográfica,material fotográfico,câmara,vídeo,fotografias,vhs,acessórios,revelação" }, + "shop/pottery": { + "name": "Loja de cerâmica", + "terms": "vasos,potes,porcelana,cerâmica,louça" + }, "shop/printer_ink": { "name": "Loja de tinteiros de impressora", "terms": "printer,loja de tinteiros,tinteiro,tinteiro para impressora,impressão,impressora,toner,cartuchos,fotocopiadora,fax" @@ -9097,6 +9207,10 @@ "name": "Loja de chás", "terms": "Tea Store,chá,ervas,medicinal,medicinais" }, + "shop/telecommunication": { + "name": "Loja de telecomunicações", + "terms": "comunicações,internet,ISP,telefones,celulares" + }, "shop/ticket": { "name": "Bilheteira", "terms": "Ticket,Bilheteria,Bilhete,Ingresso" @@ -9109,6 +9223,10 @@ "name": "Tabacaria", "terms": "Tobacco,Loja de Tabaco, Cachimbo, Cigarrilha, Tabaco,cigarros,charutos,tabaco de enrolar" }, + "shop/tool_hire": { + "name": "Aluguer de ferramentas", + "terms": "tools,construção,jardinagem,ferramentas,alugar,utensílios" + }, "shop/toys": { "name": "Loja de brinquedos", "terms": "brinquedos,toys,brincar,jogos" @@ -9231,6 +9349,14 @@ "name": "Parque de campismo", "terms": "acampamento, parque, campismo, campistas, acampar,tendas,caravanas,autocaravanas" }, + "tourism/camp_site/backcountry": { + "name": "Área de campismo selvagem", + "terms": "campismo,tendas,acampamento,montanhismo,alpinismo,trekking,informal" + }, + "tourism/camp_site/group_only": { + "name": "Área de campismo para grupos", + "terms": "campismo,tendas,acampamento,escuteiros,escoteiros,escutismo,escotismo" + }, "tourism/caravan_site": { "name": "Parque de caravanas", "terms": "RV Park,caravanas,caravana,autocaravanas,auto-caravanas,ruloutes,roulotes" @@ -9399,6 +9525,10 @@ "name": "Fronteira administrativa", "terms": "Fronteira legal, limite país, fronteira, concelho, freguesia, distrito, limite administrativo, fronteira administrativa," }, + "type/connectivity": { + "name": "Ligação de vias", + "terms": "conectividade,faixas,rodovias,estradas,ligações" + }, "type/enforcement": { "name": "Controlo", "terms": "radar, velocidade, câmara, câmera" @@ -9557,6 +9687,10 @@ "name": "Vala de drenagem", "terms": "Drain,drenagem,escoamento,descargas industriais,águas pluviais,pluviais,pluvial,chuvas" }, + "waterway/fish_pass": { + "name": "Escada para peixes", + "terms": "escadaria,escada,peixes,piscícola,canal,enguias,salmão,açude,represa,barragem,rio,transposição,desovar" + }, "waterway/fuel": { "name": "Posto de combustível marítimo", "terms": "combustível para barcos, combustível marítimo, bomba de gasolina barcos, gasóleo embarcações, combustível embarcações, gasolineira barco," @@ -9859,6 +9993,13 @@ "description": "GSI Kiban 2500 via finds.jp. Bom para rastrear, mas um pouco mais velho.", "name": "Japão GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Município de Gotemburgo, CC0" + }, + "description": "O mapa da cidade é um mapa síntese que descreve Gotemburgo. Contém informação geral sobre o solo, as comunicações, a hidrografia, os edifícios, os números de polícia e os nomes das ruas, a divisão administrativa e outros textos de orientação.", + "name": "Mapa da Cidade de Gotemburgo" + }, "gsi.go.jp": { "attribution": { "text": "GSI Japão" diff --git a/dist/locales/sl.json b/dist/locales/sl.json index 1db8f889b..c8bcd00cb 100644 --- a/dist/locales/sl.json +++ b/dist/locales/sl.json @@ -3080,7 +3080,7 @@ }, "craft/winery": { "name": "Kletarstvo", - "terms": "vinarstvo,vinarna,klet,vinska klet,kletarstvo" + "terms": "vinarstvo,vinarna,klet,vinska klet,kletarstvo,vinoteka" }, "embankment": { "name": "Nasip" @@ -4440,7 +4440,7 @@ "name": "Trgovina z okenskimi senčili" }, "shop/wine": { - "name": "Kletarstvo", + "name": "Vinoteka", "terms": "kletarstvo,vinska klet,vinotoč" }, "tourism/alpine_hut": { diff --git a/dist/locales/sv.json b/dist/locales/sv.json index 4056a4ecb..9d3cae5c4 100644 --- a/dist/locales/sv.json +++ b/dist/locales/sv.json @@ -1005,7 +1005,8 @@ "welcome": "Välkommen till iD OpenStreetMap-redigerare", "text": "iD är ett användarvänligt och kraftfullt verktyg för att bidra till världens bästa fria karta. Detta är version {version}. För mer information, besök {website} eller rapportera fel på {github}.", "privacy_update": "Vår integritetspolicy har nyligen uppdaterats.", - "privacy": "{updateMessage} Genom att använda den här programvaran accepterar du att göra det i enlighet med iDs sekretesspolicy, som kan hittas {här}.", + "privacy_policy": "iDs sekretesspolicy", + "privacy": "{updateMessage} Genom att använda den här programvaran accepterar du att göra det i enlighet {privacyLink}.", "walkthrough": "Starta genomgången", "start": "Redigera nu" }, @@ -9572,6 +9573,13 @@ "description": "GSI Kiban 2500 via finds.jp. Bra för kartläggning, men lite gammal.", "name": "Japan GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Göteborgs Stad, CC0" + }, + "description": "Stadskartan är en översiktlig karta som beskriver Göteborg. Den innehåller generell information om mark, kommunikation, hydrografi, byggnader, adressnummer och gatunamn, administrativ indelning och övrig orienterande text.", + "name": "Göteborg Stadskarta" + }, "gsi.go.jp": { "attribution": { "text": "GSI Japan" diff --git a/dist/locales/tr.json b/dist/locales/tr.json index f0be97c62..8180d0e14 100644 --- a/dist/locales/tr.json +++ b/dist/locales/tr.json @@ -8,6 +8,11 @@ "zoom_to": "yakınlaştır", "copy": "kopyala" }, + "toolbar": { + "inspect": "Denetle", + "undo_redo": "Geri Al / İleri Al", + "add_feature": "Nesne ekle" + }, "modes": { "add_area": { "title": "Alan", @@ -26,6 +31,7 @@ }, "add_note": { "title": "Not", + "label": "Not Ekle", "description": "Bir sorun tespit ettin mi? Diğer haritacıların bilmesini sağla.", "tail": "Not bırakmak için haritaya tıklayın." }, @@ -91,17 +97,42 @@ }, "not_closed": "Bu daireleştirilemez çünkü kapalı bir nesne değil.", "too_large": "Bu daireleştirilemez, çünkü yeteri kadarı görünür halde değil.", - "connected_to_hidden": "Bu nesne daireleştirilemez, çünkü gizli bir nesneye bağlı." + "connected_to_hidden": "Bu nesne daireleştirilemez, çünkü gizli bir nesneye bağlı.", + "not_downloaded": "Bazı bölümleri henüz indirilmediğinden bu dairesel hale getirilemez.", + "already_circular": "Bu dairesel yapılamaz çünkü zaten daireseldir." }, "orthogonalize": { "title": "Kareleştir", + "description": { + "feature": { + "single": "Bu nesnenin köşelerini kare yapın.", + "multiple": "Bu nesnenin köşelerini kare yapın." + } + }, "key": "Q", "square_enough": { "single": "Bu zaten olduğundan daha fazla kare yapılamaz." + }, + "not_squarish": { + "single": "Bu kare olamaz çünkü karesel değildir." + }, + "too_large": { + "single": "Bu kare yapılamaz çünkü şu anda yeterince görünmemektedir." + }, + "connected_to_hidden": { + "single": "Kare yapılamaz çünkü gizli bir özelliğe bağlıdır.", + "multiple": "Bazıları gizli özelliklere bağlı olduğu için bunlar kare yapılamaz." + }, + "not_downloaded": { + "single": "Bazı bölümleri henüz indirilmediğinden bu kare yapılamaz." } }, "straighten": { "title": "Düzleştir", + "description": { + "points": "Bu noktaları düzleştirin.", + "line": "Bu çizgiyi düzleştirin." + }, "key": "S", "too_bendy": "Bu düzleştirilemez, çünkü çok kıvrımlı. " }, @@ -153,6 +184,9 @@ "disconnect": { "title": "Birbirinden ayır", "description": "Bu çizgileri/alanları birbirinden ayır.", + "area": { + "description": "Bu alanın diğer nesnelerle olan bağlantısını kesin." + }, "key": "D", "annotation": "Çizgiler/alanlar birbirinden ayrıldı.", "not_connected": "Burada bağlantıyı kesmek için yeteri kadar çizgi/alan yok.", @@ -265,6 +299,9 @@ }, "reverse": { "title": "Ters çevir", + "description": { + "line": "Bu çizgiyi ters yöne çevirin." + }, "key": "V" }, "split": { @@ -305,7 +342,7 @@ "restriction": { "controls": { "distance": "Uzaklık", - "distance_up_to": "{Distance}'e kadar", + "distance_up_to": "{distance}'e kadar", "via": "Üzerinden", "via_node_only": "Sadece nokta" }, @@ -351,6 +388,9 @@ "loading_auth": "OpenStreetMap'e bağlanıyor...", "report_a_bug": "Hata bildir", "help_translate": "Çeviriye yardım et", + "sidebar": { + "tooltip": "Kenar çubuğunu aç/kapat." + }, "feature_info": { "hidden_warning": "{count} gizli nesne", "hidden_details": "Bu nesneler gizlenmiş durumda: {details}" @@ -364,10 +404,12 @@ "cancel": "İptal", "changes": "{count} Değişiklik", "download_changes": "osmChange dosyasını indirin", + "errors": "Hatalar", "warnings": "Uyarılar", "modified": "Değiştirildi", "deleted": "Silindi", "created": "Oluşturuldu", + "outstanding_errors_message": "Lütfen önce tüm hataları giderin. {count} tane kaldı.", "comment_needed_message": "Lütfen önce bir değişiklik açıklaması ekleyin.", "about_changeset_comments": "Değişiklikler hakkındaki yorumlar", "about_changeset_comments_link": "Yapılan değişikliklere eklenen yorumlara dair detaylı bilgiyi şu adreste bulabilirsin - İngilizce: //wiki.openstreetmap.org/wiki/Good_changeset_comments", @@ -389,7 +431,7 @@ "description": "Açıklama", "resolution": "Çözüm", "accuracy": "Doğruluk", - "unknown": "Bilinmeyen", + "unknown": "Bilinmiyor", "show_tiles": "Kılavuz Çizgilerini Göster", "hide_tiles": "Kılavuz Çizgilerini Gizle", "show_vintage": "Görüntü Yılını Göster", @@ -403,7 +445,7 @@ "last_edit": "Son Düzenleme", "edited_by": "Düzenleyen", "changeset": "Değişiklik Kümesi", - "unknown": "Bilinmeyen", + "unknown": "Bilinmiyor", "link_text": "openstreetmap.org üzerindeki geçmiş", "note_created_date": "Oluşturma Tarihi", "note_created_user": "Oluşturan" @@ -449,7 +491,7 @@ }, "inspector": { "zoom_to": { - "title": "Bunu yakınlaştır", + "title": "Buna yakınlaştır", "tooltip_feature": "Bu özelliğe odaklanmak için haritayı ortala ve yaklaştır.", "tooltip_note": "Bu nota odaklanmak için haritayı ortala ve yaklaştır.", "tooltip_data": "Bu veriye odaklanmak için haritayı ortala ve yaklaştır.", @@ -468,6 +510,12 @@ "choose": "Nesne türünü seç", "results": "{search} için {n} adet sonuç ", "no_documentation_key": "Geçerli bir belge yok.", + "wiki_reference": "Dokümanları Görüntüle", + "wiki_en_reference": "İngilizce dokümanları görüntüle", + "hidden_preset": { + "manual": "{features} gizlendi. Harita Verileri bölmesinde bunları etkinleştirin.", + "zoom": "{features} gizlendi. Etkinleştirmek için yakınlaştırın." + }, "back_tooltip": "Türü değiştir", "remove": "Kaldır", "search": "Ara", @@ -518,6 +566,9 @@ "tooltip": "Şu an ekrandaki bölgeden uzaklaşarak üzerinde çalıştığın alanı haritada bul.", "key": "/" }, + "panel": { + "description": "Ayrıntı Panelini Göster" + }, "fix_misalignment": "Uydu görüntüsünü ayarla", "offset": "Uydu görüntüsünü ayarlamak için gri kısımda herhangi bir yere taşı ya da göreceli konum değerlerini metre cinsinden gir." }, @@ -534,12 +585,46 @@ "notes": { "tooltip": "OpenStreetMap'ın Not Verileri", "title": "OpenStreetMap'ın Notları" + }, + "keepRight": { + "tooltip": "Keepright.at adresinden otomatik olarak algılanan harita sorunları", + "title": "KeepRight Sorunları" + }, + "improveOSM": { + "tooltip": "Improeosm.org tarafından otomatik olarak eksik veriler tespit edildi", + "title": "ImproveOSM Sorunları" + }, + "custom": { + "tooltip": "Bir veri dosyasını sayfaya sürükleyip bırakın veya ayarlamak için düğmeye tıklayın", + "title": "Özel Harita Verisi" } }, + "style_options": "Stil Ayarları", "map_features": "Nesneler", "autohidden": "Bu nesnelerin tamamını ekranda göstermek zor olacağı için nesneler otomatik olarak gizlendi. Düzenlemek için haritanın belli bir bölgesine yakınlaşabilirsin.", "osmhidden": "Bu nesneler OpenStreetMap katmanı gizli olduğu için otomatik olarak gizlenmiştir" }, + "visual_diff": { + "highlight_edits": { + "description": "Değişiklikleri Vurgula" + } + }, + "photo_overlays": { + "title": "Fotoğraf Bindirmeleri", + "traffic_signs": { + "title": "Trafik Tablelaları" + }, + "photo_type": { + "flat": { + "title": "Düz Fotoğraflar", + "tooltip": "Geleneksel fotoğraflar" + }, + "panoramic": { + "title": "Panoramik Fotoğraflar", + "tooltip": "360° fotoğraflar" + } + } + }, "feature": { "points": { "description": "Noktalar", @@ -606,6 +691,19 @@ "settings": { "custom_background": { "tooltip": "Özel arka planı düzenle" + }, + "custom_data": { + "header": "Özel Harita Verisi Ayarları" + } + }, + "preferences": { + "title": "Tercihler", + "description": "Tercihler", + "privacy": { + "privacy_link": "ID gizlilik politikasını görüntüleyin", + "third_party_icons": { + "description": "Üçüncü Taraf Simgelerini Göster" + } } }, "restore": { @@ -647,6 +745,10 @@ } }, "success": { + "just_edited": "OpenStreetMap'i düzenlediniz!", + "thank_you": "Haritayı geliştirdiğiniz için teşekkür ederiz.", + "thank_you_location": "{where} çevresindeki haritayı geliştirdiğiniz için teşekkür ederiz.", + "help_html": "Değişikliklerinizin birkaç dakika içinde OpenStreetMap'te görünmesi gerekir. Başka yerlerdeki haritaların güncelleme alması daha uzun sürebilir.", "help_link_text": "Detaylar", "help_link_url": "Yaptığın değişiklikleri nasıl görebileceğine dair detaylı bilgiyi şu adreste bulabilirsin - İngilizce: https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F", "view_on_osm": "Değişiklikleri OSM üzerinde gör", @@ -681,10 +783,37 @@ }, "cannot_zoom": "Bu modda daha fazla uzaklaşılamaz.", "full_screen": "Tam Ekran", + "QA": { + "keepRight": { + "comment_placeholder": "Diğer kullanıcılarla paylaşmak için bir yorum girin.", + "error_parts": { + "restaurant": "restoran" + }, + "errorTypes": { + "71": { + "description": "{var1} etiket içermiyor." + }, + "75": { + "description": "{var1}'in adı \"{var2}\" ancak başka etiketi yok." + } + } + } + }, + "streetside": { + "title": "Bing Streetside" + }, "mapillary_images": { "tooltip": "Mapilary'den sokak fotoğrafları" }, + "mapillary_map_features": { + "tooltip": "Mapillary'den harita nesneleri", + "request_data": "Veri İste" + }, "mapillary": { + "title": "Mapillary", + "signs": { + "tooltip": "Mapillary'den trafik işaretleri" + }, "view_on_mapillary": "Bu resmi Mapillary'de görüntüle" }, "openstreetcam_images": { @@ -699,7 +828,11 @@ "anonymous": "kimliği belirsiz", "closed": "(Kapalı)", "commentTitle": "Yorumlar", + "status": { + "commented": "{when} tarihinde yorum yaptı" + }, "newComment": "Yeni Yorum", + "inputPlaceholder": "Diğer kullanıcılarla paylaşmak için bir yorum girin.", "close": "Notu Kapat", "open": "Notu Tekrar Aç", "comment": "Yorum", @@ -709,7 +842,8 @@ "newDescription": "Sorunu açıklayın.", "save": "Notu Kaydet", "login": "Bu notu değiştirmek veya yorum yapmak için oturum açmanız gerekir.", - "upload_explanation": "Yorumlarınız genel olarak tüm OpenStreetMap kullanıcılarına görünür olacaktır." + "upload_explanation": "Yorumlarınız genel olarak tüm OpenStreetMap kullanıcılarına görünür olacaktır.", + "upload_explanation_with_user": "{user} olarak yorumlarınız tüm OpenStreetMap kullanıcıları tarafından görülebilir." }, "help": { "title": "Yardım", @@ -822,6 +956,9 @@ "issues": { "title": "Sorunlar", "list_title": "Sorunlar ({count})", + "errors": { + "list_title": "Hatalar ({count})" + }, "warnings": { "list_title": "Uyarılar ({count})" }, @@ -835,6 +972,8 @@ "edits_in_view": "Görünümdeki düzenlemeleriniz iyi görünüyor" }, "hidden_issues": { + "everything_else": "Diğer her şeyle ilgili sorunlar: {count}", + "everything_else_elsewhere": "Başka her şeyle ilgili başka sorunlar: {count}", "ignored_issues": "Görmezden gelinen sorunlar: {count}" } }, @@ -855,14 +994,44 @@ "almost_junction": { "title": "Neredeyse Kavşaklar" }, + "crossing_ways": { + "message": "{feature}, {feature2} ile çakışıyor", + "building-highway": { + "reference": "Binalarla yolların kesiştiği yerler; köprüler, tüneller veya farklı katmanlarla ayrılmalıdır." + }, + "highway-highway": { + "reference": "Yol kesişimlerinde köprüler, tüneller veya kavşaklar kullanılmalıdır." + } + }, "disconnected_way": { + "routable": { + "reference": "Tüm yollar, patikalar ve feribot güzergahları tek bir rota ağı oluşturmak için bağlanmalıdır." + }, "highway": { "message": "{highway}, diğer yollarla veya patikalarla bağlantıya sahip değil" } }, + "fixme_tag": { + "message": "{feature} \"Beni Düzelt\" isteğine sahip" + }, + "generic_name": { + "message": "{feature} şüpheli isme sahip \"{name}\"", + "message_language": "{feature}, {language} dilinde şüpheli isme sahip \"{name}\"" + }, + "missing_tag": { + "any": { + "message": "{feature} etiket içermiyor." + }, + "descriptive": { + "message": "{özellik} hiçbir açıklayıcı etikete sahip değil" + } + }, "outdated_tags": { "title": "Eski Etiket", - "message": "{feature} eski etiketlere sahip" + "message": "{feature} eski etiketlere sahip", + "noncanonical_brand": { + "message_incomplete": "{feature} eksik etiketlere sahip bir markaya benziyor" + } }, "impossible_oneway": { "highway": { @@ -872,6 +1041,20 @@ } }, "fix": { + "add_a_bridge": { + "title": "Bir köprü ekle", + "annotation": "Bir köprü eklendi." + }, + "add_a_tunnel": { + "title": "Bir tünel ekle", + "annotation": "Bir tünel eklendi." + }, + "address_the_concern": { + "title": "Endişeyi ele alın" + }, + "connect_features": { + "title": "Nesneleri bağla" + }, "continue_from_start": { "title": "Başlangıçtan çizmeye devam et" }, @@ -884,12 +1067,27 @@ "ignore_issue": { "title": "Bu sorunu yok say" }, + "remove_the_name": { + "title": "İsmi kaldır" + }, + "reposition_features": { + "title": "Nesneyi yeniden konumlandır" + }, + "select_preset": { + "title": "Nesne türünü seç" + }, "set_as_inner": { "title": "İç olarak ayarla" }, "set_as_outer": { "title": "Dış olarak ayarla" }, + "tag_this_as_higher": { + "title": "Bunu daha yüksek olarak etiketle" + }, + "tag_this_as_lower": { + "title": "Bunu daha düşük olarak etiketle" + }, "upgrade_tags": { "title": "Etiketleri güncelle" } @@ -1129,6 +1327,7 @@ "display_options": { "title": "Görüntü ayarları", "background_switch": "Önceki arka plana geç", + "preferences": "Kullanıcı tercihleri bölmesini aç/kapat", "fullscreen": "Tam ekran moduna gir", "wireframe": "Tel örgü moduna geçiniz", "minimap": "Küçük haritayı aç/kapa" @@ -1622,10 +1821,16 @@ "description": { "label": "Açıklama" }, + "destination_oneway": { + "label": "Hedefler" + }, "devices": { "label": "Aygıtlar", "placeholder": "1, 2, 3..." }, + "diameter": { + "label": "Çap" + }, "direction": { "label": "Yön (Saat Yönünde Derece)", "placeholder": "45, 90, 180, 270" @@ -1749,6 +1954,12 @@ "frequency": { "label": "Çalışma Sıklığı" }, + "frequency_electrified": { + "label": "Çalışma Sıklığı" + }, + "from": { + "label": "Nereden" + }, "fuel": { "label": "Benzin İstasyonu" }, @@ -1875,6 +2086,9 @@ "internet_access/fee": { "label": "İnternet Erişim Ücreti" }, + "junction/ref_oneway": { + "label": "Kavşak Numarası" + }, "junction_line": { "label": "Kavşak" }, @@ -1971,6 +2185,9 @@ "map_type": { "label": "Tür" }, + "mapillary": { + "label": "Mapillary Görüntü Kimliği" + }, "maxheight": { "label": "En Fazla Yükseklik", "placeholder": "120cm, 140cm, 160 cm, 420cm, 440cm, 460cm" @@ -2038,6 +2255,9 @@ "network": { "label": "Ağ" }, + "network/type": { + "label": "Ağ Türü" + }, "network_bicycle": { "options": { "icn": "Uluslararası", @@ -2094,7 +2314,8 @@ } }, "opening_hours": { - "label": "Çalışma Saatleri" + "label": "Çalışma Saatleri", + "placeholder": "Bilinmiyor" }, "operator": { "label": "Kurum" @@ -2216,7 +2437,7 @@ "placeholder": "1-18" }, "ref_highway_junction": { - "label": "Kesişim Numarası" + "label": "Kavşak Numarası" }, "ref_platform": { "label": "Platform Numarası" @@ -2250,6 +2471,9 @@ "restrictions": { "label": "Dönüş Kısıtlamaları" }, + "roof/colour": { + "label": "Çatı Rengi" + }, "rooms": { "label": "Oda" }, @@ -2453,6 +2677,9 @@ }, "placeholder": "Evet, Hayır, Sadece Paket Servis..." }, + "to": { + "label": "Nereye" + }, "toilets/disposal": { "label": "İmha", "options": { @@ -2533,7 +2760,7 @@ "generator": "Üreteç", "phase_angle_regulator": "Faz Açısı Düzenleyici", "traction": "Çekme", - "yes": "Bilinmeyen" + "yes": "Bilinmiyor" } }, "trees": { @@ -2543,6 +2770,9 @@ "label": "Tür", "placeholder": "Varsayılan" }, + "usage_rail": { + "label": "Kullanım Tipi" + }, "visibility": { "label": "Görüş", "options": { @@ -2579,6 +2809,9 @@ "voltage/tertiary": { "label": "Üçüncül Gerilim" }, + "voltage_electrified": { + "label": "Gerilim" + }, "wall": { "label": "Tür" }, @@ -2761,6 +2994,9 @@ "name": "Bisiklet Tamircisi", "terms": "Bisiklet Tamircisi" }, + "amenity/biergarten": { + "name": "Bira bahçesi" + }, "amenity/boat_rental": { "name": "Bot Kiralama", "terms": "Bot Kiralama" @@ -2925,6 +3161,9 @@ "name": "Çarşı", "terms": "Çarşı, Pazar Yeri" }, + "amenity/money_transfer": { + "name": "Para Transfer İstasyonu" + }, "amenity/motorcycle_parking": { "name": "Motosiklet Parkı", "terms": "Motosiklet Parkı, Motosiklet Park Yeri" @@ -3025,6 +3264,9 @@ "name": "Korucu İstasyonu", "terms": "Korucu İstasyonu, Korucu Evi" }, + "amenity/recycling": { + "name": "Geri Dönüşüm" + }, "amenity/recycling_centre": { "name": "Geri Dönüşüm Merkezi", "terms": "Geri Dönüşüm Merkezi" @@ -3036,6 +3278,57 @@ "name": "Lokanta", "terms": "Lokanta, Restoran" }, + "amenity/restaurant/american": { + "name": "Amerikan Restoranı" + }, + "amenity/restaurant/asian": { + "name": "Asya Restoranı" + }, + "amenity/restaurant/chinese": { + "name": "Çin Restoranı" + }, + "amenity/restaurant/french": { + "name": "Fransız Restoranı" + }, + "amenity/restaurant/german": { + "name": "Alman Restoranı" + }, + "amenity/restaurant/greek": { + "name": "Yunan Restoranı" + }, + "amenity/restaurant/indian": { + "name": "Hint Restoranı" + }, + "amenity/restaurant/italian": { + "name": "İtalyan Restoranı" + }, + "amenity/restaurant/japanese": { + "name": "Japon Restoranı" + }, + "amenity/restaurant/mexican": { + "name": "Meksika Restoranı" + }, + "amenity/restaurant/noodle": { + "name": "Erişte Restoranı" + }, + "amenity/restaurant/pizza": { + "name": "Pizza Restoranı" + }, + "amenity/restaurant/seafood": { + "name": "Deniz Yiyecekleri Restoranı" + }, + "amenity/restaurant/sushi": { + "name": "Sushi Restoranı" + }, + "amenity/restaurant/thai": { + "name": "Tayland Restoranı" + }, + "amenity/restaurant/turkish": { + "name": "Türk Restoranı" + }, + "amenity/restaurant/vietnamese": { + "name": "Vietnam Restoranı" + }, "amenity/sanitary_dump_station": { "name": "Tuvalet Atık Yeri", "terms": "Tuvalet Atık Yeri" @@ -3181,6 +3474,9 @@ "attraction/amusement_ride": { "name": "Eğlence Yolculuğu" }, + "attraction/animal": { + "name": "Hayvan Muhafazası" + }, "attraction/big_wheel": { "name": "Dönme Dolap", "terms": "Dönme Dolap" @@ -3288,7 +3584,7 @@ "terms": "Yapı" }, "building/apartments": { - "name": "Residans" + "name": "Apartman binası" }, "building/barn": { "name": "Samanlık", @@ -3455,6 +3751,9 @@ "name": "Depo", "terms": "Ambar" }, + "building_part": { + "name": "Yapı bölümü" + }, "club": { "name": "Klüb", "terms": "Bar, Kulüp" @@ -3790,6 +4089,9 @@ "name": "Koridor", "terms": "Koridor, Geçit" }, + "highway/crossing": { + "name": "Geçit" + }, "highway/crossing/marked": { "name": "İşaretli Yaya Geçidi" }, @@ -3823,12 +4125,18 @@ "name": "Yürüyüş Yolu", "terms": "Yürüyüş Yolu, Yaya Yolu" }, + "highway/footway/crossing": { + "name": "Yaya Geçidi" + }, "highway/footway/marked": { "name": "İşaretli Yaya Geçidi" }, "highway/footway/marked-raised": { "name": "İşaretli Yaya Geçidi (Kasisli)" }, + "highway/footway/sidewalk": { + "name": "Kaldırım" + }, "highway/footway/unmarked": { "name": "İşaretsiz Yaya Geçidi" }, @@ -4006,6 +4314,15 @@ "name": "Kale", "terms": "Kale" }, + "historic/castle/fortress": { + "name": "Tarihi Kale" + }, + "historic/castle/palace": { + "name": "Saray" + }, + "historic/castle/stately": { + "name": "Şato" + }, "historic/memorial": { "name": "Anıt", "terms": "Anıt" @@ -4251,6 +4568,9 @@ "name": "Piknik Masası", "terms": "Piknik Masası" }, + "leisure/picnic_table/chess": { + "name": "Satranç Masası" + }, "leisure/pitch": { "name": "Spor Sahası", "terms": "Spor Sahası, Saha" @@ -4361,6 +4681,9 @@ "name": "Dalgakıran", "terms": "Dalgakıran" }, + "man_made/bridge": { + "name": "Köprü Alanı" + }, "man_made/chimney": { "name": "Baca", "terms": "Baca" @@ -4426,6 +4749,9 @@ "name": "Güvenlik Direği", "terms": "Güvenlik Direği" }, + "man_made/surveillance/camera": { + "name": "Güvenlik Kamerası" + }, "man_made/survey_point": { "name": "Ölçüm Kontrol Noktası", "terms": "Ölçüm Kontrol Noktası" @@ -4434,6 +4760,9 @@ "name": "Kule", "terms": "Kule" }, + "man_made/tower/defensive": { + "name": "Güçlendirilmiş kule" + }, "man_made/wastewater_plant": { "name": "Su Arıtma Tesisleri", "terms": "Su Arıtma Tesisleri, Atıksu Santrali" @@ -4537,6 +4866,9 @@ "name": "Ağaç", "terms": "Ağaç" }, + "natural/valley": { + "name": "Vadi" + }, "natural/volcano": { "name": "Yanardağ", "terms": "Yanardağ, Volkan" @@ -4604,6 +4936,9 @@ "name": "Ortak Çalışma Alanı", "terms": "Ortak Çalışma Yeri" }, + "office/diplomatic/consulate": { + "name": "Konsolosluk" + }, "office/educational_institution": { "name": "Eğitim Kurumu", "terms": "Okul" @@ -4767,6 +5102,9 @@ "name": "Köy", "terms": "Köy" }, + "playground/slide": { + "name": "Kaydırak" + }, "point": { "name": "Nokta", "terms": "Nokta, Konum" @@ -4944,6 +5282,9 @@ "name": "Demiryolu", "terms": "Demiryolu" }, + "railway/signal": { + "name": "Demiryolu Sinyali" + }, "railway/station": { "name": "Tren İstasyonu" }, @@ -5192,8 +5533,8 @@ "terms": "Tüpçü" }, "shop/gift": { - "name": "Hediye Mağazası", - "terms": "Hediye Mağazası" + "name": "Hediyelik Eşya Dükkanı", + "terms": "Hediyelik Eşya Dükkanı" }, "shop/greengrocer": { "name": "Manav", @@ -5227,6 +5568,9 @@ "name": "İç Dekorasyon Mağazası", "terms": "İç Dekorasyon Mağazası" }, + "shop/jewelry": { + "name": "Kuyumcu" + }, "shop/kitchen": { "name": "Mutfak Eşyaları Mağazası", "terms": "Mutfak Eşyaları Mağazası" @@ -5380,7 +5724,7 @@ "terms": "Çaycı" }, "shop/ticket": { - "name": "Biletçi", + "name": "Bilet Satıcısı", "terms": "Biletçi" }, "shop/tobacco": { @@ -5454,6 +5798,9 @@ "name": "Sanat Eseri", "terms": "Sanat Eseri" }, + "tourism/artwork/statue": { + "name": "Heykel" + }, "tourism/attraction": { "name": "Turistik Yer", "terms": "Turistik Yer" @@ -5562,6 +5909,24 @@ "name": "Hız Şeridi", "terms": "Hız Şeridi" }, + "traffic_sign": { + "name": "Trafik Tabelası" + }, + "traffic_sign/city_limit": { + "name": "Şehir Sınırı Tabelası" + }, + "traffic_sign/city_limit_vertex": { + "name": "Şehir Sınırı Tabelası" + }, + "traffic_sign/maxspeed": { + "name": "Hız Sınırı Tabelası" + }, + "traffic_sign/maxspeed_vertex": { + "name": "Hız Sınırı Tabelası" + }, + "traffic_sign_vertex": { + "name": "Trafik Tabelası" + }, "type/boundary": { "name": "Sınır", "terms": "Sınır" @@ -5728,6 +6093,9 @@ } }, "imagery": { + "AGIV": { + "name": "AIV Flanders'ın en son uydu görüntüleri" + }, "Bing": { "description": "Uydu görüntüleri.", "name": "Bing Uydu Görüntüleri" @@ -5742,7 +6110,8 @@ "EsriWorldImageryClarity": { "attribution": { "text": "Şartlar ve Geri Bildirim" - } + }, + "name": "Esri Uydu Görüntüleri (Net) Beta" }, "MAPNIK": { "attribution": { @@ -5800,6 +6169,9 @@ }, "name": "OSM Müfettişi: Etiketleme" }, + "SPW_ORTHO_LAST": { + "name": "SPW(allonie)'nin en son havadan görüntüleri" + }, "US-TIGER-Roads-2014": { "description": "16'dan büyük ölçekte, US Census verileri. Daha küçük ölçeklerde, 2006'dan bu yana yapılmış güncellemeler - OpenStreetMap güncellemeleri hariç", "name": "TIGER Roads 2014" @@ -5912,16 +6284,60 @@ } }, "community": { + "Galicia-Twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "LATAM-Twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "MaptimeHRVA-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "OSM-AR-facebook": { + "description": "Facebook'ta OpenStreetMap Arjantin topluluğuna katılın" + }, + "OSM-AR-irc": { + "name": "OpenStreetMap Arjantin IRC", + "description": "#osm-ar'a irc.oftc.net'den Katılın (port 6667)" + }, + "OSM-AR-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "OSM-Asia-mailinglist": { + "name": "OpenStreetMap Asya Posta Listesi", + "description": "Talk-Asia, Asya Topluluğunun Resmî Posta Listesidir" + }, "OSM-BGD-facebook": { "name": "OpenStreetMap Bangladeş", "description": "Bangladeş'teki OpenStreetMap'ı geliştirin", "extendedDescription": "Bangladeş'te Haritalama Sorularınız var mı, buradan toplumla bağlantı kurmak mı istiyorsunuz? {Url} adresinden bize katılın. Hoşgeldiniz!" }, + "OSM-CL-facebook": { + "description": "Facebook'ta OpenStreetMap Şili topluluğuna katılın" + }, + "OSM-CL-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "OSM-CO-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "OSM-Discord": { + "name": "OpenStreetMap Discord", + "description": "Discord ile diğer haritacılarla iletişim kurun" + }, + "OSM-Facebook": { + "name": "Facebook'ta OpenStreetMap", + "description": "OpenStreetMap ile ilgili haberler ve güncellemeler için bizi Facebook'ta beğenin." + }, "OSM-IDN-facebook": { "name": "OpenStreetMap Endonezya", "description": "Endonezya'da OpenStreetMap'ı geliştirin", "extendedDescription": "Endonezya'da haritalama mı? Sorularınız var mı, buradan toplumla bağlantı kurmak mı istiyorsunuz? {Url} adresinden bize katılın. Hoşgeldiniz!" }, + "OSM-IRC": { + "name": "OpenStreetMap IRC", + "description": "#osm'ye irc.oftc.net'den Katılın (port 6667)" + }, "OSM-India-Puducherry-Facebook": { "description": "Topluluk etkinlikleri, aktiviteleri hakkında bilgi edinmek için FSHM Facebook sayfası", "extendedDescription": "FSHM, özgür yazılım / donanım, teknoloji, aktivizm ve OpenStreetMap ile ilgili etkinlikler düzenlemektedir. FB sayfası, etkinlikleriyle iletişim kurmanın en iyi yoludur." @@ -5943,6 +6359,32 @@ "name": "OpenStreetMap Malezya Forumu", "description": "Resmi OpenStreetMap Malezya Forumu" }, + "OSM-PE-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "OSM-Reddit": { + "name": "Reddit'te OpenStreetMap", + "description": "/r/openstreetmap/ OpenStreetMap hakkında daha fazla bilgi edinmek için harika bir yerdir. Bize her şeyi sor!" + }, + "OSM-Telegram": { + "name": "OpenStreetMap Telegram", + "description": "{url} adresindeki OpenStreetMap Telegram global üst grubuna katıl" + }, + "OSM-Twitter": { + "name": "OpenStreetMap Twitter", + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "OSM-br-discord": { + "name": "OpenStreetMap Brezilya Discord" + }, + "OSM-br-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "OSM-help": { + "name": "OpenStreetMap Yardım", + "description": "Bir soru sorun ve OSM'nin topluluk odaklı soru ve cevap sitesinde yanıt alın.", + "extendedDescription": "{url}, OpenStreetMap konusunda yardıma ihtiyacı olan herkes içindir. İster yeni başlayan bir haritacı olun, isterse teknik bir sorunuz olsun, yardım etmek için buradayız!" + }, "OSM-india-mailinglist": { "name": "OpenStreetMap Hindistan Posta Listesi", "description": "Konuşma, Hindistan Topluluğu için resmi Posta Listesi" @@ -5966,6 +6408,24 @@ "name": "OpenStreetMap Japonya", "description": "Japonya'daki Mappers ve OpenStreetMap kullanıcıları" }, + "OSMF": { + "name": "OpenStreetMap Vakfı", + "description": "OSMF, OpenStreetMap Projesini destekleyen, İngiltere merkezli, kâr amacı gütmeyen bir kuruluştur", + "extendedDescription": "OSMF, fon toplama, OSM'ye güç sağlayan sunucuları koruyarak, yıllık Harita Durumu konferansını organize ederek ve OSM'yi çalıştıran gönüllüleri koordine ederek OpenStreetMap'i destekler. Buradan OSMF üyesi olarak katılarak desteğinizi gösterebilir ve OpenStreetMap yönünde bir ses alabilirsiniz: {signupUrl}" + }, + "PHXGeo-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "al-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "be-facebook": { + "description": "Facebook'ta Belçika'daki Haritacılar ve OpenStreetMap" + }, + "be-irc": { + "name": "OpenStreetMap Belçika IRC", + "description": "#osmbe'ye irc.oftc.net'den Katılın (port 6667)" + }, "bw-facebook": { "description": "Botswana'daki OpenStreetMap Sayfası" }, @@ -5974,6 +6434,54 @@ "description": "Bizi Twitter'dan takip edin: {url}", "extendedDescription": "Bu, Gana'daki Cape Coast Üniversitesi'nin Gençlik Haritacıları bölümünün resmi tanıtıcısıdır. haritaları seviyoruz, verileri açıyoruz ve savunmasızlığa yardımcı oluyoruz." }, + "ch-irc": { + "name": "OpenStreetMap İsviçre IRC", + "description": "#osm-ch'ye irc.oftc.net'den Katılın (port 6667)" + }, + "de-irc": { + "name": "OpenStreetMap Almanya IRC", + "description": "#osm-de'ye irc.oftc.net'den Katılın (port 6667)" + }, + "dk-irc": { + "name": "OpenStreetMap Danimarka IRC", + "description": "#osm-dk'ye irc.oftc.net'den Katılın (port 6667)" + }, + "es-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "fi-irc": { + "name": "OpenStreetMap Finlandiya IRC", + "description": "#osm-fi'ye irc.oftc.net'den Katılın (port 6667)" + }, + "fr-irc": { + "name": "OpenStreetMap Fransa IRC", + "description": "#osm-fr'ye irc.oftc.net'den Katılın (port 6667)" + }, + "gb-irc": { + "name": "OpenStreetMap Birleşik Krallık IRC", + "description": "#osm-gb'ye irc.oftc.net'den Katılın (port 6667)" + }, + "hr-irc": { + "name": "OpenStreetMap Hırvatistan IRC" + }, + "ireland-irc": { + "name": "OpenStreetMap İrlanda IRC", + "description": "#osm-ie'ye irc.oftc.net'den Katılın (port 6667)" + }, + "it-irc": { + "name": "OpenStreetMap İtalya IRC", + "description": "#osm-it'e irc.oftc.net'den Katılın (port 6667)" + }, + "it-twitter": { + "description": "Bizi Twitter'da {url} adresinden takip edin" + }, + "no-irc": { + "name": "OpenStreetMap Norveç IRC" + }, + "osm-asia-telegram": { + "name": "OpenStreetMap Asya Telegram", + "description": "Ailemize katılın: {url}" + }, "osm-gh-facebook": { "name": "OpenStreetMap Gana Facebook'ta", "description": "OpenStreetMap ile ilgilenen kişilerin Faceboo grubu.", @@ -6014,6 +6522,10 @@ "name": "OpenStreetMap Madagaskar Facebook Grubu", "description": "OpenStreetMap ile ilgilenen insanlar için Malagasy Facebook grubu." }, + "se-irc": { + "name": "OpenStreetMap İsveç IRC", + "description": "#osm.se'ye irc.oftc.net'den Katılın (port 6667)" + }, "talk-gh": { "name": "Talk-gh E-posta listesi", "description": "Talk-gh, Gana OSM topluluğunun resmi posta listesidir." @@ -6021,6 +6533,9 @@ "talk-mg": { "name": "Talk-mg E-posta listesi", "description": "Paylaşmak ve tartışmak için Madagaskar'daki OpenStreetMap katılımcıları, toplulukları ve kullanıcıları için yer." + }, + "uy-irc": { + "name": "OpenStreetMap Uruguay IRC" } } } diff --git a/dist/locales/uk.json b/dist/locales/uk.json index 314721c51..db808afb8 100644 --- a/dist/locales/uk.json +++ b/dist/locales/uk.json @@ -1005,7 +1005,8 @@ "welcome": "Ласкаво просимо до редактора OpenStreetMap — iD", "text": "iD — дружній, але потужний інструмент для редагування найкращої вільної мапи світу. Це версія {version}. Для отримання докладної інформації відвідайте {website}, сповіщайте про помилки на {github}.", "privacy_update": "Наші правила конфіденційності було нещодавно оновлено.", - "privacy": "{updateMessage} Продовжуючи користуватись цим програмним забезпеченням ви приймаєте правила конфіденційності iD, для ознайомлення з правилами перейдіть {here}.", + "privacy_policy": "Політика конфіденційності iD", + "privacy": "{updateMessage} Продовження використання цього програмного забезпечення означатиме, що {privacyLink} є прийнятною для вас.", "walkthrough": "Подивитись Покрокове керівництво", "start": "Розпочати редагування" }, @@ -2761,6 +2762,10 @@ "baby_seat": { "label": "Місця для дітей" }, + "backcountry": { + "label": "Без зручностей", + "terms": "зручності,туалет,душ,електрика,немає" + }, "backrest": { "label": "Спинка" }, @@ -2829,6 +2834,9 @@ "booth": { "label": "Кабіна" }, + "bottle": { + "label": "Наповнення пляшок" + }, "boules": { "label": "Тип" }, @@ -3352,6 +3360,9 @@ "generator/type": { "label": "Тип" }, + "geyser/height": { + "label": "Висота виверження" + }, "gnis/feature_id": { "label": "GNIS ід. елемента", "terms": "США,Рада США з географічних назв,Федеральна служба географічних назв" @@ -3362,6 +3373,10 @@ "grape_variety": { "label": "Сорти винограду" }, + "group_only": { + "label": "Тільки для груп", + "terms": "група,купа,разом,відвідування,туризм,музей" + }, "guest_house": { "label": "Тип" }, @@ -3451,6 +3466,9 @@ "undefined": "Ні" } }, + "hot_water": { + "label": "Гаряча вода" + }, "iata": { "label": "IATA" }, @@ -3844,6 +3862,10 @@ "yes": "Так" } }, + "openfire": { + "label": "Розведення багаття", + "terms": "вогонь,вогнище,багаття,костер,полум'я" + }, "opening_date": { "label": "Очікувана дата відкриття" }, @@ -4342,6 +4364,10 @@ "shop": { "label": "Тип" }, + "shower": { + "label": "Душ", + "terms": "душ,баня,купання,гігієна,вода,мило,шампунь,чистота" + }, "siren/purpose": { "label": "Призначення" }, @@ -4544,6 +4570,10 @@ "to": { "label": "До" }, + "toilets": { + "label": "Туалет", + "terms": "яма,кабінка,велка справа,маленька справа,прив'язати коней" + }, "toilets/disposal": { "label": "Тип туалету", "options": { @@ -6297,6 +6327,10 @@ "name": "Сажотрус", "terms": "сажа,димар,чистити,труба,димохід" }, + "craft/cleaning": { + "name": "Послуги з прибирання", + "terms": "прибирання,клінінг,служба,послуги" + }, "craft/clockmaker": { "name": "Годинникар", "terms": "годинник, ремонт, годинникар, час" @@ -6384,6 +6418,10 @@ "name": "Водопровідник", "terms": "водопровідник, паяльщик, слюсар, вода, сантехнік" }, + "craft/pottery": { + "name": "Гончар", + "terms": "кераміка,порцеляна,ваза,посуд,горщик,макітра,майстер,глина" + }, "craft/rigger": { "name": "Такелажник", "terms": "мачти, реї, вітрила, такелаж" @@ -6537,6 +6575,10 @@ "name": "Вхід/вихід", "terms": "вхід, вихід, блок, під’їзд, парадне, службовий" }, + "entrance/emergency": { + "name": "Аварійний вихід", + "terms": "вихід,двері,пожарний,аварія" + }, "ford": { "name": "Брід", "terms": "брід, переправа" @@ -7917,6 +7959,10 @@ "name": "Пасовище", "terms": "Fell, gfcjdbot, пасовище" }, + "natural/geyser": { + "name": "Гейзер", + "terms": "виверження,пара,вода,гарачя вода,гідрогеологія" + }, "natural/glacier": { "name": "Льодовик", "terms": "Glacier, kmjljdbr, льодовик" @@ -8855,6 +8901,10 @@ "name": "М’ясна лавка", "terms": "Butcher, vzcyf kfdrf, м’ясо, м’ясний відділ" }, + "shop/camera": { + "name": "Фотообладнання", + "terms": "камера,об'єктив,штатив,фотоапарат,плівка,реактив,папір,спалах,світло" + }, "shop/candles": { "name": "Магазин свічок", "terms": "свічка, полум’я" @@ -8963,6 +9013,10 @@ "name": "Зроби сам", "terms": "DIY Store, phjb cfv, зроби сам, будматеріали" }, + "shop/doors": { + "name": "Магазин дверей", + "terms": "двері,магазни,замок,завіси" + }, "shop/dry_cleaning": { "name": "Хімчистка", "terms": "прання, чистка, прасування" @@ -9013,6 +9067,10 @@ "shop/fishmonger": { "name": "Риботорговець" }, + "shop/flooring": { + "name": "Магазин напільних матеріалів", + "terms": "підлога,плитка,кахель,паркет" + }, "shop/florist": { "name": "Квіти", "terms": "Florist, rdsnb, квіти" @@ -9240,6 +9298,10 @@ "name": "Фототовари", "terms": "Photography Store, ajnjnjdfhb, фотограф" }, + "shop/pottery": { + "name": "Порцелянові вироби", + "terms": "магазин,гончар,порцеляна,фаянс,посуд,ваза,тарілка,кераміка" + }, "shop/printer_ink": { "name": "Магазин чорнил для принтера", "terms": "тонер,чорнила,копірка,друк,принтер" @@ -9336,6 +9398,10 @@ "name": "Тютюн", "terms": "цигарки, сигари, кальян, запальничка, дим, тютюн, фільтр, пачка, трубка" }, + "shop/tool_hire": { + "name": "Прокат інструмента", + "terms": "інструмент,прокат,дріль,різак,перфоратор,станок,різак" + }, "shop/toys": { "name": "Іграшки", "terms": "Toy Store,suhfirb, іграшки,кукли,солдатики" @@ -9458,6 +9524,14 @@ "name": "Табір", "terms": "табір,кемпіг,наметове,містечко" }, + "tourism/camp_site/backcountry": { + "name": "Місце для табору (без зручностей)", + "terms": "табір,намет,кемпінг,палатка,зручності,немає,вогнище,багаття" + }, + "tourism/camp_site/group_only": { + "name": "Місце для групової стоянки", + "terms": "табір,туризм,кемпінг,група" + }, "tourism/caravan_site": { "name": "Караван-парк", "terms": "RV Park, rfhfdfy-gfhr, караван-парк" @@ -10094,6 +10168,13 @@ "description": "GSI Kiban 2500 від finds.jp. Годиться для мапінгу, але трохи застарілі дані.", "name": "Japan GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© Муніципалітет Гетеборга, CC0" + }, + "description": "Мапа міста - це оглядова мапа, яка зображує Гетеборг. Вона містить загальну інформацію про землю, комунікації, гідрографію, будинки, адресні номери та назви вулиць, адміністративний поділ та інший орієнтаційний текст.", + "name": "Мапа міста Гетеборг" + }, "gsi.go.jp": { "attribution": { "text": "GSI Japan" diff --git a/dist/locales/vi.json b/dist/locales/vi.json index 01c3ad42c..ae4ccb785 100644 --- a/dist/locales/vi.json +++ b/dist/locales/vi.json @@ -7,6 +7,7 @@ "undo": "hoàn tác", "zoom_to": "phóng vừa", "copy": "sao chép", + "view_on": "xem tại {domain}", "favorite": "ưa thích" }, "toolbar": { @@ -127,11 +128,59 @@ "not_closed": "Không thể làm tròn một đối tượng không phải là đa giác kín.", "too_large": "Không thể làm tròn đối tượng này vì chỉ có thấy được một phần rất nhỏ.", "connected_to_hidden": "Không thể làm tròn đối tượng này vì nó nối liền với một đối tượng ẩn.", - "not_downloaded": "Không thể làm tròn đối tượng này vì nó chưa được tải về hoàn toàn." + "not_downloaded": "Không thể làm tròn đối tượng này vì nó chưa được tải về hoàn toàn.", + "already_circular": "Không thể làm đối tượng này tròn hơn." }, "orthogonalize": { "title": "Làm Vuông góc", - "key": "L" + "description": { + "corner": { + "single": "Làm vuông góc này.", + "multiple": "Làm vuông góc một đối tượng." + }, + "feature": { + "single": "Làm vuông góc đối tượng này.", + "multiple": "Làm vuông góc các đối tượng này." + } + }, + "key": "L", + "annotation": { + "corner": { + "single": "làm vuông một góc", + "multiple": "làm vuông nhiều góc" + }, + "feature": { + "single": "làm vuông các góc của đối tượng", + "multiple": "làm vuông các góc của nhiều đối tượng" + } + }, + "multiple_blockers": { + "multiple": "Không thể làm vuông đối tượng này vì nhiều lý do." + }, + "end_vertex": { + "single": "Điểm cuối không có góc mà làm vuông được.", + "multiple": "Các điểm cuối không có góc mà làm vuông được." + }, + "square_enough": { + "single": "Không thể làm đối tượng này vuông vuông hơn.", + "multiple": "Không thể làm các đối tượng này vuông vuông hơn." + }, + "not_squarish": { + "single": "Không thể làm vuông một đối tượng không phải vuông vuông.", + "multiple": "Không thể làm vuông các đối tượng không phải vuông vuông." + }, + "too_large": { + "single": "Không thể làm vuông đối tượng này vì chỉ có thấy được một phần rất nhỏ.", + "multiple": "Không thể làm vuông các đối tượng này vì chỉ có thấy được một phần rất nhỏ." + }, + "connected_to_hidden": { + "single": "Không thể làm vuông đối tượng này vì nó nối liền với một đối tượng ẩn.", + "multiple": "Không thể làm vuông các đối tượng này vì một số nối liền với đối tượng ẩn." + }, + "not_downloaded": { + "single": "Không thể làm vuông đối tượng này vì nó chưa được tải về hoàn toàn.", + "multiple": "Không thể làm vuông các đối tượng này vì một số chưa được tải về hoàn toàn." + } }, "straighten": { "title": "Làm thẳng", @@ -509,13 +558,22 @@ "report_a_bug": "Báo cáo lỗi", "help_translate": "Hợp tác biên dịch", "sidebar": { - "key": "q", + "key": "Q", "tooltip": "Bật/tắt thanh bên." }, "feature_info": { "hidden_warning": "{count} đối tượng ẩn", "hidden_details": "Các đối tượng này đang ẩn: {details}" }, + "osm_api_status": { + "message": { + "error": "Không thể kết nối với API OpenStreetMap. Các sửa đổi của bạn vẫn được lưu tạm trên máy bạn. Hãy kiểm tra kết nối mạng.", + "offline": "API OpenStreetMap đang tạm thời ngừng hoạt động. Các sửa đổi của bạn vẫn được lưu tạm trên máy bạn. Hãy chốc nữa trở lại.", + "readonly": "API OpenStreetMap hiện đang ở chế độ chỉ được xem. Bạn có thể tiếp tục sửa đổi nhưng phải chờ đợi để lưu các thay đổi.", + "rateLimit": "API OpenStreetMap hạn chế các kết nối vô danh. Hãy đăng nhập để khắc phục hạn chế này." + }, + "retry": "Thử lại" + }, "commit": { "title": "Đăng lên OpenStreetMap", "upload_explanation": "Các thay đổi bạn đăng lên sẽ xuất hiện trên tất cả các bản đồ sử dụng dữ liệu OpenStreetMap.", @@ -694,12 +752,12 @@ "saturation": "Độ bão hòa", "sharpness": "Độ nét", "minimap": { - "description": "Hiện Bản đồ Nhỏ", + "description": "Hiện bản đồ nhỏ", "tooltip": "Mở một bản đồ thu nhỏ định vị trí đang được sửa đổi.", "key": "/" }, "panel": { - "description": "Hiện Bảng Chi tiết", + "description": "Hiện bảng chi tiết", "tooltip": "Xem thông tin nâng cao về hình nền." }, "fix_misalignment": "Chỉnh độ lệch hình ảnh", @@ -729,13 +787,13 @@ }, "custom": { "tooltip": "Kéo thả một tập tin dữ liệu vào trang hoặc bấm nút để thiết lập", - "title": "Dữ liệu Bản đồ Tùy biến", + "title": "Dữ liệu bản đồ tùy biến", "zoom": "Phóng vừa dữ liệu" } }, "style_options": "Tùy chọn Kiểu Hiển thị", "highlight_edits": { - "key": "Y" + "key": "M" }, "map_features": "Đối tượng Bản đồ", "autohidden": "Các đối tượng này đã được ẩn tự động để tránh hiển thị quá nhiều đối tượng một lúc. Bạn có thể phóng to để sửa đổi chúng.", @@ -743,14 +801,14 @@ }, "visual_diff": { "highlight_edits": { - "description": "Tô màu các Thay đổi", + "description": "Tô màu các thay đổi", "tooltip": "Tô màu các đối tượng được sửa đổi" } }, "photo_overlays": { "title": "Lớp phủ Hình ảnh", "traffic_signs": { - "title": "Bảng Giao thông" + "title": "Bảng giao thông" }, "photo_type": { "flat": { @@ -766,81 +824,81 @@ "feature": { "points": { "description": "Địa điểm", - "tooltip": "Địa điểm Quan tâm" + "tooltip": "Địa điểm quan tâm" }, "traffic_roads": { - "description": "Đường Giao thông", - "tooltip": "Đường Cao tốc, Đường sá, v.v." + "description": "Đường giao thông", + "tooltip": "Đường cao tốc, đường sá, v.v." }, "service_roads": { "description": "Ngõ ngách", - "tooltip": "Ngách, Lối trong Bãi đậu xe, Đường mòn, v.v." + "tooltip": "Ngách, lối trong bãi đậu xe, đường gom, v.v." }, "paths": { "description": "Đường mòn", - "tooltip": "Lề đường, Đường Dạo, Đường Xe đạp, v.v." + "tooltip": "Lề đường, đường dạo, đường xe đạp, v.v." }, "buildings": { "description": "Tòa nhà", - "tooltip": "Tòa nhà, Nhà trú, Ga ra, v.v." + "tooltip": "Tòa nhà, nhà trú, ga ra, v.v." }, "building_parts": { - "description": "Phần Tòa nhà", - "tooltip": "Phần Tòa nhà 3D và Mái nhà" + "description": "Phần tòa nhà", + "tooltip": "Phần tòa nhà 3D và mái nhà" }, "indoor": { "description": "Trong nhà", - "tooltip": "Phòng, Hành lang, Cầu thang, v.v." + "tooltip": "Phòng, hành lang, cầu thang, v.v." }, "landuse": { - "description": "Phân vùng Sử dụng Đất", - "tooltip": "Rừng Trồng cây, Nông nghiệp, Công viên, Dân cư, Thương mại, v.v." + "description": "Phân vùng sử dụng đất", + "tooltip": "Rừng trồng cây, nông nghiệp, công viên, dân cư, thương mại, v.v." }, "boundaries": { "description": "Biên giới", - "tooltip": "Biên giới Hành chính" + "tooltip": "Biên giới hành chính" }, "water": { "description": "Nước", - "tooltip": "Sông, Hồ, Ao, Lưu vực, v.v." + "tooltip": "Đường sông, hồ, ao, lưu vực, v.v." }, "rail": { "description": "Đường sắt", "tooltip": "Đường sắt" }, "pistes": { - "description": "Đường mòn Thể thao Mùa đông", - "tooltip": "Dốc Trượt tuyết, Đường Xe Trượt tuyết, Đường Trượt băng, v.v." + "description": "Đường mòn thể thao mùa đông", + "tooltip": "Dốc trượt tuyết, đường xe trượt tuyết, đường trượt băng, v.v." }, "aerialways": { "description": "Trên không", - "tooltip": "Ghế Cáp treo, Xe Cáp treo Nhỏ, Đu Dây, v.v." + "tooltip": "Ghế cáp treo, xe cáp treo nhỏ, đu dây, v.v." }, "power": { "description": "Điện năng", - "tooltip": "Đường Dây điện, Nhà máy Điện, Trạm Điện Phụ, v.v." + "tooltip": "Đường dây điện, nhà máy điện, trạm điện phụ, v.v." }, "past_future": { - "description": "Quá khứ & Tương lai", - "tooltip": "Đề nghị, Đang Xây, Bỏ hoang, Phá hủy, v.v." + "description": "Quá khứ & tương lai", + "tooltip": "Đề nghị, đang xây, bỏ hoang, phá hủy, v.v." }, "others": { - "description": "Các Đối tượng Khác", - "tooltip": "Những Gì Khác" + "description": "Các đối tượng khác", + "tooltip": "Những gì khác" } }, "area_fill": { "wireframe": { - "description": "Không Tô (Khung lưới)", + "description": "Không tô (khung lưới)", "tooltip": "Chế độ khung lưới cho phép thấy rõ hình ảnh nền.", "key": "K" }, "partial": { - "description": "Tô Mép", + "description": "Tô mép", "tooltip": "Các vùng chỉ được tô màu vào mép (được khuyến khích cho những người mới bắt đầu vẽ bản đồ)." }, "full": { - "description": "Tô Hẳn", + "description": "Tô hẳn", "tooltip": "Các vùng được tô màu hoàn toàn." } }, @@ -867,6 +925,19 @@ } } }, + "preferences": { + "title": "Tùy chọn", + "description": "Tùy chọn", + "key": "Y", + "privacy": { + "title": "Quyền riêng tư", + "privacy_link": "Xem chính sách về quyền riêng tư của iD", + "third_party_icons": { + "description": "Hiện các biểu trưng bên thứ ba", + "tooltip": "Tự động tải các hình biểu trưng từ trang bên thứ ba như Wikimedia Commons, Facebook, hoặc Twitter." + } + } + }, "restore": { "heading": "Bạn có Thay đổi Chưa lưu", "description": "Bạn có muốn khôi phục các thay đổi chưa lưu từ phiên làm việc trước đây không?", @@ -933,6 +1004,9 @@ "splash": { "welcome": "Chào mừng bạn đến với iD, chương trình vẽ bản đồ OpenStreetMap", "text": "iD là một công cụ hiệu quả và dễ sử dụng để đóng góp vào bản đồ mở lớn nhất trên thế giới. Đây là phiên bản {version}. Xem thêm thông tin tại {website} và báo cáo lỗi trên {github}.", + "privacy_update": "Chúng tôi mới cập nhật chính sách về quyền riêng tư gần đây.", + "privacy_policy": "chính sách về quyền riêng tư của iD", + "privacy": "{updateMessage} Việc sử dụng phần mềm này có nghĩa rằng bạn đồng ý với {privacyLink}.", "walkthrough": "Khởi đầu Hướng dẫn", "start": "Tiến hành sửa đổi" }, @@ -1317,9 +1391,50 @@ "tooltip": "Hình ảnh cấp phố do Mapillary cung cấp" }, "mapillary_map_features": { - "title": "Các Thể loại Đối tượng", + "title": "Các thể loại đối tượng", "tooltip": "Đối tượng bản đồ do Mapillary cung cấp", - "request_data": "Yêu cầu Dữ liệu" + "request_data": "Yêu cầu Dữ liệu", + "construction": { + "flat": { + "crosswalk_plain": "vạch qua đường đơn giản" + } + }, + "marking": { + "discrete": { + "crosswalk_zebra": "vạch sọc ngựa vằn" + } + }, + "object": { + "banner": "biểu ngữ", + "bench": "băng ghế", + "bike_rack": "giá đậu xe đạp", + "billboard": "bảng quảng cáo", + "catch_basin": "nắp cống thoát nước", + "cctv_camera": "camera quan sát", + "fire_hydrant": "trụ cứu hỏa", + "mailbox": "thùng thư", + "manhole": "hố ga", + "phone_booth": "trạm điện thoại", + "sign": { + "advertisement": "quảng cáo", + "information": "bảng thông tin", + "store": "bảng hiệu tiệm" + }, + "street_light": "đèn đường", + "support": { + "utility_pole": "cột điện" + }, + "traffic_cone": "cọc tiêu giao thông", + "traffic_light": { + "cyclists": "đèn giao thông cho người đi xe đạp", + "general_horizontal": "đèn giao thông ngang", + "general_single": "đèn giao thông đơn độc", + "general_upright": "đèn giao thông dọc", + "other": "đèn giao thông", + "pedestrians": "đèn giao thông cho người đi bộ" + }, + "trash_can": "thùng rác" + } }, "mapillary": { "title": "Mapillary", @@ -1642,7 +1757,7 @@ "annotation": "khắc phục nhiều vấn đề kiểm tra" }, "almost_junction": { - "title": "Gần như Giao lộ", + "title": "Gần như giao lộ", "message": "{feature} rất gần {feature2} nhưng không nối liền", "tip": "Tìm các đối tượng có thể cần nối liền với đối tượng gần", "self": { @@ -1653,7 +1768,7 @@ } }, "close_nodes": { - "title": "Điểm Rất Gần nhau", + "title": "Điểm rất gần nhau", "tip": "Tìm các điểm thừa hoặc chụm lại", "message": "Hai điểm trong {way} rất gần nhau", "reference": "Các điểm thừa trong lối nên được gộp lại hoặc làm rẽ ra.", @@ -1663,12 +1778,18 @@ } }, "crossing_ways": { - "title": "Lối Đi Ngang Nhau", + "title": "Lối đi ngang nhau", "message": "{feature} đi ngang {feature2}", "tip": "Tìm các đối tượng xuyên qua nhau một cách không chính xác", "building-building": { "reference": "Các tòa nhà không nên giao nhau, ngoại trừ có lớp khác nhau." }, + "building-highway": { + "reference": "Con đường xuyên qua tòa nhà đáng lẽ phải là cầu hay đường hầm hoặc có lớp khác với tòa nhà." + }, + "building-railway": { + "reference": "Đường sắt xuyên qua tòa nhà đáng lẽ phải là cầu hay đường hầm hoặc có lớp khác với tòa nhà." + }, "building-waterway": { "reference": "Đường thủy xuyên qua tòa nhà đáng lẽ phải là đường hầm hoặc có lớp khác với tòa nhà." }, @@ -1710,7 +1831,7 @@ } }, "disconnected_way": { - "title": "Lối Không Nối liền", + "title": "Lối không nối liền", "tip": "Tìm các con đường, đường mòn, và tuyến phà không thuộc mạng giao thông", "routable": { "message": { @@ -1732,11 +1853,11 @@ "reference": "Tên đáng lè phải phản ánh tên gọi trên thực tế, thí dụ tên ghi trên bảng hiệu." }, "help_request": { - "title": "Yêu cầu Trợ giúp", + "title": "Yêu cầu trợ giúp", "tip": "Tìm các đối tượng mà người ta yêu cầu trợ giúp" }, "incompatible_source": { - "title": "Nguồn gốc Nghi ngờ", + "title": "Nguồn gốc nghi ngờ", "tip": "Tìm các đối tượng có thẻ nguồn nghi ngờ", "google": { "feature": { @@ -1750,7 +1871,7 @@ "message_language": "{feature} có tên sai “{name}” trong {language}" }, "invalid_format": { - "title": "Định dạng Không hợp lệ", + "title": "Định dạng không hợp lệ", "tip": "Tìm các thẻ có định dạng bất ngờ", "email": { "message": "{feature} có địa chỉ thư điện tử không hợp lệ", @@ -1759,11 +1880,11 @@ } }, "mismatched_geometry": { - "title": "Kiểu Đối tượng Bất ngờ", + "title": "Kiểu đối tượng bất ngờ", "tip": "Tìm các đối tượng có thẻ xung đột với hình dạng" }, "missing_role": { - "title": "Vai trò bị Thiếu", + "title": "Vai trò bị thiếu", "message": "{member} không có vai trò trong {relation}", "tip": "Tìm các thành viên quan hệ thiếu vai trò hoặc có vai trò không chính xác", "multipolygon": { @@ -1771,7 +1892,7 @@ } }, "missing_tag": { - "title": "Thẻ bị Thiếu", + "title": "Thẻ bị thiếu", "tip": "Tìm các đối tượng thiếu thẻ bản chất", "reference": "Đối tượng phải có thẻ xác định nó là gì.", "any": { @@ -1789,7 +1910,7 @@ "reference": "Tổ hợp đa giác đáng lẽ phải được đặt thẻ vào quan hệ chứ không phải lối bên ngoài." }, "outdated_tags": { - "title": "Thẻ Lỗi thời", + "title": "Thẻ lỗi thời", "message": "{feature} có thẻ lỗi thời", "tip": "Tìm các đối tượng có thẻ bị phản đối cần được cập nhật", "reference": "Lâu ngày một số thẻ thay đổi vì nhiều lý do, nên cập nhật đối tượng để sử dụng thẻ mới.", @@ -1808,7 +1929,7 @@ "reference": "Thể loại đối tượng nào đó không nên thuộc đường kẻ hoặc vùng." }, "private_data": { - "title": "Thông tin Riêng tư", + "title": "Thông tin riêng tư", "tip": "Tìm các đối tượng có thể chứa thông tin riêng tư", "reference": "Không nên cung cấp dữ liệu nhạy cảm như số điện thoại cá nhân.", "contact": { @@ -1816,7 +1937,7 @@ } }, "suspicious_name": { - "title": "Tên Nghi ngờ", + "title": "Tên nghi ngờ", "tip": "Tìm các đối tượng có tên chung hoặc nghi ngờ" }, "tag_suggests_area": { @@ -1828,7 +1949,7 @@ "reference": "Con đường thiếu cấp có thể được ẩn trên bản đồ hoặc bỏ qua khi chỉ đường." }, "impossible_oneway": { - "title": "Đường Một chiều Không thể Xảy ra", + "title": "Đường một chiều không thể xảy ra", "tip": "Tìm các đối tượng một chiều gây vấn đề chỉ đường", "waterway": { "connected": { @@ -1852,8 +1973,12 @@ } } }, + "unclosed_multipolygon_part": { + "message": "{feature} có phần không đóng", + "reference": "Tất cả các phần bên trong và bên ngoài của tổ hợp đa giác đều phải có điểm cuối nối lại." + }, "unsquare_way": { - "title": "Góc Không Vuông (Cho tới {val}°)", + "title": "Góc không vuông (cho tới {val}°)", "message": "{feature} có góc không vuông", "tip": "Tìm các đối tượng có góc không vuông có thể được vẽ sơ qua", "buildings": { @@ -1865,6 +1990,14 @@ "reference": "Thể loại đối tượng nào đó không nên là điểm riêng." }, "fix": { + "add_a_bridge": { + "title": "Thêm cầu", + "annotation": "thêm cầu" + }, + "add_a_tunnel": { + "title": "Thêm đường hầm", + "annotation": "thêm đường hầm" + }, "address_the_concern": { "title": "Khắc phục vấn đề" }, @@ -2284,7 +2417,11 @@ }, "display_options": { "title": "Tùy chọn xem", + "background": "Bật/tắt bảng hình nền", "background_switch": "Quay lại lớp nền trước", + "map_data": "Bật/tắt bảng dữ liệu bản đồ", + "issues": "Bật/tắt bảng vấn đề kiểm tra", + "preferences": "Bật/tắt bảng tùy chọn người dùng", "fullscreen": "Bật chế độ toàn màn hình", "sidebar": "Bật/tắt thanh bên", "wireframe": "Bật/tắt chế độ khung lưới", @@ -2300,7 +2437,9 @@ "search": "Tìm kiếm đối tượng theo tên" }, "with_selected": { - "edit_menu": "Bật/tắt trình đơn sửa đổi" + "title": "Trong khi đối tượng được chọn", + "edit_menu": "Bật/tắt trình đơn sửa đổi", + "zoom_to": "Phóng vừa các đối tượng được chọn" }, "vertex_selected": { "title": "Trong khi nốt được chọn", @@ -2328,7 +2467,7 @@ "continue_line": "Vẽ tiếp đường kẻ từ nốt được chọn", "merge": "Gộp các đối tượng được chọn", "disconnect": "Tháo gỡ các đối tượng tại nốt được chọn", - "extract": "rút trích địa điểm từ đối tượng", + "extract": "Rút trích địa điểm từ đối tượng", "split": "Cắt đôi các đường kẻ tại nốt được chọn", "reverse": "Đảo ngược chiều các đối tượng được chọn", "move": "Di chuyển các đối tượng được chọn", @@ -2621,6 +2760,10 @@ "baby_seat": { "label": "Ghế Bé" }, + "backcountry": { + "label": "Hẻo lánh", + "terms": "hẻo lánh, heo lanh" + }, "backrest": { "label": "Dựa Lưng" }, @@ -2685,6 +2828,9 @@ "booth": { "label": "Buồng" }, + "bottle": { + "label": "Cho Đổ vào Bình nước" + }, "boules": { "label": "Kiểu" }, @@ -2793,6 +2939,9 @@ "communication_multi": { "label": "Kiểu Giao thông" }, + "connectivity": { + "label": "Các Kết nối Làn đường" + }, "construction": { "label": "Kiểu" }, @@ -3011,6 +3160,9 @@ "distance": { "label": "Tầm xa" }, + "disused/railway": { + "label": "Kiểu" + }, "dock": { "label": "Loại" }, @@ -3029,8 +3181,16 @@ "door_type": { "label": "Loại" }, + "drink_multi": { + "label": "Đồ uống" + }, + "drinking_water": { + "label": "Uống được", + "terms": "uống được" + }, "drive_through": { - "label": "Lối Mua hàng trên Xe" + "label": "Lối Mua hàng trên Xe", + "terms": "lối mua hàng trên xe, đứng hàng, hàng xe, xe, khu vuc mua hang tren xe, dung hang, hang xe" }, "duration": { "label": "Mất Thời gian", @@ -3134,6 +3294,9 @@ "label": "Kiểu", "placeholder": "Bình thường" }, + "fountain": { + "label": "Kiểu" + }, "frequency": { "label": "Tần số Hoạt động" }, @@ -3175,6 +3338,9 @@ "generator/type": { "label": "Kiểu" }, + "geyser/height": { + "label": "Chiều cao Phun Nước" + }, "gnis/feature_id": { "label": "Định danh Đối tượng GNIS", "terms": "mã số đối tượng gnis, gnis id, hệ thống thông tin địa danh, gnis, ủy ban địa danh hoa kỳ, ủy ban địa danh hoa kì, uỷ ban địa danh hoa kỳ, uỷ ban địa danh hoa kì, ma so doi tuong gnis, gnis id, he thong thong tin dia danh, gnis, uy ban dia danh hoa ky, uy ban dia danh hoa ki" @@ -3185,6 +3351,10 @@ "grape_variety": { "label": "Loại Nho" }, + "group_only": { + "label": "Chỉ Phục vụ Nhóm người", + "terms": "chỉ phục vụ nhóm người, chỉ phục vụ nhóm du lịch, chỉ phục vụ nhóm giáo dân, chỉ phục vụ hội họp, chỉ phục vụ hội nghị, nhóm người, nhóm du lịch, nhóm giáo dân, hội họp, hội nghị, chi phuc vu nhom nguoi, chi phuc vu nhom du lich, chi phuc vu nhom giao dan, chi phuc vu hoi hop, chi phuc vu hoi nghi, nhom nguoi, nhom du lich, nhom giao dan, hoi hop, hoi nghi" + }, "guest_house": { "label": "Kiểu" }, @@ -3197,6 +3367,7 @@ "terms": "lan can, tay vịn, tay vin" }, "hashtags": { + "label": "Thẻ băm", "placeholder": "#VíDụ" }, "healthcare": { @@ -3272,6 +3443,9 @@ "undefined": "Không" } }, + "hot_water": { + "label": "Nước Nóng" + }, "iata": { "label": "Mã Sân bay IATA" }, @@ -3473,6 +3647,9 @@ "label": "Định danh Hình Mapillary", "terms": "định danh hình mapillary, mã số hình mapillary, dinh danh hinh mapillary, ma so hinh mapillary" }, + "marker": { + "label": "Kiểu" + }, "material": { "label": "Chất liệu" }, @@ -3570,7 +3747,11 @@ "network": { "label": "Hệ thống" }, + "network/type": { + "label": "Kiểu Hệ thống" + }, "network_bicycle": { + "label": "Cấp Hệ thống", "options": { "icn": "Quốc tế", "lcn": "Địa phương", @@ -3580,6 +3761,7 @@ "placeholder": "Địa phương, Vùng miền, Quốc gia, Quốc tế" }, "network_foot": { + "label": "Cấp Hệ thống", "options": { "iwn": "Quốc tế", "lwn": "Địa phương", @@ -3589,6 +3771,7 @@ "placeholder": "Địa phương, Vùng miền, Quốc gia, Quốc tế" }, "network_horse": { + "label": "Cấp Hệ thống", "options": { "ihn": "Quốc tế", "lhn": "Địa phương", @@ -3634,6 +3817,10 @@ "yes": "1 Chiều" } }, + "openfire": { + "label": "Cho phép Đánh lửa Dã ngoại", + "terms": "cho phép đánh lửa dã ngoại, cho phép nhóm lửa dã ngoại, cho phép đánh lửa giã ngoại, cho phép nhóm lửa dã ngoại, đánh lửa dã ngoại, nhóm lửa dã ngoại, đánh lửa giã ngoại, nhóm lửa dã ngoại, cho phep danh lua da ngoai, cho phep nhom lua da ngoai, cho phep danh lua gia ngoai, cho phep nhom lua da ngoai, danh lua da ngoai, nhom lua da ngoai, danh lua gia ngoai, nhom lua da ngoai" + }, "opening_date": { "label": "Ngày Dự kiến Khai trương" }, @@ -3655,7 +3842,8 @@ "placeholder": "3, 4, 5…" }, "park_ride": { - "label": "Trung chuyển" + "label": "Trung chuyển", + "terms": "trung chuyển, trung chuyển" }, "parking": { "label": "Kiểu", @@ -3829,6 +4017,9 @@ "public_bookcase/type": { "label": "Kiểu" }, + "pump": { + "label": "Bơm" + }, "railway": { "label": "Kiểu" }, @@ -3847,6 +4038,9 @@ "rating": { "label": "Công suất" }, + "rcn_ref": { + "label": "Số Tuyến đường Xe đạp" + }, "recycling_accepts": { "label": "Nhận" }, @@ -3947,6 +4141,9 @@ "route_master": { "label": "Kiểu" }, + "rwn_ref": { + "label": "Số Tuyến đường Đi bộ Dài" + }, "sac_scale": { "label": "Độ hiểm trở Đi bộ Đường dài", "options": { @@ -4104,6 +4301,10 @@ "shop": { "label": "Kiểu" }, + "shower": { + "label": "Có Tắm Đứng", + "terms": "tắm đứng, phòng tắm đứng, buồng tắm đứng, khay tắm đứng, cabin tắm, tam dung, phong tam dung, buong tam dung, khay tam dung, cabin tam" + }, "siren/purpose": { "label": "Mục đích" }, @@ -4147,6 +4348,10 @@ }, "placeholder": "Bánh xe Trượt, Bánh xe, Xa đường…" }, + "sms": { + "label": "SMS", + "terms": "dịch vụ tin nhắn ngắn, tin nhắn, nhắn tin, dich vu tin nhan ngan, tin nhan, nhan tin" + }, "social_facility": { "label": "Kiểu" }, @@ -4289,6 +4494,10 @@ "to": { "label": "Đến" }, + "toilets": { + "label": "Có Cầu tiêu", + "terms": "cầu tiêu, xí bệt, vệ sinh, cau tieu, xi bet, ve sinh" + }, "toilets/disposal": { "label": "Phương pháp thải", "options": { @@ -4504,6 +4713,11 @@ "label": "Wikidata", "terms": "wikidata, qid, số khoản mục, so khoan muc" }, + "wikimedia_commons": { + "label": "Trang Wikimedia Commons", + "placeholder": "File:Ví dụ.jpg", + "terms": "trang commons, wikimedia commons" + }, "wikipedia": { "label": "Wikipedia", "terms": "wikipedia, wiki" @@ -4757,6 +4971,10 @@ "name": "Trung tâm Cộng đồng", "terms": "trung tâm cộng đồng, hội trường cộng đồng, trung tam cong dong, hoi truong cong dong" }, + "amenity/community_centre/lgbtq": { + "name": "Trung tâm Cộng đồng LGBTQ+", + "terms": "trung tâm cộng đồng lgbtq+, trung tâm cộng đồng lgbtq, trung tâm cộng đồng lgbtqia, trung tâm cộng đồng lgbt, trung tâm cộng đồng glbtq+, trung tâm cộng đồng lgb, trung tâm cộng đồng đồng tính luyến ái, trung tâm cộng đồng song tính luyến ái, trung tâm cộng đồng chuyển giới, trung tam cong dong lgbtq+, trung tam cong dong lgbtq, trung tam cong dong lgbtqia, trung tam cong dong lgbt, trung tam cong dong glbtq+, trung tam cong dong lgb, trung tam cong dong dong tinh luyen ai, trung tam cong dong song tinh luyen ai, trung tam cong dong chuyen gioi" + }, "amenity/compressed_air": { "name": "Khí Nén", "terms": "khí nén, không khí nén, khi nen, khong khi nen" @@ -4893,6 +5111,10 @@ "name": "Quán Internet", "terms": "quán internet, tiệm internet, cửa hàng internet, quan internet, tiem internet, cua hang internet" }, + "amenity/karaoke_box": { + "name": "Dàn Karaoke", + "terms": "dàn karaoke, phòng karaoke, truyền hình karaoke, ktv, karaoke, dan karaoke, phong karaoke, truyen hinh karaoke" + }, "amenity/kindergarten": { "name": "Sân Nhà trẻ", "terms": "sân nhà trẻ, sân nhà giữ trẻ, sân trường mẫu giáo, sân trường mầm non, san nha tre, san nha giu tre, san truong mau giao, san truong mam non" @@ -4941,6 +5163,10 @@ "name": "Câu lạc bộ Giải trí", "terms": "câu lạc bộ giải trí, clb giải trí, câu lạc bộ đêm, clb đêm, vũ trường, hộp đêm, câu lạc bộ, sàn nhảy về đêm, cau lac bo giai tri, clb giai tri, cau lac bo dem, clb dem, vu truong, hop dem, cau lac bo, san nhay ve dem" }, + "amenity/nightclub/lgbtq": { + "name": "Câu lạc bộ Giải trí LGBTQ+", + "terms": "câu lạc bộ giải trí lgbtq+, clb giải trí lgbtq+, câu lạc bộ giải trí lgbtq, lcb giải trí lgbtq, câu lạc bộ giải trí lgbtqia, clb giải trí lgbtqia, câu lạc bộ giải trí lgbt, clb giải trí lgbt, câu lạc bộ giải trí glbtq+, clb giải trí glbtq+, câu lạc bộ giải trí lgb, clb giải trí lgb, câu lạc bộ giải trí đồng tính luyến ái, clb giải trí đồng tính luyến ái, câu lạc bộ giải trí song tính luyến ái, clb giải trí song tính luyến ái, câu lạc bộ giải trí chuyển giới, clb giải trí chuyển giới, cau lac bo giai tri lgbtq+, clb giai tri lgbtq+, cau lac bo giai tri lgbtq, lcb giai tri lgbtq, cau lac bo giai tri lgbtqia, clb giai tri lgbtqia, cau lac bo giai tri lgbt, clb giai tri lgbt, cau lac bo giai tri glbtq+, clb giai tri glbtq+, cau lac bo giai tri lgb, clb giai tri lgb, cau lac bo giai tri dong tinh luyen ai, clb giai tri dong tinh luyen ai, cau lac bo giai tri song tinh luyen ai, clb giai tri song tinh luyen ai, cau lac bo giai tri chuyen gioi, clb giai tri chuyen gioi" + }, "amenity/nursing_home": { "name": "Viện Dưỡng lão" }, @@ -4952,6 +5178,14 @@ "name": "Bãi Đậu xe Cao tầng", "terms": "bãi đậu xe cao tầng, nhà đậu xe cao tầng, nhà đậu xe, bãi đỗ xe cao tầng, nhà đỗ xe cao tầng, nhà đỗ xe, bai dau xe cao tang, nha dau xe cao tang, nha dau xe, bai do xe cao tang, nha do xe cao tang, nha do xe" }, + "amenity/parking/park_ride": { + "name": "Bãi Đậu xe Trung chuyển", + "terms": "bãi đậu xe trung chuyển, sân đậu xe trung chuyển, bãi đỗ xe trung chuyển, sân đỗ xe trung chuyển, bai dau xe trung chuyen, san dau xe trung chuyen, bai do xe trung chuyen, san do xe trung chuyen" + }, + "amenity/parking/underground": { + "name": "Bãi Đậu xe Ngầm", + "terms": "bãi đậu xe ngầm, bãi đỗ xe ngầm, bai dau xe ngam, bai do xe ngam" + }, "amenity/parking_entrance": { "name": "Lối Ra vào Ga ra", "terms": "lối ra vào ga ra, lối ra vào ga-ra, lối ra ga ra, lối vào ga ra, lối ra ga-ra, lối ra ga-ra, loi ra vao ga ra, loi ra vao ga-ra, loi ra ga ra, loi vao ga ra, loi ra ga-ra, loi ra ga-ra" @@ -5016,6 +5250,10 @@ "name": "Bưu điện", "terms": "nhà bưu điện, bưu điện, bưu chính, nha buu dien, buu dien, buu chinh" }, + "amenity/prep_school": { + "name": "Trường Luyện thi", + "terms": "trường luyện thi, trường học thêm, trung tâm luyện thi, trung tâm học thêm, truong luyen thi, truong hoc them, trung tam luyen thi, trung tam hoc them" + }, "amenity/prison": { "name": "Sân Nhà tù", "terms": "sân nhà tù, sân tù, san nha tu, san tu" @@ -5372,6 +5610,10 @@ "name": "Vùng", "terms": "khu vực, vùng, khu, khu vuc, vung" }, + "area/highway": { + "name": "Mặt Đường", + "terms": "mặt đường, mặt phố, mat duong, mat pho" + }, "attraction": { "name": "Điểm Thu hút" }, @@ -5510,6 +5752,10 @@ "name": "Nhà thu phí", "terms": "nhà thu phí, trạm thu phí, trạm thu giá, thu phí, thu gia, trả tiền, nha thu phi, tram thu phi, tram thu gia, thu phi, thu gia, tra tien" }, + "barrier/turnstile": { + "name": "Cổng Xoay", + "terms": "cổng xoay, cổng quay, cửa xoay, cửa quay, cong xoay, cong quay, cua xoay, cua quay" + }, "barrier/wall": { "name": "Tường", "terms": "tường, tuong" @@ -5635,6 +5881,10 @@ "name": "Nhà ở", "terms": "nhà ở, căn nhà, tòa nhà, toà nhà, nha o, can nha, toa nha" }, + "building/houseboat": { + "name": "Nhà thuyền", + "terms": "nhà thuyền, nha thuyen" + }, "building/hut": { "name": "Túp lều", "terms": "túp lều, tup leu" @@ -5785,6 +6035,10 @@ "name": "Quét Bồ hóng", "terms": "người quét bồ hóng, người cạo ống khói, thợ quét bồ hóng, thợ quét ống khói, nguoi quet bo hong, nguoi cao ong khoi, tho quet bo hong, tho quet ong khoi" }, + "craft/cleaning": { + "name": "Lau dọn", + "terms": "dịch vụ lau dọn nhà cửa, dịch vụ lau dọn, dịch vụ lau nhà, lau dọn nhà cửa, lau dọn, lau nhà, dich vu lau don nha cua, dich vu lau don, dich vu lau nha, lau don nha cua, lau don, lau nha" + }, "craft/clockmaker": { "name": "Xây Đồng hồ", "terms": "thợ đồng hồ, người làm đồng hồ, người xây đồng hồ, tho dong ho, nguoi lam dong ho, nguoi xay dong ho" @@ -5860,6 +6114,10 @@ "name": "Sửa Ống nước", "terms": "thợ ống nước, thợ sửa ống nước, người sửa ống nước, cầu tiêu, bồn rửa tay, bồn rửa mặt, bồn vệ sinh, chậu treo tường, tho ong nuoc, tho sua ong nuoc, nguoi sua ong nuoc, cau tieu, bon rua tay, bon rua mat, bon ve sinh, chau treo tuong" }, + "craft/pottery": { + "name": "Thợ Gốm", + "terms": "thợ gốm, người làm đồ gốm, bát chén, tho gom, nguoi lam do gom, bat chen" + }, "craft/rigger": { "name": "Dựng Cột Buồm", "terms": "người dựng cột buồm, nguoi dung cot buom" @@ -5892,6 +6150,10 @@ "name": "Đóng Giày", "terms": "thợ đóng giày dép, người đóng giày dép, người làm giày dép, thợ sửa giày dép, người sửa giày dép, tho dong giay dep, nguoi dong giay dep, nguoi lam giay dep, tho sua giay dep, nguoi sua giay dep" }, + "craft/signmaker": { + "name": "Làm Bảng hiệu", + "terms": "thợ làm bảng hiệu, thợ làm biển hiệu, người làm bảng hiệu, người làm biển hiệu, tiệm làm bảng hiệu, tiệm làm biển hiệu, cửa hàng làm bảng hiệu, cửa hàng làm biển hiệu, tho lam bang hieu, tho lam bien hieu, nguoi lam bang hieu, nguoi lam bien hieu, tiem lam bang hieu, tiem lam bien hieu, cua hang lam bang hieu, cua hang lam bien hieu" + }, "craft/stonemason": { "name": "Xây Đá", "terms": "thợ xây đá, người xây đá, tho xay da, nguoi xay da" @@ -5923,9 +6185,16 @@ "name": "Nhà máy Rượu vang", "terms": "nhà máy rượu vang, nha may ruou vang" }, + "cycleway/asl": { + "name": "Vạch Dừng Đằng trước Xe hơi", + "terms": "vạch dừng đằng trước xe hơi, vạch dừng đằng trước ô tô, vach dung dang truoc xe hoi, vach dung dang truoc o to" + }, "demolished/building": { "name": "Tòa nhà Mới Phá" }, + "disused/railway": { + "name": "Đường sắt Không hoạt động" + }, "embankment": { "name": "Đường đắp cao" }, @@ -6101,6 +6370,9 @@ "name": "Trị liệu Ngôn ngữ", "terms": "nhà trị liệu ngôn ngữ, nhà ngôn ngữ trị liệu, nhà trị liệu lời nói, nhà tri lieu ngon ngu, nhà ngon ngu tri lieu, nha tri lieu loi noi" }, + "highway": { + "name": "Đường" + }, "highway/bridleway": { "name": "Đường mòn Ngựa", "terms": "đường mòn ngựa, đường cưỡi ngựa, đường đi ngựa, duong mon ngua, duong cuoi ngua, duong di ngua" @@ -6156,6 +6428,14 @@ "highway/cycleway/crossing": { "name": "Lối Đạp Xe đạp qua Đường" }, + "highway/cycleway/crossing/marked": { + "name": "Vạch Xe đạp Qua đường", + "terms": "vạch xe đạp qua đường, vạch kẻ đường cho xe đạp, vach xe dap qua duong, vach ke duong cho xe dap" + }, + "highway/cycleway/crossing/unmarked": { + "name": "Lối Băng qua Đường dành cho Xe đạp Không có Vạch", + "terms": "lối băng qua đường dành cho xe đạp không có vạch, loi bang qua duong danh cho xe dap khong co vach" + }, "highway/elevator": { "name": "Thang máy", "terms": "thang máy, thang may" @@ -6345,6 +6625,10 @@ "name": "Đèn Giao thông", "terms": "đèn giao thông, đèn tín hiệu giao thông, đèn tín hiệu, đèn điều khiển giao thông, đèn điều khiển, đèn xanh đèn đỏ, đèn xanh đỏ, đèn ngã tư, đèn ngã ba, den giao thong, den tin hieu giao thong, den tin hieu, den dieu khien giao thong, den dieu khien, den xanh den do, den xanh do, den nga tu, den nga ba" }, + "highway/trailhead": { + "name": "Đầu Đường mòn", + "terms": "đầu đường mòn, cuối đường mòn, đầu đường xe đạp, dau duong mon, cuoi duong mon, dau duong xe dap" + }, "highway/trunk": { "name": "Xa lộ", "terms": "xa lộ, xl, xa lo" @@ -6381,10 +6665,26 @@ "name": "Lâu đài", "terms": "lâu đài, lau dai" }, + "historic/castle/fortress": { + "name": "Pháo đài Lớn Lịch sử", + "terms": "pháo đài lớn lịch sử, phao dai lon lich su" + }, "historic/castle/palace": { "name": "Cung điện", "terms": "cung, điện, cung điện, lâu đài, dien, cung dien, lau dai" }, + "historic/castle/stately": { + "name": "Lâu đài", + "terms": "lâu đài, château, sa-tô, sa tô, lau dai, chateau, sa-to, sa to" + }, + "historic/city_gate": { + "name": "Cổng thành", + "terms": "cổng thành, cổng thành phố, cong thanh, cong thanh pho" + }, + "historic/fort": { + "name": "Pháo đài Lịch sử", + "terms": "pháo đài lịch sử, công sự lịch sử, phao dai lich su, cong su lich su" + }, "historic/memorial": { "name": "Vật Tưởng niệm", "terms": "đài tưởng niệm, đài kỷ niệm, đài kỉ niệm, tượng kỷ niệm, tượng kỉ niệm, bia kỷ niệm, bia kỉ niệm, dai tuong niem, dai ky niem, dai ki niem, tuong ky niem, tuong ki niem, bia ky niem, bia ki niem" @@ -6416,9 +6716,21 @@ "indoor": { "name": "Đối tượng trong Nhà" }, + "indoor/corridor": { + "name": "Hành lang trong Nhà", + "terms": "hành lang trong nhà, lối đi trong nhà, hanh lang trong nha, loi di trong nha" + }, "indoor/corridor_line": { "name": "Hành lang trong Nhà" }, + "indoor/door": { + "name": "Cửa trong Nhà", + "terms": "cửa trong nhà, cửa, ô cửa, ngưỡng cửa, cua trong nha, cua, o cua, nguong cua" + }, + "indoor/room": { + "name": "Phòng", + "terms": "phòng, buồng, phòng ngoài, tiền sảnh, buồng ngủ, phong, buong, phong ngoai, tien sanh, buong ngu" + }, "indoor/stairs": { "name": "Cầu thang trong Nhà", "terms": "cầu thang trong nhà, cầu thang, cau thang trong nha, cau thang" @@ -6435,6 +6747,9 @@ "name": "Giao lộ", "terms": "giao lộ, chỗ đường gặp nhau, nơi đường gặp nhau, giao lo, cho duong gap nhau, noi duong gap nhau" }, + "landuse": { + "name": "Sử dụng Đất" + }, "landuse/allotments": { "name": "Khu Vườn Gia đình", "terms": "khu vườn gia đình, khu vườn cộng đồng, khu vuon gia dinh, khu vuon cong dong" @@ -6477,6 +6792,10 @@ "name": "Sân Trại", "terms": "sân trại, nhà trại, trang trại, san trai, nha trai, trang trai" }, + "landuse/flowerbed": { + "name": "Luống Hoa", + "terms": "luống hoa, vườn hoa, luong hoa, vuon hoa" + }, "landuse/forest": { "name": "Rừng Trồng cây", "terms": "rừng trồng cây, rừng lâm nghiệp, rừng lâm học, rung trong cay, rung lam nghiep, rung lam hoc" @@ -6599,6 +6918,9 @@ "name": "Vườn Nho", "terms": "vườn nho, vuon nho" }, + "leisure": { + "name": "Giải trí" + }, "leisure/adult_gaming_centre": { "name": "Trung tâm Đánh bạc", "terms": "trung tâm đánh bạc, máy đánh bạc, trung tam danh bac, may danh bac" @@ -6643,6 +6965,10 @@ "name": "Công viên dành cho Chó", "terms": "công viên chó, công viên cho chó, công viên dành cho chó, công viên chó chạy nhảy, cong vien cho, cong vien cho cho, cong vien danh cho cho, cong vien cho chay nhay" }, + "leisure/escape_game": { + "name": "Trò chơi Thoát khỏi Phòng", + "terms": "trò chơi thoát khỏi phòng, trò chơi thoát khỏi phòng kín, trò chơi giải thoát, tro choi thoat khoi phong, tro choi thoat khoi phong kin, tro choi giai thoat" + }, "leisure/fishing": { "name": "Chỗ Câu cá", "terms": "chỗ câu cá, nơi câu cá, chỗ đánh cá, nơi đánh cá, cho cau ca, noi cau ca, cho danh ca, noi danh ca" @@ -6795,6 +7121,10 @@ "name": "Sân Cưỡi ngựa", "terms": "sân cưỡi ngựa, câu lạc bộ cưỡi ngựa, clb cưỡi ngựa, câu lạc bộ ngựa, clb ngựa, san cuoi ngua, cau lac bo cuoi ngua, clb cuoi ngua, cau lac bo ngua, clb ngua" }, + "leisure/pitch/field_hockey": { + "name": "Sân cỏ Khúc côn cầu", + "terms": "sân cỏ khúc côn cầu, sân khúc côn cầu trên cỏ, sân cỏ hockey, sân hockey trên cỏ, san co khuc con cau, san khuc con cau tren co, san co hockey, san hockey tren co" + }, "leisure/pitch/netball": { "name": "Sân Bóng lưới", "terms": "sân bóng lưới, sân netball, san bong luoi, san netball" @@ -6875,6 +7205,14 @@ "name": "Đường Đua (Không phải Đua Xe)", "terms": "đường đua, trường đua, đường đua ngựa, đường đua xe đạp, duong dua, truong dua, duong dua ngua, duong dua xe dap" }, + "leisure/track/horse_racing": { + "name": "Đường Đua Ngựa", + "terms": "đường đua ngựa, trường đua ngựa, duong dua ngua, truong dua ngua" + }, + "leisure/track/horse_racing_point": { + "name": "Đường Đua Ngựa", + "terms": "đường đua ngựa, trường đua ngựa, duong dua ngua, truong dua ngua" + }, "leisure/track/running": { "name": "Đường Chạy", "terms": "đường chạy, đường chạy đua, đường chạy điền kinh, duong chay, duong chay dua, duong chay dien kinh" @@ -6891,6 +7229,9 @@ "name": "Đường kẻ", "terms": "đường kẻ, đường, lối, duong ke, duong, loi" }, + "man_made": { + "name": "Công trình" + }, "man_made/adit": { "name": "Lối vào Mỏ", "terms": "lối vào mỏ, đường vào mỏ, loi vao mo, duong vao mo" @@ -6903,6 +7244,10 @@ "name": "Đê Chắn Sóng", "terms": "đê chắn sóng, de chan song" }, + "man_made/bridge": { + "name": "Cầu", + "terms": "cầu, cau" + }, "man_made/bunker_silo": { "name": "Xilô Boong ke", "terms": "xilô boong ke, xi-lô boong ke, xi lô boong ke, xilô boongke, xi-lô boong-ke, xi lô boong ke, xilo boong ke, xi-lo boong ke, xi lo boong ke, xilo boonke, xi-lo boong-ke, xi lo boong ke" @@ -6919,6 +7264,10 @@ "name": "Cẩu", "terms": "cẩu, cần cẩu, cần trục, cầu trục, cầu chạy, cổng trục, cẩu bay, cau, can cau, can truc, cau truc, cau chay, cong truc, cau bay" }, + "man_made/cross": { + "name": "Thánh Giá trên Núi", + "terms": "thánh giá trên núi, thập giá trên núi, thánh giá trên đỉnh núi, thập giá trên đỉnh núi, thanh gia tren nui, thap gia tren nui, thanh gia tren dinh nui, thap gia tren dinh nui" + }, "man_made/cutline": { "name": "Vành đai Chặt cây", "terms": "vành đai chặt cây, hàng cây chặt, vanh dai chat cay, hang cay chat" @@ -6943,6 +7292,14 @@ "name": "Hải đăng", "terms": "hải đăng, đèn biển, hai dang, den bien" }, + "man_made/manhole": { + "name": "Hố ga", + "terms": "hố ga, lỗ cống, miệng cống, viễn thông, ho ga, lo cong, mieng cong, vien thong" + }, + "man_made/manhole/telecom": { + "name": "Hố Cáp Viễn thông", + "terms": "hố cáp viễn thông, lỗ cáp viễn thông, ho cap vien thong, lo cap vien thong" + }, "man_made/mast": { "name": "Cột Ăngten", "terms": "cột ăngten, cột ăng-ten, cột ăng ten, cột anten, cột an-ten, cột radio, cột rađiô, cột ra-đi-ô, cột vô tuyến, tháp radio, tháp rađiô, tháp ra-đi-ô, tháp vô tuyến, anten radio, anten rađiô, an-ten ra-đi-ô, cột tv, cột tivi, tháp tv, tháp tivi, anten tv, anten tivi, cot angten, cot ang-ten, cot ang ten, cot anten, cot an-ten, cot radio, cot ra-di-o, cot vo tuyen, thap radio, thap ra-di-o, thap vo tuyen, anten radio, anten ra-di-o, cot tv, cot tivi, thap tv, thap tivi, anten tv, anten tivi" @@ -6995,6 +7352,10 @@ "name": "Thùng Chứa", "terms": "thùng chứa, bể chứa, bình chứa, xi-téc, xi-tẹc, bể nước, thung chua, be chua, binh chua, xi-tec, be nuoc" }, + "man_made/storage_tank/water": { + "name": "Bể Chứa Nước", + "terms": "bể chứa nước, thùng chứa nước, tháp nước, be chua nuoc, thung chua nuoc, thap nuoc" + }, "man_made/surveillance": { "name": "Camera Giám sát", "terms": "camera giám sát, máy ảnh giám sát, giám sát, camera giam sat, may anh giam sat, giam sat" @@ -7031,6 +7392,10 @@ "name": "Tháp Quan sát", "terms": "tháp quan sát, trạm quan sát, tầng quan sát, thap quan sat, tram quan sat, tang quan sat" }, + "man_made/tunnel": { + "name": "Đường hầm", + "terms": "đường hầm, hầm, lỗ khoan, hào, duong ham ham, lo khoan, hao" + }, "man_made/wastewater_plant": { "name": "Nhà máy Nước thải", "terms": "nhà máy nước thải, nhà máy xử lý nước thải, nhà máy xử lí nước thải, nha may nuoc thai, nha may xu ly nuoc thai, nha may xu li nuoc thai" @@ -7059,6 +7424,29 @@ "name": "Nhà máy", "terms": "nhà máy, xí nghiệp, xưởng, hãng, nha may, xi nghiep, xuong, hang" }, + "military/bunker": { + "name": "Boong Ke", + "terms": "boong ke, boong-ke, boongke" + }, + "military/checkpoint": { + "name": "Trạm Kiểm soát", + "terms": "trạm kiểm soát, tram kiem soat" + }, + "military/nuclear_explosion_site": { + "name": "Nơi Nổ Vũ khí Hạt nhân", + "terms": "nơi nổ vũ khí hạt nhân, nơi nổ bom hạt nhân, noi no vu khi hat nhan, noi no bom hat nhan" + }, + "military/office": { + "name": "Văn phòng Quân sự", + "terms": "văn phòng quân sự, văn phòng quân đội, văn phòng hải quân, văn phòng không quân, van phong quan su, van phong quan doi, van phong hai quan, van phong khong quan" + }, + "military/trench": { + "name": "Hào Quân sự", + "terms": "hào quân sự, hầm trú ẩn, hao quan su, ham tru an" + }, + "natural": { + "name": "Thiên nhiên" + }, "natural/bare_rock": { "name": "Hòn đá Không", "terms": "hòn đá không, hon da khong" @@ -7071,6 +7459,10 @@ "name": "Bãi biển", "terms": "bãi biển, bai bien" }, + "natural/cape": { + "name": "Mũi đất", + "terms": "mũi đất, mũi, cáp, mui dat, mui, cap" + }, "natural/cave_entrance": { "name": "Cửa Hang", "terms": "cửa hang, lối vào hang, cua hang, loi vao hang" @@ -7171,10 +7563,22 @@ "name": "Bể nước", "terms": "bể nước, be nuoc" }, + "natural/water/river": { + "name": "Mặt Sông", + "terms": "mặt sông, mặt đường sông, mặt con sông, nước sông, nước con sông, mat song, mat duong song, mat con song, nuoc song, nuoc con song" + }, + "natural/water/stream": { + "name": "Mặt Dòng suối", + "terms": "mặt dòng suối, mặt suối, mặt sông nhánh, mặt sông con, nước dòng suối, nước suối, nước sông nhánh, nước sông con, mat dong suoi, mat suoi, mat song nhanh, mat song con, nuoc dong suoi, nuoc suoi, nuoc song nhanh, nuoc song con" + }, "natural/wetland": { "name": "Đầm lầy", "terms": "đầm lầy, dam lay" }, + "natural/wood": { + "name": "Rừng Thiên nhiên", + "terms": "rừng thiên nhiên, rừng, rung thien nhien, rung" + }, "noexit/yes": { "name": "Không có Lối ra", "terms": "không có lối ra, không ra được, đường cùng, ngõ cụt, cuối đường, khong co loi ra, khong ra duoc, duong cung, ngo cut, cuoi duong" @@ -7218,10 +7622,22 @@ "name": "Văn phòng Công ty", "terms": "văn phòng công ty, văn phòng công ti, văn phòng cty, trụ sở công ty, trụ sở công ti, trụ sở cty, van phong cong ty, van phong cong ti, van phong cty, tru so cong ty, tru so cong ti, tru so cty" }, + "office/consulting": { + "name": "Văn phòng Tư vấn", + "terms": "văn phòng tư vấn, văn phòng cố vấn, van phong tu van, van phong co van" + }, "office/coworking": { "name": "Văn phòng Làm việc Chung", "terms": "văn phòng làm việc chung, không gian làm việc chung, van phong lam viec chung, khong gian lam viec chung" }, + "office/diplomatic/consulate": { + "name": "Lãnh sự quán", + "terms": "lãnh sự quán, tổng lãnh sự quán, tòa lãnh sự, toà lãnh sự, lanh su quan, tong lanh su quan, toa lanh su" + }, + "office/diplomatic/embassy": { + "name": "Đại sứ quán", + "terms": "đại sứ quán, tòa đại sứ, toà đại sứ, dai su quan, toa dai su" + }, "office/educational_institution": { "name": "Trường học", "terms": "trường học, trường cao đẳng, trường đại học, học viện, hội đồng giáo dục, học khu, khu học chánh, nha học chánh, truong hoc, trường cao đẳng, trường đại học, học viện, hoi dong giao duc, hoc khu, khu hoc chanh, nha hoc chanh" @@ -7242,6 +7658,10 @@ "name": "Văn phòng Tài chính", "terms": "văn phòng tài chính, văn phòng tài chánh, van phong tai chinh, van phong tai chanh" }, + "office/financial_advisor": { + "name": "Cố vấn Tài chính", + "terms": "cố vấn tài chính, tư vấn tài chính, co van tai chinh, tu van tai chinh" + }, "office/forestry": { "name": "Văn phòng Lâm nghiệp", "terms": "văn phòng lâm nghiệp, van phong lam nghiep" @@ -7480,6 +7900,9 @@ "name": "Địa điểm", "terms": "địa điểm, điểm, dia diem, diem" }, + "power": { + "name": "Điện năng" + }, "power/cable/underground": { "name": "Cáp Điện Ngầm", "terms": "cáp điện ngầm, cáp điện dưới đất, cap dien ngam, cap dien duoi dat" @@ -7697,6 +8120,9 @@ "name": "Nơi Đón khách Xe điện Bánh hơi", "terms": "nơi đón khách xe điện bánh hơi, nơi đón khách xe buýt điện, nơi đón khách xe bus điện, chỗ đón khách xe điện bánh hơi, chỗ đón khách xe buýt điện, chỗ đón khách xe bus điện, noi don khach xe dien banh hoi, noi don khach xe buyt dien, noi don khach xe bus dien, cho don khach xe dien banh hoi, cho don khach xe buyt dien, cho don khach xe bus dien" }, + "railway": { + "name": "Đường sắt" + }, "railway/abandoned": { "name": "Đường sắt Bỏ hoang", "terms": "đường sắt bỏ hoang, duong sat bo hoang" @@ -7705,6 +8131,10 @@ "name": "Trạm Dừng Đệm", "terms": "trạm dừng đệm, tram dung dem" }, + "railway/construction": { + "name": "Đường sắt đang Xây dựng", + "terms": "đường sắt đang xây dựng, đường xe lửa đang xây dựng, đường tàu hỏa đang xây dựng, đường ray đang xây dựng, duong sat dang xay dung, duong xe lua dang xay dung, duong tau hoa dang xay dung, duong ray dang xay dung" + }, "railway/crossing": { "name": "Lối Đi bộ qua Đường sắt", "terms": "lối đi bộ qua đường sắt, lối đi bộ qua đường xe lửa, lối đi bộ qua đường tàu hỏa, lối đi bộ qua đường tàu hoả, lối đi bộ qua đường ray, lối qua đường sắt, lối qua đường xe lửa, lối qua đường tàu hỏa, lối qua đường tàu hoả, lối qua đường ray, loi di bo qua duong sat, loi di bo qua duong xe lua, loi di bo qua duong tau hoa, loi di bo qua duong tau hoa, loi di bo qua duong ray, loi qua duong sat, loi qua duong xe lua, loi qua duong tau hoa, loi qua duong tau hoa, loi qua duong ray" @@ -7789,6 +8219,10 @@ "railway/tram_stop": { "name": "Vị trí Đón khách Tàu điện" }, + "railway/yard": { + "name": "Sân ga", + "terms": "sân ga, san ga" + }, "relation": { "name": "Quan hệ", "terms": "quan hệ, liên kệ, mối quan hệ, mối liên hệ, quan he, lien ke, moi quan he, moi lien he" @@ -8252,6 +8686,10 @@ "name": "Tiệm Bán đồ Tôn giáo", "terms": "tiệm bán đồ tôn giáo, cửa hàng bán đồ tôn giáo, cửa hiệu bán đồ tôn giáo, tiệm sách tôn giáo, hiệu sách tôn giáo, cửa hàng sách tôn giáo, cửa hiệu sách tôn giáo, tiem ban do ton giao, cua hang ban do ton giao, cua hieu ban do ton giao, tiem sach ton giao, hieu sach ton giao, cua hang sach ton giao, cua hieu sach ton giao" }, + "shop/rental": { + "name": "Cho thuê Hàng hóa", + "terms": "cho thuê hàng hóa, cho thuê hàng hoá, cho thuê đồ, cho thue hang hoa, cho thue hang hoa, cho thue do" + }, "shop/scuba_diving": { "name": "Tiệm Dụng cụ Lặn Scuba", "terms": "tiệm dụng cụ lặn scuba, cửa hàng dụng cụ lặn scuba, cửa hiệu dụng cụ lặn scuba, tiem dung cu lan scuba, cua hang dung cu lan scuba, cua hieu dung cu lan scuba" @@ -9289,6 +9727,9 @@ "description": "Cải thiện OpenStreetMap tại khu vực Washington, D.C.", "extendedDescription": "Chúng ta tình nguyện xây dựng bản đồ OpenStreetMap tại khu vực Washington, D.C. Nhóm này cũng nhằm mục đích dạy người khác về hệ sinh thái OSM, môn phân tích dữ liệu, bản đồ học, và GIS. Chúng ta họp mặt hai tháng một lần để tập trung chú ý vào một phần của thành phố này." }, + "MappingWR": { + "name": "MappingWR" + }, "Maptime-Bogota": { "name": "Maptime Bogotá", "description": "Chúng ta là nhóm người lập bản đồ quan tâm đến việc đóng góp vào OpenStreetMap ở vùng Bogotá." @@ -9371,6 +9812,10 @@ "name": "Slack OSM Canada", "description": "Mời bạn tham gia tại {signupUrl}" }, + "OSM-CA-mailinglist": { + "name": "Danh sách thư OSM-CA", + "description": "Danh sách thư để thảo luận về OpenStreetMap tại Canada" + }, "OSM-CL-facebook": { "name": "Facebook OpenStreetMap Chile", "description": "Hãy tham gia cộng đồng OpenStreetMap Chile tại Facebook", @@ -9389,6 +9834,10 @@ "name": "Twitter OpenStreetMap Chile", "description": "Theo dõi chúng tôi trên Twitter: {url}" }, + "OSM-CN-telegram": { + "name": "Telegram OpenStreetMap Trung Quốc", + "description": "Nhóm Telegram dành cho cộng đồng OSM Trung Quốc: {url}" + }, "OSM-CO": { "name": "OpenStreetMap Colombia", "description": "Tin tức về cộng đồng OpenStreetMap Colombia và Quỹ OSMCo" @@ -9478,6 +9927,10 @@ "name": "Telegram OpenStreetMap Nhật Bản", "description": "Nhóm Telegram dành cho cộng đồng OSM Nhật Bản: {url}" }, + "OSM-Kerala-facebook": { + "description": "Cải thiện OpenStreetMap tại Kerala", + "extendedDescription": "Bạn có lập bản đồ tại Kerala? Bạn có thắc mắc, muốn liên hệ với cộng đồng tại đây? Mời bạn tham gia tại {Url}." + }, "OSM-Korea-mailinglist": { "name": "Danh sách thư OpenStreetMap Triều Tiên", "description": "talk-ko là danh sách thư chính thức của cộng đồng Triều Tiên và Hàn Quốc" @@ -9513,6 +9966,10 @@ "description": "Cải thiện OpenStreetMap tại Nepal", "extendedDescription": "Bạn có lập bản đồ tại Nepal? Bạn có thắc mắc, muốn liên hệ với cộng đồng tại đây? Mời bạn tham gia tại {Url}." }, + "OSM-Ottawa-meetup": { + "name": "OpenStreetMap Ottawa", + "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Ottawa" + }, "OSM-PE": { "name": "OpenStreetMap Peru", "description": "Tin tức về và tài nguyên cho cộng đồng OpenStreetMap Peru" @@ -9775,6 +10232,10 @@ "name": "Kênh Telegram OSM Albania", "description": "Kênh Telegram OpenStreetMap Albania" }, + "al-twitter": { + "name": "Twitter OpenStreetMap Albania", + "description": "Theo dõi chúng tôi trên Twitter: {url}" + }, "at-forum": { "name": "Diễn đàn OpenStreetMap Áo", "description": "Diễn đàn chính thức dành cho các câu hỏi về OpenStreetMap trong và chung quanh nước Áo" @@ -9787,6 +10248,10 @@ "name": "Twitter OpenStreetMap Áo", "description": "OpenStreetMap Áo tại Twitter: {url}" }, + "be-chapter": { + "name": "Chi nhánh Địa phương OpenStreetMap Bỉ", + "description": "Chúng ta giúp phát triển và cải thiện OpenStreetMap tại Bỉ." + }, "be-facebook": { "name": "Cộng đồng Facebook OpenStreetMap Bỉ", "description": "Nhóm Facebook của những người lập bản đồ OpenStreetMap ở Bỉ" @@ -9816,6 +10281,14 @@ "name": "Twitter OpenStreetMap Bỉ", "description": "OSM Bỉ tại Twitter: @osm_be" }, + "bg-forum": { + "name": "Diễn đàn OpenStreetMap Bulgaria", + "description": "Diễn đàn của cộng đồng OpenStreetMap tại Bulgaria" + }, + "bg-wiki": { + "name": "Dự án Wiki OpenStreetMap Bulgaria", + "description": "Trang dự án wiki Bulgaria" + }, "bw-facebook": { "name": "Mapping Botswana tại Facebook", "description": "Trang OpenStreetMap tại Botswana" @@ -9880,6 +10353,10 @@ "name": "Danh sách thư talk-de", "description": "talk-de là danh sách thư chính thức của cộng đồng Đức" }, + "de-matrix": { + "name": "Matrix OpenStreetMap Đức", + "description": "Hãy tham gia #osm-de:matrix.org tại https://riot.im/app/#/room/%23osm-de:matrix.org" + }, "de-ostwestfalen-lippe-mailinglist": { "name": "Danh sách OWL", "description": "Đây là danh sách thư của cộng đồng OSM tại Ostwestfalen-Lippe" @@ -9900,6 +10377,10 @@ "name": "Danh sách thư talk-dk", "description": "Danh sách thư để thảo luận về OpenStreetMap tại Đan Mạch" }, + "es-twitter": { + "name": "Twitter OpenStreetMap Tây Ban Nha", + "description": "Theo dõi chúng tôi trên Twitter: {url}" + }, "fi-forum": { "name": "Diễn đàn OpenStreetMap Phần Lan", "description": "Diễn đàn Web của OpenStreetMap Phần Lan" @@ -9912,6 +10393,10 @@ "name": "Danh sách thư talk-fi", "description": "talk-fi là danh sách thư chính thức của cộng đồng Phần Lan" }, + "fr-chapter": { + "name": "Chi nhánh Địa phương OpenStreetMap Pháp", + "description": "Chúng ta giúp phát triển và cải thiện OpenStreetMap tại Pháp." + }, "fr-facebook": { "name": "Trang Facebook của OpenStreetMap Pháp", "description": "Trang Facebook của OpenStreetMap Pháp" @@ -9969,6 +10454,10 @@ "name": "Diễn đàn OpenStreetMap Hungary", "description": "Diễn đàn Web của OpenStreetMap Hungary" }, + "hu-matrix": { + "name": "Phòng Matrix OpenStreetMap Hungary", + "description": "Trò chuyện Matrix OpenStreetMap Hungary" + }, "hu-meetup": { "name": "Họp mặt OpenStreetMap Hungary", "description": "Trang tổ chức cuộc họp mặt tại Hungary" @@ -9977,6 +10466,10 @@ "name": "OSM Israel tại Telegram", "description": "Nhóm Telegram dành cho cộng đồng OpenStreetMap tại Israel: {url}" }, + "ireland-chapter": { + "name": "Chi nhánh Địa phương OpenStreetMap Ireland", + "description": "Chúng ta giúp phát triển và cải thiện OpenStreetMap tại Ireland." + }, "ireland-facebook": { "name": "Nhóm Facebook OpenStreetMap Ireland", "description": "Trang Facebook OpenStreetMap Ireland" @@ -9998,6 +10491,10 @@ "name": "OpenStreetMap Ireland tại Twitter", "description": "OpenStreetMap Ireland tại Twitter: {url}" }, + "is-chapter": { + "name": "Chi nhánh Địa phương OpenStreetMap Iceland", + "description": "Chúng ta giúp phát triển và cải thiện OpenStreetMap tại Iceland." + }, "is-facebook": { "name": "OSM Iceland tại Facebook", "description": "Trang OpenStreetMap tại Iceland" @@ -10010,6 +10507,10 @@ "name": "OSM Iceland tại Twitter", "description": "Twitter OpenStreetMap tại Iceland" }, + "it-chapter": { + "name": "Chi nhánh Địa phương OpenStreetMap Ý", + "description": "Chúng ta giúp phát triển và cải thiện OpenStreetMap tại Ý." + }, "it-facebook": { "name": "Facebook OpenStreetMap Ý", "description": "Hãy tham gia cộng đồng OpenStreetMap Ý tại Facebook" @@ -10037,6 +10538,13 @@ "name": "Danh sách thư talk-lu", "description": "Danh sách thư chính thức của cộng đồng OSM tại Luxembourg" }, + "mailinglist-sk-googlegroups": { + "name": "Danh sách thứ Slovakia tại Google Nhóm", + "description": "Danh sách thư chính thức của cộng đồng OSM tại Slovakia" + }, + "map-kibera": { + "name": "Quỹ Map Kibera" + }, "mappa-mercia-group": { "name": "Nhóm địa phương Mappa Mercia", "description": "Nơi tụ tập những người hâm mộ OpenStreetMap tại Midlands" @@ -10110,6 +10618,10 @@ "description": "Nhóm Facebook dành cho những người quan tâm đến OpenStreetMap.", "extendedDescription": "Những người lập bản đồ trong cộng đồng tại Ghana, ủng hộ OpenStreetMap và các dự án Nhóm Nhân đạo OpenStreetMap (HOT) tại Ghana. Mời bạn tham gia!" }, + "osm-gh-telegram": { + "name": "Telegram OpenStreetMap Ghana", + "description": "Cộng đồng OpenStreetMap Ghana tại Telegram" + }, "osm-gh-twitter": { "name": "OpenStreetMap Ghana tại Twitter", "description": "Theo dõi chúng tôi trên Twitter: {url}" @@ -10156,6 +10668,12 @@ "name": "OSM Kenya", "description": "OSM Kenya là cộng đồng người đóng góp vào và sử dụng OSM" }, + "osm-kerala-telegram": { + "name": "Telegram OpenStreetMap Kerala" + }, + "osm-kerala-wiki": { + "name": "OpenStreetMap Kerala" + }, "osm-latam": { "name": "OpenStreetMap Mỹ Latinh", "description": "Hỗ trợ OpenStreetMap tại Mỹ Latinh" @@ -10236,6 +10754,20 @@ "name": "Twitter OpenStreetMap Slovenia", "description": "Theo dõi OpenStreetMap Slovenia trên Twitter: {url}" }, + "sk-facebook": { + "name": "Trang Facebook của Cộng đồng Slovakia Freemap.sk", + "description": "Trang Facebook của Cộng đồng Slovakia Freemap.sk" + }, + "sk-freemap": { + "name": "Trang OpenStreetMap Freemap Slovakia" + }, + "sk-freemap-wiki": { + "name": "Trang Wiki OpenStreetMap Freemap Slovakia" + }, + "sk-twitter": { + "name": "OpenStreetMap Freemap Slovakia tại Twitter", + "description": "OpenStreetMap Freemap Slovakia tại Twitter: {url}" + }, "talk-au": { "name": "Danh sách thư talk-au", "description": "Nơi trò chuyện của những người Úc lập bản đồ" @@ -10331,22 +10863,270 @@ "name": "Telegram OpenStreetMap Venezuela", "description": "Hãy tham gia cộng đồng OpenStreetMap Venezuela tại Telegram" }, + "ym-Abia-State-University": { + "name": "AbsuMappersTeam", + "description": "Nhánh YouthMappers tại Đại học Quốc gia Abia" + }, + "ym-African-Methodist-Episcopal-University": { + "name": "YouthMappers-AMEU" + }, + "ym-Ahmadu-Bello-University": { + "description": "Nhánh YouthMappers tại Đại học Ahmadu Bello" + }, + "ym-Ardhi-University": { + "description": "Nhánh YouthMappers tại Đại học Ardhi" + }, + "ym-Asian-University-for-Women": { + "name": "YouthMappers tại AUW", + "description": "Nhánh YouthMappers tại Đại học châu Á dành cho Phụ nữ" + }, + "ym-Ball-State-University": { + "description": "Nhánh YouthMappers tại Đại học Tiểu bang Ball" + }, + "ym-Busitema-University": { + "description": "Nhánh YouthMappers tại Đại học Busitema" + }, + "ym-California-University-of-Pennsylvania": { + "name": "Câu lạc bộ GIS tại Đại học California tiểu bang Pennsylvania", + "description": "Nhánh YouthMappers tại Đại học California tiểu bang Pennsylvania" + }, + "ym-Central-Washington-University": { + "name": "Câu lạc bộ Địa lý", + "description": "Nhánh YouthMappers tại Đại học Trung Washington" + }, + "ym-Clemson-University": { + "description": "Nhánh YouthMappers tại Đại học Clemson" + }, + "ym-College-of-William-and-Mary": { + "description": "Nhánh YouthMappers tại Trường cao đẳng William & Mary" + }, + "ym-Cornell-University": { + "description": "Nhánh YouthMappers tại Đại học Cornell" + }, + "ym-Cuttington-University": { + "name": "YouthMappers Đại học Cuttington", + "description": "Nhánh YouthMappers tại Đại học Cuttington" + }, + "ym-Dedan-Kimathi-University-of-Technology": { + "description": "Nhánh YouthMappers tại Đại học Công nghệ Dedan Kimathi" + }, "ym-Dhaka-College": { "name": "YouthMappers Cao đẳng Daka", "description": "Nhánh YouthMappers tại Trường cao đẳng Dhaka" }, + "ym-Dhaka-University": { + "name": "YouthMappers OpenStreetMap", + "description": "Nhánh YouthMappers tại Đại học Dhaka" + }, + "ym-Eastern-University": { + "name": "YouthMappers tại Đại học Miền Đông", + "description": "Nhánh YouthMappers tại Đại học Miền Đông" + }, + "ym-George-Mason-University": { + "description": "Nhánh YouthMappers tại Đại học George Mason" + }, + "ym-Grand-Gedeh-County-Community-College": { + "name": "YouthMappers tại Trường cao đẳng Cộng đồng Quận Grand Gedeh", + "description": "Nhánh YouthMappers tại Trường cao đẳng Cộng đồng Quận Grand Gedeh" + }, + "ym-Gujarat-University": { + "name": "CCIM tại Ahmedabad", + "description": "Nhánh YouthMappers tại Đại học Gujarat" + }, + "ym-Gulu-University": { + "description": "Nhánh YouthMappers tại Đại học Gulu" + }, + "ym-Heidelberg-University": { + "description": "Nhánh YouthMappers tại Đại học Heidelberg" + }, + "ym-Ignatius-Ajuru-University-of-Education": { + "description": "Nhánh YouthMappers tại Đại học Giáo dục Ignatius Ajuru" + }, + "ym-Indiana-University-of-Pennsylvania": { + "description": "Nhánh YouthMappers tại Đại học Indiana tiểu bang Pennsylvania" + }, + "ym-Istanbul-Technical-University": { + "description": "Nhánh YouthMappers tại Đại học Công nghệ Istanbul" + }, + "ym-Jacksonville-State-University": { + "description": "Nhánh YouthMappers tại Đại học Tiểu bang Jacksonville" + }, + "ym-Jahangirnagar-University": { + "description": "Nhánh YouthMappers tại Đại học Jahangirnagar" + }, + "ym-Jomo-Kenyatta-University-of-Agriculture-and-Technology": { + "description": "Nhánh YouthMappers tại Đại học Nông nghiệp và Công nghệ Jomo Kenyatta" + }, + "ym-Kansas-State-University": { + "description": "Nhánh YouthMappers tại Đại học Tiểu bang Kansas" + }, + "ym-Karatina-University": { + "description": "Nhánh YouthMappers tại Đại học Karatina" + }, + "ym-Kathmandu-University": { + "description": "Nhánh YouthMappers tại Đại học Kathmandu" + }, "ym-Kenyatta-University": { "name": "Câu lạc bộ Hệ thống thông tin địa lý Đại học Kenyatta", "description": "Nhánh YouthMappers tại Đại học Kenyatta" }, + "ym-Khulna-University": { + "name": "YouthMappers Đại học Khulna", + "description": "Nhánh YouthMappers tại Đại học Khulna" + }, + "ym-Kumi-University": { + "description": "Nhánh YouthMappers tại Đại học Kumi" + }, + "ym-Kwame-Nkrumah-University-of-Science-and-Technology": { + "name": "YouthMappers tại Đại học Khoa học và Công nghệ Kwame Nkrumah", + "description": "Nhánh YouthMappers tại Đại học Khoa học và Công nghệ Kwame Nkrumah" + }, + "ym-Makerere-University": { + "description": "Nhánh YouthMappers tại Đại học Makerere" + }, + "ym-Mbarara-University-of-Science-and-Technology": { + "description": "Nhánh YouthMappers tại Đại học Khoa học và Công nghệ Mbarara" + }, + "ym-McGill-University": { + "description": "Nhánh YouthMappers tại Đại học McGill" + }, + "ym-Miami-University": { + "description": "Nhánh YouthMappers tại Đại học Miami" + }, + "ym-Moi-University": { + "description": "Nhánh YouthMappers tại Đại học Moi" + }, + "ym-Monroe-Community-College": { + "description": "Nhánh YouthMappers tại Trường cao đẳng Cộng đồng Monroe" + }, + "ym-Montgomery-College": { + "description": "Nhánh YouthMappers tại Trường cao đẳng Montgomery" + }, "ym-Namibia-University-of-Science-and-Technology": { "name": "Hội Sinh viên Địa tin học", "description": "Nhánh YouthMappers tại Đại học Khoa học và Công nghệ Namibia" }, + "ym-New-York-University": { + "description": "Nhánh YouthMappers tại Đại học New York" + }, + "ym-Nimba-County-Community-College": { + "name": "YouthMappers tại Trường cao đẳng Cộng đồng Quận Nimba", + "description": "Nhánh YouthMappers tại Trường cao đẳng Cộng đồng Quận Nimba" + }, + "ym-Njala-University-Freetown-Campus": { + "name": "YouthMappers tại Njala tại Freetown", + "description": "Nhánh YouthMappers tại Đại học Njala tại Freetown" + }, + "ym-Njala-University-Njala-Campus": { + "name": "YouthMappers tại Đại học Njala tại Njala", + "description": "Nhánh YouthMappers tại Đại học Njala tại Njala" + }, + "ym-Ohio-Wesleyan-University": { + "name": "Câu lạc bộ Môi trường và Hoang dã", + "description": "Nhánh YouthMappers tại Đại học Wesley Ohio" + }, + "ym-Oklahoma-State-University": { + "name": "Câu lạc bộ Địa lý", + "description": "Nhánh YouthMappers tại Đại học Tiểu bang Oklahoma" + }, + "ym-Open-University-of-Tanzania": { + "name": "YouthMappers tại Đại học Mở Tanzania", + "description": "Nhánh YouthMappers tại Đại học Mở Tanzania" + }, + "ym-Politecnico-di-Milano": { + "name": "PoliMappers", + "description": "Nhánh YouthMappers tại Đại học Bách khoa Milano" + }, + "ym-Queen-Mary-University-of-London": { + "description": "Nhánh YouthMappers tại Đại học Nữ hoàng Mary tại Luân Đôn" + }, + "ym-Rajshahi-University-of-Engineering-Technology": { + "description": "Nhánh YouthMappers tại Đại học Kỹ thuật và Công nghệ Rajshahi" + }, + "ym-SUNY-at-Fredonia": { + "name": "Geoventurers", + "description": "Nhánh YouthMappers tại Đại học Tiểu bang New York tại Fredonia" + }, + "ym-Sacred-Heart-Junior-College": { + "name": "YouthMappers tại Trường cao đẳng Thánh Tâm", + "description": "Nhánh YouthMappers tại Trường cao đẳng Thánh Tâm" + }, + "ym-Sherubtse-College": { + "description": "Nhánh YouthMappers tại Trường cao đẳng Sherubtse" + }, + "ym-Sokoine-University-of-Agriculture": { + "description": "Nhánh YouthMappers tại Đại học Nông nghiệp Sokoine" + }, + "ym-St.-Augustine-International-University": { + "name": "YouthMappers tại Đại học Quốc tế St. Augustine", + "description": "Nhánh YouthMappers tại Đại học Quốc tế St. Augustine" + }, + "ym-State-University-of-New-York-Geneseo": { + "description": "Nhánh YouthMappers tại Đại học Tiểu bang New York tại Geneseo" + }, + "ym-Stella-Maris-Polytechnic": { + "description": "Nhánh YouthMappers tại Đại học Bách khoa Stella Maris" + }, + "ym-Technical-University-of-Kenya": { + "description": "Nhánh YouthMappers tại Đại học Công nghệ Kenya" + }, + "ym-Texas-Tech-University": { + "description": "Nhánh YouthMappers tại Đại học Công nghệ Texas" + }, + "ym-The-Citadel": { + "name": "YouthMappers tại The Citadel", + "description": "Nhánh YouthMappers tại The Citadel" + }, + "ym-The-Gambia-YMCA-University-of-the-Gambia": { + "description": "Nhánh YouthMappers tại YMCA Gambia / Đại học Gambia" + }, + "ym-The-George-Washington-University": { + "description": "Nhánh YouthMappers tại Đại học George Washington" + }, + "ym-The-Johns-Hopkins-University-SAIS": { + "description": "Nhánh YouthMappers tại Học viện Nghiên cứu Quốc tế Cao cấp tại Đại học Johns Hopkins" + }, + "ym-The-Pennsylvania-State-University": { + "description": "Nhánh YouthMappers tại Đại học Tiểu bang Pennsylvania" + }, + "ym-The-University-of-Zambia": { + "description": "Nhánh YouthMappers tại Đại học Zambia" + }, + "ym-Tribhuvan-University": { + "description": "Nhánh YouthMappers tại Đại học Tribhuvan" + }, + "ym-UW-Madison": { + "name": "BadgerMaps", + "description": "Nhánh YouthMappers tại Đại học Wisconsin tại Madison" + }, + "ym-Uganda-Christian-University-Mbale-Campus": { + "description": "Nhánh YouthMappers tại Đại học Kitô giáo Uganda tại Mbale" + }, + "ym-Uganda-Pentecostal-University": { + "description": "Nhánh YouthMappers tại Đại học Ngũ Tuần Uganda" + }, + "ym-Universidad-Autonoma-de-Madrid": { + "description": "Nhánh YouthMappers tại Đại học Tự trị Madrid" + }, "ym-Universidad-Distrital-Francisco-Jose-de-Caldas": { "name": "YouthMappers tại Bogotá", "description": "Nhánh YouthMappers tại Đại học Đặc khu Francisco José de Caldas" }, + "ym-Universidad-Nacional-Autnoma-de-Honduras": { + "description": "Nhánh YouthMappers tại Đại học Quốc gia Tự trị Honduras" + }, + "ym-Universidad-Nacional-de-Colombia": { + "description": "Nhánh YouthMappers tại Đại học Quốc gia Colombia" + }, + "ym-Universidad-Nacional-de-Ingenieria": { + "description": "Nhánh YouthMappers tại Đại học Kỹ thuật Quốc gia" + }, + "ym-Universidad-Politcnica-de-Madrid": { + "description": "Nhánh YouthMappers tại Đại học Bách khoa Madrid" + }, + "ym-Universidad-de-Antioquia": { + "description": "Nhánh YouthMappers tại Đại học Antioquia" + }, "ym-Universidad-de-San-Buenaventura": { "name": "YouthMappers San Buenaventura", "description": "Nhánh YouthMappers tại Đại học San Buenaventura" diff --git a/dist/locales/zh-CN.json b/dist/locales/zh-CN.json index 22b4003b2..091bd545a 100644 --- a/dist/locales/zh-CN.json +++ b/dist/locales/zh-CN.json @@ -5458,8 +5458,8 @@ "terms": "学院,建筑,教学楼,实验室,校舍,宿舍,大学,院校,大专,校园,学校,学习" }, "building/commercial": { - "name": "商业建筑物", - "terms": "商业建筑物" + "name": "商务办公楼", + "terms": "商业建筑物,写字楼,办公楼" }, "building/construction": { "name": "在建建筑", @@ -5521,8 +5521,8 @@ "terms": "住宅建筑物,住宅建筑" }, "building/retail": { - "name": "零售业建筑", - "terms": "零售业建筑,百货" + "name": "商场建筑", + "terms": "零售业建筑,百货,购物中心,商场" }, "building/roof": { "name": "开放式建筑", @@ -6275,8 +6275,8 @@ "terms": "教堂庭院" }, "landuse/commercial": { - "name": "商业区", - "terms": "商业区,商业用地" + "name": "商务办公用地", + "terms": "商业区,商业用地,办公用地,商务" }, "landuse/construction": { "name": "建设区域", @@ -6400,8 +6400,8 @@ "terms": "公寓区,楼区,公寓楼,公寓,住宅,住宅区,住所,套间" }, "landuse/retail": { - "name": "零售场所", - "terms": "零售场所" + "name": "购物区", + "terms": "零售场所,购物区,商业区,商业用地" }, "landuse/vineyard": { "name": "葡萄园", diff --git a/dist/locales/zh-TW.json b/dist/locales/zh-TW.json index 1943487af..8dd555142 100644 --- a/dist/locales/zh-TW.json +++ b/dist/locales/zh-TW.json @@ -1005,7 +1005,8 @@ "welcome": "歡迎使用 iD 開放街圖編輯器", "text": "iD 編輯器是一個易用且強大的工具，以助您編輯世界上最好的自由世界地圖。這是版本 {version}。欲知詳情，請瀏覽 {website} 及於 {github} 回報臭蟲。", "privacy_update": "我們的隱私權政策最近已更新。", - "privacy": "{updateMessage} 使用此軟體，即表示您同意 iD 隱私權政策，可以在 {here} 看到。", + "privacy_policy": "iD 隱私權政策", + "privacy": "{updateMessage} 使用此軟體，即表示您同意遵守 {privacyLink}。", "walkthrough": "開始教學", "start": "現在就編輯" }, @@ -2761,6 +2762,10 @@ "baby_seat": { "label": "嬰兒座椅" }, + "backcountry": { + "label": "偏遠地區", + "terms": "偏遠地區" + }, "backrest": { "label": "椅背" }, @@ -2829,6 +2834,9 @@ "booth": { "label": "亭子" }, + "bottle": { + "label": "裝瓶" + }, "boules": { "label": "類型" }, @@ -3352,6 +3360,9 @@ "generator/type": { "label": "種類" }, + "geyser/height": { + "label": "噴發高度" + }, "gnis/feature_id": { "label": "GNIS 特徵 ID", "terms": "GNIS 特徵 ID" @@ -3362,6 +3373,10 @@ "grape_variety": { "label": "葡萄品種" }, + "group_only": { + "label": "僅團體", + "terms": "僅團體" + }, "guest_house": { "label": "類型" }, @@ -3451,6 +3466,9 @@ "undefined": "否" } }, + "hot_water": { + "label": "熱水" + }, "iata": { "label": "IATA 機場代碼" }, @@ -3844,6 +3862,10 @@ "yes": "是" } }, + "openfire": { + "label": "允許明火", + "terms": "允許明火" + }, "opening_date": { "label": "預計開放日期" }, @@ -4342,6 +4364,10 @@ "shop": { "label": "種類" }, + "shower": { + "label": "淋浴", + "terms": "淋浴" + }, "siren/purpose": { "label": "目的" }, @@ -4544,6 +4570,10 @@ "to": { "label": "到" }, + "toilets": { + "label": "廁所", + "terms": "廁所" + }, "toilets/disposal": { "label": "處置方式", "options": { @@ -6289,6 +6319,10 @@ "name": "煙囪清掃工 ", "terms": "掃煙囪" }, + "craft/cleaning": { + "name": "清潔服務", + "terms": "清潔服務" + }, "craft/clockmaker": { "name": "製鐘匠", "terms": "製鐘店" @@ -6373,6 +6407,10 @@ "name": "水管工", "terms": "水喉匠" }, + "craft/pottery": { + "name": "製陶業", + "terms": "製陶業" + }, "craft/rigger": { "name": "吊運服務", "terms": "吊運服務" @@ -6524,6 +6562,10 @@ "name": "入口/出口", "terms": "入口/出口" }, + "entrance/emergency": { + "name": "緊急出口", + "terms": "緊急出口" + }, "ford": { "name": "淺灘", "terms": "淺灘" @@ -7901,6 +7943,10 @@ "name": "高原荒地", "terms": "高原荒地" }, + "natural/geyser": { + "name": "間歇泉", + "terms": "間歇泉" + }, "natural/glacier": { "name": "冰川", "terms": "冰川,冰河" @@ -8831,6 +8877,10 @@ "name": "肉販", "terms": "肉販" }, + "shop/camera": { + "name": "相機配件店", + "terms": "相機配件店" + }, "shop/candles": { "name": "燈具店", "terms": "燈具行" @@ -8939,6 +8989,10 @@ "name": "DIY商店", "terms": "DIY商店" }, + "shop/doors": { + "name": "門店", + "terms": "門店" + }, "shop/dry_cleaning": { "name": "乾洗店", "terms": "乾洗商店" @@ -8975,8 +9029,8 @@ "name": "時尚店" }, "shop/fashion_accessories": { - "name": "時尚配件商店", - "terms": "時尚配件商店" + "name": "服裝配飾商店", + "terms": "服裝配飾商店" }, "shop/fireplace": { "name": "壁爐商店", @@ -8989,6 +9043,10 @@ "shop/fishmonger": { "name": "魚販" }, + "shop/flooring": { + "name": "地板商店", + "terms": "地板商店" + }, "shop/florist": { "name": "花店", "terms": "花卉行" @@ -9216,6 +9274,10 @@ "name": "攝影用品店", "terms": "照相店" }, + "shop/pottery": { + "name": "陶器店", + "terms": "陶器店" + }, "shop/printer_ink": { "name": "印表機墨水商店", "terms": "印表機墨水商店" @@ -9312,6 +9374,10 @@ "name": "菸店", "terms": "香菸店" }, + "shop/tool_hire": { + "name": "工具租賃", + "terms": "工具租賃" + }, "shop/toys": { "name": "玩具店", "terms": "玩具店" @@ -9434,6 +9500,14 @@ "name": "露營地", "terms": "營地" }, + "tourism/camp_site/backcountry": { + "name": "野外露營區", + "terms": "野外露營區" + }, + "tourism/camp_site/group_only": { + "name": "團體露營區", + "terms": "團體露營區" + }, "tourism/caravan_site": { "name": "露營車停車場", "terms": "房車營地" @@ -10065,6 +10139,13 @@ "description": "透過 finds.jp 而來的 GSI Kiban 2500。適合用於追蹤軌跡，但有點老舊。", "name": "日本 GSI KIBAN 2500" }, + "gothenburg-citymap": { + "attribution": { + "text": "© 哥特堡市, CC0" + }, + "description": "城市地圖是描述哥特堡的概覽地圖。它包含了關於土地、通訊、水文、建築、地址號碼與街道名稱、行政區劃與其他方向文字等的一般性資訊。", + "name": "哥特堡城市地圖" + }, "gsi.go.jp": { "attribution": { "text": "GSI 日本" diff --git a/modules/osm/entity.js b/modules/osm/entity.js index a99f4bbc6..a86635564 100644 --- a/modules/osm/entity.js +++ b/modules/osm/entity.js @@ -205,7 +205,7 @@ osmEntity.prototype = { return vals.indexOf(d.old[key]) !== -1; } else { if (tags[key] === d.old[key]) { - if (d.old[key] === d.replace[key]) { + if (d.replace && d.old[key] === d.replace[key]) { return !Object.keys(d.replace).every(function(key) { return tags[key] === d.replace[key]; }); diff --git a/modules/services/improveOSM.js b/modules/services/improveOSM.js index c851fc29f..71c5f9897 100644 --- a/modules/services/improveOSM.js +++ b/modules/services/improveOSM.js @@ -361,9 +361,10 @@ export default { var that = this; d3_json(url) .then(function(data) { + // Assign directly for immediate use in the callback // comments are served newest to oldest - var comments = data.comments ? data.comments.reverse() : []; - that.replaceError(d.update({ comments: comments })); + d.comments = data.comments ? data.comments.reverse() : []; + that.replaceError(d); if (callback) callback(null, d); }) .catch(function(err) { @@ -390,18 +391,10 @@ export default { var key = d.error_key; var url = _impOsmUrls[key] + '/comment'; var payload = { - username: user.display_name + username: user.display_name, + targetIds: [ d.identifier ] }; - // Each error type has different data for identification - if (key === 'ow') { - payload.roadSegments = [ d.identifier ]; - } else if (key === 'mr') { - payload.tiles = [ d.identifier ]; - } else if (key === 'tr') { - payload.targetIds = [ d.identifier ]; - } - if (d.newStatus !== undefined) { payload.status = d.newStatus; payload.text = 'status changed'; diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js index bd4cc4fb8..87d958765 100644 --- a/modules/services/taginfo.js +++ b/modules/services/taginfo.js @@ -106,7 +106,8 @@ function filterRoles(geometry) { function valKey(d) { return { value: d.key, - title: d.key + title: d.key, + count: d.count }; } @@ -114,7 +115,8 @@ function valKey(d) { function valKeyDescription(d) { return { value: d.value, - title: d.description || d.value + title: d.description || d.value, + count: d.count }; } @@ -122,7 +124,8 @@ function valKeyDescription(d) { function roleKey(d) { return { value: d.role, - title: d.role + title: d.role, + count: d.count }; } diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js index f78955079..38796ef9b 100644 --- a/modules/ui/feature_list.js +++ b/modules/ui/feature_list.js @@ -149,8 +149,11 @@ export function uiFeatureList(context) { var localResults = []; for (var id in allEntities) { var entity = allEntities[id]; + if (!entity) continue; + var name = utilDisplayName(entity) || ''; if (name.toLowerCase().indexOf(q) < 0) continue; + var matched = context.presets().match(entity, graph); var type = (matched && matched.name()) || utilDisplayType(entity.id); var extent = entity.extent(graph); diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js index b5f5e4a5c..2274ad498 100644 --- a/modules/ui/fields/combo.js +++ b/modules/ui/fields/combo.js @@ -181,6 +181,10 @@ export function uiFieldCombo(field, context) { taginfo[fn](params, function(err, data) { if (err) return; + data = data.filter(function(d) { + return !d.count || d.count > 10; + }); + var deprecatedValues = osmEntity.deprecatedTagValuesByKey()[field.key]; if (deprecatedValues) { // don't suggest deprecated tag values diff --git a/modules/ui/preset_editor.js b/modules/ui/preset_editor.js index 38a20b7ee..e6d2f66da 100644 --- a/modules/ui/preset_editor.js +++ b/modules/ui/preset_editor.js @@ -59,7 +59,8 @@ export function uiPresetEditor(context) { }); additionalFields.forEach(function(field) { - if (_preset.fields.indexOf(field) === -1) { + if (_preset.fields.indexOf(field) === -1 && + field.matchGeometry(geometry)) { _fieldsArr.push( uiField(context, field, entity, { show: false }) ); diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js index 6b8cf1d12..4b6a364e2 100644 --- a/modules/ui/raw_tag_editor.js +++ b/modules/ui/raw_tag_editor.js @@ -144,14 +144,6 @@ export function uiRawTagEditor(context) { .on('blur', textChanged) .on('change', textChanged); - // If All Fields section is hidden, focus textarea and put cursor at end.. - var fieldsExpanded = d3_select('.hide-toggle-preset_fields.expanded').size(); - if (_state !== 'hover' && _tagView === 'text' && !fieldsExpanded) { - var element = textarea.node(); - element.focus(); - element.setSelectionRange(textData.length, textData.length); - } - // View as List var list = wrap.selectAll('.tag-list') diff --git a/package.json b/package.json index d2fc4e8ce..fa4dd363a 100644 --- a/package.json +++ b/package.json @@ -63,13 +63,13 @@ "@fortawesome/free-solid-svg-icons": "^5.11.2", "@ideditor/temaki": "~3.8.0", "@mapbox/maki": "^6.0.0", - "@rollup/plugin-buble": "^0.20.0", + "@rollup/plugin-buble": "^0.21.0", "chai": "^4.1.0", "cldr-core": "36.0.0", "cldr-localenames-full": "36.0.0", "colors": "^1.1.2", "concat-files": "^0.1.1", - "d3": "~5.14.2", + "d3": "~5.15.0", "editor-layer-index": "github:osmlab/editor-layer-index#gh-pages", "eslint": "^6.3.0", "gaze": "^1.1.3", diff --git a/svg/fontawesome/fas-church.svg b/svg/fontawesome/fas-church.svg new file mode 100644 index 000000000..9947a275b --- /dev/null +++ b/svg/fontawesome/fas-church.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-door-open.svg b/svg/fontawesome/fas-door-open.svg new file mode 100644 index 000000000..ce3e894b2 --- /dev/null +++ b/svg/fontawesome/fas-door-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-hospital-alt.svg b/svg/fontawesome/fas-hospital-alt.svg new file mode 100644 index 000000000..e514b9441 --- /dev/null +++ b/svg/fontawesome/fas-hospital-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-hotel.svg b/svg/fontawesome/fas-hotel.svg new file mode 100644 index 000000000..d46d5ed2e --- /dev/null +++ b/svg/fontawesome/fas-hotel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-house-damage.svg b/svg/fontawesome/fas-house-damage.svg new file mode 100644 index 000000000..248a905e9 --- /dev/null +++ b/svg/fontawesome/fas-house-damage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-mosque.svg b/svg/fontawesome/fas-mosque.svg new file mode 100644 index 000000000..5e502e19e --- /dev/null +++ b/svg/fontawesome/fas-mosque.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-school.svg b/svg/fontawesome/fas-school.svg new file mode 100644 index 000000000..21bd5c636 --- /dev/null +++ b/svg/fontawesome/fas-school.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-store.svg b/svg/fontawesome/fas-store.svg new file mode 100644 index 000000000..76bdef864 --- /dev/null +++ b/svg/fontawesome/fas-store.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/spec/validations/outdated_tags.js b/test/spec/validations/outdated_tags.js index d03609176..2c3abb487 100644 --- a/test/spec/validations/outdated_tags.js +++ b/test/spec/validations/outdated_tags.js @@ -55,7 +55,7 @@ describe('iD.validations.outdated_tags', function () { expect(issues).to.have.lengthOf(0); }); - it('flags deprecated tags', function() { + it('flags deprecated tag with replacement', function() { createWay({'highway': 'ford'}); var issues = validate(); expect(issues).to.have.lengthOf(1); @@ -67,6 +67,17 @@ describe('iD.validations.outdated_tags', function () { expect(issue.entityIds[0]).to.eql('w-1'); }); + it('flags deprecated tag with no replacement', function() { + createWay({'highway': 'no'}); + var issues = validate(); + expect(issues).to.have.lengthOf(1); + var issue = issues[0]; + expect(issue.type).to.eql('outdated_tags'); + expect(issue.subtype).to.eql('deprecated_tags'); + expect(issue.severity).to.eql('warning'); + expect(issue.entityIds).to.have.lengthOf(1); + expect(issue.entityIds[0]).to.eql('w-1'); + }); it('ignores way with no relations', function() { createWay({});