Just a little comment about google map templates:
since the gis/google/google-map.js template is now included in "google-single.js" template, it is now impossible to override the "controls" and "load_extra" blocks (if i'm not mistaken) which was very convenient in the first place.
to avoid this I had to create my own "google-single.js" like this:
{% extends "gis/google/google-base.js" %}
{% block functions %}{% include "world/google-map-ext.js" %}{% endblock %}
with "google-map-ext.js" like for example:
{% extends "gis/google/google-map.js" %}
{% block controls %}
{{ js_module }}.{{ dom_id }}.setUIToDefault();
{{ js_module }}.{{ dom_id }}.setMapType({{ maptype }});
{% endblock %}
This is not really harmful, but I still wanted to point it out...
Or may be I'm missing something ?