Merge branch 'develop' into 1ec5-custom-wms-template-7428

data/core.yaml

@@ -33,33 +33,25 @@ en:
     add_area:
       title: Area
       description: "Add parks, buildings, lakes or other areas to the map."
-      tail: "Click on the map to start drawing an area, like a park, lake, or building."
       filter_tooltip: areas
     add_line:
       title: Line
       description: "Add highways, streets, pedestrian paths, canals or other lines to the map."
-      tail: "Click on the map to start drawing a road, path, or route."
       filter_tooltip: lines
     add_point:
       title: Point
       description: "Add restaurants, monuments, postal boxes or other points to the map."
-      tail: Click on the map to add a point.
       filter_tooltip: points
     add_note:
       title: Note
       label: Add Note
       description: "Spotted an issue? Let other mappers know."
-      tail: Click on the map to add a note.
       key: N
     add_preset:
       title: "Add {feature}"
     browse:
       title: Browse
       description: Pan and zoom the map.
-    draw_area:
-      tail: Click to add nodes to your area. Click the first node to finish the area.
-    draw_line:
-      tail: "Click to add more nodes to the line. Click on other lines to connect to them, and double-click to end the line."
     drag_node:
       connected_to_hidden: This can't be edited because it is connected to a hidden feature.
   operations:
@@ -88,6 +80,26 @@ en:
       annotation: Changed the role of a relation member.
     change_tags:
       annotation: Changed tags.
+    copy:
+      title: Copy
+      description:
+        single: Set this feature for pasting.
+        multiple: Set these features for pasting.
+      annotation:
+        single: Copied a feature.
+        multiple: "Copied {n} features."
+      too_large:
+        single: This can't be copied because not enough of it is currently visible.
+        multiple: These can't be copied because not enough of them are currently visible.
+    paste:
+      title: Paste
+      description:
+        single: "Add a duplicate {feature} here."
+        multiple: "Add {n} duplicate features here."
+      annotation:
+        single: Pasted a feature.
+        multiple: "Pasted {n} features."
+      nothing_copied: No features have been copied.
     circularize:
       title: Circularize
       description:
@@ -377,6 +389,8 @@ en:
       description:
         vertex:
           single: Extract this point from its parent lines/areas.
+        line:
+          single: Extract a point from this line.
         area:
           single: Extract a point from this area.
       annotation:
@@ -1844,18 +1858,15 @@ en:
       welcome: "Welcome! This walkthrough will teach you the basics of editing on OpenStreetMap."
       practice: "All of the data in this walkthrough is just for practicing, and any edits that you make in the walkthrough will not be saved."
       words: "This walkthrough will introduce some new words and concepts. When we introduce a new word, we'll use *italics*."
-      mouse: "You can use any input device to edit the map, but this walkthrough assumes you have a mouse with left and right buttons. **If you want to attach a mouse, do so now, then click OK.**"
-      leftclick: "When this tutorial asks you to click or double-click, we mean with the left button. On a trackpad it might be a single-click or single-finger tap. **Left-click {num} times.**"
-      rightclick: "Sometimes we'll also ask you to right-click. This might be the same as control-click, or two-finger tap on a trackpad. Your keyboard might even have a 'menu' key that works like right-click. **Right-click {num} times.**"
-      chapters: "So far, so good! You can use the buttons below to skip chapters at any time or to restart a chapter if you get stuck. Let's begin! **Click '{next}' to continue.**"
+      chapters: "You can use the buttons below to skip chapters at any time or to restart a chapter if you get stuck. Let's begin! **Press '{next}' to continue.**"
     navigation:
       title: "Navigation"
-      drag: "The main map area shows OpenStreetMap data on top of a background.{br}You can drag the map by pressing and holding the left mouse button while moving the mouse around. You can also use the arrow keys on your keyboard. **Drag the map!**"
-      zoom: "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons. **Zoom the map!**"
+      drag: "The main map area shows OpenStreetMap data on top of a background.{br}You can click-and-drag or tap-and-drag the map to move it around. You can also use the arrow keys on a keyboard. **Drag the map!**"
+      zoom: "You can zoom in or out by scrolling with a mouse wheel, pinching on a touchscreen, or pressing the {plus} / {minus} buttons. **Zoom the map!**"
       features: "We use the word *features* to describe the things that appear on the map. Anything in the real world can be mapped as a feature on OpenStreetMap."
       points_lines_areas: "Map features are represented using *points, lines, or areas.*"
       nodes_ways: "In OpenStreetMap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
-      click_townhall: "All features on the map can be selected by clicking on them. **Click on the point to select it.**"
+      click_townhall: "All features on the map can be selected by clicking or tapping on them. **Select the point.**"
       selected_townhall: "Great! The point is now selected. Selected features are drawn with a pulsing glow."
       editor_townhall: "When a feature is selected, the *feature editor* is displayed alongside the map."
       preset_townhall: "The top part of the feature editor shows the feature's type. This point is a {preset}."
@@ -1865,7 +1876,7 @@ en:
       choose_street: "**Choose {name} from the list to select it.**"
       selected_street: "Great! {name} is now selected."
       editor_street: "The fields shown for a street are different than the fields that were shown for the town hall.{br}For this selected street, the feature editor shows fields like '{field1}' and '{field2}'. **Close the feature editor by hitting escape or pressing the {button} button.**"
-      play: "Try moving the map and clicking on some other features to see what kinds of things can be added to OpenStreetMap. **When you are ready to continue to the next chapter, click '{next}'.**"
+      play: "Try exploring the map and selecting some other features to see what kinds of things can be added to OpenStreetMap. **When you are ready to continue to the next chapter, press '{next}'.**"
     points:
       title: "Points"
       add_point: "*Points* can be used to represent features such as shops, restaurants, and monuments.{br}They mark a specific location, and describe what's there. **Click the {button} Point button to add a new point.**"
@@ -1968,6 +1979,7 @@ en:
       enter: Enter
       esc: Esc
       home: Home
+      menu: Menu
       option: Option
       pause: Pause
       pgdn: PgDn

data/deprecated.json

@@ -11,6 +11,14 @@
     "old": {"access": "public"},
     "replace": {"access": "yes"}
   },
+  {
+    "old": {"aerodrome": "military"},
+    "replace": {"military": "airfield"}
+  },
+  {
+    "old": {"aerodrome:type": "military"},
+    "replace": {"military": "airfield"}
+  },
   {
     "old": {"agrarian": "agrcultural_machinry"},
     "replace": {"agrarian": "agricultural_machinery"}
@@ -215,6 +223,10 @@
     "old": {"bridge": "1"},
     "replace": {"bridge": "yes"}
   },
+  {
+    "old": {"bridge": "true"},
+    "replace": {"bridge": "yes"}
+  },
   {
     "old": {"building": "entrance"},
     "replace": {"entrance": "*"}
@@ -271,6 +283,13 @@
     "old": {"company": "consulting"},
     "replace": {"office": "consulting"}
   },
+  {
+    "old": {"content": "unknown"}
+  },
+  {
+    "old": {"contents": "*"},
+    "replace": {"content": "$1"}
+  },
   {
     "old": {"craft": "catering"},
     "replace": {"craft": "caterer"}
@@ -610,6 +629,14 @@
     "old": {"kerb": "flat"},
     "replace": {"kerb": "flush"}
   },
