Fix warning on route

1 files changed, 18 insertions, 9 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 378307b..a2c7564 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -749,22 +749,31 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2,
     cats = SubCategory.objects.filter(routing_warn=True)
     message = ''
     if cats.count():
+        st_string = '{"type":"Feature", "geometry":{ "type": "Point", '\
+                 '"coordinates": [ %f, %f ] }, "properties":{"icon_path":"%s",'\
+                 '"icon_width":%d, "icon_height":%d}}'
         points = [(m.point, m.categories.all()[0].icon)
                    for m in list(Marker.objects.filter(status='A',
                    categories__in=cats, point__distance_lte=(route, D(m=15))
                                                                ).all())]
+        for pt, icon in points:
+            st = st_string % (pt.x, pt.y, icon.image.url, icon.image.width,
+                              icon.image.height)
+            jsons.append(st)
         routes = Route.objects.filter(status='A', categories__in=cats,
                                       route__crosses=route)
+        intersect = False
         for rout in routes.intersection(route):
-            rt = rout.intersection
-            points.append((rt, rout.categories.all()[0].icon))
-        for pt, icon in points:
-            st = '{"type":"Feature", "geometry":{ "type": "Point", '\
-                 '"coordinates": [ %f, %f ] }, "properties":{"icon_path":"%s",'\
-                 '"icon_width":%d, "icon_height":%d}}' % (pt.x, pt.y,
-                            icon.image.url, icon.image.width, icon.image.height)
-            jsons.append(st)
-        if points:
+            pts = rout.intersection
+            icon = rout.categories.all()[0].icon
+            if hasattr(pts, 'x'):
+                pts = [pts]
+            if pts:
+                pt = pts[0]
+                st = st_string % (pt.x, pt.y, icon.image.url, icon.image.width,
+                              icon.image.height)
+                jsons.append(st)
+        if points or intersect:
             message = getattr(settings, 'CHIMERE_ROUTING_WARN_MESSAGE', '')
             if message:
                 message = ', "message":%s' % jsonencoder.encode(