fix models select to export

2 files changed, 15 insertions, 12 deletions

diff --git a/app/exporters/chouette/kml/exporter.rb b/app/exporters/chouette/kml/exporter.rb
index 046d5d29f..aca4a1d09 100644
--- a/app/exporters/chouette/kml/exporter.rb
+++ b/app/exporters/chouette/kml/exporter.rb
@@ -43,14 +43,14 @@ class Chouette::Kml::Exporter
         Chouette::Kml::StopAreaExporter.save( stop_areas, temp_dir, kml_export, "Quay")
 
         commercial_stop_areas = lines_collected.collect(&:commercial_stop_areas).flatten.uniq.sort_by(&:name)
-        Chouette::Kml::StopAreaExporter.save( stop_areas, temp_dir, kml_export, "CommercialStopPoint")
+        Chouette::Kml::StopAreaExporter.save( commercial_stop_areas, temp_dir, kml_export, "CommercialStopPoint")
 
         if(options[:o].present?) # Add all objects
           stop_places = referential.stop_areas.stop_place.sort_by(&:name)
-          Chouette::Kml::StopAreaExporter.save( stop_areas, temp_dir, kml_export, "StopPlace")
+          Chouette::Kml::StopAreaExporter.save( stop_places, temp_dir, kml_export, "StopPlace")
 
           itls = referential.stop_areas.itl.sort_by(&:name)
-          Chouette::Kml::StopAreaExporter.save( stop_areas, temp_dir, kml_export, "ITL")
+          Chouette::Kml::StopAreaExporter.save( itls, temp_dir, kml_export, "ITL")
 
           connection_links = referential.connection_links.sort_by(&:name)
           Chouette::Kml::ConnectionLinkExporter.save( connection_links, temp_dir, kml_export)
diff --git a/spec/exporters/chouette/kml/exporter_spec.rb b/spec/exporters/chouette/kml/exporter_spec.rb
index dd7c44327..a1d33613d 100644
--- a/spec/exporters/chouette/kml/exporter_spec.rb
+++ b/spec/exporters/chouette/kml/exporter_spec.rb
@@ -19,37 +19,40 @@ describe Chouette::Kml::Exporter do
   let!(:line) { Factory(:line_with_stop_areas_having_parent) }
   let!(:line2) { Factory(:line_with_stop_areas_having_parent) }
 
-  describe "#export" do    
-    before(:each) do 
+  describe "#export" do
+    before(:each) do
       Dir.mkdir( tmp_path) unless File.directory?( tmp_path)
       Dir.mkdir( exports_path) unless File.directory?( exports_path)
     end
 
     it "should return a zip file with nothing inside with no objects in arguments" do
-      subject.export(zip_file_path, {:export_id => 1, :o => "line"} )                   
+      subject.export(zip_file_path, {:export_id => 1, :o => "line"} )
       File.exists?(zip_file_path).should be_true
+      ::Zip::ZipFile.open(zip_file_path) do |f|
+        puts "f = #{f.inspect}"
+      end
       ::Zip::ZipFile.open(zip_file_path).size.should == 6
     end
 
     it "should return a zip file with 4 kml files" do
-      subject.export(zip_file_path, {:export_id => 1, :o => "line", :id => "#{line.id}" } )  
+      subject.export(zip_file_path, {:export_id => 1, :o => "line", :id => "#{line.id}" } )
       File.exists?(zip_file_path).should be_true
       ::Zip::ZipFile.open(zip_file_path).size.should == 4
     end
 
     it "should return a zip file with 6 kml files" do
-      subject.export(zip_file_path, {:export_id => 1, :o => "line", :id => "#{line.id},#{line2.id}" } )  
+      subject.export(zip_file_path, {:export_id => 1, :o => "line", :id => "#{line.id},#{line2.id}" } )
       File.exists?(zip_file_path).should be_true
       ::Zip::ZipFile.open(zip_file_path).size.should == 6
     end
 
     it "should return a zip file with 6 kml files" do
-      subject.export(zip_file_path, {:export_id => 1, :o => "", :id => "" } )  
+      subject.export(zip_file_path, {:export_id => 1, :o => "", :id => "" } )
       File.exists?(zip_file_path).should be_true
       ::Zip::ZipFile.open(zip_file_path).size.should == 6
     end
-    
-  end
-                              
+
+   end
+
 
 end