+  {
+    "old": {"landcover": "flower_bed"},
+    "replace": {"landuse": "flowerbed"}
+  },
+  {
+    "old": {"landcover": "flowerbed"},
+    "replace": {"landuse": "flowerbed"}
+  },
   {
     "old": {"landuse": "basin"},
     "replace": {"natural": "water", "water": "basin"}
@@ -618,10 +645,6 @@
     "old": {"landuse": "conservation"},
     "replace": {"boundary": "protected_area"}
   },
-  {
-    "old": {"landuse": "farm"},
-    "replace": {"landuse": "farmland"}
-  },
   {
     "old": {"landuse": "field"},
     "replace": {"landuse": "farmland"}
@@ -710,6 +733,18 @@
     "old": {"man_made": "cut_line"},
     "replace": {"man_made": "cutline"}
   },
+  {
+    "old": {"man_made": "flower_bed"},
+    "replace": {"landuse": "flowerbed"}
+  },
+  {
+    "old": {"man_made": "flowerbed"},
+    "replace": {"landuse": "flowerbed"}
+  },
+  {
+    "old": {"man_made": "fuel_storage_tank"},
+    "replace": {"man_made": "storage_tank", "content": "fuel"}
+  },
   {
     "old": {"man_made": "gas_well"},
     "replace": {"man_made": "petroleum_well", "substance": "gas"}
@@ -726,10 +761,6 @@
     "old": {"man_made": "MDF"},
     "replace": {"telecom": "exchange"}
   },
