Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

27 files changed, 41 insertions, 33 deletions

diff --git a/app/exporters/chouette/hub/city_code_exporter.rb b/app/exporters/chouette/hub/city_code_exporter.rb
index 07afa9cf5..1279313eb 100644
--- a/app/exporters/chouette/hub/city_code_exporter.rb
+++ b/app/exporters/chouette/hub/city_code_exporter.rb
@@ -27,7 +27,7 @@ class Chouette::Hub::CityCodeExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("COMMUNES\u000D\u000A") if f.size == 0
       f.write(render)
     end
diff --git a/app/exporters/chouette/hub/commercial_stop_area_exporter.rb b/app/exporters/chouette/hub/commercial_stop_area_exporter.rb
index bd1ee27cf..da134a08f 100644
--- a/app/exporters/chouette/hub/commercial_stop_area_exporter.rb
+++ b/app/exporters/chouette/hub/commercial_stop_area_exporter.rb
@@ -27,7 +27,7 @@ class Chouette::Hub::CommercialStopAreaExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("ARRET\u000D\u000A") if f.size == 0
       f.write(render)
     end if stop_area.present?
diff --git a/app/exporters/chouette/hub/company_exporter.rb b/app/exporters/chouette/hub/company_exporter.rb
index 830e5bf96..142853b22 100644
--- a/app/exporters/chouette/hub/company_exporter.rb
+++ b/app/exporters/chouette/hub/company_exporter.rb
@@ -26,7 +26,7 @@ class Chouette::Hub::CompanyExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("TRANSPORTEUR\u000D\u000A") if f.size == 0
       f.write(render)
     end if company.present?
diff --git a/app/exporters/chouette/hub/connection_link_exporter.rb b/app/exporters/chouette/hub/connection_link_exporter.rb
index fec8838a9..0db286434 100644
--- a/app/exporters/chouette/hub/connection_link_exporter.rb
+++ b/app/exporters/chouette/hub/connection_link_exporter.rb
@@ -31,7 +31,7 @@ class Chouette::Hub::ConnectionLinkExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("CORRESPONDANCE\u000D\u000A") if f.size == 0
       f.write(render) if (connection_link.present? && connection_link.link_distance.present?)
     end
diff --git a/app/exporters/chouette/hub/direction_exporter.rb b/app/exporters/chouette/hub/direction_exporter.rb
index a3f04d141..03c4c8c85 100644
--- a/app/exporters/chouette/hub/direction_exporter.rb
+++ b/app/exporters/chouette/hub/direction_exporter.rb
@@ -6,8 +6,8 @@ class Chouette::Hub::DirectionExporter
     @journey_pattern = journey_pattern
     @directory = directory
     @template = File.open('app/views/api/hub/directions.hub.erb' ){ |f| f.read }
-    @arrival_stop_point = Chouette::StopPoint.find(@journey_pattern.arrival_stop_point_id) if @journey_pattern.arrival_stop_point_id
-    @direction = Chouette::StopArea.find(@arrival_stop_point.stop_area_id) if @arrival_stop_point
+    #@arrival_stop_point = Chouette::StopPoint.find(@journey_pattern.arrival_stop_point_id) if @journey_pattern.arrival_stop_point_id
+    #@direction = Chouette::StopArea.find(@arrival_stop_point.stop_area_id) if @arrival_stop_point
     route = Chouette::Route.find(@journey_pattern.route_id) if @journey_pattern.route_id
     @line = Chouette::Line.find(route.line_id) if route
   end
@@ -30,7 +30,7 @@ class Chouette::Hub::DirectionExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("DIRECTION\u000D\u000A") if f.size == 0
       f.write(render)
     end if journey_pattern.present?
diff --git a/app/exporters/chouette/hub/group_of_lines_exporter.rb b/app/exporters/chouette/hub/group_of_lines_exporter.rb
index 8113bfd60..2b07d7c4d 100644
--- a/app/exporters/chouette/hub/group_of_lines_exporter.rb
+++ b/app/exporters/chouette/hub/group_of_lines_exporter.rb
@@ -26,7 +26,7 @@ class Chouette::Hub::GroupOfLinesExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("GROUPELIGNE\u000D\u000A") if f.size == 0
       f.write(render)
     end if group_of_lines.present?
