use commercial stop points on line and network kml

6 files changed, 30 insertions, 2 deletions

diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index 071c5eab5..e85c29fc9 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -3,6 +3,7 @@ class LinesController < ChouetteController
   respond_to :html
   respond_to :xml
   respond_to :json
+  respond_to :kml, :only => :show
 
   belongs_to :referential
 
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 8cdd562a4..aabdadaf4 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -3,6 +3,7 @@ class NetworksController < ChouetteController
   respond_to :html
   respond_to :xml
   respond_to :json
+  respond_to :kml, :only => :show
 
   belongs_to :referential
 
diff --git a/app/maps/line_map.rb b/app/maps/line_map.rb
index 60e6cb4fc..ec1f6618f 100644
--- a/app/maps/line_map.rb
+++ b/app/maps/line_map.rb
@@ -17,7 +17,7 @@ class LineMap < ApplicationMap
       page << map.add_layer(google_satellite) 
 
       #page << map.add_layer(kml_layer(line, :styleMap => StyleMap::LineStyleMap.new( :style => line_style).style_map))
-      page.assign "stop_areas_layer", kml_layer([line.referential, line, :stop_areas], :styleMap => StyleMap::StopAreasStyleMap.new.style_map)
+      page.assign "stop_areas_layer", kml_layer([line.referential, line], :styleMap => StyleMap::StopAreasStyleMap.new.style_map)
 
       page << map.add_layer(:stop_areas_layer)
       page << map.add_control( hover_control_display_name(:stop_areas_layer) )
diff --git a/app/maps/network_map.rb b/app/maps/network_map.rb
index c1104e877..f87f088ad 100644
--- a/app/maps/network_map.rb
+++ b/app/maps/network_map.rb
@@ -15,7 +15,7 @@ class NetworkMap < ApplicationMap
       page << map.add_layer(google_hybrid) 
       page << map.add_layer(google_satellite)
       
-      page.assign "stop_areas_layer", kml_layer([network.referential, network, :stop_areas], :styleMap => StyleMap::StopAreasStyleMap.new.style_map)
+      page.assign "stop_areas_layer", kml_layer([network.referential, network], :styleMap => StyleMap::StopAreasStyleMap.new.style_map)
 
       page << map.add_layer(:stop_areas_layer)
       page << map.add_control( hover_control_display_name(:stop_areas_layer) )
diff --git a/app/views/lines/show.kml.erb b/app/views/lines/show.kml.erb
new file mode 100644
index 000000000..1ea08fa5a
--- /dev/null
+++ b/app/views/lines/show.kml.erb
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+  <Document>
+  <% @line.commercial_stop_areas.each do |stop_area| %>
+    <Placemark id="<%= stop_area.id %>" >
+      <name><%= stop_area.name %></name>
+      <stop_area_type><%= stop_area.area_type.underscore %></stop_area_type>
+      <%= (stop_area.position or stop_area.default_position).kml_representation.html_safe %>
+    </Placemark>
+  <% end %>
+  </Document>
+</kml>
+
diff --git a/app/views/networks/show.kml.erb b/app/views/networks/show.kml.erb
new file mode 100644
index 000000000..c99b46a7a
--- /dev/null
+++ b/app/views/networks/show.kml.erb
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+  <Document>
+  <% @network.commercial_stop_areas.each do |stop_area| %>
+    <Placemark id="<%= stop_area.id %>" >
+      <name><%= stop_area.name %></name>
+      <stop_area_type><%= stop_area.area_type.underscore %></stop_area_type>
+      <%= (stop_area.position or stop_area.default_position).kml_representation.html_safe %>
+    </Placemark>
+  <% end %>
+  </Document>
+</kml>
+