-  {
-    "old": {"man_made": "fuel_storage_tank"},
-    "replace": {"man_made": "storage_tank", "content": "fuel"}
-  },
   {
     "old": {"man_made": "oil_tank"},
     "replace": {"man_made": "storage_tank", "content": "oil"}
@@ -887,6 +918,30 @@
   {
     "old": {"operator:type": "unknown"}
   },
+  {
+    "old": {"parking": "covered"},
+    "replace": {"covered": "yes"}
+  },
+  {
+    "old": {"parking": "customers"},
+    "replace": {"access": "customers"}
+  },
+  {
+    "old": {"parking": "entrance"},
+    "replace": {"amenity": "parking_entrance"}
+  },
+  {
+    "old": {"parking": "park_and_ride"},
+    "replace": {"park_ride": "yes"}
+  },
+  {
+    "old": {"parking": "private"},
+    "replace": {"access": "private"}
+  },
+  {
+    "old": {"parking": "street"},
+    "replace": {"parking": "lane"}
+  },
   {
     "old": {"place_name": "*"},
     "replace": {"name": "$1"}
@@ -1303,6 +1358,30 @@
     "old": {"type": "extinct"},
     "replace": {"volcano:status": "extinct"}
   },
+  {
+    "old": {"type": "gas", "man_made": "pipeline"},
+    "replace": {"substance": "gas", "man_made": "pipeline"}
+  },
+  {
+    "old": {"type": "gas", "man_made": "pumping_rig"},
+    "replace": {"substance": "gas", "man_made": "pumping_rig"}
+  },
+  {
+    "old": {"type": "gas", "pipeline": "*"},
+    "replace": {"substance": "gas", "pipeline": "$1"}
+  },
+  {
+    "old": {"type": "oil", "man_made": "pipeline"},
+    "replace": {"substance": "oil", "man_made": "pipeline"}
+  },
+  {
+    "old": {"type": "oil", "man_made": "pumping_rig"},
+    "replace": {"substance": "oil", "man_made": "pumping_rig"}
+  },
+  {
+    "old": {"type": "oil", "pipeline": "*"},
+    "replace": {"substance": "oil", "pipeline": "$1"}
+  },
   {
     "old": {"type": "scoria"},
     "replace": {"volcano:type": "scoria"}
@@ -1319,6 +1398,18 @@
     "old": {"type": "video", "amenity": "studio"},
     "replace": {"studio": "video"}
   },
+  {
+    "old": {"type": "water", "man_made": "pipeline"},
+    "replace": {"substance": "water", "man_made": "pipeline"}
+  },
+  {
+    "old": {"type": "water", "man_made": "reservoir_covered"},
+    "replace": {"content": "water", "man_made": "reservoir_covered"}
+  },
+  {
+    "old": {"type": "water", "pipeline": "*"},
+    "replace": {"substance": "water", "pipeline": "$1"}
+  },
   {
     "old": {"unnamed": "*"},
     "replace": {"noname": "$1"}

data/presets.yaml

@@ -276,13 +276,6 @@ en:
       bath/type:
         # 'bath:type=*'
         label: Specialty
-        options:
-          # 'bath:type=foot_bath'
-          foot_bath: Foot Bath
-          # 'bath:type=hot_spring'
-          hot_spring: Hot Spring
-          # 'bath:type=onsen'
-          onsen: Japanese Onsen
       beauty:
         # beauty=*
         label: Services
@@ -358,6 +351,9 @@ en:
       bridge/support:
         # 'bridge:support=*'
         label: Type
+      bridge_combo:
+        # bridge=*
+        label: Type
       building:
         # building=*
         label: Building
@@ -473,6 +469,9 @@ en:
       collection_times:
         # collection_times=*
         label: Collection Times
+      collector:
+        # collector=*
+        label: Items
       colour:
         # colour=*
         label: Color
@@ -652,6 +651,9 @@ en:
       design:
         # design=*
         label: Design
+      destination:
+        # destination=*
+        label: Destination
       destination/ref_oneway:
         # 'destination:ref=*'
         label: Destination Road Numbers
@@ -743,6 +745,14 @@ en:
           both: Both / All
           # direction=forward
           forward: Forward
+      direction_vertex_dual:
+        # direction=*
+        label: Direction Affected
+        options:
+          # direction=backward
+          backward: Backward
+          # direction=forward
+          forward: Forward
       dispensing:
         # dispensing=*
         label: Dispenses Prescriptions
@@ -1111,6 +1121,13 @@ en:
       icao:
         # icao=*
         label: ICAO Airport Code
+      image:
+        # image=*
+        label: Image
+        # image field placeholder
+        placeholder: 'https://example.com/photo.jpg'
+        # 'terms: icon,image uri,photo,picture'
+        terms: '[translate with synonyms or related terms for ''Image'', separated by commas]'
       incline:
         # incline=*
         label: Incline
@@ -1603,6 +1620,11 @@ en:
         # opening_hours field placeholder
         placeholder: Unknown
         terms: '[translate with synonyms or related terms for ''Hours'', separated by commas]'
+      opening_hours/covid19:
+        # 'opening_hours:covid19=*'
+        label: COVID-19 Pandemic Hours
+        # 'terms: coronavirus,lockdown,opening hours,SARS‑CoV‑2'
+        terms: '[translate with synonyms or related terms for ''COVID-19 Pandemic Hours'', separated by commas]'
       operator:
         # operator=*
         label: Operator
@@ -1635,6 +1657,8 @@ en:
           lane: Roadside Lane
           # parking=multi-storey
           multi-storey: Multilevel
+          # parking=rooftop
+          rooftop: Rooftop
           # parking=sheds
           sheds: Sheds
           # parking=surface
@@ -2020,6 +2044,9 @@ en:
       route_master:
         # route_master=*
         label: Type
+      ruins:
+        # ruins=*
+        label: Type
       rwn_ref:
         # rwn_ref=*
         label: Walking Code
@@ -2631,6 +2658,9 @@ en:
         label: Type
         # tunnel field placeholder
         placeholder: Default
+      tunnel_combo:
+        # tunnel=*
+        label: Type
       usage_rail:
         # usage=*
         label: Usage Type
@@ -2852,9 +2882,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Drag Lift'', separated by commas>'
       aerialway/gondola:
         # aerialway=gondola
-        name: Gondola
+        name: Gondola Lift
         # 'terms: aerial cable,lift,skiing,snowboarding'
-        terms: '<translate with synonyms or related terms for ''Gondola'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Gondola Lift'', separated by commas>'
       aerialway/goods:
         # aerialway=goods
         name: Goods Aerialway
@@ -2910,9 +2940,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Airport'', separated by commas>'
       aeroway/apron:
         # aeroway=apron
-        name: Apron
-        # 'terms: ramp'
-        terms: '<translate with synonyms or related terms for ''Apron'', separated by commas>'
+        name: Airport Apron
+        # 'terms: aircraft parking,flight line,hardstand,ramp,tarmac,taxiway'
+        terms: '<translate with synonyms or related terms for ''Airport Apron'', separated by commas>'
       aeroway/gate:
         # aeroway=gate
         name: Airport Gate
@@ -3269,7 +3299,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Sandwich Fast Food'', separated by commas>'
       amenity/ferry_terminal:
         # amenity=ferry_terminal
-        name: Ferry Station / Terminal
+        name: Ferry Terminal
       amenity/fire_station:
         # amenity=fire_station
         name: Fire Station
@@ -3610,9 +3640,6 @@ en:
         name: Recycling Container
         # 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
         terms: '<translate with synonyms or related terms for ''Recycling Container'', separated by commas>'
-      amenity/register_office:
-        # amenity=register_office
-        name: Register Office
       amenity/research_institute:
         # amenity=research_institute
         name: Research Institute Grounds
@@ -3723,9 +3750,6 @@ en:
         name: School Grounds
         # 'terms: academy,elementary school,middle school,high school'
         terms: '<translate with synonyms or related terms for ''School Grounds'', separated by commas>'
-      amenity/scrapyard:
-        # amenity=scrapyard
-        name: Scrap Yard
       amenity/shelter:
         # amenity=shelter
         name: Shelter
@@ -3816,9 +3840,6 @@ en:
         name: Film Studio
         # 'terms: movie production,movie studio,video production,video recording,video studio'
         terms: '<translate with synonyms or related terms for ''Film Studio'', separated by commas>'
-      amenity/swimming_pool:
-        # amenity=swimming_pool
-        name: Swimming Pool
       amenity/taxi:
         # amenity=taxi
         name: Taxi Stand
@@ -4205,6 +4226,7 @@ en:
       barrier/height_restrictor:
         # barrier=height_restrictor
         name: Height Restrictor
+        # 'terms: height barrier,height restriction barrier,maxheight,maximum height measurer'
         terms: '<translate with synonyms or related terms for ''Height Restrictor'', separated by commas>'
       barrier/kerb:
         # barrier=kerb
@@ -4236,6 +4258,7 @@ en:
       barrier/lift_gate:
         # barrier=lift_gate
         name: Lift Gate
+        # 'terms: boom barrier,boom gate,boom lift,hinged bar,pivoted pole'
         terms: '<translate with synonyms or related terms for ''Lift Gate'', separated by commas>'
       barrier/retaining_wall:
         # barrier=retaining_wall
@@ -4354,6 +4377,11 @@ en:
         # building=construction
         name: Building Under Construction
         terms: '<translate with synonyms or related terms for ''Building Under Construction'', separated by commas>'
+      building/cowshed:
+        # building=cowshed
+        name: Cowshed
+        # 'terms: byre,cow barn,cow house,cow shed,cowbarn,cowhouse,dairy barn,milking barn'
+        terms: '<translate with synonyms or related terms for ''Cowshed'', separated by commas>'
       building/detached:
         # building=detached
         name: Detached House
@@ -4431,6 +4459,11 @@ en:
         # building=mosque
         name: Mosque Building
         terms: '<translate with synonyms or related terms for ''Mosque Building'', separated by commas>'
+      building/office:
+        # building=office
+        name: Office Building
+        # 'terms: business center,office block'
+        terms: '<translate with synonyms or related terms for ''Office Building'', separated by commas>'
       building/pavilion:
         # building=pavilion
         name: Pavilion Building
@@ -4489,6 +4522,11 @@ en:
         name: Static Mobile Home
         # 'terms: house trailer,manufactured home,mobile home,prefabricated home,residential caravan,static caravan,trailer home'
         terms: '<translate with synonyms or related terms for ''Static Mobile Home'', separated by commas>'
+      building/sty:
+        # building=sty
+        name: Pigsty
+        # 'terms: hog parlor,hog pen,pig ark,pig barn,pig parlor,pig pen,pig shed,pig shelter,pig-cote,piggery,pigpen,pigshed,sty'
+        terms: '<translate with synonyms or related terms for ''Pigsty'', separated by commas>'
       building/temple:
         # building=temple
         name: Temple Building
@@ -4631,13 +4669,13 @@ en:
         terms: '<translate with synonyms or related terms for ''Glaziery'', separated by commas>'
       craft/handicraft:
         # craft=handicraft
-        name: Handicraft
-        terms: '<translate with synonyms or related terms for ''Handicraft'', separated by commas>'
+        name: Handicraft Workspace
+        terms: '<translate with synonyms or related terms for ''Handicraft Workspace'', separated by commas>'
       craft/hvac:
         # craft=hvac
-        name: HVAC
+        name: HVAC Workplace
         # 'terms: heat*,vent*,air conditioning'
-        terms: '<translate with synonyms or related terms for ''HVAC'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''HVAC Workplace'', separated by commas>'
       craft/insulator:
         # craft=insulation
         name: Insulator
@@ -4656,8 +4694,8 @@ en:
         name: Locksmith
       craft/metal_construction:
         # craft=metal_construction
-        name: Metal Construction
-        terms: '<translate with synonyms or related terms for ''Metal Construction'', separated by commas>'
+        name: Metalworker
+        terms: '<translate with synonyms or related terms for ''Metalworker'', separated by commas>'
       craft/painter:
         # craft=painter
         name: Painter
@@ -4961,6 +4999,11 @@ en:
         # healthcare=counselling
         name: Counselling Center
         terms: '<translate with synonyms or related terms for ''Counselling Center'', separated by commas>'
+      healthcare/dentist/orthodontics:
+        # 'healthcare=dentist, healthcare:speciality=orthodontics'
+        name: Orthodontist
+        # 'terms: braces,dentistry,dentofacial orthopedics,headgear,jaw alignment,teeth,tooth'
+        terms: '<translate with synonyms or related terms for ''Orthodontist'', separated by commas>'
       healthcare/hospice:
         # healthcare=hospice
         name: Hospice
@@ -5028,9 +5071,9 @@ en:
         name: Bus Stop
       highway/construction:
         # 'highway=construction, access=no'
-        name: Road Closed
-        # 'terms: closed,closure,construction'
-        terms: '<translate with synonyms or related terms for ''Road Closed'', separated by commas>'
+        name: Closed Road
+        # 'terms: closure,construction,road closed,road work,roadwork'
+        terms: '<translate with synonyms or related terms for ''Closed Road'', separated by commas>'
       highway/corridor:
         # highway=corridor
         name: Indoor Corridor
@@ -5195,6 +5238,11 @@ en:
         name: Path
         # 'terms: hike,hiking,trackway,trail,walk'
         terms: '<translate with synonyms or related terms for ''Path'', separated by commas>'
+      highway/path/boardwalk:
+        # 'highway=path, bridge=boardwalk'
+        name: Boardwalk
+        # 'terms: pier,plank walkway,wooden raised foot path'
+        terms: '<translate with synonyms or related terms for ''Boardwalk'', separated by commas>'
       highway/path/informal:
         # 'highway=path, informal=yes'
         name: Informal Path
@@ -6109,6 +6157,11 @@ en:
         name: Running Track
         # 'terms: athletics track,decathlon,foot race,long distance running,marathon,middle distance running,racetrack,running,sprint,track,walking'
         terms: '<translate with synonyms or related terms for ''Running Track'', separated by commas>'
+      leisure/trampoline_park:
+        # leisure=trampoline_park
+        name: Trampoline Park
+        # 'terms: bounce,jump,spring'
+        terms: '<translate with synonyms or related terms for ''Trampoline Park'', separated by commas>'
       leisure/water_park:
         # leisure=water_park
         name: Water Park
@@ -6167,6 +6220,11 @@ en:
         name: Clearcut Forest
         # 'terms: cut,forest,lumber,tree,wood'
         terms: '<translate with synonyms or related terms for ''Clearcut Forest'', separated by commas>'
+      man_made/courtyard:
+        # man_made=courtyard
+        name: Courtyard
+        # 'terms: court,enclosed open air,quadrangle,yard'
+        terms: '<translate with synonyms or related terms for ''Courtyard'', separated by commas>'
       man_made/crane:
         # man_made=crane
         name: Crane
@@ -6318,6 +6376,11 @@ en:
         # man_made=pumping_station
         name: Pumping Station
         terms: '<translate with synonyms or related terms for ''Pumping Station'', separated by commas>'
+      man_made/reservoir_covered:
+        # man_made=reservoir_covered
+        name: Covered Reservoir
+        # 'terms: underground reservoir,water tank'
+        terms: '<translate with synonyms or related terms for ''Covered Reservoir'', separated by commas>'
       man_made/silo:
         # man_made=silo
         name: Silo
@@ -7294,9 +7357,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Bus Station / Terminal'', separated by commas>'
       public_transport/station_ferry:
         # 'public_transport=station, ferry=yes'
-        name: Ferry Station / Terminal
+        name: Ferry Terminal
         # 'terms: boat,dock,ferry,pier,public transit,public transportation,station,terminal,transit,transportation'
-        terms: '<translate with synonyms or related terms for ''Ferry Station / Terminal'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Ferry Terminal'', separated by commas>'
       public_transport/station_light_rail:
         # 'public_transport=station, light_rail=yes'
         name: Light Rail Station
@@ -7448,6 +7511,11 @@ en:
         # railway=monorail
         name: Monorail Track
         terms: '<translate with synonyms or related terms for ''Monorail Track'', separated by commas>'
+      railway/monorail/hanging:
+        # 'railway=monorail, monorail=hanging'
+        name: Hanging Monorail Track
+        # 'terms: suspension railway'
+        terms: '<translate with synonyms or related terms for ''Hanging Monorail Track'', separated by commas>'
       railway/narrow_gauge:
         # railway=narrow_gauge
         name: Narrow Gauge Track
@@ -7456,6 +7524,11 @@ en:
       railway/platform:
         # railway=platform
         name: Train Platform
+      railway/preserved:
+        # 'railway=*, railway:preserved=yes'
+        name: Heritage Railway Track
+        # 'terms: historic train,preserved rail,steam train,tourist train'
+        terms: '<translate with synonyms or related terms for ''Heritage Railway Track'', separated by commas>'
       railway/rail:
         # railway=rail
         name: Train Track
@@ -7746,6 +7819,11 @@ en:
         # shop=coffee
         name: Coffee Store
         terms: '<translate with synonyms or related terms for ''Coffee Store'', separated by commas>'
+      shop/collector:
+        # shop=collector
+        name: Collectibles Shop
+        # 'terms: antiques,coins,collection,collectors,comics,dolls,figurines,numismatics,philately,stamps,thrift'
+        terms: '<translate with synonyms or related terms for ''Collectibles Shop'', separated by commas>'
       shop/computer:
         # shop=computer
         name: Computer Store
@@ -7863,9 +7941,6 @@ en:
         name: Fishing Shop
         # 'terms: bait,fishing line,flies,fly,lure,reel,rod,tackle'
         terms: '<translate with synonyms or related terms for ''Fishing Shop'', separated by commas>'
-      shop/fishmonger:
-        # shop=fishmonger
-        name: Fishmonger
       shop/flooring:
         # shop=flooring
         name: Flooring Supply Shop
@@ -7894,9 +7969,6 @@ en:
         name: Funeral Home
         # 'terms: undertaker,memorial home'
         terms: '<translate with synonyms or related terms for ''Funeral Home'', separated by commas>'
-      shop/furnace:
-        # shop=furnace
-        name: Furnace Store
       shop/furniture:
         # shop=furniture
         name: Furniture Store
@@ -7969,6 +8041,11 @@ en:
         name: Hobby Shop
         # 'terms: manga,figurine,model'
         terms: '<translate with synonyms or related terms for ''Hobby Shop'', separated by commas>'
+      shop/household_linen:
+        # shop=household_linen
+        name: Household Linen Shop
+        # 'terms: bedspreads,blankets,domestic cloths,curtains,handkerchieves,napkins,pillow cases,robes,sheets,towels'
+        terms: '<translate with synonyms or related terms for ''Household Linen Shop'', separated by commas>'
       shop/houseware:
         # shop=houseware
         name: Houseware Store
@@ -8190,6 +8267,11 @@ en:
         name: Sewing Supply Shop
         # 'terms: haberdashery'
         terms: '<translate with synonyms or related terms for ''Sewing Supply Shop'', separated by commas>'
+      shop/shoe_repair:
+        # shop=shoe_repair
+        name: Shoe Repair Shop
+        # 'terms: cobbler'
+        terms: '<translate with synonyms or related terms for ''Shoe Repair Shop'', separated by commas>'
       shop/shoes:
         # shop=shoes
         name: Shoe Store

data/presets/fields.json

@@ -35,7 +35,7 @@
   "basin": {"key": "basin", "type": "combo", "label": "Type"},
   "bath/open_air": {"key": "bath:open_air", "label": "Open Air", "type": "check"},
   "bath/sand_bath": {"key": "bath:sand_bath", "label": "Sand Bath", "type": "check"},
-  "bath/type": {"key": "bath:type", "type": "combo", "label": "Specialty", "strings": {"options": {"onsen": "Japanese Onsen", "foot_bath": "Foot Bath", "hot_spring": "Hot Spring"}}},
+  "bath/type": {"key": "bath:type", "type": "combo", "label": "Specialty"},
   "beauty": {"key": "beauty", "type": "semiCombo", "label": "Services"},
   "bench": {"key": "bench", "type": "check", "label": "Bench", "terms": ["seating"]},
   "bicycle_parking": {"key": "bicycle_parking", "type": "combo", "label": "Type"},
@@ -50,6 +50,7 @@
   "boundary": {"key": "boundary", "type": "combo", "label": "Type"},
   "brand": {"key": "brand", "type": "text", "label": "Brand"},
   "brewery": {"key": "brewery", "type": "semiCombo", "label": "Draft Beers", "terms": ["on tap"]},
+  "bridge_combo": {"key": "bridge", "type": "combo", "label": "Type"},
   "bridge": {"key": "bridge", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
   "bridge/support": {"key": "bridge:support", "type": "typeCombo", "label": "Type"},
   "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": ["area"], "label": "Building"},
@@ -76,6 +77,7 @@
   "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
   "club": {"key": "club", "type": "typeCombo", "label": "Type"},
   "collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"},
+  "collector": {"key": "collector", "type": "semiCombo", "label": "Items"},
   "colour": {"key": "colour", "type": "text", "label": "Color"},
   "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
   "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
@@ -111,6 +113,7 @@
   "description": {"key": "description", "type": "textarea", "label": "Description", "universal": true, "terms": ["summary"]},
   "design": {"key": "design", "type": "combo", "label": "Design"},
   "destination_oneway": {"key": "destination", "type": "semiCombo", "label": "Destinations", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
+  "destination": {"key": "destination", "type": "text", "label": "Destination"},
   "destination/ref_oneway": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
   "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
   "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
@@ -120,6 +123,7 @@
   "diplomatic/services": {"key": "diplomatic:services:", "type": "multiCombo", "label": "Services"},
   "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}},
   "direction_clock": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"clockwise": "Clockwise", "anticlockwise": "Counterclockwise"}}},