diff --git a/app/exporters/chouette/hub/journey_pattern_exporter.rb b/app/exporters/chouette/hub/journey_pattern_exporter.rb
index af7e27eef..97cbab41d 100644
--- a/app/exporters/chouette/hub/journey_pattern_exporter.rb
+++ b/app/exporters/chouette/hub/journey_pattern_exporter.rb
@@ -40,7 +40,7 @@ class Chouette::Hub::JourneyPatternExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("CHEMIN\u000D\u000A") if f.size == 0
       f.write(render)
     end if journey_pattern.present?
diff --git a/app/exporters/chouette/hub/line_exporter.rb b/app/exporters/chouette/hub/line_exporter.rb
index be2f52060..622f7a924 100644
--- a/app/exporters/chouette/hub/line_exporter.rb
+++ b/app/exporters/chouette/hub/line_exporter.rb
@@ -31,7 +31,7 @@ class Chouette::Hub::LineExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("LIGNE\u000D\u000A") if f.size == 0
       f.write(render)
     end if line.present?
diff --git a/app/exporters/chouette/hub/network_exporter.rb b/app/exporters/chouette/hub/network_exporter.rb
index 584c3770b..fc77a84fc 100644
--- a/app/exporters/chouette/hub/network_exporter.rb
+++ b/app/exporters/chouette/hub/network_exporter.rb
@@ -26,7 +26,7 @@ class Chouette::Hub::NetworkExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("RESEAU\u000D\u000A") if f.size == 0
       f.write(render)
     end if network.present?
diff --git a/app/exporters/chouette/hub/physical_stop_area_exporter.rb b/app/exporters/chouette/hub/physical_stop_area_exporter.rb
index 3086bb850..a8d992735 100644
--- a/app/exporters/chouette/hub/physical_stop_area_exporter.rb
+++ b/app/exporters/chouette/hub/physical_stop_area_exporter.rb
@@ -38,7 +38,7 @@ class Chouette::Hub::PhysicalStopAreaExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("ARRET\u000D\u000A") if f.size == 0
       f.write(render)
     end if stop_area.present?
diff --git a/app/exporters/chouette/hub/route_exporter.rb b/app/exporters/chouette/hub/route_exporter.rb
index e4e6579ce..e94780329 100644
--- a/app/exporters/chouette/hub/route_exporter.rb
+++ b/app/exporters/chouette/hub/route_exporter.rb
@@ -35,7 +35,7 @@ class Chouette::Hub::RouteExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("SCHEMA\u000D\u000A") if f.size == 0
       f.write(render)
     end if route.present?
diff --git a/app/exporters/chouette/hub/time_table_exporter.rb b/app/exporters/chouette/hub/time_table_exporter.rb
index 8620a38dd..2553128cd 100644
--- a/app/exporters/chouette/hub/time_table_exporter.rb
+++ b/app/exporters/chouette/hub/time_table_exporter.rb
@@ -40,7 +40,7 @@ class Chouette::Hub::TimeTableExporter
   end
 
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("PERIODE\u000D\u000A") if f.size == 0
       f.write(render)
     end if time_table.present?
diff --git a/app/exporters/chouette/hub/transport_mode_exporter.rb b/app/exporters/chouette/hub/transport_mode_exporter.rb
index af9a2357a..46d116eec 100644
--- a/app/exporters/chouette/hub/transport_mode_exporter.rb
+++ b/app/exporters/chouette/hub/transport_mode_exporter.rb
@@ -27,7 +27,7 @@ class Chouette::Hub::TransportModeExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("MODETRANSPORT\u000D\u000A") if f.size == 0
       f.write(render)
     end
diff --git a/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb b/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb
index ede411463..1c4b4c620 100644
--- a/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb
+++ b/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb
@@ -12,9 +12,12 @@ class Chouette::Hub::VehicleJourneyAtStopExporter
     stop_area = stop_point.stop_area
     @stop_area_code = stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if stop_area
     @stop_area_id = stop_area.registration_number if stop_area
-    @arrival_time = @vehicle_journey_at_stop.arrival_time.sec + 60 * @vehicle_journey_at_stop.arrival_time.min + 60 * 60 * @vehicle_journey_at_stop.arrival_time.hour
+    #Time.zone = ActiveSupport::TimeZone.new('Atlantic/Azores')
+    arrival_time = @vehicle_journey_at_stop.arrival_time
+    @arrival_time = arrival_time.sec + 60 * arrival_time.min + 60 * 60 * arrival_time.hour if arrival_time
     @arrival_type = "A"
