Ticket #11072: add_info_window_html.diff

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

@@ -19 +19 @@
     {% for marker in markers %}{{ js_module }}.{{ dom_id }}_marker{{ forloop.counter }} = new {{ marker }};
     {{ js_module }}.{{ dom_id }}.addOverlay({{ js_module }}.{{ dom_id }}_marker{{ forloop.counter }});
     {% for event in marker.events %}GEvent.addListener({{ js_module }}.{{ dom_id }}_marker{{ forloop.parentloop.counter }}, {{ event }}); {% endfor %}
+    {% if marker.info_window_html %}{{ js_module }}.{{ dom_id }}_marker{{ forloop.counter }}.bindInfoWindowHtml('{{ marker.info_window_html }}');{% endif %}
     {% if calc_zoom %}bounds.extend({{ js_module }}.{{ dom_id }}_marker{{ forloop.counter }}.getLatLng()); {% endif %}{% endfor %}
     {% if calc_zoom %}{{ js_module }}.{{ dom_id }}.setCenter(bounds.getCenter(), {{ js_module }}.{{ dom_id }}.getBoundsZoomLevel(bounds));{% endif %}
     {% block load_extra %}{% endblock %}

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

@@ -250 +250 @@
           return render_to_response('mytemplate.html',
                  {'google' : GoogleMap(markers=[marker])})
     """
-    def __init__(self, geom, title=None, draggable=False, icon=None):
+    def __init__(self, geom, title=None, draggable=False, icon=None, info_window_html=None):
         """
         The GMarker object may initialize on GEOS Points or a parameter
         that may be instantiated into a GEOS point.  Keyword options map to
@@ -262 +262 @@
 
          draggable:
            Draggable option for GMarker, disabled by default.
+         
+         info_window_html:
+           An HTML fragment that will be displayed when the marker is clicked.
         """
         # If a GEOS geometry isn't passed in, try to construct one.
         if isinstance(geom, basestring): geom = fromstr(geom)
@@ -276 +279 @@
         self.title = title
         self.draggable = draggable
         self.icon = icon
+        self.info_window_html = info_window_html
         super(GMarker, self).__init__()
 
     def latlng_from_coords(self, coords):