+  "direction_vertex_dual": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward"}}},
   "direction_vertex": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
   "direction": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"},
   "dispensing": {"key": "dispensing", "type": "check", "label": "Dispenses Prescriptions", "default": "yes"},
@@ -205,6 +209,7 @@
   "hot_water": {"key": "hot_water", "type": "check", "label": "Hot Water"},
   "iata": {"key": "iata", "type": "text", "label": "IATA Airport Code"},
   "icao": {"key": "icao", "type": "text", "label": "ICAO Airport Code"},
+  "image": {"key": "image", "type": "url", "label": "Image", "placeholder": "https://example.com/photo.jpg", "universal": true, "terms": ["icon", "image uri", "photo", "picture"]},
   "incline_steps": {"key": "incline", "type": "combo", "label": "Incline", "strings": {"options": {"up": "Up", "down": "Down"}}},
   "incline": {"key": "incline", "type": "combo", "label": "Incline"},
   "indoor_type": {"key": "indoor", "type": "typeCombo", "label": "Type"},
@@ -260,7 +265,7 @@
   "maxstay": {"key": "maxstay", "type": "combo", "label": "Max Stay", "options": ["15 min", "30 min", "45 min", "1 hr", "1.5 hr", "2 hr", "2.5 hr", "3 hr", "4 hr", "1 day", "2 day"], "snake_case": false},
   "maxweight_bridge": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false, "prerequisiteTag": {"key": "bridge", "valueNot": "no"}},
   "maxweight": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false},
