Ticket #13112: map_type.diff

django/contrib/gis/templates/gis/google/google-map.js

@@ -10 +10 @@
   if (GBrowserIsCompatible()) {
     {{ js_module }}.{{ dom_id }} = new GMap2(document.getElementById("{{ dom_id }}"));
     {{ js_module }}.{{ dom_id }}.setCenter(new GLatLng({{ center.1 }}, {{ center.0 }}), {{ zoom }});
+    {{ js_module }}.{{ dom_id }}.setMapType({{ map_type }});
     {% 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 }}");

django/contrib/gis/maps/google/gmap.py

@@ -22 +22 @@
                  center=None, zoom=None, dom_id='map',
                  kml_urls=[], polylines=None, polygons=None, markers=None,
                  template='gis/google/google-map.js',
-                 js_module='geodjango',
+                 js_module='geodjango', map_type='map',
                  extra_context={}):
 
         # The Google Maps API Key defined in the settings will be used
@@ -86 +86 @@
         self.zoom = zoom
         if center is None: center = (0, 0)
         self.center = center
+            
+        if map_type == 'terrain':
+            self.map_type = 'G_PHYSICAL_MAP'
+        elif map_type == 'satellite':
+            self.map_type = 'G_SATELLITE_MAP'
+        else:
+            self.map_type = 'G_NORMAL_MAP'
 
     def render(self):
         """
@@ -97 +104 @@
                   'js_module' : self.js_module,
                   'kml_urls' : self.kml_urls,
                   'zoom' : self.zoom,
+                  'map_type' : self.map_type,
                   'polygons' : self.polygons,
                   'polylines' : self.polylines,
                   'icons': self.icons,