Ticket #11211: django_overlays_with_zindex.patch

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

@@ -258 +258 @@
           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, clickable=False,
+                 bouncy=False, dragCrossMove=False, bounceGravity=1,
+                 autoPan=True, hide=False, icon=None, zIndexProcess=None):
         """
         The GMarker object may initialize on GEOS Points or a parameter
         that may be instantiated into a GEOS point.  Keyword options map to
@@ -270 +272 @@
 
          draggable:
            Draggable option for GMarker, disabled by default.
+
+        clickable:
+            Clickable option for GMarker, disabled by default.
+
+        bouncy:
+            Bouncy option for GMarker, disabled by default.
+
+        dragCrossMove:
+            Drag cross move option for GMarker, disabled by default.
+
+        bounceGravity:
+            Bounce gravity option for GMarker, 1 by default.
+
+        autoPan:
+            Auto pan option for GMarker, enabled by default.
+
+        hide:
+            Hide option for GMarker, disabled by default.
+
+        icon:
+            Icon option for GMarker, disabled by default.
+        
+        zIndexProcess:
+            Function that will determine the z-Index of this marker.
         """
         # If a GEOS geometry isn't passed in, try to construct one.
         if isinstance(geom, basestring): geom = fromstr(geom)
@@ -281 +307 @@
         # Getting the envelope for automatic zoom determination.
         self.envelope = geom.envelope
         # TODO: Add support for more GMarkerOptions
+        # TODO: zIndexProcess is all that is left currently (05-27-2009)
         self.title = title
         self.draggable = draggable
         self.icon = icon
+        self.clickable = clickable
+        self.bouncy = bouncy
+        self.dragCrossMove = dragCrossMove
+        self.bounceGravity = bounceGravity
+        self.autoPan = autoPan
+        self.zIndexProcess = zIndexProcess
         super(GMarker, self).__init__()
 
     def latlng_from_coords(self, coords):
@@ -294 +327 @@
         if self.title: result.append('title: "%s"' % self.title)
         if self.icon: result.append('icon: %s' % self.icon.varname)
         if self.draggable: result.append('draggable: true')
+        if self.clickable: result.append('clickable: true')
+        if self.bouncy: result.append('bouncy: true')
+        if self.dragCrossMove: result.append('dragCrossMove: true')
+        if self.bounceGravity: result.append('bounceGravity: %s' %
+                                             self.bounceGravity)
+        if not self.autoPan: result.append('autoPan: false')
+        if self.zIndexProcess: result.append('zIndexProcess: %s' % self.zIndexProcess)
         return '{%s}' % ','.join(result)
 
     @property