-  "memorial": {"key": "memorial", "type": "typeCombo", "label": "Type"},
+  "memorial": {"key": "memorial", "type": "combo", "label": "Type"},
   "microbrewery": {"key": "microbrewery", "type": "check", "label": "Microbrewery", "terms": ["brewpub", "craft beer"]},
   "mimics": {"key": "mimics", "type": "combo", "label": "Mimics", "terms": ["camoflauged", "disguised", "looks like", "tree"]},
   "min_age": {"key": "min_age", "type": "number", "minValue": 0, "label": "Minimum Age", "terms": ["lower age limit"]},
@@ -287,13 +292,14 @@
   "openfire": {"key": "openfire", "type": "check", "label": "Open Fires Allowed"},
   "opening_date": {"key": "opening_date", "type": "text", "label": "Expected Opening Date", "placeholder": "YYYY-MM-DD"},
   "opening_hours": {"key": "opening_hours", "type": "combo", "label": "Hours", "placeholder": "Unknown", "snake_case": false},
+  "opening_hours/covid19": {"key": "opening_hours:covid19", "type": "combo", "label": "COVID-19 Pandemic Hours", "terms": ["coronavirus", "lockdown", "opening hours", "SARS‑CoV‑2"], "snake_case": false},
   "operator": {"key": "operator", "type": "text", "label": "Operator"},
   "operator/type": {"key": "operator:type", "type": "combo", "label": "Operator Type", "prerequisiteTag": {"key": "operator"}},
   "outdoor_seating": {"key": "outdoor_seating", "type": "check", "label": "Outdoor Seating"},
   "par": {"key": "par", "type": "number", "minValue": 1, "label": "Par", "placeholder": "3, 4, 5..."},
   "park_ride": {"key": "park_ride", "type": "check", "label": "Park and Ride"},
   "parking_space": {"key": "parking_space", "type": "combo", "label": "Type"},
-  "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "multi-storey": "Multilevel", "underground": "Underground", "sheds": "Sheds", "carports": "Carports", "garage_boxes": "Garage Boxes", "lane": "Roadside Lane"}}},
+  "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "underground": "Underground", "multi-storey": "Multilevel", "lane": "Roadside Lane", "carports": "Carports", "garage_boxes": "Garage Boxes", "rooftop": "Rooftop", "sheds": "Sheds"}}},
   "payment_multi_fee": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
   "payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types"},
   "phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
@@ -358,6 +364,7 @@
   "rooms": {"key": "rooms", "type": "number", "minValue": 0, "label": "Rooms"},
   "route_master": {"key": "route_master", "type": "combo", "label": "Type"},
   "route": {"key": "route", "type": "combo", "label": "Type"},
+  "ruins": {"key": "ruins", "type": "combo", "label": "Type"},
   "rwn_ref": {"key": "rwn_ref", "type": "text", "label": "Walking Code"},
   "sac_scale": {"key": "sac_scale", "type": "combo", "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": {"options": {"hiking": "T1: Hiking", "mountain_hiking": "T2: Mountain Hiking", "demanding_mountain_hiking": "T3: Demanding Mountain Hiking", "alpine_hiking": "T4: Alpine Hiking", "demanding_alpine_hiking": "T5: Demanding Alpine Hiking", "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"}}},
   "salt": {"key": "salt", "type": "check", "label": "Salt", "terms": ["saline", "salinated"]},
@@ -454,6 +461,7 @@
   "trees": {"key": "trees", "type": "semiCombo", "label": "Trees"},
   "trench": {"key": "trench", "type": "combo", "label": "Type"},
   "trolley_wire": {"key": "trolley_wire", "type": "check", "label": "Overhead Trolley Wires"},
+  "tunnel_combo": {"key": "tunnel", "type": "combo", "label": "Type"},
   "tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
   "usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}},
   "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"},

data/presets/fields/bath/type.json

@@ -1,12 +1,5 @@
 {
   "key": "bath:type",
   "type": "combo",
-  "label": "Specialty",
-  "strings": {
-    "options": {
-      "onsen": "Japanese Onsen",
-      "foot_bath": "Foot Bath",
-      "hot_spring": "Hot Spring"
-    }
-  }
+  "label": "Specialty"
 }

