Merge branch 'master' into validation_and_change_perf

css/20_map.css

@@ -179,7 +179,7 @@ g.vertex.selected .shadow {
 .preset-icon .icon.iD-other-line {
     color: #989898;
 }
-.preset-icon-line path.casing {
+.preset-icon-container path.line.casing {
     stroke: #afafaf;
 }
 

css/30_highways.css

@@ -1,4 +1,4 @@
-/* highways */
+preset-icon-container/* highways */
 
 /* defaults */
 .preset-icon .icon.tag-highway.other-line {
@@ -486,10 +486,10 @@ path.line.stroke.tag-highway-path {
 }
 path.line.stroke.tag-highway-footway,
 path.line.stroke.tag-highway_bus_stop,
-.preset-icon-line path.casing.tag-highway-footway {
+.preset-icon-container path.casing.tag-highway-footway {
     stroke: #988;
 }
-.preset-icon-line path.stroke.tag-highway-footway:not(.tag-footway-crossing, .tag-man_made-pier, .tag-public_transport-platform) {
+.preset-icon-container path.stroke.tag-highway-footway:not(.tag-footway-crossing):not(.tag-man_made-pier):not(.tag-public_transport-platform) {
     stroke: #fff;
 }
 
@@ -500,10 +500,10 @@ path.line.stroke.tag-highway_bus_stop,
     fill: #fff;
 }
 path.line.stroke.tag-highway-cycleway,
-.preset-icon-line path.casing.tag-highway-cycleway {
+.preset-icon-container path.casing.tag-highway-cycleway {
     stroke: #58a9ed;
 }
-.preset-icon-line path.stroke.tag-highway-cycleway:not(.tag-crossing) {
+.preset-icon-container path.stroke.tag-highway-cycleway:not(.tag-crossing) {
     stroke: #fff;
 }
 
@@ -514,10 +514,10 @@ path.line.stroke.tag-highway-cycleway,
     fill: #fff;
 }
 path.line.stroke.tag-highway-bridleway,
-.preset-icon-line path.casing.tag-highway-bridleway {
+.preset-icon-container path.casing.tag-highway-bridleway {
     stroke: #e06d5f;
 }
-.preset-icon-line path.stroke.tag-highway-bridleway {
+.preset-icon-container path.stroke.tag-highway-bridleway {
     stroke: #fff;
 }
 
@@ -526,10 +526,10 @@ path.line.stroke.tag-highway-bridleway,
     color: rgb(229, 184, 43);
 }
 path.line.stroke.tag-leisure-track,
-.preset-icon-line path.casing.tag-highway.tag-leisure-track {
+.preset-icon-container path.casing.tag-highway.tag-leisure-track {
     stroke: rgb(229, 184, 43);
 }
-.preset-icon-line path.line.stroke.tag-highway.tag-leisure-track {
+.preset-icon-container path.line.stroke.tag-highway.tag-leisure-track {
     stroke: #fff;
 }
 
@@ -552,10 +552,10 @@ path.line.casing.tag-highway-steps.tag-unpaved {
     stroke-dasharray: none;
 }
 path.line.stroke.tag-highway-steps,
-.preset-icon-line path.line.casing.tag-highway-steps {
+.preset-icon-container path.line.casing.tag-highway-steps {
     stroke: #81d25c;
 }
-.preset-icon-line path.line.stroke.tag-highway-steps {
+.preset-icon-container path.line.stroke.tag-highway-steps {
     stroke: #fff;
 }
 

css/35_aeroways.css

@@ -83,6 +83,6 @@ path.line.stroke.tag-aeroway-runway {
     stroke-width: 2;
     stroke-dasharray: 12, 24;
 }
-.preset-icon-line path.line.stroke.tag-aeroway-runway {
+.preset-icon-container path.line.stroke.tag-aeroway-runway {
     stroke-dasharray: 0, 14, 8, 14;
 }

css/40_railways.css

@@ -33,7 +33,7 @@ path.line.stroke.tag-railway {
     stroke-width: 2;
     stroke-dasharray: 6,6;
 }
-.preset-icon-line path.line.stroke.tag-railway:not(.tag-status) {
+.preset-icon-container path.line.stroke.tag-railway:not(.tag-status) {
     stroke-dasharray: 6;
 }
 

css/50_misc.css

@@ -74,7 +74,7 @@ path.line.stroke.tag-route-ferry {
     stroke-width: 12;
 }
 .low-zoom path.line.stroke.tag-route-ferry,
-.preset-icon-line path.line.stroke.tag-route-ferry {
+.preset-icon-container path.line.stroke.tag-route-ferry {
     stroke-width: 2;
     stroke-dasharray: 6,4;
 }
@@ -163,7 +163,7 @@ path.line.casing.tag-man_made-pipeline {
 .low-zoom path.line.stroke.tag-man_made-pipeline {
     stroke-dasharray: 40, 1;
 }
-.preset-icon-line path.line.stroke.tag-man_made-pipeline {
+.preset-icon-container path.line.stroke.tag-man_made-pipeline {
     stroke-dasharray: 19, 1;
 }
 
@@ -190,7 +190,7 @@ path.line.casing.tag-boundary-national_park {
 path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
     stroke: #ddd;
 }
-.preset-icon-line path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
+.preset-icon-container path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
     stroke: rgb(170, 170, 170);
 }
 path.line.casing.tag-natural,
@@ -213,9 +213,9 @@ path.line.stroke.tag-man_made-breakwater {
     stroke-linecap: butt;
     stroke-dasharray: 8, 2, 2, 2;
 }
-.preset-icon-line path.line.stroke.tag-barrier,
-.preset-icon-line path.line.stroke.tag-man_made-groyne,
-.preset-icon-line path.line.stroke.tag-man_made-breakwater {
+.preset-icon-container path.line.stroke.tag-barrier,
+.preset-icon-container path.line.stroke.tag-man_made-groyne,
+.preset-icon-container path.line.stroke.tag-man_made-breakwater {
     stroke-dasharray: 1, 4, 6, 4;
 }
 
@@ -373,34 +373,34 @@ path.line.casing.tag-status {
     color: #fc6c14;
     fill: #fff;
 }
-path.line.shadow.tag-status.tag-status-construction {
+path.line.shadow.tag-highway.tag-status.tag-status-construction {
     stroke-width: 20;
 }
-path.line.casing.tag-status.tag-status-construction {
+path.line.casing.tag-highway.tag-status.tag-status-construction {
     stroke-width: 10;
     stroke-linecap: butt;
     stroke-dasharray: none
 }
-path.line.stroke.tag-status.tag-status-construction {
+path.line.stroke.tag-highway.tag-status.tag-status-construction {
     stroke-width: 8;
     stroke-linecap: butt;
     stroke-dasharray: 10, 10;
 }
-path.line.casing.tag-status.tag-status-construction,
-.preset-icon-line path.line.stroke.tag-status.tag-status-construction {
+path.line.casing.tag-highway.tag-status.tag-status-construction,
+.preset-icon-container path.line.stroke.tag-highway.tag-status.tag-status-construction {
     stroke: #fff;
 }
-path.line.stroke.tag-status.tag-status-construction,
-.preset-icon-line path.line.casing.tag-status.tag-status-construction {
+path.line.stroke.tag-highway.tag-status.tag-status-construction,
+.preset-icon-container path.line.casing.tag-highway.tag-status.tag-status-construction {
     stroke: #fc6c14;
 }
-.low-zoom path.line.shadow.tag-status.tag-status-construction {
+.low-zoom path.line.shadow.tag-highway.tag-status.tag-status-construction {
     stroke-width: 16;
 }
-.low-zoom path.line.casing.tag-status.tag-status-construction {
+.low-zoom path.line.casing.tag-highway.tag-status.tag-status-construction {
     stroke-width: 7;
 }
-.low-zoom path.line.stroke.tag-status.tag-status-construction {
+.low-zoom path.line.stroke.tag-highway.tag-status.tag-status-construction {
     stroke-width: 5;
     stroke-dasharray: 8, 8;
 }
@@ -414,45 +414,3 @@ path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
-
-
-/* "Special" paths - highways that aren't highways */
-.preset-icon .icon.tag-golf-path {
-    color: #988;
-    fill: #dca;
-}
-
-path.line.shadow.tag-golf-path {
-    stroke-width: 16;
-}
-path.line.casing.tag-golf-path {
-    stroke: #dca;
-    stroke-width: 5;
-    stroke-linecap: round;
-    stroke-dasharray: none;
-}
-path.line.stroke.tag-golf-path {
-    stroke: #988;
-    stroke-width: 3;
-    stroke-linecap: butt;
-    stroke-dasharray: 6, 6;
-}
-
-.low-zoom path.line.shadow.tag-golf-path {
-    stroke-width: 12;
-}
-.low-zoom path.line.casing.tag-golf-path {
-    stroke-width: 3;
-}
-.low-zoom path.line.stroke.tag-golf-path {
-    stroke-width: 1;
-    stroke-linecap: butt;
-    stroke-dasharray: 3, 3;
-}
-
-g.midpoint.tag-golf-path .fill {
-    fill: #fff;
-    stroke: #333;
-    stroke-opacity: .8;
-    opacity: .8;
-}

css/80_app.css

@@ -227,7 +227,6 @@ table.tags, table.tags td, table.tags th {
 /* Grid
 ------------------------------------------------------- */
 .col6  { float: left; width: 50.0000%; max-width: 600px; }
-.col8  { float: left; width: 66.6666%; }
 .col12 { float: left; width: 100.0000%; }
 
 
@@ -1203,21 +1202,16 @@ a.hide-toggle {
 .preset-icon-line {
     margin: auto;
     position: absolute;
+    left: 0;
+    right: 0;
     top: 0;
     width: 100%;
     height: 100%;
 }
-[dir='ltr'] .preset-icon-line {
-    left: 0;
-}
-[dir='rtl'] .preset-icon-line {
-    right: 0;
-}
-.preset-icon-line path.line {
+.preset-icon-container path {
     cursor: inherit;
 }
-.preset-icon-line circle.vertex,
-.preset-icon-fill circle.vertex {
+.preset-icon-container circle.vertex {
     fill: #fff;
     stroke: rgba(0, 0, 0, 0.25);
 }
@@ -1226,10 +1220,10 @@ a.hide-toggle {
     stroke: rgba(0, 0, 0, 0.25);
 }
 /* use a consistent stroke width */
-.preset-icon-line path.line.stroke {
+.preset-icon-container path.line.stroke {
     stroke-width: 2 !important;
 }
-.preset-icon-line path.line.casing {
+.preset-icon-container path.line.casing {
     stroke-width: 4 !important;
 }
 
@@ -1280,7 +1274,8 @@ a.hide-toggle {
 .preset-icon.framed .icon {
     transform: scale(0.4);
 }
-.preset-icon.framed.line-geom .icon {
+.preset-icon.framed.line-geom .icon,
+.preset-icon.framed.route-geom .icon {
     top: 20%;
     transform: translateY(-30%) scale(0.4);
 }
@@ -1290,7 +1285,8 @@ a.hide-toggle {
 .preset-icon-iD.framed .icon {
     transform: scale(0.74);
 }
-.preset-icon-iD.framed.line-geom .icon {
+.preset-icon-iD.framed.line-geom .icon,
+.preset-icon-iD.framed.route-geom .icon {
     transform: translateY(-30%) scale(0.74);
 }
 .preset-icon-container.fallback .preset-icon .icon {
@@ -4357,6 +4353,9 @@ img.tile-debug {
     right: 0;
     margin: auto;
     z-index: 50;
+    width: 50%;
+    min-width: 200px;
+    max-width: 600px;
 }
 
 .modal .loader {
@@ -4422,7 +4421,9 @@ img.tile-debug {
 .loading-modal {
     text-align: center;
 }
-
+.modal-actions {
+    display: flex;
+}
 .modal-actions button {
     font-weight: normal;
     color: #7092ff;
@@ -4430,7 +4431,7 @@ img.tile-debug {
     border-radius: 0;
     height: 160px;
     text-align: center;
-    display: inline-block;
+    width: 100%;
 }
 .modal-actions button:hover {
     background-color: #ececec;
@@ -5331,8 +5332,8 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
     padding: 10px 20px 0 20px;
 }
 
-[dir='rtl'] .curtain-tooltip .tooltip-inner .button-section button.col8 {
-    float: right;
+.curtain-tooltip .tooltip-inner .button-section button {
+    width: 66.6666%;
 }
 
 .curtain-tooltip .tooltip-inner .instruction:only-child {

data/core.yaml

@@ -489,6 +489,7 @@ en:
     all_tags: All tags
     all_members: All members
     all_relations: All relations
+    add_to_relation: Add to a relation
     new_relation: New relation...
     choose_relation: Choose a parent relation
     role: Role
@@ -1309,6 +1310,13 @@ en:
       title: Generic Names
       message: '{feature} has the generic name "{name}"'
       tip: "Names should be the actual, on-the-ground names of features."
+    incompatible_source:
+      title: Incompatible Data Sources
+      google:
+        feature:
+          message: '{feature} lists Google as a data source'
+        tip: "Google products are proprietary and must not be used as references."
+      tip: "Source data must be licensed in a manner compatible with OpenStreetMap."
     many_deletions:
       title: Many Deletions
       points-lines-areas:
@@ -1377,6 +1385,8 @@ en:
         annotation: Removed a generic name.
       remove_private_info:
         annotation: Removed private information.
+      remove_proprietary_data:
+        title: Remove any proprietary data
       remove_tag:
         title: Remove the tag
         annotation: Removed tag.

data/deprecated.json

@@ -1,5 +1,9 @@
 {
   "dataDeprecated": [
+    {
+      "old": {"aerialway": "canopy"},
+      "replace": {"aerialway": "zip_line"}
+    },
     {
       "old": {"amenity": "advertising"},
       "replace": {"advertising": "*"}
@@ -20,10 +24,26 @@
       "old": {"amenity": "community_center"},
       "replace": {"amenity": "community_centre"}
     },
+    {
+      "old": {"amenity": "dog_bin"},
+      "replace": {"amenity": "waste_basket", "waste": "dog_excrement"}
+    },
+    {
+      "old": {"amenity": "dog_waste_bin"},
+      "replace": {"amenity": "waste_basket", "waste": "dog_excrement"}
+    },
+    {
+      "old": {"amenity": "embassy"},
+      "replace": {"office": "diplomatic"}
+    },
     {
       "old": {"amenity": "ev_charging"},
       "replace": {"amenity": "charging_station"}
     },
+    {
+      "old": {"amenity": "fire_hydrant"},
+      "replace": {"emergency": "fire_hydrant"}
+    },
     {
       "old": {"amenity": "firepit"},
       "replace": {"leisure": "firepit"}
@@ -36,6 +56,26 @@
       "old": {"amenity": "garages"},
       "replace": {"landuse": "garages"}
     },
+    {
+      "old": {"amenity": "gym"},
+      "replace": {"leisure": "fitness_centre"}
+    },
+    {
+      "old": {"amenity": "hotel"},
+      "replace": {"tourism": "hotel"}
+    },
+    {
+      "old": {"amenity": "kiosk"},
+      "replace": {"shop": "kiosk"}
+    },
+    {
+      "old": {"amenity": "nursery"},
+      "replace": {"amenity": "kindergarten"}
+    },
+    {
+      "old": {"amenity": "preschool"},
+      "replace": {"amenity": "kindergarten"}
+    },
     {
       "old": {"amenity": "public_building"},
       "replace": {"building": "public"}
@@ -68,6 +108,10 @@
       "old": {"amenity": "swimming_pool"},
       "replace": {"leisure": "swimming_pool"}
     },
+    {
+      "old": {"amenity": "ticket_booth"},
+      "replace": {"shop": "ticket"}
+    },
     {
       "old": {"amenity": "toilet"},
       "replace": {"amenity": "toilets"}
@@ -76,6 +120,10 @@
       "old": {"amenity": "vending_machine", "vending": "news_papers"},
       "replace": {"amenity": "vending_machine", "vending": "newspapers"}
     },
+    {
+      "old": {"amenity": "winery"},
+      "replace": {"craft": "winery"}
+    },
     {
       "old": {"amenity": "youth_center"},
       "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"}
@@ -84,6 +132,14 @@
       "old": {"amenity": "youth_centre"},
       "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"}
     },
+    {
+      "old": {"barrier": "curb"},
+      "replace": {"barrier": "kerb"}
+    },
+    {
+      "old": {"barrier": "entrance"},
+      "replace": {"entrance": "*"}
+    },
     {
       "old": {"barrier": "wire_fence"},
       "replace": {"barrier": "fence", "fence_type": "chain"}
@@ -124,6 +180,10 @@
       "old": {"color": "*"},
       "replace": {"colour": "$1"}
     },
+    {
+      "old": {"craft": "glass"},
+      "replace": {"craft": "glaziery"}
+    },
     {
       "old": {"crossing": "zebra"},
       "replace": {"crossing": "marked"}
@@ -237,7 +297,7 @@
     },
     {
       "old": {"highway": "unsurfaced"},
-      "replace": {"highway": "road", "incline": "unpaved"}
+      "replace": {"highway": "road", "surface": "unpaved"}
     },
     {
       "old": {"kerb": "dropped"},
@@ -283,6 +343,14 @@
       "old": {"leisure": "club"},
       "replace": {"club": "*"}
     },
+    {
+      "old": {"leisure": "video_arcade"},
+      "replace": {"leisure": "amusement_arcade"}
+    },
+    {
+      "old": {"man_made": "cut_line"},
+      "replace": {"man_made": "cutline"}
+    },
     {
       "old": {"man_made": "jetty"},
       "replace": {"highway": "footway", "man_made": "pier"}
@@ -303,6 +371,10 @@
       "old": {"man_made": "well"},
       "replace": {"man_made": "water_well"}
     },
+    {
+      "old": {"man_made": "winery"},
+      "replace": {"craft": "winery"}
+    },
     {
       "old": {"memorial": "plate"},
       "replace": {"memorial": "plaque"}
@@ -335,10 +407,18 @@
       "old": {"postcode": "*"},
       "replace": {"addr:postcode": "$1"}
     },
+    {
+      "old": {"power": "busbar"},
+      "replace": {"power": "line", "line": "busbar"}
+    },
     {
       "old": {"power": "sub_station"},
       "replace": {"power": "substation"}
     },
+    {
+      "old": {"power": "underground_cable"},
+      "replace": {"power": "cable", "location": "underground"}
+    },
     {
       "old": {"power_source": "*"},
       "replace": {"generator:source": "$1"}
@@ -355,6 +435,30 @@
       "old": {"route": "ncn"},
       "replace": {"route": "bicycle", "network": "ncn"}
     },
+    {
+      "old": {"shop": "adult"},
+      "replace": {"shop": "erotic"}
+    },
+    {
+      "old": {"shop": "antique"},
+      "replace": {"shop": "antiques"}
+    },
+    {
+      "old": {"shop": "auto_parts"},
+      "replace": {"shop": "car_parts"}
+    },
+    {
+      "old": {"shop": "baby"},
+      "replace": {"shop": "baby_goods"}
+    },
+    {
+      "old": {"shop": "baby_care"},
+      "replace": {"shop": "baby_goods"}
+    },
+    {
+      "old": {"shop": "bags"},
+      "replace": {"shop": "bag"}
+    },
     {
       "old": {"shop": "betting"},
       "replace": {"shop": "bookmaker"}
@@ -363,6 +467,10 @@
       "old": {"shop": "boutique"},
       "replace": {"shop": "clothes"}
     },
+    {
+      "old": {"shop": "dive"},
+      "replace": {"shop": "scuba_diving"}
+    },
     {
       "old": {"shop": "fashion"},
       "replace": {"shop": "clothes"}
@@ -383,6 +491,18 @@
       "old": {"shop": "gallery"},
       "replace": {"shop": "art"}
     },
+    {
+      "old": {"shop": "lingerie"},
+      "replace": {"shop": "clothes", "clothes": "underwear"}
+    },
+    {
+      "old": {"shop": "luggage"},
+      "replace": {"shop": "bag"}
+    },
+    {
+      "old": {"shop": "moneylender"},
+      "replace": {"shop": "money_lender"}
+    },
     {
       "old": {"shop": "organic"},
       "replace": {"shop": "supermarket", "organic": "only"}
@@ -395,6 +515,18 @@
       "old": {"shop": "real_estate"},
       "replace": {"office": "estate_agent"}
     },
+    {
+      "old": {"shop": "tickets"},
+      "replace": {"shop": "ticket"}
+    },
+    {
+      "old": {"shop": "underwear"},
+      "replace": {"shop": "clothes", "clothes": "underwear"}
+    },
+    {
+      "old": {"shop": "winery"},
+      "replace": {"craft": "winery"}
+    },
     {
       "old": {"sloped_curb": "0"},
       "replace": {"kerb": "flush"}

data/presets.yaml

@@ -358,6 +358,9 @@ en:
       construction:
         # construction=*
         label: Type
+      consulate:
+        # consulate=*
+        label: Type
       contact/webcam:
         # 'contact:webcam=*'
         label: Webcam URL
@@ -510,6 +513,12 @@ en:
       diet_multi:
         # 'diet:=*'
         label: Diet Types
+      diplomatic:
+        # diplomatic=*
+        label: Type
+      diplomatic/services:
+        # 'diplomatic:services:=*'
+        label: Services
       direction:
         # direction=*
         label: Direction (Degrees Clockwise)
@@ -632,6 +641,9 @@ en:
         label: Type
         # embankment field placeholder
         placeholder: Default
+      embassy:
+        # embassy=*
+        label: Type
       emergency:
         # emergency=*
         label: Emergency
@@ -1003,6 +1015,9 @@ en:
         label: Levels
         # levels field placeholder
         placeholder: '2, 4, 6...'
+      liaison:
+        # liaison=*
+        label: Type
       lit:
         # lit=*
         label: Lit
@@ -1582,6 +1597,11 @@ en:
       sanitary_dump_station:
         # sanitary_dump_station=*
         label: Toilet Disposal
+      screen:
+        # screen=*
+        label: Screens
+        # screen field placeholder
+        placeholder: '1, 4, 8…'
       scuba_diving:
         # 'scuba_diving:=*'
         label: Services
@@ -1938,6 +1958,9 @@ en:
           'yes': 'Yes'
         # takeaway field placeholder
         placeholder: 'Yes, No, Takeaway Only...'
+      target:
+        # target=*
+        label: Target
       tidal:
         # tidal=*
         label: Tidal
@@ -2262,6 +2285,11 @@ en:
         name: T-bar Lift
         # 'terms: tbar'
         terms: '<translate with synonyms or related terms for ''T-bar Lift'', separated by commas>'
+      aerialway/zip_line:
+        # aerialway=zip_line
+        name: Zip Line
+        # 'terms: aerial runway,canopy,flying fox,foefie slide,gravity propelled aerial ropeslide,Tyrolean traverse,zip wire,zip-line,zipline,zipwire'
+        terms: '<translate with synonyms or related terms for ''Zip Line'', separated by commas>'
       aeroway:
         # aeroway=*
         name: Aeroway
@@ -2473,6 +2501,11 @@ en:
         # amenity=compressed_air
         name: Compressed Air
         terms: '<translate with synonyms or related terms for ''Compressed Air'', separated by commas>'
+      amenity/conference_centre:
+        # amenity=conference_centre
+        name: Convention Center
+        # 'terms: auditorium,conference,exhibition,exposition,lecture'
+        terms: '<translate with synonyms or related terms for ''Convention Center'', separated by commas>'
       amenity/courthouse:
         # amenity=courthouse
         name: Courthouse
@@ -2517,7 +2550,11 @@ en:
       amenity/embassy:
         # amenity=embassy
         name: Embassy
-        terms: '<translate with synonyms or related terms for ''Embassy'', separated by commas>'
+      amenity/events_venue:
+        # amenity=events_venue
+        name: Events Venue
+        # 'terms: banquet hall,baptism,Bar Mitzvah,Bat Mitzvah,birthdays,celebrations,conferences,confirmation,meetings,parties,party,quinceañera,reunions,weddings'
+        terms: '<translate with synonyms or related terms for ''Events Venue'', separated by commas>'
       amenity/fast_food:
         # amenity=fast_food
         name: Fast Food
@@ -3903,13 +3940,9 @@ en:
         # 'terms: hazard,bunker'
         terms: '<translate with synonyms or related terms for ''Sand Trap'', separated by commas>'
       golf/cartpath:
-        # 'golf=cartpath, golf_cart=designated'
+        # golf=cartpath
         name: Golf Cartpath
         terms: '<translate with synonyms or related terms for ''Golf Cartpath'', separated by commas>'
-      golf/cartpath_service:
-        # 'highway=service, golf=cartpath, golf_cart=designated'
-        name: Golf Cartpath / Service Road
-        terms: '<translate with synonyms or related terms for ''Golf Cartpath / Service Road'', separated by commas>'
       golf/driving_range:
         # 'golf=driving_range, landuse=grass'
         name: Driving Range
@@ -3931,7 +3964,7 @@ en:
         name: Lateral Water Hazard
         terms: '<translate with synonyms or related terms for ''Lateral Water Hazard'', separated by commas>'
       golf/path:
-        # 'golf=path, foot=designated'
+        # golf=path
         name: Golf Walking Path
         terms: '<translate with synonyms or related terms for ''Golf Walking Path'', separated by commas>'
       golf/rough:
@@ -4316,6 +4349,11 @@ en:
         name: Traffic Signals
         # 'terms: light,stoplight,traffic light'
         terms: '<translate with synonyms or related terms for ''Traffic Signals'', separated by commas>'
+      highway/trailhead:
+        # highway=trailhead
+        name: Trailhead
+        # 'terms: hiking,mile zero,mountain biking,mountaineering,trail endpoint,trail start,staging area,trekking'
+        terms: '<translate with synonyms or related terms for ''Trailhead'', separated by commas>'
       highway/trunk:
         # highway=trunk
         name: Trunk Road
@@ -4970,6 +5008,11 @@ en:
         # leisure=stadium
         name: Stadium
         terms: '<translate with synonyms or related terms for ''Stadium'', separated by commas>'
+      leisure/swimming_area:
+        # leisure=swimming_area
+        name: Natural Swimming Area
+        # 'terms: dive,water,aquatics'
+        terms: '<translate with synonyms or related terms for ''Natural Swimming Area'', separated by commas>'
       leisure/swimming_pool:
         # leisure=swimming_pool
         name: Swimming Pool
@@ -5439,6 +5482,22 @@ en:
         name: Coworking Space
         # 'terms: coworking,office'
         terms: '<translate with synonyms or related terms for ''Coworking Space'', separated by commas>'
+      office/diplomatic:
+        # office=diplomatic
+        name: Diplomatic Office
+        terms: '<translate with synonyms or related terms for ''Diplomatic Office'', separated by commas>'
+      office/diplomatic/consulate:
+        # 'office=diplomatic, diplomatic=consulate'
+        name: Consulate
+        terms: '<translate with synonyms or related terms for ''Consulate'', separated by commas>'
+      office/diplomatic/embassy:
+        # 'office=diplomatic, diplomatic=embassy'
+        name: Embassy
+        terms: '<translate with synonyms or related terms for ''Embassy'', separated by commas>'
+      office/diplomatic/liaison:
+        # 'office=diplomatic, diplomatic=liaison'
+        name: Liaison Office
+        terms: '<translate with synonyms or related terms for ''Liaison Office'', separated by commas>'
       office/educational_institution:
         # office=educational_institution
         name: Educational Institution
@@ -6025,6 +6084,10 @@ en:
         name: Buffer Stop
         # 'terms: stop,halt,buffer'
         terms: '<translate with synonyms or related terms for ''Buffer Stop'', separated by commas>'
+      railway/construction:
+        # railway=construction
+        name: Railway Under Construction
+        terms: '<translate with synonyms or related terms for ''Railway Under Construction'', separated by commas>'
       railway/crossing:
         # railway=crossing
         name: Railway Crossing (Path)
@@ -6082,6 +6145,7 @@ en:
       railway/rail:
         # railway=rail
         name: Rail
+        # 'terms: rail line,railroad track,train track'
         terms: '<translate with synonyms or related terms for ''Rail'', separated by commas>'
       railway/rail/highspeed:
         # 'railway=rail, highspeed=yes'
@@ -6318,6 +6382,11 @@ en:
         name: Clothing Store
         # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear'
         terms: '<translate with synonyms or related terms for ''Clothing Store'', separated by commas>'
+      shop/clothes/underwear:
+        # 'shop=clothes, clothes=underwear'
+        name: Underwear Store
+        # 'terms: boutique,bras,brassieres,briefs,boxers,fashion,lingerie,panties,slips,socks,stockings,underclothes,undergarments,underpants,undies'
+        terms: '<translate with synonyms or related terms for ''Underwear Store'', separated by commas>'
       shop/coffee:
         # shop=coffee
         name: Coffee Store
@@ -6814,6 +6883,11 @@ en:
         name: Tactile Paving
         # 'terms: blind path,detectable warning surfaces,tactile ground surface indicators,tactile walking surface indicators,truncated domes,visually impaired path'
         terms: '<translate with synonyms or related terms for ''Tactile Paving'', separated by commas>'
+      telecom/data_center:
+        # telecom=data_center
+        name: Data Center
+        # 'terms: computer systems storage,information technology,server farm,the cloud,telecommunications'
+        terms: '<translate with synonyms or related terms for ''Data Center'', separated by commas>'
       tourism:
         # tourism=*
         name: Tourism

data/presets/categories.json

@@ -41,7 +41,6 @@
         "golf/driving_range",
         "golf/hole",
         "golf/cartpath",
-        "golf/cartpath_service",
         "golf/path"
       ]
     },

data/presets/categories/golf.json

@@ -12,7 +12,6 @@
         "golf/driving_range",
         "golf/hole",
         "golf/cartpath",
-        "golf/cartpath_service",
         "golf/path"
     ]
 }

data/presets/fields.json

@@ -64,6 +64,7 @@
     "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
     "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
     "construction": {"key": "construction", "type": "combo", "label": "Type"},
+    "consulate": {"key": "consulate", "type": "combo", "label": "Type"},
     "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
     "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
     "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
@@ -93,6 +94,8 @@
     "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
     "diaper": {"key": "diaper", "type": "combo", "label": "Diaper Changing Available", "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]},
     "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types"},
+    "diplomatic": {"key": "diplomatic", "type": "combo", "label": "Type"},
+    "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": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
@@ -110,6 +113,7 @@
     "elevation": {"key": "ele", "type": "number", "icon": "elevation", "universal": true, "label": "Elevation"},
     "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "label": "Email"},
     "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+    "embassy": {"key": "embassy", "type": "combo", "label": "Type"},
     "emergency": {"key": "emergency", "type": "check", "label": "Emergency"},
     "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"},
     "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"},
@@ -192,6 +196,7 @@
     "length": {"key": "length", "type": "number", "minValue": 0, "label": "Length (Meters)"},
     "level": {"key": "level", "type": "combo", "label": "Level", "universal": true},
     "levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
+    "liaison": {"key": "liaison", "type": "combo", "label": "Type"},
     "lit": {"key": "lit", "type": "check", "label": "Lit"},
     "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
     "location": {"key": "location", "type": "combo", "label": "Location"},
@@ -286,6 +291,7 @@
     "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"},
     "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"},
+    "screen": {"key": "screen", "type": "number", "label": "Screens", "placeholder": "1, 4, 8…", "minValue": 0},
     "scuba_diving": {"key": "scuba_diving:", "type": "multiCombo", "label": "Services", "options": ["repair", "courses", "rental", "filling", "air_filling", "nitrox_filling", "trimix_filling", "oxygen_filling"]},
     "seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"},
     "seamark/beacon_lateral/category": {"key": "seamark:beacon_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right"}}},
@@ -343,6 +349,7 @@
     "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}},
     "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
     "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}},
+    "target": {"key": "target", "type": "combo", "label": "Target"},
     "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
     "to": {"key": "to", "type": "text", "label": "To"},
     "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit/Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},

data/presets/fields/consulate.json

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

data/presets/fields/diplomatic.json

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

data/presets/fields/diplomatic/services.json

@@ -0,0 +1,5 @@
+{
+    "key": "diplomatic:services:",
+    "type": "multiCombo",
+    "label": "Services"
+}

data/presets/fields/embassy.json

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

data/presets/fields/liaison.json

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

data/presets/fields/screen.json

@@ -0,0 +1,7 @@
+{
+    "key": "screen",
+    "type": "number",
+    "label": "Screens",
+    "placeholder": "1, 4, 8…",
+    "minValue": 0
+}

data/presets/fields/target.json

@@ -0,0 +1,5 @@
+{
+    "key": "target",
+    "type": "combo",
+    "label": "Target"
+}

data/presets/presets/aerialway/cable_car.json

@@ -1,4 +1,5 @@
 {
+    "icon": "fas-tram",
     "geometry": [
         "line"
     ],

data/presets/presets/aerialway/chair_lift.json

@@ -5,6 +5,7 @@
     ],
     "fields": [
         "name",
+        "oneway_yes",
         "aerialway/occupancy",
         "aerialway/capacity",
         "aerialway/duration",

data/presets/presets/aerialway/gondola.json

@@ -1,4 +1,5 @@
 {
+    "icon": "maki-aerialway",
     "geometry": [
         "line"
     ],

data/presets/presets/aerialway/mixed_lift.json

@@ -4,6 +4,7 @@
     ],
     "fields": [
       "name",
+      "oneway_yes",
       "aerialway/occupancy",
       "aerialway/capacity",
       "aerialway/duration",

data/presets/presets/aerialway/rope_tow.json

@@ -8,6 +8,7 @@
     ],
     "fields": [
         "name",
+        "oneway_yes",
         "aerialway/capacity",
         "aerialway/duration"
     ],

data/presets/presets/aerialway/zip_line.json

@@ -0,0 +1,28 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "fields": [
+        "name",
+        "oneway_yes",
+        "aerialway/duration",
+        "maxweight",
+        "access_simple"
+    ],
+    "terms": [
+        "aerial runway",
+        "canopy",
+        "flying fox",
+        "foefie slide",
+        "gravity propelled aerial ropeslide",
+        "Tyrolean traverse",
+        "zip wire",
+        "zip-line",
+        "zipline",
+        "zipwire"
+    ],
+    "tags": {
+        "aerialway": "zip_line"
+    },
+    "name": "Zip Line"
+}

data/presets/presets/amenity/_embassy.json

@@ -20,5 +20,6 @@
     "tags": {
         "amenity": "embassy"
     },
+    "searchable": false,
     "name": "Embassy"
 }

data/presets/presets/amenity/biergarten.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-beer",
+    "icon": "fas-beer",
     "fields": [
         "name",
         "address",

data/presets/presets/amenity/childcare.json

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

data/presets/presets/amenity/cinema.json

@@ -3,16 +3,17 @@
     "fields": [
         "name",
         "address",
+        "screen",
         "building_area",
         "opening_hours",
         "payment_multi"
     ],
     "moreFields": [
         "air_conditioning",
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/conference_centre.json

@@ -0,0 +1,36 @@
+{
+    "icon": "fas-user-tie",
+    "fields": [
+        "name",
+        "operator",
+        "building_area",
+        "address",
+        "website",
+        "internet_access"
+    ],
+    "moreFields" : [
+        "air_conditioning",
+        "email",
+        "fax",
+        "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"
+}

data/presets/presets/amenity/courthouse.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-courthouse",
+    "icon": "fas-gavel",
     "fields": [
         "name",
         "operator",

data/presets/presets/amenity/events_venue.json

@@ -0,0 +1,45 @@
+{
+    "icon": "fas-users",
+    "fields": [
+        "name",
+        "operator",
+        "building_area",
+        "address",
+        "website",
+        "internet_access"
+    ],
+    "moreFields" : [
+        "air_conditioning",
+        "email",
+        "fax",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "phone",
+        "smoking",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "events_venue"
+    },
+    "terms": [
+        "banquet hall",
+        "baptism",
+        "Bar Mitzvah",
+        "Bat Mitzvah",
+        "birthdays",
+        "celebrations",
+        "conferences",
+        "confirmation",
+        "meetings",
+        "parties",
+        "party",
+        "quinceañera",
+        "reunions",
+        "weddings"
+    ],
+    "name": "Events Venue"
+}

data/presets/presets/amenity/payment_terminal.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bank",
+    "icon": "far-credit-card",
     "fields": [
 	    "name",
         "brand",

data/presets/presets/amenity/photo_booth.json

@@ -1,5 +1,5 @@
 {
-	"icon": "maki-attraction",
+	"icon": "fas-person-booth",
 	"fields": [
 		"name",
 		"operator",

data/presets/presets/amenity/vending_machine/newspapers.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "far-newspaper",
     "fields": [
         "vending",
         "operator",

data/presets/presets/amenity/waste_disposal.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-waste-basket",
+    "icon": "fas-dumpster",
     "fields": [
         "operator",
         "collection_times"

data/presets/presets/barrier/_entrance.json

@@ -7,6 +7,5 @@
         "barrier": "entrance"
     },
     "name": "Entrance",
-    "searchable": false,
-    "replacement": "entrance"
+    "searchable": false
 }

data/presets/presets/craft/photographic_laboratory.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-attraction",
+    "icon": "fas-film",
     "geometry": [
         "point",
         "area"

data/presets/presets/golf/cartpath.json

@@ -1,14 +1,24 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "{golf/path}"
+        "{golf/path}",
+        "maxspeed"
     ],
     "geometry": [
         "line"
     ],
     "tags": {
+        "golf": "cartpath"
+    },
+    "addTags": {
         "golf": "cartpath",
-        "golf_cart": "designated"
+        "golf_cart": "designated",
+        "highway": "service"
+    },
+    "removeTags": {
+        "golf": "cartpath",
+        "golf_cart": "designated",
+        "highway": "service"
     },
     "reference": {
         "key": "golf",

data/presets/presets/golf/cartpath_service.json

@@ -1,20 +0,0 @@
-{
-    "icon": "maki-golf",
-    "fields": [
-        "{golf/path}",
-        "maxspeed"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "highway": "service",
-        "golf": "cartpath",
-        "golf_cart": "designated"
-    },
-    "reference": {
-        "key": "golf",
-        "value": "cartpath"
-    },
-    "name": "Golf Cartpath / Service Road"
-}

data/presets/presets/golf/path.json

@@ -11,7 +11,16 @@
         "line"
     ],
     "tags": {
+        "golf": "path"
+    },
+    "addTags": {
         "golf": "path",
+        "highway": "path",
+        "foot": "designated"
+    },
+    "removeTags": {
+        "golf": "path",
+        "highway": "path",
         "foot": "designated"
     },
     "reference": {

data/presets/presets/healthcare/birthing_center.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-hospital",
+    "icon": "fas-baby",
     "geometry": [
         "point",
         "area"

data/presets/presets/healthcare/laboratory.json

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

data/presets/presets/healthcare/optometrist.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-hospital",
+    "icon": "fas-eye",
     "geometry": [
         "point",
         "area"

data/presets/presets/healthcare/speech_therapist.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-hospital",
+    "icon": "fas-comment",
     "geometry": [
         "point",
         "area"

data/presets/presets/highway/trailhead.json

@@ -0,0 +1,28 @@
+{
+    "icon": "fas-hiking",
+    "fields": [
+        "name",
+        "operator",
+        "elevation",
+        "access_simple",
+        "fee",
+        "opening_hours"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "trailhead"
+    },
+    "terms": [
+        "hiking",
+        "mile zero",
+        "mountain biking",
+        "mountaineering",
+        "trail endpoint",
+        "trail start",
+        "staging area",
+        "trekking"
+    ],
+    "name": "Trailhead"
+}

data/presets/presets/leisure/hackerspace.json

@@ -1,15 +1,15 @@
 {
-    "icon": "maki-commercial",
+    "icon": "fas-code",
     "fields": [
         "name",
         "address",
         "building_area",
         "opening_hours",
-        "website"
+        "website",
+        "internet_access"
     ],
     "moreFields": [
         "payment_multi",
-        "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "smoking",

data/presets/presets/leisure/picnic_table/chess.json

@@ -1,5 +1,5 @@
 {
-    "icon": "fas-chess-knight",
+    "icon": "fas-chess-pawn",
     "geometry": [
         "point"
     ],

data/presets/presets/leisure/swimming_area.json

@@ -0,0 +1,26 @@
+{
+    "icon": "maki-swimming",
+    "fields": [
+        "name",
+        "access_simple",
+        "supervised",
+        "fee",
+        "lit"
+    ],
+    "moreFields": [
+        "opening_hours",
+        "operator"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "terms": [
+        "dive",
+        "water",
+        "aquatics"
+    ],
+    "tags": {
+        "leisure": "swimming_area"
+    },
+    "name": "Natural Swimming Area"
+}

data/presets/presets/leisure/swimming_pool.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-swimming",
+    "icon": "fas-swimming-pool",
     "fields": [
         "name",
         "access_simple",
@@ -9,8 +9,9 @@
         "swimming_pool"
     ],
     "moreFields": [
-        "operator",
-        "address"
+        "address",
+        "opening_hours",
+        "operator"
     ],
     "geometry": [
         "point",

data/presets/presets/office/architect.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-suitcase",
+    "icon": "fas-drafting-compass",
     "geometry": [
         "point",
         "area"

data/presets/presets/office/diplomatic.json

@@ -0,0 +1,20 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "diplomatic",
+        "country",
+        "target",
+        "diplomatic/services",
+        "{office}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic"
+    },
+    "terms": [],
+    "name": "Diplomatic Office"
+}

data/presets/presets/office/diplomatic/consulate.json

@@ -0,0 +1,22 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "consulate",
+        "{office/diplomatic}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic",
+        "diplomatic": "consulate"
+    },
+    "reference": {
+        "key": "diplomatic",
+        "value": "consulate"
+    },
+    "terms": [],
+    "name": "Consulate"
+}

data/presets/presets/office/diplomatic/embassy.json

@@ -0,0 +1,22 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "embassy",
+        "{office/diplomatic}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic",
+        "diplomatic": "embassy"
+    },
+    "reference": {
+        "key": "diplomatic",
+        "value": "embassy"
+    },
+    "terms": [],
+    "name": "Embassy"
+}

data/presets/presets/office/diplomatic/liaison.json

@@ -0,0 +1,22 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "liaison",
+        "{office/diplomatic}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic",
+        "diplomatic": "liaison"
+    },
+    "reference": {
+        "key": "diplomatic",
+        "value": "liaison"
+    },
+    "terms": [],
+    "name": "Liaison Office"
+}

data/presets/presets/office/newspaper.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-library",
+    "icon": "fas-newspaper",
     "geometry": [
         "point",
         "area"

data/presets/presets/office/notary.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-suitcase",
+    "icon": "fas-stamp",
     "geometry": [
         "point",
         "area"

data/presets/presets/office/private_investigator.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-suitcase",
+    "icon": "fas-user-secret",
     "geometry": [
         "point",
         "area"

data/presets/presets/railway/construction.json

@@ -0,0 +1,28 @@
+{
+    "icon": "iD-railway-rail",
+    "fields": [
+        "name",
+        "opening_date",
+        "check_date",
+        "note",
+        "structure",
+        "gauge",
+        "electrified"
+    ],
+    "moreFields": [
+        "covered",
+        "frequency_electrified",
+        "highspeed",
+        "maxspeed",
+        "service_rail",
+        "usage_rail",
+        "voltage_electrified"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "railway": "construction"
+    },
+    "name": "Railway Under Construction"
+}

data/presets/presets/railway/rail.json

@@ -22,6 +22,10 @@
     "tags": {
         "railway": "rail"
     },
-    "terms": [],
+    "terms": [
+        "rail line",
+        "railroad track",
+        "train track"
+    ],
     "name": "Rail"
 }

data/presets/presets/shop.json

@@ -13,10 +13,11 @@
         "air_conditioning",
         "brand",
         "currency_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "second_hand",
+        "website",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/shop/agrarian.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-tractor",
     "fields": [
         "{shop}",
         "agrarian"

data/presets/presets/shop/alcohol.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-alcohol-shop",
+    "icon": "fas-wine-bottle",
     "fields": [
         "{shop}",
         "drive_through"

data/presets/presets/shop/anime.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-dragon",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/baby_goods.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-baby-carriage",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/bag.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-suitcase-rolling",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/bathroom_furnishing.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-bath",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/books.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-book",
     "fields": [
         "{shop}",
         "internet_access"

data/presets/presets/shop/candles.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-burn",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/car_parts.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "fas-car-battery",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/chemist.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-grocery",
+    "icon": "fas-shopping-basket",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/clothes/underwear.json

@@ -0,0 +1,33 @@
+{
+    "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"
+}

data/presets/presets/shop/computer.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-laptop",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/convenience.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-shopping-basket",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/craft.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-palette",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/electronics.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-plug",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/fabric.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-tape",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/frame.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-vector-square",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/herbalist.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-leaf",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/mobile_phone.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-mobile-phone",
+    "icon": "fas-mobile-alt",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/music.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-music",
+    "icon": "fas-compact-disc",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/musical_instrument.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-music",
+    "icon": "fas-guitar",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/newsagent.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-newspaper",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/party.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-mask",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/photo.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-attraction",
+    "icon": "fas-camera-retro",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/radiotechnics.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-microchip",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/sports.json

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

data/presets/presets/shop/stationery.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-paperclip",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/toys.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-space-shuttle",
     "geometry": [
         "point",
         "area"

data/presets/presets/telecom/data_center.json

@@ -0,0 +1,29 @@
+{
+    "icon": "fas-server",
+    "fields": [
+        "name",
+        "ref",
+        "operator",
+        "building_area"
+    ],
+    "moreFields": [
+        "address",
+        "phone",
+        "website"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "telecom": "data_center"
+    },
+    "terms": [
+        "computer systems storage",
+        "information technology",
+        "server farm",
+        "the cloud",
+        "telecommunications"
+    ],
+    "name": "Data Center"
+}

data/presets/presets/tourism/hotel.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-lodging",
+    "icon": "fas-concierge-bell",
     "fields": [
         "{tourism/motel}"
     ],

data/presets/presets/tourism/information/guidepost.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-information",
+    "icon": "fas-map-signs",
     "fields": [
         "name",
         "elevation",

data/presets/presets/tourism/information/map.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-information",
+    "icon": "fas-map",
     "fields": [
         "operator",
         "map_type",

data/presets/presets/traffic_calming/chicane.json

@@ -6,6 +6,7 @@
     ],
     "geometry": [
         "vertex",
+        "line",
         "area"
     ],
     "terms": [

data/presets/presets/traffic_calming/choker.json

@@ -6,6 +6,7 @@
     ],
     "geometry": [
         "vertex",
+        "line",
         "area"
     ],
     "terms": [

data/presets/presets/traffic_sign.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-square-stroked",
+    "icon": "fas-directions",
     "fields": [
         "traffic_sign",
         "direction"

data/presets/presets/type/route/bicycle.json

@@ -1,11 +1,11 @@
 {
-    "icon": "iD-route-bicycle",
+    "icon": "maki-bicycle",
     "fields": [
         "name",
         "ref_route",
         "network_bicycle",
         "cycle_network",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [

data/presets/presets/type/route/bus.json

@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-bus",
+    "icon": "maki-bus",
     "fields": [
         "name",
         "ref_route",

data/presets/presets/type/route/ferry.json

@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-ferry",
+    "icon": "maki-ferry",
     "fields": [
         "name",
         "ref_route",