Switched the order of the lat/long output in the KML routes to match the API.

[dead/census-tools.git] / www / maps / maps / controllers / directions.py

diff --git a/www/maps/maps/controllers/directions.py b/www/maps/maps/controllers/directions.py
index dab8f6630930ac2a2a9b60e907e0584254b9ef6f..d1c0d1567439ce847fcdfa639e1094bb38965dc6 100644 (file)
--- a/www/maps/maps/controllers/directions.py
+++ b/www/maps/maps/controllers/directions.py
@@ -60,9 +60,9 @@ class DirectionsController(BaseController):
                 
                 for step in route['steps']:
                     for coord in step['lat_lngs']:
-                        coords.text += str(coord.values()[1])
-                        coords.text += ','
                         coords.text += str(coord.values()[0])
+                        coords.text += ','
+                        coords.text += str(coord.values()[1])
                         coords.text += ',0 '
                         
                 ls.children.append(coords)
@@ -88,31 +88,31 @@ class DirectionsController(BaseController):
 
 
     def directions_result_to_csv(self, result):
-        row = ''
+        rows = []
 
         for trip in result['trips']:
 
             for route in trip['routes']:
                 route_start = self.get_route_address(route, True)
                 route_end   = self.get_route_address(route, False)
-                row += '"' + route_start + '"'
+                row = '"' + route_start + '"'
                 row += ', '
                 row += '"' + route_end   + '"'
                 row += ', '
                 row += str(float(route['distance']['value']) / 1000)
-                row += "\n"
+                rows.append(row)
                 
-        return row
+        return rows
 
     
     def distances(self):
         directions_array = json.loads(request.POST['data'])
-        csv = ''
+        csv_rows = []
         
         for result in directions_array:
-            csv += self.directions_result_to_csv(result)
+            csv_rows += self.directions_result_to_csv(result)
         
         response.content_type = 'text/csv'
         response.headers['Content-disposition'] = 'attachment; filename=distances.csv'
-        return csv
+        return "\n".join(csv_rows)