data/presets/fields/bridge_combo.json

@@ -0,0 +1,5 @@
+{
+    "key": "bridge",
+    "type": "combo",
+    "label": "Type"
+}

data/presets/fields/collector.json

@@ -0,0 +1,5 @@
+{
+    "key": "collector",
+    "type": "semiCombo",
+    "label": "Items"
+}

data/presets/fields/destination.json

@@ -0,0 +1,5 @@
+{
+    "key": "destination",
+    "type": "text",
+    "label": "Destination"
+}

data/presets/fields/direction_vertex_dual.json

@@ -0,0 +1,11 @@
+{
+    "key": "direction",
+    "type": "combo",
+    "label": "Direction Affected",
+    "strings": {
+        "options": {
+          "forward": "Forward",
+          "backward": "Backward"
+        }
+    }
+}

data/presets/fields/image.json

@@ -0,0 +1,13 @@
+{
+    "key": "image",
+    "type": "url",
+    "label": "Image",
+    "placeholder": "https://example.com/photo.jpg",
+    "universal": true,
+    "terms": [
+        "icon",
+        "image uri",
+        "photo",
+        "picture"
+    ]
+}

data/presets/fields/memorial.json

@@ -1,5 +1,5 @@
 {
     "key": "memorial",
-    "type": "typeCombo",
+    "type": "combo",
     "label": "Type"
-}
+}

data/presets/fields/opening_hours/covid19.json

@@ -0,0 +1,12 @@
+{
+    "key": "opening_hours:covid19",
+    "type": "combo",
+    "label": "COVID-19 Pandemic Hours",
+    "terms": [
+        "coronavirus",
+        "lockdown",
+        "opening hours",
+        "SARS‑CoV‑2"
+    ],
+    "snake_case": false
+}

data/presets/fields/parking.json

@@ -5,12 +5,13 @@
     "strings": {
         "options": {
             "surface": "Surface",
-            "multi-storey": "Multilevel",
             "underground": "Underground",
-            "sheds": "Sheds",
+            "multi-storey": "Multilevel",
+            "lane": "Roadside Lane",
             "carports": "Carports",
             "garage_boxes": "Garage Boxes",
-            "lane": "Roadside Lane"
+            "rooftop": "Rooftop",
+            "sheds": "Sheds"
         }
     }
 }

data/presets/fields/ruins.json

@@ -0,0 +1,5 @@
+{
+    "key": "ruins",
+    "type": "combo",
+    "label": "Type"
+}

data/presets/fields/tunnel_combo.json

@@ -0,0 +1,5 @@
+{
+    "key": "tunnel",
+    "type": "combo",
+    "label": "Type"
+}

data/presets/presets/_attraction.json

@@ -5,6 +5,7 @@
         "attraction",
         "operator",
         "opening_hours",
+        "opening_hours/covid19",
         "fee",
         "charge_fee"
     ],
@@ -13,6 +14,7 @@
         "email",
         "fax",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi",
         "phone",
         "website"

data/presets/presets/aerialway/gondola.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-aerialway",
+    "icon": "temaki-gondola_lift",
     "geometry": [
         "line"
     ],
@@ -21,5 +21,5 @@
         "skiing",
         "snowboarding"
     ],
-    "name": "Gondola"
+    "name": "Gondola Lift"
 }

data/presets/presets/aeroway/aerodrome.json

@@ -1,21 +1,30 @@
 {
     "icon": "temaki-airport",
-    "geometry": [
-        "area",
-        "point"
-    ],
     "fields": [
         "name",
         "iata",
         "icao",
+        "address",
         "operator",
+        "operator/type",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid"
     ],
     "moreFields": [
-        "gnis/feature_id"
+        "email",
+        "fax",
+        "gnis/feature_id",
+        "phone",
+        "website"
     ],
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "aeroway": "aerodrome"
+    },
     "terms": [
         "aerodrome",
         "aeroway",
@@ -24,9 +33,6 @@
         "jet",
         "plane"
     ],
-    "tags": {
-        "aeroway": "aerodrome"
-    },
     "matchScore": 0.9,
     "name": "Airport"
 }

data/presets/presets/aeroway/apron.json

@@ -1,17 +1,22 @@
 {
     "icon": "temaki-planes",
-    "geometry": [
-        "area"
-    ],
-    "terms": [
-        "ramp"
-    ],
     "fields": [
         "ref",
         "surface"
     ],
+    "geometry": [
+        "area"
+    ],
     "tags": {
         "aeroway": "apron"
     },
-    "name": "Apron"
+    "terms": [
+        "aircraft parking",
+        "flight line",
+        "hardstand",
+        "ramp",
+        "tarmac",
+        "taxiway"
+    ],
+    "name": "Airport Apron"
 }

data/presets/presets/aeroway/gate.json

