Ticket #9204: gicon1.patch

__init__.py

@@ -57 +57 @@
       version.
 """
 from django.contrib.gis.maps.google.gmap import GoogleMap
-from django.contrib.gis.maps.google.overlays import GEvent, GMarker, GPolygon, GPolyline
+from django.contrib.gis.maps.google.overlays import GEvent, GMarker, GPolygon, GPolyline, GIcon
 from django.contrib.gis.maps.google.zoom import GoogleZoom

overlays.py

@@ -165 +165 @@
     def js_params(self):
         return '%s, "%s", %s, %s' % (self.latlngs, self.color, self.weight, self.opacity)
 
+class GIcon(object):
+    """
+    A Python wrapper for the Google GIcon object.  For more information
+    please see the Google Maps API Reference:
+     http://code.google.com/apis/maps/documentation/reference.html#GIcon
+
+    >>> GIcon("http://gmaps-samples.googlecode.com/svn/trunk/markers/blue/blank.png")
+    <django.contrib.gis.maps.google.overlays.GIcon object at 0x132c6d0>
+    >>> "%s"%GIcon("http://gmaps-samples.googlecode.com/svn/trunk/markers/blue/blank.png")
+    'icon: eval("icon=new GIcon(G_DEFAULT_ICON);icon.image=\'http://gmaps-samples.googlecode.com/svn/trunk/markers/blue/blank.png\';icon")'
+    """
+    def __init__(self, icon=None):
+        self.icon = icon
+
+    def __str__(self):
+        js = ""
+        if self.icon: js='''icon: eval("icon=new GIcon(G_DEFAULT_ICON);icon.image='%s';icon")''' % self.icon
+        return js
+
+
 class GMarker(GOverlayBase):
     """
     A Python wrapper for the Google GMarker object.  For more information
@@ -184 +204 @@
           return render_to_response('mytemplate.html', 
                  {'google' : GoogleMap(markers=[marker])})
     """
-    def __init__(self, geom, title=None):
+    def __init__(self, geom, title=None, icon=None):
         """
         The GMarker object may initialize on GEOS Points or a parameter
         that may be instantiated into a GEOS point.  Keyword options map to
@@ -205 +225 @@
         self.envelope = geom.envelope
         # TODO: Add support for more GMarkerOptions
         self.title = title
+        self.icon = icon
         super(GMarker, self).__init__()
 
     def latlng_from_coords(self, coords):
@@ -213 +234 @@
     def options(self):
         result = []
         if self.title: result.append('title: "%s"' % self.title) 
+        if self.icon: result.append("%s"%self.icon)
         return '{%s}' % ','.join(result)
 
     @property