diff --git a/data/presets.yaml b/data/presets.yaml
index e65d3cbce..252d9f2c1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2875,6 +2875,11 @@ en:
         # building=cabin
         name: Cabin
         terms: '<translate with synonyms or related terms for ''Cabin'', separated by commas>'
+      building/carport:
+        # building=carport
+        name: Carport
+        # 'terms: covered parking space,garage,car,porch'
+        terms: '<translate with synonyms or related terms for ''Carport'', separated by commas>'
       building/cathedral:
         # building=cathedral
         name: Cathedral Building
@@ -4249,6 +4254,11 @@ en:
         name: Soccer Field
         # 'terms: football'
         terms: '<translate with synonyms or related terms for ''Soccer Field'', separated by commas>'
+      leisure/pitch/softball:
+        # 'leisure=pitch, sport=softball'
+        name: Softball Field
+        # 'terms: softball,diamond'
+        terms: '<translate with synonyms or related terms for ''Softball Field'', separated by commas>'
       leisure/pitch/table_tennis:
         # 'leisure=pitch, sport=table_tennis'
         name: Ping Pong Table
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 06a5024b2..821699937 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -220,6 +220,7 @@
     "building/boathouse": {"icon": "maki-harbor", "fields": ["name", "levels", "height", "address"], "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
     "building/bungalow": {"icon": "maki-home", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
     "building/cabin": {"icon": "maki-home", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"},
+    "building/carport": {"icon": "fas-warehouse", "fields": ["height", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"},
     "building/cathedral": {"icon": "maki-place-of-worship", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"},
     "building/chapel": {"icon": "maki-place-of-worship", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"},
     "building/church": {"icon": "maki-place-of-worship", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"},
@@ -511,7 +512,6 @@
     "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
     "leisure/pitch/american_football": {"icon": "maki-america-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": [], "name": "American Football Field"},
     "leisure/pitch/badminton": {"icon": "maki-tennis", "fields": ["name", "surface", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "badminton"}, "reference": {"key": "sport", "value": "badminton"}, "terms": [], "name": "Badminton Court"},
-    "leisure/pitch/baseball": {"icon": "maki-baseball", "fields": ["name", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "baseball"}, "reference": {"key": "sport", "value": "baseball"}, "terms": [], "name": "Baseball Diamond"},
     "leisure/pitch/baseball": {"icon": "maki-baseball", "fields": ["name", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "baseball"}, "reference": {"key": "sport", "value": "baseball"}, "terms": [], "name": "Baseball Field"},
     "leisure/pitch/basketball": {"icon": "maki-basketball", "fields": ["name", "surface", "hoops", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "basketball"}, "reference": {"key": "sport", "value": "basketball"}, "terms": [], "name": "Basketball Court"},
     "leisure/pitch/beachvolleyball": {"icon": "maki-basketball", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "beachvolleyball"}, "addTags": {"leisure": "pitch", "sport": "beachvolleyball", "surface": "sand"}, "removeTags": {"leisure": "pitch", "sport": "beachvolleyball", "surface": "sand"}, "reference": {"key": "sport", "value": "beachvolleyball"}, "terms": ["volleyball"], "name": "Beach Volleyball Court"},
@@ -523,6 +523,7 @@
     "leisure/pitch/rugby_union": {"icon": "maki-america-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_union"}, "reference": {"key": "sport", "value": "rugby_union"}, "terms": [], "name": "Rugby Union Field"},
     "leisure/pitch/skateboard": {"icon": "maki-pitch", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "skateboard"}, "reference": {"key": "sport", "value": "skateboard"}, "terms": [], "name": "Skate Park"},
     "leisure/pitch/soccer": {"icon": "maki-soccer", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "soccer"}, "reference": {"key": "sport", "value": "soccer"}, "terms": ["football"], "name": "Soccer Field"},
+    "leisure/pitch/softball": {"icon": "maki-baseball", "fields": ["name", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "softball"}, "reference": {"key": "sport", "value": "softball"}, "terms": ["softball", "diamond"], "name": "Softball Field"},
     "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["table tennis", "ping pong"], "name": "Ping Pong Table"},
     "leisure/pitch/tennis": {"icon": "maki-tennis", "fields": ["name", "surface", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "tennis"}, "reference": {"key": "sport", "value": "tennis"}, "terms": [], "name": "Tennis Court"},
     "leisure/pitch/volleyball": {"icon": "maki-basketball", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"},
diff --git a/data/taginfo.json b/data/taginfo.json
index 694bc6281..69055bca0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1496,6 +1496,13 @@
       "object_types": ["area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/home-15.svg?sanitize=true"
     },
+    {
+      "key": "building",
+      "value": "carport",
+      "description": "Carport",
+      "object_types": ["area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-warehouse.svg?sanitize=true"
+    },
     {
       "key": "building",
       "value": "cathedral",
@@ -3521,6 +3528,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/soccer-15.svg?sanitize=true"
     },
+    {
+      "key": "sport",
+      "value": "softball",
+      "description": "Softball Field",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/baseball-15.svg?sanitize=true"
+    },
     {
       "key": "sport",
       "value": "table_tennis",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9e8f55edf..57269705c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3939,6 +3939,10 @@
                     "name": "Cabin",
                     "terms": ""
                 },
+                "building/carport": {
+                    "name": "Carport",
+                    "terms": "covered parking space,garage,car,porch"
+                },
                 "building/cathedral": {
                     "name": "Cathedral Building",
                     "terms": ""
@@ -5147,6 +5151,10 @@
                     "name": "Soccer Field",
                     "terms": "football"
                 },
+                "leisure/pitch/softball": {
+                    "name": "Softball Field",
+                    "terms": "softball,diamond"
+                },
                 "leisure/pitch/table_tennis": {
                     "name": "Ping Pong Table",
                     "terms": "table tennis,ping pong"