-    @departure_time = @vehicle_journey_at_stop.departure_time.sec + 60 *  @vehicle_journey_at_stop.departure_time.min + 60 * 60 *  @vehicle_journey_at_stop.departure_time.hour
+    departure_time = @vehicle_journey_at_stop.departure_time
+    @departure_time = departure_time.sec + 60 *  departure_time.min + 60 * 60 *  departure_time.hour if departure_time
     @departure_type = "D"
   end
   
@@ -46,7 +49,7 @@ class Chouette::Hub::VehicleJourneyAtStopExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("HORAIRE\u000D\u000A") if f.size == 0
       f.write(render)
     end if vehicle_journey_at_stop.present?
diff --git a/app/exporters/chouette/hub/vehicle_journey_exporter.rb b/app/exporters/chouette/hub/vehicle_journey_exporter.rb
index 65c507ce4..e1d7fce58 100644
--- a/app/exporters/chouette/hub/vehicle_journey_exporter.rb
+++ b/app/exporters/chouette/hub/vehicle_journey_exporter.rb
@@ -14,8 +14,13 @@ class Chouette::Hub::VehicleJourneyExporter
     @departure_stop_area =  Chouette::StopArea.find(@departure_stop_point.stop_area_id)
     @arrival_stop_point = Chouette::StopPoint.find(@journey_pattern.arrival_stop_point_id)
     @arrival_stop_area = Chouette::StopArea.find(@arrival_stop_point.stop_area_id)
-    departure_time = Chouette::VehicleJourneyAtStop.where( :vehicle_journey_id => @vehicle_journey.id ).where( :stop_point_id => @departure_stop_point.id )[0].departure_time
+
+    #Time.zone = ActiveSupport::TimeZone.new('Atlantic/Azores')
+    departure_time = Chouette::VehicleJourneyAtStop.where( :vehicle_journey_id => @vehicle_journey.id ).where( :stop_point_id => @departure_stop_point.id )[0].departure_time 
+    # Time.zone.parse(Chouette::VehicleJourneyAtStop.where( :vehicle_journey_id => @vehicle_journey.id ).where( :stop_point_id => @departure_stop_point.id )[0].departure_time.to_s)
     arrival_time = Chouette::VehicleJourneyAtStop.where( :vehicle_journey_id => @vehicle_journey.id ).where( :stop_point_id => @arrival_stop_point.id )[0].arrival_time
+    #Time.zone.parse(Chouette::VehicleJourneyAtStop.where( :vehicle_journey_id => @vehicle_journey.id ).where( :stop_point_id => @arrival_stop_point.id )[0].arrival_time.to_s)
+    
     @departure_time_sec = departure_time.sec + ( departure_time.min + departure_time.hour * 60 ) * 60
     @arrival_time_sec = arrival_time.sec + ( arrival_time.min + arrival_time.hour * 60 ) * 60
     @validity = 0
@@ -35,7 +40,7 @@ class Chouette::Hub::VehicleJourneyExporter
     if @vehicle_journey.mobility_restricted_suitability
       @renvoi = "1"
     end
-    File.open(directory + "/RENVOI.TXT" , "a") do |f|
+    File.open(directory + "/RENVOI.TXT" , "a:ISO_8859_1") do |f|
       if f.size == 0
         f.write("RENVOI\u000D\u000A") 
         f.write("a;PMR;1\u000D\u000A")
@@ -61,7 +66,7 @@ class Chouette::Hub::VehicleJourneyExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("COURSE\u000D\u000A") if f.size == 0
       f.write(render)
     end if vehicle_journey.present?
diff --git a/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb b/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb
index 7f1e52245..533f0628e 100644
--- a/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb
+++ b/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb
@@ -91,7 +91,7 @@ class Chouette::Hub::VehicleJourneyOperationExporter
   end
   
   def save
-    File.open(directory + hub_name , "a") do |f|
+    File.open(directory + hub_name , "a:ISO_8859_1") do |f|
       f.write("COURSE_OPERATION\u000D\u000A") if f.size == 0
       f.write(render)
     end if vehicle_journey.present?
