Changeset 4801

Timestamp:

11/14/08 09:36:27 (2 months ago)

Author:

martin_s

Message:

Merged trunk with dev/0.11 branch.

Files:

• googlemapmacro/0.11/tracgooglemap/htdocs/tracgooglemap.js (modified) (2 diffs)
• googlemapmacro/0.11/tracgooglemap/macro.py (modified) (10 diffs)

googlemapmacro/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/0.11/tracgooglemap/macro.py

@@ -9 +9 @@
-from trac.core import *
-from trac.util.html import escape,Markup
-.wiki.api
+advparseargs
-from trac.wiki.formatter import extract_link
-from trac.wiki.macros import WikiMacroBase
@@ -20 +20 @@
-import re
-
+COUNT = '_googlemapmacro_count'
+
-_reWHITESPACES = re.compile(r'\s+')
-_reCOMMA       = re.compile(r',\s*')
@@ -40 +42 @@
-//<![CDATA[
-
-
+,index
-    var map = new GMap2(mapdiv, {
-    //    size: new GSize(%(width)s, %(height)s),
@@ -63 +65 @@
-    }
-    %(markers_str)s
+    if ("%(directions)s") {
+        dirdiv = document.getElementById("tracgooglemap-directions-" + index);
+        gdir = new GDirections(map, dirdiv);
+        gdir.load("%(directions)s");
+    }
-}, "%(id)s" );
-
@@ -68 +75 @@
-"""
-
-
-
-
+
+
-    implements(IRequestFilter,ITemplateProvider,IRequestFilter,IEnvironmentSetupParticipant)
-
@@ -157 +163 @@
-        return address
-
-    def _parse_args(self, args, strict=True, sep = ',', quote = '"', kw = True, min = -1, num = -1):
-        """ parses a comma separated string were the values can include multiple
-        quotes """
-        esc    = 0   # last char was escape char
-        quoted = 0   # inside quote
-        start  = 0   # start of current field
-        pos    = 0   # current position
-        largs  = []
-        kwargs = {}
-
-        def checkkey (arg):
-            import re
-            arg = arg.replace(r'\,', ',')
-            if strict:
-                m = re.match(r'\s*[a-zA-Z_]\w+=', arg)
-            else:
-                m = re.match(r'\s*[^=]+=', arg)
-            if m:
-                kw = arg[:m.end()-1].strip()
-                if strict:
-                    kw = unicode(kw).encode('utf-8')
-                kwargs[kw] = self._strip(arg[m.end():])
-            else:
-                largs.append(self._strip(arg))
-
-        if args:
-            for char in args:
-                if esc:
-                    esc = 0
-                elif char == quote:
-                    quoted = not quoted
-                elif char == '\\':
-                    esc = 1
-                elif char == sep and not quoted:
-                    checkkey( args[start:pos] )
-                    start = pos + 1
-                pos = pos + 1
-            checkkey( args[start:] )
-
-        if num > 0:
-            if   len(largs) > num:
-                largs = largs[0:num]
-            elif len(largs) < num:
-                min = num
-
-        if min > 0 and min > len(largs):
-            for i in range(len(largs), min):
-                largs.append(None)
-
-        if kw:
-            return largs, kwargs
-        else:
-            return largs
-
-
-    def _get_coords(self, address):
@@ -246 +198 @@
-
-    def expand_macro(self, formatter, name, content):
-self._parse_args(content
+parse_args(content, multi=['marker','to']
-        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' in kwargs and not 'center' in kwargs:
+            arg = unicode(kwargs['from'])
-            if _reCOORDS.match(arg):
-                if not 'center' in kwargs:
@@ -399 +359 @@
-        # Produce markers
-        markers_str = ""
+        if not 'marker' in kwargs:
+            kwargs['marker'] = []
-        if 'markers' in kwargs:
+            kwargs['marker'].extend( parse_args( unicode(kwargs['markers']), delim='|',
+                                      listonly=True) )
+        if kwargs['marker']:
-            markers = []
-self._parse_args(unicode(kwargs['markers']), sep='|', kw=False)
-self._parse_args(
-sep=';', kw=False, num=4 )
+kwargs['marker']
+parse_args( 
+delim=';', listonly=True, minlen=4 )[:4]
-                if not title:
-                    title = link
@@ -440 +405 @@
-            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'],' to: '.join(list(kwargs['to'])))
+            mapnmore = tag.table(
+                            tag.tr(
+                                tag.td(
+                                    tag.div( "", 
+                                        class_ = 'tracgooglemap-directions',
+                                        id     = 'tracgooglemap-directions-%s' % count
+                                    ),
+                                    style="vertical-align:top;",
+                                ),
+                                tag.td(
+                                    mapdiv,
+                                    style="vertical-align:top;",
+                                )
+                            ),
+                          class_ = 'tracgooglemaps'
+                       )
+
+        else:
+            directions = ""
+            mapnmore = mapdiv
+
-        # put everything in a tidy div
-        html = tag.div(
@@ -449 +451 @@
-                        'type':type, 'width':width, 'height':height,
-                        'types_str':types_str, 'controls_str':controls_str,
-
+, 'directions':directions,
-                        },
-                        type = "text/javascript"),
-
-
-
-
-
-
-
+
-                    ],
-                class_ = "tracgooglemap-parent"