Ticket #14186: geodjango-gdirections.patch

django/contrib/gis/templates/gis/google/google-map.js

@@ -22 +22 @@
     {{ js_module }}.{{ dom_id }}.addOverlay({{ js_module }}.{{ dom_id }}_polyline{{ forloop.counter }});
     {% for event in polyline.events %}GEvent.addListener({{ js_module }}.{{ dom_id }}_polyline{{ forloop.parentloop.counter }}, {{ event }}); {% endfor %}
     {% if calc_zoom %}tmp_bounds = {{ js_module }}.{{ dom_id }}_polyline{{ forloop.counter }}.getBounds(); bounds.extend(tmp_bounds.getSouthWest()); bounds.extend(tmp_bounds.getNorthEast());{% endif %}{% endfor %}
+    {% if directions %}{{ js_module }}.{{ dom_id }}_directions = new GDirections({{ js_module }}.{{ dom_id }});
+    {{ js_module }}.{{ dom_id }}_directions.loadFromWaypoints({{ directions }});{% endif %}
     {% for marker in markers %}{{ js_module }}.{{ dom_id }}_marker{{ forloop.counter }} = new {{ marker }};
     {{ js_module }}.{{ dom_id }}.addOverlay({{ js_module }}.{{ dom_id }}_marker{{ forloop.counter }});
     {% for event in marker.events %}GEvent.addListener({{ js_module }}.{{ dom_id }}_marker{{ forloop.parentloop.counter }}, {{ event }}); {% endfor %}

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

@@ -4 +4 @@
 from django.utils.safestring import mark_safe
 
 class GoogleMapException(Exception): pass
-from django.contrib.gis.maps.google.overlays import GPolygon, GPolyline, GMarker, GIcon
+from django.contrib.gis.maps.google.overlays import GPolygon, GPolyline, GMarker, GIcon, GDirections
 
 # The default Google Maps URL (for the API javascript)
 # TODO: Internationalize for Japan, UK, etc.
@@ -21 +21 @@
     def __init__(self, key=None, api_url=None, version=None,
                  center=None, zoom=None, dom_id='map',
                  kml_urls=[], polylines=None, polygons=None, markers=None,
+                 directions=None,
                  template='gis/google/google-map.js',
                  js_module='geodjango',
                  extra_context={}):
@@ -56 +57 @@
         self.js_module = js_module
         self.template = template
         self.kml_urls = kml_urls
+        # Does the user want to draw google directions on the map?
+        self.directions = directions;
 
         # Does the user want any GMarker, GPolygon, and/or GPolyline overlays?
         overlay_info = [[GMarker, markers, 'markers'],
@@ -101 +104 @@
                   'polylines' : self.polylines,
                   'icons': self.icons,
                   'markers' : self.markers,
+                  'directions' : self.directions,
                   }
         params.update(self.extra_context)
         return render_to_string(self.template, params)

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

@@ -299 +299 @@
     @property
     def js_params(self):
         return '%s, %s' % (self.latlng, self.options())
+
+class GDirections():
+    """
+    A Python wrapper for the Google GDirections object.  For more information
+    please see the Google Maps API Reference:
+     http://code.google.com/apis/maps/documentation/reference.html#GDirections
+
+    Example:
+
+      from django.shortcuts import render_to_response
+      from django.contrib.gis.maps.google.overlays import GDirections
+
+      def sample_request(request):
+          route = GDirections(LineString(POINT(40.44 -3.77), POINT(42.33 -3.66))
+          return render_to_response('mytemplate.html',
+                 {'google' : GoogleMap(directions=route)})
+    """
+
+    def __init__(self, geom):
+        """
+        The GDirections object may be initialized on GEOS LineString, LinearRing,
+        and Polygon objects (internal rings not supported) or a parameter that
+        may instantiated into one of the above geometries.
+        """
+        # If a GEOS geometry isn't passed in, try to contsruct one.
+        if isinstance(geom, basestring): geom = fromstr(geom)
+        if isinstance(geom, (tuple, list)): geom = Polygon(geom)
+        # Generating the lat/lng coordinate pairs.
+        if isinstance(geom, (LineString, LinearRing)):
+            self.latlngs = self.waypoints(geom.coords)
+        elif isinstance(geom, Polygon):
+            self.latlngs = self.waypoints(geom.shell.coords)
+        else:
+            raise TypeError('GPolyline may only initialize on GEOS LineString, LinearRing, and/or Polygon geometries.')
+
+    def waypoints(self, coords):
+        "Generates a JavaScript array of strings for the given coordinates."
+        return '[%s]' % ','.join(['"%s,%s"' % (y, x) for x, y in coords])
+
+    def __unicode__(self):
+        return self.latlngs