Merge pull request #16314 from CartoDB/feature/ch145382/cgonzalez-abachiller-google-basemaps-persist

Use googlemaps if the base layer is google

NEWS.md

@@ -40,6 +40,7 @@ Development
 - Fix a regression test and add some warnings to source code [#16297](https://github.com/CartoDB/cartodb/pull/16297)
 - Fix broken links on the public footer [#16308](https://github.com/CartoDB/cartodb/pull/16308)
 - Fix search in _Filter by Column Value_ analysis [#16310](https://github.com/CartoDB/cartodb/pull/16310)
+- Use Google Maps provider if the base layer is Google [#16314](https://github.com/CartoDB/cartodb/pull/16314)
 
 4.45.0 (2021-04-14)
 -------------------

app/models/visualization/table_blender.rb

@@ -22,6 +22,7 @@ module CartoDB
           if base_layer.supports_labels_layer?
             destination_map.layers << Carto::LayerFactory.build_default_labels_layer(base_layer)
           end
+          destination_map.provider = base_layer.gmapsbase? ? 'googlemaps' : 'leaflet'
         else
           copier.copy_base_layer(maps.first, destination_map)
         end