diff options
| -rw-r--r-- | app/controllers/api/kml/stop_areas_controller.rb | 16 | ||||
| -rw-r--r-- | app/views/api/kml/stop_areas/index.kml.erb | 14 |
2 files changed, 9 insertions, 21 deletions
diff --git a/app/controllers/api/kml/stop_areas_controller.rb b/app/controllers/api/kml/stop_areas_controller.rb index 5663d7bad..6027f152a 100644 --- a/app/controllers/api/kml/stop_areas_controller.rb +++ b/app/controllers/api/kml/stop_areas_controller.rb @@ -10,17 +10,15 @@ module Api protected def collection - @commercials = [] - @places = [] - @physicals = [] - referential.stop_areas.select {|sa| sa.longitude && sa.latitude}.each do |sa| - case sa.area_type + @stop_areas ||= referential.stop_areas.select {|sa| sa.longitude && sa.latitude}.select do |sa| + case params[ :category] when "StopPlace" - @places << sa + sa.area_type == "StopPlace" when "CommercialStopPoint" - @commercials << sa - when "BoardingPosition", "Quay" - @physicals << sa + sa.area_type == "CommercialStopPoint" + when "Physical" + sa.area_type == "BoardingPosition" || + sa.area_type == "Quay" end end end diff --git a/app/views/api/kml/stop_areas/index.kml.erb b/app/views/api/kml/stop_areas/index.kml.erb index b4ce5a215..635921f03 100644 --- a/app/views/api/kml/stop_areas/index.kml.erb +++ b/app/views/api/kml/stop_areas/index.kml.erb @@ -2,18 +2,8 @@ <kml xmlns="http://www.opengis.net/kml/2.2"> <Document> - <% @places.each do |stop_area| %> - <Placemark id="<%= stop_area.objectid %>:Places" > - <%= render :partial => "stop_area", :locals => { :stop_area => stop_area} %> - </Placemark> - <% end %> - <% @commercials.each do |stop_area| %> - <Placemark id="<%= stop_area.objectid %>:Commercials" > - <%= render :partial => "stop_area", :locals => { :stop_area => stop_area} %> - </Placemark> - <% end %> - <% @physicals.each do |stop_area| %> - <Placemark id="<%= stop_area.objectid %>:Physicals" > + <% @stop_areas.each do |stop_area| %> + <Placemark id="<%= stop_area.objectid %>" > <%= render :partial => "stop_area", :locals => { :stop_area => stop_area} %> </Placemark> <% end %> |