diff options
21 files changed, 10 insertions, 11 deletions
diff --git a/app/exporters/chouette/hub/commercial_stop_area_exporter.rb b/app/exporters/chouette/hub/commercial_stop_area_exporter.rb index 201fce3d2..2c7828d59 100644 --- a/app/exporters/chouette/hub/commercial_stop_area_exporter.rb +++ b/app/exporters/chouette/hub/commercial_stop_area_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::CommercialStopAreaExporter def initialize(stop_area, directory) @stop_area = stop_area @directory = directory - @template = File.open('app/views/api/hub/stop_area/commercial_show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/arrets_generiques.hub.erb' ){ |f| f.read } @type = "ONNNNNNNNNNNNNNNNN" end diff --git a/app/exporters/chouette/hub/company_exporter.rb b/app/exporters/chouette/hub/company_exporter.rb index eb530d6d4..824e857f2 100644 --- a/app/exporters/chouette/hub/company_exporter.rb +++ b/app/exporters/chouette/hub/company_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::CompanyExporter def initialize(company, directory) @company = company @directory = directory - @template = File.open('app/views/api/hub/transporteur/show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/transporteurs.hub.erb' ){ |f| f.read } end def render() diff --git a/app/exporters/chouette/hub/connection_link_exporter.rb b/app/exporters/chouette/hub/connection_link_exporter.rb index 793da52bd..c7d1820d8 100644 --- a/app/exporters/chouette/hub/connection_link_exporter.rb +++ b/app/exporters/chouette/hub/connection_link_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::ConnectionLinkExporter def initialize(connection_link, directory) @connection_link = connection_link @directory = directory - @template = File.open('app/views/api/hub/correspondance/show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/correspondances.hub.erb' ){ |f| f.read } end def render() diff --git a/app/exporters/chouette/hub/journey_pattern_exporter.rb b/app/exporters/chouette/hub/journey_pattern_exporter.rb index 12c157408..03f20e6bf 100644 --- a/app/exporters/chouette/hub/journey_pattern_exporter.rb +++ b/app/exporters/chouette/hub/journey_pattern_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::JourneyPatternExporter def initialize(journey_pattern, directory) @journey_pattern = journey_pattern @directory = directory - @template = File.open('app/views/api/hub/chemin/show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/chemins.hub.erb' ){ |f| f.read } @type = "COM" end diff --git a/app/exporters/chouette/hub/line_exporter.rb b/app/exporters/chouette/hub/line_exporter.rb index b9575876a..0d58f3757 100644 --- a/app/exporters/chouette/hub/line_exporter.rb +++ b/app/exporters/chouette/hub/line_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::LineExporter def initialize(line, directory) @line = line @directory = directory - @template = File.open('app/views/api/hub/ligne/show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/lignes.hub.erb' ){ |f| f.read } end def render() diff --git a/app/exporters/chouette/hub/network_exporter.rb b/app/exporters/chouette/hub/network_exporter.rb index d59cd5fd3..2673b7bb8 100644 --- a/app/exporters/chouette/hub/network_exporter.rb +++ b/app/exporters/chouette/hub/network_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::NetworkExporter def initialize(network, directory) @network = network @directory = directory - @template = File.open('app/views/api/hub/reseau/show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/reseaux.hub.erb' ){ |f| f.read } end def render() diff --git a/app/exporters/chouette/hub/physical_stop_area_exporter.rb b/app/exporters/chouette/hub/physical_stop_area_exporter.rb index 4a2666321..7669aa64e 100644 --- a/app/exporters/chouette/hub/physical_stop_area_exporter.rb +++ b/app/exporters/chouette/hub/physical_stop_area_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::PhysicalStopAreaExporter def initialize(stop_area, directory) @stop_area = stop_area @directory = directory - @template = File.open('app/views/api/hub/stop_area/physical_show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/arrets_physiques.hub.erb' ){ |f| f.read } @type = "NNNNNNNNNNNNNNNNNN" @stop_area.referential.projection_type = "27562" end diff --git a/app/exporters/chouette/hub/time_table_exporter.rb b/app/exporters/chouette/hub/time_table_exporter.rb index 1e91ead6c..f3a28cf79 100644 --- a/app/exporters/chouette/hub/time_table_exporter.rb +++ b/app/exporters/chouette/hub/time_table_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::TimeTableExporter def initialize(time_table, directory) @time_table = time_table @directory = directory - @template = File.open('app/views/api/hub/periode/show.hub.erb' ){ |f| f.read } + @template = File.open('app/views/api/hub/periodes.hub.erb' ){ |f| f.read } @calendar = "" s_date = @time_table.start_date e_date = @time_table.end_date 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 e78048ecb..546e3cec1 100644 --- a/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb +++ b/app/exporters/chouette/hub/vehicle_journey_at_stop_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::VehicleJourneyAtStopExporter def initialize(vehicle_journey_at_stop, directory) @vehicle_journey_at_stop = vehicle_journey_at_stop @directory = directory - @template = File.open('app/views/api/hub/horaire/show.hub.erb' ) { |f| f.read } + @template = File.open('app/views/api/hub/horaires.hub.erb' ) { |f| f.read } @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 ced67fdd8..df7cda97f 100644 --- a/app/exporters/chouette/hub/vehicle_journey_exporter.rb +++ b/app/exporters/chouette/hub/vehicle_journey_exporter.rb @@ -5,7 +5,7 @@ class Chouette::Hub::VehicleJourneyExporter def initialize(vehicle_journey, directory) @vehicle_journey = vehicle_journey @directory = directory - @template = File.open('app/views/api/hub/course/show.hub.erb' ) { |f| f.read } + @template = File.open('app/views/api/hub/courses.hub.erb' ) { |f| f.read } end def render() diff --git a/app/views/api/hub/stop_area/commercial_show.hub.erb b/app/views/api/hub/arrets_generiques.hub.erb index a7cc7585a..a7cc7585a 100644 --- a/app/views/api/hub/stop_area/commercial_show.hub.erb +++ b/app/views/api/hub/arrets_generiques.hub.erb diff --git a/app/views/api/hub/stop_area/physical_show.hub.erb b/app/views/api/hub/arrets_physiques.hub.erb index f2aee2e6d..f2aee2e6d 100644 --- a/app/views/api/hub/stop_area/physical_show.hub.erb +++ b/app/views/api/hub/arrets_physiques.hub.erb diff --git a/app/views/api/hub/chemin/show.hub.erb b/app/views/api/hub/chemins.hub.erb index ed6e9a4d1..ed6e9a4d1 100644 --- a/app/views/api/hub/chemin/show.hub.erb +++ b/app/views/api/hub/chemins.hub.erb diff --git a/app/views/api/hub/correspondance/show.hub.erb b/app/views/api/hub/correspondances.hub.erb index 8d4c5ba7c..8d4c5ba7c 100644 --- a/app/views/api/hub/correspondance/show.hub.erb +++ b/app/views/api/hub/correspondances.hub.erb diff --git a/app/views/api/hub/course/show.hub.erb b/app/views/api/hub/courses.hub.erb index d92939dc2..d92939dc2 100644 --- a/app/views/api/hub/course/show.hub.erb +++ b/app/views/api/hub/courses.hub.erb diff --git a/app/views/api/hub/horaire/show.hub.erb b/app/views/api/hub/horaires.hub.erb index bebea0959..bebea0959 100644 --- a/app/views/api/hub/horaire/show.hub.erb +++ b/app/views/api/hub/horaires.hub.erb diff --git a/app/views/api/hub/ligne/show.hub.erb b/app/views/api/hub/lignes.hub.erb index ee6d4de8f..ee6d4de8f 100644 --- a/app/views/api/hub/ligne/show.hub.erb +++ b/app/views/api/hub/lignes.hub.erb diff --git a/app/views/api/hub/periode/show.hub.erb b/app/views/api/hub/periodes.hub.erb index 342e4016f..342e4016f 100644 --- a/app/views/api/hub/periode/show.hub.erb +++ b/app/views/api/hub/periodes.hub.erb diff --git a/app/views/api/hub/reseau/show.hub.erb b/app/views/api/hub/reseaux.hub.erb index 25f24dc6d..25f24dc6d 100644 --- a/app/views/api/hub/reseau/show.hub.erb +++ b/app/views/api/hub/reseaux.hub.erb diff --git a/app/views/api/hub/stops/show.hub.erb b/app/views/api/hub/stops/show.hub.erb deleted file mode 100644 index 2bab51c97..000000000 --- a/app/views/api/hub/stops/show.hub.erb +++ /dev/null @@ -1 +0,0 @@ -<%= @stop.code %>;<%= @stop.name %>;<%= @stop.description if @stop.description? %>;<%= @stop.type %>;<%= @stop.short_name %>;<%= @stop.x %>;<%= @stop.y %>;<%= @stop.city %>;<%= @stop.administrative_code %>;<%= @stop.comment if @stop.comment? %>;<%= @stop.object_id %> diff --git a/app/views/api/hub/transporteur/show.hub.erb b/app/views/api/hub/transporteurs.hub.erb index 3f175b053..3f175b053 100644 --- a/app/views/api/hub/transporteur/show.hub.erb +++ b/app/views/api/hub/transporteurs.hub.erb |