Add 'building' combo field for ice rink and swim facility

These features are frequently indoors or outdoors, so we should offer the
mapper the ability to specify this, but not necessarily default to yes like
the building_area field does.

Trivia:  power=sub_station/substation works this way too

data/presets/presets/leisure/ice_rink.json

@@ -5,7 +5,7 @@
         "sport_ice",
         "operator",
         "address",
-        "building_area",
+        "building",
         "opening_hours"
     ],
     "geometry": [

data/presets/presets/leisure/sports_centre/swimming.json

@@ -3,7 +3,8 @@
     "fields": [
         "access_simple",
         "operator",
-        "address"
+        "address",
+        "building"
     ],
     "geometry": [
         "point",