@@ -1,11 +1,11 @@
 {
     "icon": "fas-plane",
-    "geometry": [
-        "point"
-    ],
     "fields": [
         "ref_aeroway_gate"
     ],
+    "geometry": [
+        "point"
+    ],
     "tags": {
         "aeroway": "gate"
     },

data/presets/presets/aeroway/hangar.json

@@ -1,12 +1,12 @@
 {
     "icon": "temaki-hangar",
-    "geometry": [
-        "area"
-    ],
     "fields": [
         "name",
         "building_area"
     ],
+    "geometry": [
+        "area"
+    ],
     "tags": {
         "aeroway": "hangar"
     },

data/presets/presets/aeroway/helipad.json

@@ -1,9 +1,5 @@
 {
     "icon": "maki-heliport",
-    "geometry": [
-        "area",
-        "point"
-    ],
     "fields": [
         "name",
         "ref",
@@ -16,15 +12,20 @@
         "address",
         "charge_fee",
         "fee",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "aeroway": "helipad"
+    },
     "terms": [
         "helicopter",
         "helipad",
         "heliport"
     ],
-    "tags": {
-        "aeroway": "helipad"
-    },
     "name": "Helipad"
 }

data/presets/presets/aeroway/holding_position.json

@@ -1,11 +1,11 @@
 {
     "icon": "temaki-plane_taxiing",
-    "geometry": [
-        "vertex"
-    ],
     "fields": [
         "ref"
     ],
+    "geometry": [
+        "vertex"
+    ],
     "tags": {
         "aeroway": "holding_position"
     },

data/presets/presets/aeroway/jet_bridge.json

@@ -1,8 +1,5 @@
 {
     "icon": "temaki-pedestrian_walled",
-    "geometry": [
-        "line"
-    ],
     "fields": [
         "ref_aeroway_gate",
         "width",
@@ -12,6 +9,16 @@
     "moreFields": [
         "manufacturer"
     ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "aeroway": "jet_bridge"
+    },
+    "addTags": {
+        "aeroway": "jet_bridge",
+        "highway": "corridor"
+    },
     "terms": [
         "aerobridge",
         "air jetty",
@@ -26,13 +33,6 @@
         "skybridge",
         "terminal gate connector"
     ],
-    "tags": {
-        "aeroway": "jet_bridge"
-    },
-    "addTags": {
-        "aeroway": "jet_bridge",
-        "highway": "corridor"
-    },
     "matchScore": 1.05,
     "name": "Jet Bridge"
 }

data/presets/presets/aeroway/parking_position.json

@@ -1,13 +1,13 @@
 {
     "icon": "temaki-plane_taxiing",
+    "fields": [
+        "ref"
+    ],
     "geometry": [
         "vertex",
         "point",
         "line"
     ],
-    "fields": [
-        "ref"
-    ],
     "tags": {
         "aeroway": "parking_position"
     },

data/presets/presets/aeroway/runway.json

@@ -1,20 +1,20 @@
 {
     "icon": "fas-plane-departure",
-    "geometry": [
-        "line",
-        "area"
-    ],
-    "terms": [
-        "landing strip"
-    ],
     "fields": [
         "ref_runway",
         "surface",
         "length",
         "width"
     ],
+    "geometry": [
+        "line",
+        "area"
+    ],
     "tags": {
         "aeroway": "runway"
     },
+    "terms": [
+        "landing strip"
+    ],
     "name": "Runway"
 }

data/presets/presets/aeroway/spaceport.json

@@ -1,9 +1,5 @@
 {
     "icon": "fas-space-shuttle",
-    "geometry": [
-        "area",
-        "point"
-    ],
     "fields": [
         "name",
         "operator",
@@ -19,6 +15,13 @@
         "internet_access/ssid",
         "phone"
     ],
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "aeroway": "spaceport"
+    },
     "terms": [
         "cosmodrome",
         "rocket launch center",
@@ -27,8 +30,5 @@
         "rocket range",
         "space port"
     ],
-    "tags": {
-        "aeroway": "spaceport"
-    },
     "name": "Spaceport"
 }

data/presets/presets/aeroway/taxiway.json

@@ -1,12 +1,12 @@
 {
     "icon": "temaki-plane_taxiing",
-    "geometry": [
-        "line"
-    ],
     "fields": [
         "ref_taxiway",
         "surface"
     ],
+    "geometry": [
+        "line"
+    ],
     "tags": {
         "aeroway": "taxiway"
     },

data/presets/presets/aeroway/terminal.json

@@ -1,13 +1,5 @@
 {
     "icon": "maki-airport",
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "terms": [
-        "airport",
-        "aerodrome"
-    ],
     "fields": [
         "name",
         "operator",
@@ -16,10 +8,19 @@
         "baby_feeding"
     ],
     "moreFields": [
+        "air_conditioning",
         "smoking"
     ],
+    "geometry": [
+        "point",
+        "area"
+    ],
     "tags": {
         "aeroway": "terminal"
     },
+    "terms": [
+        "airport",
+        "aerodrome"
+    ],
     "name": "Airport Terminal"
 }

data/presets/presets/aeroway/windsock.json

@@ -1,9 +1,5 @@
 {
     "icon": "temaki-windsock",
-    "geometry": [
-        "point",
-        "vertex"
-    ],
     "fields": [
         "ref",
         "lit",
@@ -12,6 +8,10 @@
     "moreFields": [
         "manufacturer"
     ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
     "tags": {
         "aeroway": "windsock"
     },

data/presets/presets/amenity/_bus_station.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bus",
+    "icon": "temaki-bus",
     "fields": [
         "name",
         "building_area",

data/presets/presets/amenity/_coworking_space.json

@@ -5,6 +5,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid"

data/presets/presets/amenity/_ferry_terminal.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-ferry",
+    "icon": "temaki-ferry",
     "fields": [
         "name",
         "network",
@@ -16,7 +16,7 @@
         "amenity": "ferry_terminal"
     },
     "matchScore": 0.95,
-    "name": "Ferry Station / Terminal",
+    "name": "Ferry Terminal",
     "searchable": false,
     "replacement": "public_transport/station_ferry"
 }

data/presets/presets/amenity/_nursing_home.json

@@ -1,13 +1,7 @@
 {
     "icon": "maki-wheelchair",
     "fields": [
-        "name",
-        "operator",
-        "address",
-        "building_area",
-        "social_facility",
-        "social_facility_for",
-        "opening_hours",
+        "{amenity/social_facility}",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/_register_office.json

@@ -1,23 +0,0 @@
-{
-    "icon": "temaki-town_hall",
-    "fields": [
-        "name",
-        "address",
-        "building_area",
-        "opening_hours",
-        "operator"
-    ],
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "amenity": "register_office"
-    },
-    "reference": {
-        "key": "government",
-        "value": "register_office"
-    },
-    "name": "Register Office",
-    "searchable": false
-}

data/presets/presets/amenity/_scrapyard.json

@@ -1,22 +0,0 @@
-{
-    "icon": "temaki-junk_car",
-    "fields": [
-        "name",
-        "operator",
-        "address",
-        "opening_hours"
-    ],
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "amenity": "scrapyard"
-    },
-    "reference": {
-        "key": "industrial",
-        "value": "scrap_yard"
-    },
-    "name": "Scrap Yard",
-    "searchable": false
-}

data/presets/presets/amenity/_swimming_pool.json

@@ -1,17 +0,0 @@
-{
-    "icon": "fas-swimmer",
-    "geometry": [
-        "point",
-        "vertex",
-        "area"
-    ],
-    "tags": {
-        "amenity": "swimming_pool"
-    },
-    "reference": {
-        "key": "leisure",
-        "value": "swimming_pool"
-    },
-    "name": "Swimming Pool",
-    "searchable": false
-}

data/presets/presets/amenity/animal_boarding.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "animal_boarding"
     ],
     "moreFields": [

data/presets/presets/amenity/animal_breeding.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "animal_breeding"
     ],
     "moreFields": [

data/presets/presets/amenity/animal_shelter.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "animal_shelter"
     ],
     "moreFields": [

data/presets/presets/amenity/arts_centre.json

@@ -5,6 +5,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "website"
     ],
     "moreFields": [

data/presets/presets/amenity/atm.json

@@ -17,6 +17,7 @@
         "manufacturer",
         "name",
         "opening_hours",
+        "opening_hours/covid19",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/bank.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "atm",
         "drive_through"
     ],

data/presets/presets/amenity/bar.json

@@ -5,6 +5,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "min_age",
         "brewery"
     ],

data/presets/presets/amenity/bicycle_parking/building.json

@@ -3,6 +3,7 @@
     "fields": [
         "{amenity/bicycle_parking}",
         "opening_hours",
+        "opening_hours/covid19",
         "building_area"
     ],
     "geometry": [

data/presets/presets/amenity/bicycle_rental.json

@@ -15,6 +15,7 @@
         "fax",
         "level",
         "opening_hours",
+        "opening_hours/covid19",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/bicycle_repair_station.json

@@ -4,6 +4,7 @@
         "operator",
         "brand",
         "opening_hours",
+        "opening_hours/covid19",
         "fee",
         "payment_multi_fee",
         "charge_fee",

data/presets/presets/amenity/biergarten.json

@@ -4,6 +4,7 @@
         "name",
         "address",
         "opening_hours",
+        "opening_hours/covid19",
         "outdoor_seating",
         "brewery"
     ],

data/presets/presets/amenity/boat_rental.json

@@ -5,6 +5,7 @@
         "operator",
         "operator/type",
         "opening_hours",
+        "opening_hours/covid19",
         "fee",
         "payment_multi_fee",
         "charge_fee"

data/presets/presets/amenity/bureau_de_change.json

@@ -13,6 +13,7 @@
         "fax",
         "level",
         "opening_hours",
+        "opening_hours/covid19",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/cafe.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "outdoor_seating",
         "internet_access",
         "internet_access/fee",

data/presets/presets/amenity/car_pooling.json

@@ -7,6 +7,7 @@
         "capacity",
         "address",
         "opening_hours",
+        "opening_hours/covid19",
         "lit"
     ],
     "moreFields": [

data/presets/presets/amenity/car_rental.json

@@ -5,6 +5,7 @@
         "operator",
         "address",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi"
     ],
     "moreFields": [

data/presets/presets/amenity/car_wash.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi",
         "self_service"
     ],

data/presets/presets/amenity/casino.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "gambling",
         "smoking"
     ],

data/presets/presets/amenity/childcare.json

@@ -7,6 +7,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "website"
     ],
     "moreFields": [

data/presets/presets/amenity/cinema.json

@@ -6,6 +6,7 @@
         "screen",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi"
     ],
     "moreFields": [

data/presets/presets/amenity/clinic.json

@@ -7,7 +7,8 @@
         "healthcare/speciality",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "air_conditioning",

data/presets/presets/amenity/community_centre.json

@@ -7,6 +7,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "website"
     ],
     "moreFields": [

data/presets/presets/amenity/crematorium.json

@@ -5,6 +5,7 @@
         "website",
         "phone",
         "opening_hours",
+        "opening_hours/covid19",
         "wheelchair"
     ],
     "moreFields": [

data/presets/presets/amenity/dentist.json

@@ -6,7 +6,8 @@
         "healthcare/speciality",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/dive_centre.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "scuba_diving"
     ],
     "moreFields": [

data/presets/presets/amenity/doctors.json

@@ -6,7 +6,8 @@
         "healthcare/speciality",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/dojo.json

@@ -5,7 +5,8 @@
         "sport",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/dressing_room.json

@@ -12,6 +12,7 @@
         "fee",
         "level",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi_fee",
         "ref"
     ],

data/presets/presets/amenity/driving_school.json

@@ -6,7 +6,8 @@
         "operator/type",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/fast_food.json

@@ -7,6 +7,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "drive_through"
     ],
     "moreFields": [
@@ -23,6 +24,7 @@
         "internet_access/ssid",
         "level",
         "opening_hours",
+        "opening_hours/covid19",
         "outdoor_seating",
         "payment_multi",
         "phone",

data/presets/presets/amenity/food_court.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid"

data/presets/presets/amenity/fuel.json

@@ -15,6 +15,7 @@
         "fax",
         "gnis/feature_id",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi",
         "phone",
         "ref/vatin",

data/presets/presets/amenity/ice_cream.json

@@ -5,6 +5,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "outdoor_seating"
     ],
     "moreFields": [

data/presets/presets/amenity/internet_cafe.json

@@ -18,6 +18,7 @@
         "level",
         "min_age",
         "opening_hours",
+        "opening_hours/covid19",
         "outdoor_seating",
         "payment_multi",
         "phone",

data/presets/presets/amenity/karaoke_box.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "website"
     ],
     "moreFields": [

data/presets/presets/amenity/kindergarten.json

@@ -20,6 +20,7 @@
         "min_age",
         "not/name",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi",
         "website",
         "wheelchair"

data/presets/presets/amenity/kneipp_water_cure.json

@@ -3,6 +3,7 @@
     "fields": [ 
         "kneipp_water_cure_multi",       
         "opening_hours",
+        "opening_hours/covid19",
         "fee"
                                       
         

data/presets/presets/amenity/language_school.json

@@ -7,6 +7,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "language_multi"
     ],
     "moreFields": [

data/presets/presets/amenity/library.json

@@ -21,6 +21,7 @@
         "level",
         "not/name",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi",
         "phone",
         "polling_station",

data/presets/presets/amenity/marketplace.json

@@ -5,7 +5,8 @@
         "operator",
         "address",
         "building",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/money_transfer.json

@@ -13,6 +13,7 @@
         "fax",
         "level",
         "opening_hours",
+        "opening_hours/covid19",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/music_school.json

@@ -5,7 +5,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/nightclub.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "min_age",
         "smoking"
     ],

data/presets/presets/amenity/parking.json

@@ -20,6 +20,7 @@
         "maxstay",
         "name",
         "opening_hours",
+        "opening_hours/covid19",
         "park_ride",
         "phone",
         "ref",

data/presets/presets/amenity/payment_centre.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi"
     ],
     "moreFields": [

data/presets/presets/amenity/payment_terminal.json

@@ -5,6 +5,7 @@
         "brand",
         "address",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi"
     ],
     "moreFields": [

data/presets/presets/amenity/pharmacy.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "dispensing",
         "drive_through"
     ],

data/presets/presets/amenity/place_of_worship.json

@@ -18,6 +18,7 @@
         "internet_access/ssid",
         "level",
         "opening_hours",
+        "opening_hours/covid19",
         "phone",
         "polling_station",
         "website",

data/presets/presets/amenity/planetarium.json

@@ -5,7 +5,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "air_conditioning",

data/presets/presets/amenity/police.json

@@ -5,7 +5,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/polling_station.json

@@ -6,6 +6,7 @@
         "operator",
         "address",
         "opening_hours",
+        "opening_hours/covid19",
         "building_area"
     ],
     "moreFields": [

data/presets/presets/amenity/post_depot.json

@@ -12,6 +12,7 @@
         "fax",
         "gnis/feature_id",
         "opening_hours",
+        "opening_hours/covid19",
         "website",
         "wheelchair"
     ],

data/presets/presets/amenity/post_office.json

@@ -5,7 +5,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "brand",

data/presets/presets/amenity/prep_school.json

@@ -5,7 +5,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/pub.json

@@ -5,6 +5,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "smoking",
         "brewery"
     ],

