Django

Code

Show
Ignore:
Timestamp:
07/05/08 17:10:33 (6 months ago)
Author:
jbronn
Message:

gis: Fixed #7619. Added support Google Maps markers (GMarker) and events (GEvent). Thanks, Ludwig Brinckmann.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis/django/contrib/gis/templates/gis/google/js/google-map.js

    r7400 r7841  
    44  if (GBrowserIsCompatible()) { 
    55    map = new GMap2(document.getElementById("{{ dom_id }}")); 
     6    map.setCenter(new GLatLng({{ center.1 }}, {{ center.0 }}), {{ zoom }}); 
    67    {% block controls %}map.addControl(new GSmallMapControl()); 
    78    map.addControl(new GMapTypeControl());{% endblock %} 
    8     {% if calc_zoom %}var bounds = new GLatLngBounds(); var tmp_bounds = new GLatLngBounds();{% else %}map.setCenter(new GLatLng({{ center.1 }}, {{ center.0 }}), {{ zoom }});{% endif %} 
     9    {% if calc_zoom %}var bounds = new GLatLngBounds(); var tmp_bounds = new GLatLngBounds();{% endif %} 
    910    {% for kml_url in kml_urls %}var kml{{ forloop.counter }} = new GGeoXml("{{ kml_url }}"); 
    1011    map.addOverlay(kml{{ forloop.counter }});{% endfor %} 
     12 
    1113    {% for polygon in polygons %}var poly{{ forloop.counter }} = new {{ polygon }}; 
    12     map.addOverlay(poly{{ forloop.counter }});{% if calc_zoom %} 
    13     tmp_bounds = poly{{ forloop.counter }}.getBounds(); bounds.extend(tmp_bounds.getSouthWest()); bounds.extend(tmp_bounds.getNorthEast());{% endif %}{% endfor %} 
     14    map.addOverlay(poly{{ forloop.counter }}); 
     15    {% for event in polygon.events %}GEvent.addListener(poly{{ forloop.parentloop.counter }}, {{ event }});{% endfor %} 
     16    {% if calc_zoom %}tmp_bounds = poly{{ forloop.counter }}.getBounds(); bounds.extend(tmp_bounds.getSouthWest()); bounds.extend(tmp_bounds.getNorthEast());{% endif %}{% endfor %} 
     17 
    1418    {% for polyline in polylines %}var polyline{{ forloop.counter }} = new {{ polyline }}; 
    15     map.addOverlay(polyline{{ forloop.counter }});{% if calc_zoom %} 
    16     tmp_bounds = polyline{{ forloop.counter }}.getBounds(); bounds.extend(tmp_bounds.getSouthWest()); bounds.extend(tmp_bounds.getNorthEast());{% endif %}{% endfor %} 
     19    map.addOverlay(polyline{{ forloop.counter }}); 
     20    {% for event in polyline.events %}GEvent.addListener(polyline{{ forloop.parentloop.counter }}, {{ event }}); {% endfor %} 
     21    {% if calc_zoom %}tmp_bounds = polyline{{ forloop.counter }}.getBounds(); bounds.extend(tmp_bounds.getSouthWest()); bounds.extend(tmp_bounds.getNorthEast());{% endif %}{% endfor %} 
     22     
     23    {% for marker in markers %}var marker{{ forloop.counter }} = new {{ marker }}; 
     24    map.addOverlay(marker{{ forloop.counter }}); 
     25    {% for event in marker.events %}GEvent.addListener(marker{{ forloop.parentloop.counter }}, {{ event }}); {% endfor %} 
     26    {% if calc_zoom %}bounds.extend(marker{{ forloop.counter }}.getLatLng()); {% endif %}{% endfor %} 
     27 
    1728    {% if calc_zoom %}map.setCenter(bounds.getCenter(), map.getBoundsZoomLevel(bounds));{% endif %} 
    1829    {% block load_extra %}{% endblock %}