Rework map partial to not require the map's mappable to be passed in

Author: rsmithlal

…r_together/shared/_mappable_map.html.erb …ews/better_together/shared/_map.html.erbapp/views/better_together/shared/_mappable_map.html.erb renamed to app/views/better_together/shared/_map.html.erb app/views/better_together/shared/_mappable_map.html.erb renamed to app/views/better_together/shared/_map.html.erb

@@ -1,15 +1,15 @@
 
-<%# locals: (mappable:, map: mappable.map)%>
+<%# locals: (map:)%>
 
 <% if map %>
-  <div class="map" id="<%= dom_id(mappable, :map) %>"
+  <div class="map" id="<%= dom_id(map) %>"
       data-controller="better_together--map"
       data-better_together--map-center-value="<%= map.center_for_leaflet %>"
       data-better_together--map-spaces-value="<%= map.leaflet_points %>"
       data-better_together--map-zoom-value="<%= map.zoom %>"
       data-better_together--map-extent-value="<%= map.viewport %>">
     <div class="map-controls">
-      <button class="btn btn-secondary" data-action="better_together--map#switchToOSM">OpenStreetMap</button>
+      <button class="btn btn-secondary" data-action="better_together--map#switchToOSM">Map</button>
       <button class="btn btn-secondary" data-action="better_together--map#switchToSatellite">Satellite</button>
       <button class="btn btn-secondary" data-action="better_together--map#enableGeolocation">Geolocate Me</button>
     </div>