data/presets/presets/amenity/public_bath.json

@@ -18,6 +18,7 @@
         "internet_access/fee",
         "internet_access/ssid",
         "opening_hours",
+        "opening_hours/covid19",
         "payment_multi_fee",
         "phone",
         "website",

data/presets/presets/amenity/public_bookcase.json

@@ -5,6 +5,7 @@
         "public_bookcase/type",
         "operator",
         "opening_hours",
+        "opening_hours/covid19",
         "capacity",
         "website",
         "lit"

data/presets/presets/amenity/ranger_station.json

@@ -5,7 +5,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "moreFields": [
         "email",

data/presets/presets/amenity/recycling_centre.json

@@ -7,6 +7,7 @@
         "address",
         "building",
         "opening_hours",
+        "opening_hours/covid19",
         "recycling_accepts"
     ],
     "moreFields": [

data/presets/presets/amenity/recycling_container.json

@@ -4,6 +4,7 @@
         "operator",
         "recycling_accepts",
         "opening_hours",
+        "opening_hours/covid19",
         "collection_times"
     ],
     "moreFields": [

data/presets/presets/amenity/restaurant.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "opening_hours/covid19",
         "phone",
         "website"
     ],

data/presets/presets/amenity/sanitary_dump_station.json

@@ -9,7 +9,8 @@
         "water_point"
     ],
     "moreFields": [
-        "opening_hours"
+        "opening_hours",
+        "opening_hours/covid19"
     ],
     "geometry": [
         "point",