Changeset 4797

Timestamp:

11/14/08 09:03:54 (2 months ago)

Author:

martin_s

Message:

0.11

Merged with 0.11_reqid branch.

Files:

• googlemapmacro/dev/0.11 (modified) (1 prop)
• googlemapmacro/dev/0.11/tracgooglemap/htdocs/tracgooglemap.js (modified) (2 diffs)
• googlemapmacro/dev/0.11/tracgooglemap/macro.py (modified) (6 diffs)

googlemapmacro/dev/0.11/tracgooglemap/htdocs/tracgooglemap.js

@@ -55 +55 @@
-        // associated init function:
-        $("div.tracgooglemap")
-        .attr( 'id', function (index) {
-            return 'tracgooglemap-' + index;
-        })
-        .each( function (index) {
-            var initfunc = tracgooglemapfuncs[index];
-            if (initfunc) {
-
+, index
-            }
-        });
@@ -71 +68 @@
-        var key = $("link.google-key").attr('title');
-        jQuery.getScript("http://www.google.com/jsapi?key=" + key, function () {
-
+.x
-        });
-    }

googlemapmacro/dev/0.11/tracgooglemap/macro.py

@@ -21 +21 @@
-import re
-
+COUNT = '_googlemapmacro_count'
+
-_reWHITESPACES = re.compile(r'\s+')
-_reCOMMA       = re.compile(r',\s*')
@@ -41 +43 @@
-//<![CDATA[
-
-
+,index
-    var map = new GMap2(mapdiv, {
-    //    size: new GSize(%(width)s, %(height)s),
@@ -64 +66 @@
-    }
-    %(markers_str)s
+    if ("%(directions)s") {
+        dirdiv = document.getElementById("tracgooglemap-directions-" + index);
+        gdir = new GDirections(map, dirdiv);
+        gdir.load("%(directions)s");
+    }
-}, "%(id)s" );
-
@@ -201 +208 @@
-        if len(largs) > 0:
-            arg = unicode(largs[0])
+            if _reCOORDS.match(arg):
+                if not 'center' in kwargs:
+                    kwargs['center'] = arg
+            else:
+                if not 'address' in kwargs:
+                    kwargs['address'] = arg
+        if 'from' in kwargs and not 'address' kwargs and not 'center' in kwargs:
+            arg = unicode(kwargs['from'])
-            if _reCOORDS.match(arg):
-                if not 'center' in kwargs:
@@ -397 +412 @@
-            markers_str = ''.join( markers )
-
+        # Get macro count from request object
+        req = formatter.req
+        count = getattr (req, COUNT, 0)
+        id = 'tracgooglemap-%s' % count
+        setattr (req, COUNT, count + 1)
+
+        # Canvas for this map
+        mapdiv = tag.div (
+                    "Google Map is loading ... (JavaScript enabled?)",
+                    id=id,
+                    style = "width: %s; height: %s;" % (width,height),
+                    class_ = "tracgooglemap"
+                )
+
+        if 'from' in kwargs and 'to' in kwargs:
+            directions = "from: %s to: %s" % (kwargs['from'],kwargs['to'])
+            mapnmore = tag.table(
+                            tag.tr(
+                                tag.td(
+                                    tag.div( "", 
+                                        class_ = 'tracgooglemap-directions',
+                                        id     = 'tracgooglemap-directions-%s' % count
+                                    )
+                                ),
+                                tag.td(
+                                    mapdiv
+                                )
+                            ),
+                          class_ = 'tracgooglemaps'
+                       )
+
+        else:
+            directions = ""
+            mapnmore = mapdiv
+
-        # put everything in a tidy div
-        html = tag.div(
@@ -406 +456 @@
-                        'type':type, 'width':width, 'height':height,
-                        'types_str':types_str, 'controls_str':controls_str,
-
+, 'directions':directions,
-                        },
-                        type = "text/javascript"),
-
-
-
-
-
-
-
+
-                    ],
-                class_ = "tracgooglemap-parent"