diff --git a/app/views/api/hub/arrets_generiques.hub.erb b/app/views/api/hub/arrets_generiques.hub.erb
index b540130f9..00f041552 100644
--- a/app/views/api/hub/arrets_generiques.hub.erb
+++ b/app/views/api/hub/arrets_generiques.hub.erb
@@ -1 +1 @@
-<%= @stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @stop_area.objectid %>;<%= @stop_area.name if @stop_area.name %>;<%= @stop_area.nearest_topic_name if @stop_area.nearest_topic_name %>;<%= @type %>;;<%= (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[0].to_i : '' %>;<%=  (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[1].to_i : '' %>;<%= @stop_area.city_name if @stop_area.city_name %>;<%= @stop_area.zip_code if @stop_area.zip_code %>;<%= @stop_area.comment if @stop_area.comment %>;<%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @stop_area.objectid %>;<%= @stop_area.name.encode(Encoding::ISO_8859_1) if @stop_area.name %>;<%= @stop_area.nearest_topic_name.encode(Encoding::ISO_8859_1) if @stop_area.nearest_topic_name %>;<%= @type %>;;<%= (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[0].to_i : '' %>;<%=  (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[1].to_i : '' %>;<%= @stop_area.city_name.encode(Encoding::ISO_8859_1) if @stop_area.city_name %>;<%= @stop_area.zip_code if @stop_area.zip_code %>;<%= @stop_area.comment.encode(Encoding::ISO_8859_1) if @stop_area.comment %>;<%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/arrets_physiques.hub.erb b/app/views/api/hub/arrets_physiques.hub.erb
index a69047882..02cb11238 100644
--- a/app/views/api/hub/arrets_physiques.hub.erb
+++ b/app/views/api/hub/arrets_physiques.hub.erb
@@ -1 +1 @@
-<%= @stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @stop_area.objectid %>;<%= @stop_area.name if @stop_area.name %>;<%= @stop_area.nearest_topic_name if @stop_area.nearest_topic_name %>;<%= @type %>;<%= @parent.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @parent %>;<%= (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[0].to_i : -1 %>;<%=  (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[1].to_i : -1 %>;<%= @stop_area.city_name if @stop_area.city_name %>;<%= @stop_area.zip_code if @stop_area.zip_code %>;<%= @stop_area.comment if @stop_area.comment %>;<%= @stop_area.registration_number %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @stop_area.objectid %>;<%= @stop_area.name.encode(Encoding::ISO_8859_1) if @stop_area.name %>;<%= @stop_area.nearest_topic_name.encode(Encoding::ISO_8859_1) if @stop_area.nearest_topic_name %>;<%= @type %>;<%= @parent.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @parent %>;<%= (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[0].to_i : -1 %>;<%=  (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[1].to_i : -1 %>;<%= @stop_area.city_name.encode(Encoding::ISO_8859_1) if @stop_area.city_name %>;<%= @stop_area.zip_code if @stop_area.zip_code %>;<%= @stop_area.comment.encode(Encoding::ISO_8859_1) if @stop_area.comment %>;<%= @stop_area.registration_number %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/chemins.hub.erb b/app/views/api/hub/chemins.hub.erb
index 2a4235db9..f5408c51f 100644
--- a/app/views/api/hub/chemins.hub.erb
+++ b/app/views/api/hub/chemins.hub.erb
@@ -1 +1 @@
-<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @line %>;<%= @journey_pattern.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @journey_pattern.objectid %>;<%= @journey_pattern.registration_number if @journey_pattern.registration_number %>;<%= @journey_pattern.name if @journey_pattern.name %>;<%= (@journey_pattern.route.wayback == 'A' ? 1 : 2) if @journey_pattern.route %>;<%= @type %>;<% @stop_areas.each do |s| %>;<%= s.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if s.objectid %>;<%= s.registration_number %>;;<% end %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @line %>;<%= @journey_pattern.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @journey_pattern.objectid %>;<%= @journey_pattern.registration_number if @journey_pattern.registration_number %>;<%= @journey_pattern.name.encode(Encoding::ISO_8859_1) if @journey_pattern.name %>;<%= (@journey_pattern.route.wayback == 'A' ? 1 : 2) if @journey_pattern.route %>;<%= @type %>;<% @stop_areas.each do |s| %>;<%= s.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if s.objectid %>;<%= s.registration_number %>;;<% end %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/communes.hub.erb b/app/views/api/hub/communes.hub.erb
index 714969301..265271c54 100644
--- a/app/views/api/hub/communes.hub.erb
+++ b/app/views/api/hub/communes.hub.erb
@@ -1 +1 @@
-<%= @city_code %>;<%= @city_name %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @city_code %>;<%= @city_name.encode(Encoding::ISO_8859_1) if @city_name %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/directions.hub.erb b/app/views/api/hub/directions.hub.erb
index f7ae19781..dd069968d 100644
--- a/app/views/api/hub/directions.hub.erb
+++ b/app/views/api/hub/directions.hub.erb
@@ -1 +1 @@
-<%= @direction.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @direction %>;<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @line %>;<%= (@journey_pattern.route.wayback == 'A' ? 1 : 2) if @journey_pattern.route %>;<%= @journey_pattern.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @journey_pattern.objectid %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @journey_pattern.name.encode(Encoding::ISO_8859_1) if @journey_pattern.name %>;<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @line %>;<%= (@journey_pattern.route.wayback == 'A' ? 1 : 2) if @journey_pattern.route %>;<%= @journey_pattern.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @journey_pattern.objectid %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/groupe_de_lignes.hub.erb b/app/views/api/hub/groupe_de_lignes.hub.erb
index 7f7e24abc..2547c1e11 100644
--- a/app/views/api/hub/groupe_de_lignes.hub.erb
+++ b/app/views/api/hub/groupe_de_lignes.hub.erb
@@ -1 +1 @@
-<%= @group_of_lines.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @group_of_lines.name %>;<%= @group_of_lines.id %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @group_of_lines.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @group_of_lines.name.encode(Encoding::ISO_8859_1) if @group_of_lines.name %>;<%= @group_of_lines.id %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/lignes.hub.erb b/app/views/api/hub/lignes.hub.erb
index 312d45e1c..921eb7056 100644
--- a/app/views/api/hub/lignes.hub.erb
+++ b/app/views/api/hub/lignes.hub.erb
@@ -1 +1 @@
-<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @line.objectid %>;<%= @line.number %>;<%= @line.name %>;;;<%= @company.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @company %>;<%= @network.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @network %>;<%= @group_of_line %>;<%= @line.id %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @line.objectid %>;<%= @line.number %>;<%= @line.name.encode(Encoding::ISO_8859_1) if @line.name %>;;;<%= @company.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @company %>;<%= @network.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') if @network %>;<%= @group_of_line %>;<%= @line.id %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/periodes.hub.erb b/app/views/api/hub/periodes.hub.erb
index 38b2d3db9..2bb3e8368 100644
--- a/app/views/api/hub/periodes.hub.erb
+++ b/app/views/api/hub/periodes.hub.erb
@@ -1 +1 @@
-<%= Chouette::TimeTable.find(@time_table.id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @time_table.comment %>;<%= @time_table.start_date.strftime("%d/%m/%Y") %>;<%= @time_table.end_date.strftime("%d/%m/%Y") %>;<%= @calendar %>;<%= @identifier %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= Chouette::TimeTable.find(@time_table.id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @time_table.comment.encode(Encoding::ISO_8859_1) if @time_table.comment %>;<%= @time_table.start_date.strftime("%d/%m/%Y") %>;<%= @time_table.end_date.strftime("%d/%m/%Y") %>;<%= @calendar %>;<%= @identifier %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/reseaux.hub.erb b/app/views/api/hub/reseaux.hub.erb
index 1f12a7017..95ab8d547 100644
--- a/app/views/api/hub/reseaux.hub.erb
+++ b/app/views/api/hub/reseaux.hub.erb
@@ -1 +1 @@
-<%= @network.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @network.name %>;<%= @network.id %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @network.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @network.name.encode(Encoding::ISO_8859_1) if @network.name %>;<%= @network.id %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/api/hub/transporteurs.hub.erb b/app/views/api/hub/transporteurs.hub.erb
index 7d153ad7c..595d3b5fb 100644
--- a/app/views/api/hub/transporteurs.hub.erb
+++ b/app/views/api/hub/transporteurs.hub.erb
@@ -1 +1 @@
-<%= @company.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @company.name %>;<%= @company.id %><%= "\u000D\u000A" %>
\ No newline at end of file
+<%= @company.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @company.name.encode(Encoding::ISO_8859_1) if @company.name %>;<%= @company.id %><%= "\u000D\u000A" %>
\ No newline at end of file
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 3b19dddf2..ff452c924 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -6,6 +6,6 @@
 
    <%= form.actions do %>
      <%= form.action :submit, :as => :button %> 
-     <%= form.action :cancel, :as => :link %>
+     <%= form.action :cancel, :as => :link , :url => organisation_path %>
    <% end %>
 <% end %>