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

23 files changed, 92 insertions, 63 deletions

diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 4f7261311..2b3b556c8 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -20,21 +20,17 @@ class TimeTablesController < ChouetteController
   def new
     @autocomplete_items = ActsAsTaggableOn::Tag.all
     new! do
-      build_breadcrumb :show      
+      build_breadcrumb :show
     end
   end
 
   def edit
     edit! do
-      build_breadcrumb :edit      
+      build_breadcrumb :edit
       @autocomplete_items = ActsAsTaggableOn::Tag.all
     end
   end
 
-  def comment_filter
-    @time_tables = filtered_time_tables    
-  end
-
   def index
     request.format.kml? ? @per_page = nil : @per_page = 12
 
@@ -43,7 +39,7 @@ class TimeTablesController < ChouetteController
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
-        build_breadcrumb :index      
+        build_breadcrumb :index
       }
     end
   end
@@ -65,10 +61,6 @@ class TimeTablesController < ChouetteController
 
   protected
 
-  def filtered_time_tables
-    referential.time_tables.select{ |t| t.comment =~ /#{params[:q]}/i  }
-  end
-
   def collection
     ransack_params = params[:q]
     # Hack to delete params can't be used by ransack
diff --git a/app/exporters/chouette/hub/exporter.rb b/app/exporters/chouette/hub/exporter.rb
index 2d14d3a3b..091fa75c2 100644
--- a/app/exporters/chouette/hub/exporter.rb
+++ b/app/exporters/chouette/hub/exporter.rb
@@ -82,11 +82,9 @@ class Chouette::Hub::Exporter
         
         @lines = select_lines( options[:o], options[:id] )
         @routes = lines.map(&:routes).flatten.sort {|a,b| (a.name && b.name) ? a.name <=> b.name : a.id <=> b.id} if lines_exportable?
-        @journey_patterns = Chouette::JourneyPattern.where( :route_id => routes.map(&:id) ).order(:name) if routes_exportable?
-        
-        @vehicle_journeys = Chouette::VehicleJourney.where( :route_id => routes.map(&:id) ).order(:id) if routes_exportable?
-        @vehicle_journeys = Chouette::VehicleJourney.where( :route_id => routes.map(&:id) ).order(:id) if routes_exportable?
-        
+        @journey_patterns = Chouette::JourneyPattern.where(:route_id => routes.map(&:id)).order(:name) if routes_exportable?
+        @vehicle_journeys = Chouette::VehicleJourney.where(:route_id => routes.map(&:id)).order(:objectid) if routes_exportable?
+                
         vjs = []
         tts = []
         @vehicle_journeys.each do |vj|
@@ -116,7 +114,7 @@ class Chouette::Hub::Exporter
         
         stop_points = Chouette::StopPoint.where( :id => vehicle_journey_at_stops.map(&:stop_point_id)).order(:id)
         physical_stop_areas =  Chouette::StopArea.where( :id => stop_points.map(&:stop_area_id)).order(:parent_id)
-        commercial_stop_areas = Chouette::StopArea.where( :id => physical_stop_areas.map(&:parent_id)).order(:id)
+        commercial_stop_areas = Chouette::StopArea.where( :id => physical_stop_areas.map(&:parent_id)).order(:objectid)
         
         Chouette::Hub::CommercialStopAreaExporter.save(commercial_stop_areas, temp_dir, hub_export)
         Chouette::Hub::PhysicalStopAreaExporter.save(physical_stop_areas, temp_dir, hub_export)
diff --git a/app/exporters/chouette/hub/physical_stop_area_exporter.rb b/app/exporters/chouette/hub/physical_stop_area_exporter.rb
index 7669aa64e..23e5d73ec 100644
--- a/app/exporters/chouette/hub/physical_stop_area_exporter.rb
+++ b/app/exporters/chouette/hub/physical_stop_area_exporter.rb
@@ -8,6 +8,13 @@ class Chouette::Hub::PhysicalStopAreaExporter
     @template = File.open('app/views/api/hub/arrets_physiques.hub.erb' ){ |f| f.read }
     @type = "NNNNNNNNNNNNNNNNNN"
     @stop_area.referential.projection_type = "27562"
+
+    wgs84 = '+proj=lonlat +datum=WGS84 +ellps=WGS84'
+    @from_projection = RGeo::CoordSys::Proj4.new(wgs84)
+    
+    lambert2_extended = '+proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 +k_0=0.99987742 +x_0=600000 +y_0=2200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs'
+    @to_projection = RGeo::CoordSys::Proj4.new(lambert2_extended)
+    
   end
   
   def render()
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 546e3cec1..12cb5e1df 100644
--- a/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb
+++ b/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb
@@ -6,6 +6,7 @@ class Chouette::Hub::VehicleJourneyAtStopExporter
     @vehicle_journey_at_stop = vehicle_journey_at_stop
     @directory = directory
     @template = File.open('app/views/api/hub/horaires.hub.erb' ) { |f| f.read }
+    @stop_area_code = Chouette::StopArea.find(@vehicle_journey_at_stop.stop_point.stop_area_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2')
     @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
     @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
diff --git a/app/exporters/chouette/hub/vehicle_journey_exporter.rb b/app/exporters/chouette/hub/vehicle_journey_exporter.rb
index df7cda97f..96b458953 100644
--- a/app/exporters/chouette/hub/vehicle_journey_exporter.rb
+++ b/app/exporters/chouette/hub/vehicle_journey_exporter.rb
@@ -2,10 +2,34 @@ class Chouette::Hub::VehicleJourneyExporter
   include ERB::Util
   attr_accessor :vehicle_journey, :directory, :template
   
-  def initialize(vehicle_journey, directory)
+  def initialize(vehicle_journey, directory, index)
     @vehicle_journey = vehicle_journey
     @directory = directory
     @template = File.open('app/views/api/hub/courses.hub.erb' ) { |f| f.read }
+    @numero = index
+    @journey_pattern = Chouette::JourneyPattern.find(@vehicle_journey.journey_pattern_id)
+    @route = Chouette::Route.find(@vehicle_journey.route_id)
+    @line = Chouette::Line.find(@route.line_id)
+    @departure_stop_point = Chouette::StopPoint.find(@journey_pattern.departure_stop_point_id)
+    @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
+    arrival_time = Chouette::VehicleJourneyAtStop.where( :vehicle_journey_id => @vehicle_journey.id ).where( :stop_point_id => @arrival_stop_point.id )[0].arrival_time
+    @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
+    @vehicle_journey.time_tables.map(&:int_day_types).each { |v| @validity += v }
+    
+    periods = Chouette::TimeTablePeriod.where( :time_table_id => @vehicle_journey.time_tables.map(&:id) ).map(&:id)
+    @periods = ""
+    unless periods.empty? 
+      @periods += periods[0].to_s
+      periods.shift
+    end
+    unless periods.empty?
+      periods.each { |p| @periods += "|" + p.to_s }
+    end
   end
   
   def render()
@@ -17,9 +41,8 @@ class Chouette::Hub::VehicleJourneyExporter
   end
   
   def self.save( vehicle_journeys, directory, hub_export)
-    vehicle_journeys.each do |vehicle_journey|
-      #Chouette::Hub::VehicleJourneyAtStopExporter.save(vehicle_journey.vehicle_journey_at_stops, directory, hub_export)
-      self.new( vehicle_journey, directory).tap do |specific_exporter|
+    vehicle_journeys.each_index do |index|
+      self.new( vehicle_journeys[index], directory, index).tap do |specific_exporter|
         specific_exporter.save
       end
     end
diff --git a/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb b/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb
index e6c5b8d07..3a45f2cab 100644
--- a/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb
+++ b/app/exporters/chouette/hub/vehicle_journey_operation_exporter.rb
@@ -2,8 +2,9 @@ class Chouette::Hub::VehicleJourneyOperationExporter
   include ERB::Util
   attr_accessor :vehicle_journey, :directory, :template
   
-  def initialize(vehicle_journey, directory)
+  def initialize(vehicle_journey, directory, index)
     @vehicle_journey = vehicle_journey
+    @number = index
     @directory = directory
     @template = File.open('app/views/api/hub/courses_operations.hub.erb' ) { |f| f.read }
   end
@@ -17,11 +18,16 @@ class Chouette::Hub::VehicleJourneyOperationExporter
   end
   
   def self.save( vehicle_journeys, directory, hub_export)
-    vehicle_journeys.each do |vehicle_journey|
-      self.new( vehicle_journey, directory).tap do |specific_exporter|
+    vehicle_journeys.each_index do |index|
+      self.new( vehicle_journeys[index], directory, index).tap do |specific_exporter|
         specific_exporter.save
       end
     end
+    #vehicle_journeys.each do |vehicle_journey|
+    #  self.new( vehicle_journey, directory).tap do |specific_exporter|
+    #    specific_exporter.save
+    #  end
+    #end
     hub_export.log_messages.create( :severity => "ok", :key => "EXPORT|VEHICLE_JOURNEY_COUNT", :arguments => {"0" => vehicle_journeys.size})
   end
   
diff --git a/app/inputs/search_time_table_input.rb b/app/inputs/search_time_table_input.rb
index eb992c2d0..bdfe79451 100644
--- a/app/inputs/search_time_table_input.rb
+++ b/app/inputs/search_time_table_input.rb
@@ -2,7 +2,7 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput
 
   def search
     if options[:json]
-      tokenLimit = options[:tokenLimit].present? ? options[:tokenLimit] : "null" 
+      tokenLimit = options[:tokenLimit].present? ? options[:tokenLimit] : "null"
       template.content_tag( :script,
        ("$(document).ready(function() {
            $('##{dom_id}').tokenInput('#{options[:json]}', {
@@ -11,6 +11,7 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput
              minChars: 2,
              propertyToSearch: 'comment',
              preventDuplicates: true,
+             queryParam: 'q[comment_cont]',
              hintText: '#{options[:hint_text]}',
              noResultsText: '#{options[:no_result_text]}',
              searchingText: '#{options[:searching_text]}',
@@ -20,15 +21,15 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput
         });").html_safe)
     end
   end
-  
+
   def to_html
-    input_wrapping do      
+    input_wrapping do
       label_html <<
         builder.search_field(method, input_html_options) <<
           search
     end
   end
-  
+
   def input_html_options
     super.merge({
                   :required          => nil,
@@ -36,6 +37,6 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput
                   :class             => 'token-input',
                   'data-model-name' => object.class.model_name.human
                 })
-  end 
-  
+  end
+
 end
diff --git a/app/views/api/hub/arrets_generiques.hub.erb b/app/views/api/hub/arrets_generiques.hub.erb
index a7cc7585a..bb989920f 100644
--- a/app/views/api/hub/arrets_generiques.hub.erb
+++ b/app/views/api/hub/arrets_generiques.hub.erb
@@ -1 +1 @@
-<%= @stop_area.id %>;<%= @stop_area.name %>;;<%= @type %>;;;;<%= @stop_area.country_code %>;<%= @stop_area.country_code %>;<%= @stop_area.comment %>;<%= @stop_area.registration_number %>
+<%= @stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @stop_area.name %>;<%= @stop_area.nearest_topic_name %>;<%= @type %>;;;;;;<%= @stop_area.comment %>;<%= @stop_area.id %>
diff --git a/app/views/api/hub/arrets_physiques.hub.erb b/app/views/api/hub/arrets_physiques.hub.erb
index f2aee2e6d..a63ee2335 100644
--- a/app/views/api/hub/arrets_physiques.hub.erb
+++ b/app/views/api/hub/arrets_physiques.hub.erb
@@ -1 +1 @@
-<%= @stop_area.id %>;<%= @stop_area.name %>;;<%= @type %>;<%= @stop_area.parent_id %>;<%= @stop_area.projection_x %>;<%= @stop_area.projection_y %>;<%= @stop_area.country_code %>;<%= @stop_area.country_code %>;<%= @stop_area.comment %>;<%= @stop_area.registration_number %>
+<%= @stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @stop_area.name %>;;<%= @type %>;<%= Chouette::StopArea.find(@stop_area.parent_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[0] : -1 %>;<%=  (@stop_area.latitude && @stop_area.longitude) ? RGeo::CoordSys::Proj4::transform_coords(@from_projection, @to_projection, @stop_area.longitude, @stop_area.latitude)[1] : -1 %>;<%= @stop_area.city_name %>;<%= @stop_area.country_code %>;<%= @stop_area.comment %>;<%= @stop_area.id %>
diff --git a/app/views/api/hub/chemins.hub.erb b/app/views/api/hub/chemins.hub.erb
index ed6e9a4d1..37c5b1260 100644
--- a/app/views/api/hub/chemins.hub.erb
+++ b/app/views/api/hub/chemins.hub.erb
@@ -1 +1 @@
-<%= @journey_pattern.route.line_id %>;<%= @journey_pattern.id %>;<%= @journey_pattern.registration_number %>;<%= @journey_pattern.name %>;<%= @journey_pattern.route.wayback == 'A' ? 1 : 2 %>;<%= @type %>;<% @journey_pattern.stop_points.each do |sp| %>;<%= sp.stop_area_id %>;<%= sp.stop_area.registration_number %>;;<% end %>
+<%= Chouette::Line.find(@journey_pattern.route.line_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @journey_pattern.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @journey_pattern.registration_number %>;<%= @journey_pattern.name %>;<%= @journey_pattern.route.wayback == 'A' ? 1 : 2 %>;<%= @type %>;<% @journey_pattern.stop_points.each do |sp| %>;<%= Chouette::StopArea.find(sp.stop_area_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= sp.stop_area_id %>;;<% end %>
diff --git a/app/views/api/hub/correspondances.hub.erb b/app/views/api/hub/correspondances.hub.erb
index 8d4c5ba7c..91fdd9215 100644
--- a/app/views/api/hub/correspondances.hub.erb
+++ b/app/views/api/hub/correspondances.hub.erb
@@ -1 +1 @@
-<%= @connection_link.departure_id %>;<%= @connection_link.departure.registration_number %>;<%= @connection_link.arrival_id %>;<%= @connection_link.arrival.registration_number %>;<%= @connection_link.link_distance %>;<%= @connection_link.default_duration %>;<%= @connection_link.id %>
+<%= Chouette::StopArea.find(@connection_link.departure_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @connection_link.departure_id %>;<%= Chouette::StopArea.find(@connection_link.arrival_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @connection_link.arrival_id %>;<%= @connection_link.link_distance %>;<%= @connection_link.default_duration %>;<%= @connection_link.id %>
diff --git a/app/views/api/hub/courses.hub.erb b/app/views/api/hub/courses.hub.erb
index d92939dc2..b0ef2fe2b 100644
--- a/app/views/api/hub/courses.hub.erb
+++ b/app/views/api/hub/courses.hub.erb
@@ -1 +1,2 @@
-<%= @vehicle_journey.id %>;;;;;<%= @vehicle_journey.route.line_id %>;<%= @vehicle_journey.journey_pattern.id %>;...
+<%= @numero %>;;;<%= @departure_stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @departure_time_sec %>;<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @journey_pattern.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= "D" %>;<%= (@route.wayback == "R") ? 2 : 1 %>;<%= @validity %>;;<%= @departure_stop_area.id %>;;<%= @periods %>;<%= 1 %>;
+<%= @numero %>;;;<%= @arrival_stop_area.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @arrival_time_sec %>;<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @journey_pattern.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= "A" %>;<%= (@route.wayback == "R") ? 2 : 1 %>;<%= @validity %>;;<%= @arrival_stop_area.id %>;;<%= @periods %>;<%= 1 %>;
diff --git a/app/views/api/hub/courses_operations.hub.erb b/app/views/api/hub/courses_operations.hub.erb
index f85b3508e..ee6b27581 100644
--- a/app/views/api/hub/courses_operations.hub.erb
+++ b/app/views/api/hub/courses_operations.hub.erb
@@ -1 +1 @@
-<%= @vehicle_journey.id %>;<%= @vehicle_journey.published_journey_identifier %>;;;<%= @vehicle_journey.transport_mode %>;;
+<%= @number %>;<%= @vehicle_journey.published_journey_identifier %>;;;<%= @vehicle_journey.transport_mode %>;;
diff --git a/app/views/api/hub/horaires.hub.erb b/app/views/api/hub/horaires.hub.erb
index bebea0959..7716976d6 100644
--- a/app/views/api/hub/horaires.hub.erb
+++ b/app/views/api/hub/horaires.hub.erb
@@ -1,2 +1,2 @@
-<%= @vehicle_journey_at_stop.stop_point.stop_area_id %>;<%= @arrival_time %>;<%= @arrival_type %>;<%= @vehicle_journey_at_stop.vehicle_journey_id %>;<%= @vehicle_journey_at_stop.vehicle_journey.journey_pattern_id %>;<%= @vehicle_journey_at_stop.stop_point.stop_area.registration_number %>;<%= @vehicle_journey_at_stop.id %>
-<%= @vehicle_journey_at_stop.stop_point.stop_area_id %>;<%= @departure_time %>;<%= @departure_type %>;<%= @vehicle_journey_at_stop.vehicle_journey_id %>;<%= @vehicle_journey_at_stop.vehicle_journey.journey_pattern_id %>;<%= @vehicle_journey_at_stop.stop_point.stop_area.registration_number %>;<%= @vehicle_journey_at_stop.id %>
+<%= @stop_area_code %>;<%= @arrival_time %>;<%= @arrival_type %>;<%= @vehicle_journey_at_stop.vehicle_journey_id %>;<%= @vehicle_journey_at_stop.vehicle_journey.journey_pattern_id %>;<%= @vehicle_journey_at_stop.stop_point.stop_area.id %>;<%= @vehicle_journey_at_stop.id %>
+<%= @stop_area_code %>;<%= @departure_time %>;<%= @departure_type %>;<%= @vehicle_journey_at_stop.vehicle_journey_id %>;<%= @vehicle_journey_at_stop.vehicle_journey.journey_pattern_id %>;<%= @vehicle_journey_at_stop.stop_point.stop_area.id %>;<%= @vehicle_journey_at_stop.id %>
diff --git a/app/views/api/hub/lignes.hub.erb b/app/views/api/hub/lignes.hub.erb
index ee6d4de8f..e5d2c4c4c 100644
--- a/app/views/api/hub/lignes.hub.erb
+++ b/app/views/api/hub/lignes.hub.erb
@@ -1 +1 @@
-<%= @line.id %>;<%= @line.objectid %>;<%= @line.name %>;;;<%= @line.company_id %>;<%= @line.network_id %>;;<%= @line.registration_number %>
+<%= @line.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @line.number %>;<%= @line.name %>;;;<%= Chouette::Company.find(@line.company_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= Chouette::Network.find(@line.network_id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;;<%= @line.id %>
diff --git a/app/views/api/hub/periodes.hub.erb b/app/views/api/hub/periodes.hub.erb
index 342e4016f..dc3e475df 100644
--- a/app/views/api/hub/periodes.hub.erb
+++ b/app/views/api/hub/periodes.hub.erb
@@ -1 +1 @@
-<%= @time_table.id %>;<%= @time_table.comment %>;<%= @time_table.start_date %>;<%= @time_table.end_date %>;<%= @calendar %>
+<%= Chouette::TimeTable.find(@time_table.id).objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @time_table.comment %>;<%= @time_table.start_date %>;<%= @time_table.end_date %>;<%= @calendar %>
diff --git a/app/views/api/hub/reseaux.hub.erb b/app/views/api/hub/reseaux.hub.erb
index 25f24dc6d..634b10b30 100644
--- a/app/views/api/hub/reseaux.hub.erb
+++ b/app/views/api/hub/reseaux.hub.erb
@@ -1 +1 @@
-<%= @network.id %>;<%= @network.name %>;<%= @network.registration_number %>
+<%= @network.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @network.name %>;<%= @network.id %>
diff --git a/app/views/api/hub/transporteurs.hub.erb b/app/views/api/hub/transporteurs.hub.erb
index 3f175b053..fdabda5b1 100644
--- a/app/views/api/hub/transporteurs.hub.erb
+++ b/app/views/api/hub/transporteurs.hub.erb
@@ -1 +1 @@
-<%= @company.id %>;<%= @company.name %>;<%= @company.registration_number %>
+<%= @company.objectid.sub(/(\w*\:\w*\:)(\w*)/, '\2') %>;<%= @company.name %>;<%= @company.id %>
diff --git a/app/views/time_table_combinations/_combine_form.html.erb b/app/views/time_table_combinations/_combine_form.html.erb
index 8a651277e..a2124d9dc 100644
--- a/app/views/time_table_combinations/_combine_form.html.erb
+++ b/app/views/time_table_combinations/_combine_form.html.erb
@@ -20,7 +20,7 @@
         queryTokenizer: Bloodhound.tokenizers.whitespace,
         limit: 12,
         remote: {
-          url: '<%= comment_filter_referential_time_tables_path(@referential, :format => :json) %>',
+          url: '<%= referential_time_tables_path(@referential, :format => :json) %>?q[comment_cont]=%QUERY',
           },
         });
 
@@ -38,12 +38,12 @@
           source: timeTableSuggestion.ttAdapter()
         }
       );
-      
-  $('#time_table_combination_combined_name').on('typeahead:selected', function($e, datum) 
+
+  $('#time_table_combination_combined_name').on('typeahead:selected', function($e, datum)
   {
     $('input[name="time_table_combination[combined_id]"]').val(datum.id);
-  })      
-      
+  })
+
 	});
 </script>
 <% end %>
diff --git a/app/views/time_tables/comment_filter.json.rabl b/app/views/time_tables/comment_filter.json.rabl
deleted file mode 100644
index dec29cb69..000000000
--- a/app/views/time_tables/comment_filter.json.rabl
+++ /dev/null
@@ -1,5 +0,0 @@
-collection @time_tables, :object_root => false
-
-node do |time_table|
-  { :id => time_table.id, :comment => time_table.comment, :time_table_bounding => time_table_bounding( time_table), :composition_info => composition_info(time_table) }
-end                     
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 7d530a66e..459e8ea07 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -12,7 +12,7 @@
     <%= form.input :facility %>
     <%= form.input :vehicle_type_identifier%>
     <%= form.input :objectid, :required => !@vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles.vehicle_journey.objectid")} %>
-    <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :search_time_table, :json => comment_filter_referential_time_tables_path(@referential, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'),  :input_html => { :"data-pre" => ( @vehicle_journey.time_tables.map{ |time_table| { :id => time_table.id, :comment => time_table.comment, :time_table_bounding => time_table_bounding( time_table), :composition_info => composition_info(time_table) } } ).to_json }  %>
+    <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :search_time_table, :json => referential_time_tables_path(@referential, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'),  :input_html => { :"data-pre" => ( @vehicle_journey.time_tables.map{ |time_table| { :id => time_table.id, :comment => time_table.comment, :time_table_bounding => time_table_bounding( time_table), :composition_info => composition_info(time_table) } } ).to_json }  %>
     <li class="input">
 	    <%= form.label @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
     </li>
diff --git a/app/views/vehicle_journeys/index.html.erb b/app/views/vehicle_journeys/index.html.erb
index d045d4239..4b3dcd27a 100644
--- a/app/views/vehicle_journeys/index.html.erb
+++ b/app/views/vehicle_journeys/index.html.erb
@@ -33,14 +33,14 @@
       <%= f.check_box :vehicle_journey_at_stops_departure_time_not_eq %>
 
       <span class="vehicle_journey_at_stops_departure_time_gt">
-      <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(3i)]" %> type="hidden" value="1">
-      <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(2i)]" %> type="hidden" value="1">
-      <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(1i)]" %> type="hidden" value="2000">
-      <%= f.label :vehicle_journey_at_stops_departure_time_gt, t('.time_range') %>
-      <%= select_hour(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").hour : 0,
-                       :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(4i)") %>
-      <%= select_minute(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").min : 0,
-                         :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(5i)") %>
+        <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(3i)]" %> type="hidden" value="1">
+        <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(2i)]" %> type="hidden" value="1">
+        <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(1i)]" %> type="hidden" value="2000">
+        <%= f.label :vehicle_journey_at_stops_departure_time_gt, t('.time_range') %>
+        <%= select_hour(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").hour : 0,
+                         :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(4i)") %>
+        <%= select_minute(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").min : 0,
+                           :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(5i)") %>
       </span>
       </div>
     </div>
@@ -57,6 +57,11 @@
         var time_tables_url = function(){
           return '<%= referential_time_tables_path(@referential, :format => :json) %>?route_id=<%= @route.id %>';
         };
+        var time_table_to_html = function( item ){
+          return '<li><div class=\"comment\">' + item.comment +
+              '</div><div class=\"info\">' + item.time_table_bounding +
+              '</div><div class=\"info\">' +  item.composition_info + '</div></li>';
+        };
 		$( "#q_time_tables_id_eq" ).tokenInput( time_tables_url, {
           crossDomain: false,
           prePopulate: $('#q_time_tables_id_eq').data('pre'),
@@ -66,7 +71,8 @@
           hintText: '<%= t('search_hint') %>',
           noResultsText: '<%= t('no_result_text') %>',
           searchingText: '<%= t('searching_term') %>',
-          resultsFormatter: function(item){ return '<li><div class=\"name\">' + item.comment + '</div><div class=\"info\">' + item.start_date + ' ' + item.end_date + '</div></li>' },
+          resultsFormatter: time_table_to_html,
+          tokenFormatter: time_table_to_html,
         });
 		$( "#q_journey_pattern_id_eq" ).tokenInput( '<%= referential_line_route_journey_patterns_path(@referential, @line, @route, :format => :json) %>', {
           crossDomain: false,
diff --git a/config/routes.rb b/config/routes.rb
index a2a6f07ce..827ee97a1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -125,7 +125,6 @@ ChouetteIhm::Application.routes.draw do
 
     resources :time_tables do
       collection do
-        get :comment_filter
         get :tags
       end
       member do