diff --git a/data/presets.yaml b/data/presets.yaml
index 4efecdb3d..942c40117 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -873,6 +873,16 @@ en:
       location:
         # location=*
         label: Location
+      location_pool:
+        # location=*
+        label: Location
+        options:
+          # location=indoor
+          indoor: Indoor
+          # location=outdoor
+          outdoor: Outdoor
+          # location=roof
+          roof: Rooftop
       man_made:
         # man_made=*
         label: Type
@@ -1509,6 +1519,9 @@ en:
       surveillance/zone:
         # 'surveillance:zone=*'
         label: Surveillance Zone
+      swimming_pool:
+        # swimming_pool=*
+        label: Type
       switch:
         # switch=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b92a073f6..3c2b44d03 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -156,6 +156,7 @@
     "level": {"key": "level", "type": "combo", "label": "Level", "universal": true},
     "levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
     "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"},
     "man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
     "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
@@ -269,6 +270,7 @@
     "surveillance": {"key": "surveillance", "type": "combo", "label": "Surveillance Kind"},
     "surveillance/type": {"key": "surveillance:type", "type": "combo", "label": "Surveillance Type", "strings": {"options": {"camera": "Camera", "guard": "Guard", "ALPR": "Automatic License Plate Reader"}}},
     "surveillance/zone": {"key": "surveillance:zone", "type": "combo", "label": "Surveillance Zone"},
+    "swimming_pool": {"key": "swimming_pool", "type": "combo", "label": "Type"},
     "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"}}},
diff --git a/data/presets/fields/location_pool.json b/data/presets/fields/location_pool.json
new file mode 100644
index 000000000..be692c419
--- /dev/null
+++ b/data/presets/fields/location_pool.json
@@ -0,0 +1,12 @@
+{
+    "key": "location",
+    "type": "typeCombo",
+    "label": "Location",
+    "strings": {
+		"options": {
+			"outdoor": "Outdoor",
+			"indoor": "Indoor",
+			"roof": "Rooftop"
+		}
+    }
+}
diff --git a/data/presets/fields/swimming_pool.json b/data/presets/fields/swimming_pool.json
new file mode 100644
index 000000000..6e4d07bd0
--- /dev/null
+++ b/data/presets/fields/swimming_pool.json
@@ -0,0 +1,5 @@
+{
+    "key": "swimming_pool",
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 62e77cb19..d4aa19eed 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -528,7 +528,7 @@
     "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
     "leisure/sports_centre/swimming": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "building"], "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
     "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
-    "leisure/swimming_pool": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
+    "leisure/swimming_pool": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
     "leisure/track": {"icon": "iD-highway-road", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
     "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
     "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "name": "Line", "matchScore": 0.1},
@@ -2794,10 +2794,10 @@
     "leisure/sports_centre/ДЮСШ": {"tags": {"name": "ДЮСШ", "leisure": "sports_centre"}, "name": "ДЮСШ", "icon": "maki-pitch", "geometry": ["point", "area"], "fields": ["name", "sport", "building", "address", "opening_hours"], "suggestion": true},
     "leisure/sports_centre/Ледовый дворец": {"tags": {"name": "Ледовый дворец", "leisure": "sports_centre"}, "name": "Ледовый дворец", "icon": "maki-pitch", "geometry": ["point", "area"], "fields": ["name", "sport", "building", "address", "opening_hours"], "suggestion": true},
     "leisure/sports_centre/体育館": {"tags": {"name": "体育館", "leisure": "sports_centre"}, "name": "体育館", "icon": "maki-pitch", "geometry": ["point", "area"], "fields": ["name", "sport", "building", "address", "opening_hours"], "suggestion": true},
-    "leisure/swimming_pool/Schwimmerbecken": {"tags": {"name": "Schwimmerbecken", "leisure": "swimming_pool"}, "name": "Schwimmerbecken", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true},
-    "leisure/swimming_pool/Yüzme Havuzu": {"tags": {"name": "Yüzme Havuzu", "leisure": "swimming_pool"}, "name": "Yüzme Havuzu", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true},
-    "leisure/swimming_pool/プール": {"tags": {"name": "プール", "leisure": "swimming_pool"}, "name": "プール", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true},
-    "leisure/swimming_pool/游泳池": {"tags": {"name": "游泳池", "leisure": "swimming_pool"}, "name": "游泳池", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true},
+    "leisure/swimming_pool/Schwimmerbecken": {"tags": {"name": "Schwimmerbecken", "leisure": "swimming_pool"}, "name": "Schwimmerbecken", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "suggestion": true},
+    "leisure/swimming_pool/Yüzme Havuzu": {"tags": {"name": "Yüzme Havuzu", "leisure": "swimming_pool"}, "name": "Yüzme Havuzu", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "suggestion": true},
+    "leisure/swimming_pool/プール": {"tags": {"name": "プール", "leisure": "swimming_pool"}, "name": "プール", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "suggestion": true},
+    "leisure/swimming_pool/游泳池": {"tags": {"name": "游泳池", "leisure": "swimming_pool"}, "name": "游泳池", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "suggestion": true},
     "man_made/windmill/De Hoop": {"tags": {"name": "De Hoop", "man_made": "windmill"}, "name": "De Hoop", "icon": "temaki-windmill", "geometry": ["point", "area"], "fields": ["building_area"], "suggestion": true},
     "shop/alcohol/Alko": {"tags": {"name": "Alko", "shop": "alcohol"}, "name": "Alko", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "drive_through"], "suggestion": true},
     "shop/alcohol/BC Liquor Store": {"tags": {"name": "BC Liquor Store", "shop": "alcohol"}, "name": "BC Liquor Store", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "drive_through"], "suggestion": true},
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index 0d868e43d..776cbb5b5 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -5,7 +5,10 @@
         "access_simple",
         "operator",
         "address",
-        "lit"
+        "lit",
+        "location_pool",
+        "length",
+        "swimming_pool"
     ],
     "geometry": [
         "point",
diff --git a/data/taginfo.json b/data/taginfo.json
index f5797f12f..2ee7a7cd1 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -6718,6 +6718,9 @@
     {"key": "level", "description": "Level"},
     {"key": "building:levels", "description": "Levels"},
     {"key": "lit", "description": "Lit"},
+    {"key": "location", "value": "outdoor", "description": "Location"},
+    {"key": "location", "value": "indoor", "description": "Location"},
+    {"key": "location", "value": "roof", "description": "Location"},
     {"key": "location", "description": "Location"},
     {"key": "map_size", "description": "Coverage"},
     {"key": "map_type", "description": "Type"},
@@ -7058,6 +7061,7 @@
       "description": "Surveillance Type"
     },
     {"key": "surveillance:zone", "description": "Surveillance Zone"},
+    {"key": "swimming_pool", "description": "Type"},
     {"key": "switch", "value": "mechanical", "description": "Type"},
     {"key": "switch", "value": "circuit_breaker", "description": "Type"},
     {"key": "switch", "value": "disconnector", "description": "Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 5ae64843e..16821c0bc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2204,6 +2204,14 @@
                 "lit": {
                     "label": "Lit"
                 },
+                "location_pool": {
+                    "label": "Location",
+                    "options": {
+                        "outdoor": "Outdoor",
+                        "indoor": "Indoor",
+                        "roof": "Rooftop"
+                    }
+                },
                 "location": {
                     "label": "Location"
                 },
@@ -2728,6 +2736,9 @@
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "swimming_pool": {
+                    "label": "Type"
+                },
                 "switch": {
                     "label": "Type",
                     "options": {