Index: contrib/gis/templates/gis/google/google-map.js
===================================================================
--- contrib/gis/templates/gis/google/google-map.js	(revision 10924)
+++ contrib/gis/templates/gis/google/google-map.js	(working copy)
@@ -3,8 +3,7 @@
   if (GBrowserIsCompatible()) {
     {{ js_module }}.{{ dom_id }} = new GMap2(document.getElementById("{{ dom_id }}"));
     {{ js_module }}.{{ dom_id }}.setCenter(new GLatLng({{ center.1 }}, {{ center.0 }}), {{ zoom }});
-    {% block controls %}{{ js_module }}.{{ dom_id }}.addControl(new GSmallMapControl());
-    {{ js_module }}.{{ dom_id }}.addControl(new GMapTypeControl());{% endblock %}
+    {% block controls %}{{ js_module }}.{{ dom_id }}.setUIToDefault();{% endblock %}
     {% if calc_zoom %}var bounds = new GLatLngBounds(); var tmp_bounds = new GLatLngBounds();{% endif %}
     {% for kml_url in kml_urls %}{{ js_module }}.{{ dom_id }}_kml{{ forloop.counter }} = new GGeoXml("{{ kml_url }}");
     {{ js_module }}.{{ dom_id }}.addOverlay({{ js_module }}.{{ dom_id }}_kml{{ forloop.counter }});{% endfor %}