Add route_sections for traces

8 files changed, 114 insertions, 7 deletions

diff --git a/config/database.yml b/config/database.yml
index 08d265760..81951d183 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,12 +1,12 @@
 default: &default
-  adapter: postgresql
+  adapter: postgis
   encoding: unicode
-  pool: 5
   port: 5432
   host: localhost
-  schema_search_path: "public"
+  schema_search_path: 'public,shared_extensions'
   username: chouette
   password: chouette
+  postgis_schema: 'shared_extensions'
 
 development:
   <<: *default
diff --git a/config/database.yml.travis b/config/database.yml.travis
index c554142f5..dc35cfcb2 100644
--- a/config/database.yml.travis
+++ b/config/database.yml.travis
@@ -1,11 +1,11 @@
 default: &default
-  adapter: postgresql
+  adapter: postgis
   encoding: unicode
-  pool: 5
   port: 5432
   host: localhost
-  schema_search_path: "public"
+  schema_search_path: 'public,shared_extensions'
   username: postgres
+  postgis_schema: 'shared_extensions'
 
 development:
   <<: *default
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index b87a9fd67..31649f3e2 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -26,7 +26,7 @@ Apartment.configure do |config|
   #config.use_sql = true
 
   # configure persistent schemas (E.g. hstore )
-  # config.persistent_schemas = %w{ hstore }
+  config.persistent_schemas = %w{ shared_extensions }
 
   # add the Rails environment to database names?
   # config.prepend_environment = true
diff --git a/config/initializers/route_section.rb b/config/initializers/route_section.rb
new file mode 100644
index 000000000..dadea36ee
--- /dev/null
+++ b/config/initializers/route_section.rb
@@ -0,0 +1,3 @@
+Rails.application.config.to_prepare do
+  Chouette::RouteSection.processor = OsrmRouteSectionProcessor.new
+end
diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml
index bb328a430..7a1d26956 100644
--- a/config/locales/referentials.fr.yml
+++ b/config/locales/referentials.fr.yml
@@ -57,6 +57,7 @@ fr:
         access_points: "points d'accès"
         time_tables: "Calendriers"
         connection_links: "Correspondances"
+        route_sections: "Sections de parcours"
         quays: "quais"
         boarding_positions: "points d'embarquement"
         commercial_stops: "arrêts commerciaux"
diff --git a/config/locales/route_sections.en.yml b/config/locales/route_sections.en.yml
new file mode 100644
index 000000000..f799432f0
--- /dev/null
+++ b/config/locales/route_sections.en.yml
@@ -0,0 +1,47 @@
+en:
+  route_sections:
+    new:
+      title: "Add a new section"
+    show:
+      title: "Show this section"
+    edit:
+      title: "Edit this section"
+    form:
+      no_processing: "Geometry processing"
+      standard_processor: "Standard"
+      no_processor: "No treatment"
+      submit: "Submit"
+    index:
+      title: "Sections course"
+      all_lines: "All lines"
+      actions:
+        show: "Show"
+        edit: "Edit"
+        destroy: "Delete"
+        destroy_confirm: "Are you sure you want to delete this route section?"
+    actions:
+      edit: "Edit this section"
+      destroy: "Delete this section"
+      destroy_confirm: "Are you sure you want to delete this route section?"
+  route_sections_selectors:
+    edit:
+      title: "Changing the course of the mission %{journey_pattern}"
+      route_section:
+        edit: "Edit this section"
+        new: "Add alternative"
+      no_candidate: "No known path"
+      no_selection: "No selection"
+      selection:
+        title: "Selected section"
+      form:
+        title: "Full course"
+      submit: "Change the route"
+  activerecord:
+    models:
+      route_section: "Section course"
+    attributes:
+      route_section:
+        departure: "Departure point"
+        arrival: "Arrival point"
+        points: "Via"
+        distance: "Distance"
diff --git a/config/locales/route_sections.fr.yml b/config/locales/route_sections.fr.yml
new file mode 100644
index 000000000..65bead733
--- /dev/null
+++ b/config/locales/route_sections.fr.yml
@@ -0,0 +1,47 @@
+fr:
+  route_sections:
+    new:
+      title: "Ajouter une section"
+    show:
+      title: "Détails d'une Section de parcours"
+    edit:
+      title: "Modifier une Section de parcours"
+    form:
+      no_processing: "Traitement de la géométrie"
+      standard_processor: "Standard"
+      no_processor: "Pas de traitement"
+      submit: "Valider"
+    index:
+      title: "Sections de parcours"
+      all_lines: "Tous les lignes"
+      actions:
+        show: "Voir"
+        edit: "Modifier"
+        destroy: "Supprimer"
+        destroy_confirm: "Etes vous sûr de vouloir supprimer cette section de parcours ?"
+    actions:
+      edit: "Modifier cette section"
+      destroy: "Supprimer cette section"
+      destroy_confirm: "Etes vous sûr de vouloir supprimer cette section de parcours ?"
+  route_sections_selectors:
+    edit:
+      title: "Modification du parcours de la mission %{journey_pattern}"
+      route_section:
+        edit: "Modifier cette section"
+        new: "Ajouter une alternative"
+      no_candidate: "Aucun parcours connu"
+      no_selection: "Aucune selection"
+      selection:
+        title: "Section sélectionnée"
+      form:
+        title: "Parcours complet"
+      submit: "Modifier le parcours"
+  activerecord:
+    models:
+      route_section: "Section du parcours"
+    attributes:
+      route_section:
+        departure: "Arrêt de départ"
+        arrival: "Arrêt d'arrivée"
+        points: "Via"
+        distance: "Distance"
diff --git a/config/routes.rb b/config/routes.rb
index 8f41615d9..5f899292a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -46,6 +46,7 @@ ChouetteIhm::Application.routes.draw do
     resources :api_keys
     resources :autocomplete_stop_areas
     resources :autocomplete_time_tables
+    resources :autocomplete_route_sections
     resources :autocomplete_timebands
     resources :group_of_lines do
       collection do
@@ -70,6 +71,9 @@ ChouetteIhm::Application.routes.draw do
           member do
             get 'new_vehicle_journey'
           end
+          resource :route_sections_selector, path: 'sections' do
+            post 'selection'
+          end
         end
         resources :vehicle_journeys, :vehicle_journey_frequencies do
           get 'select_journey_pattern', :on => :member
@@ -164,6 +168,11 @@ ChouetteIhm::Application.routes.draw do
     end
     resources :clean_ups
 
+    resources :route_sections do
+      collection  do
+        get 'create_to_edit'
+      end
+    end
   end
   root :to => "referentials#index"