10 files changed, 82 insertions, 43 deletions
diff --git a/app/helpers/access_links_helper.rb b/app/helpers/access_links_helper.rb
new file mode 100644
index 000000000..8df452f65
--- /dev/null
+++ b/app/helpers/access_links_helper.rb
@@ -0,0 +1,7 @@
+module AccessLinksHelper
+  def access_link_type_label_pairs
+    Chouette::AccessLink
+    .access_link_types
+    .zip_map { |type| t("connection_link_types.label.#{type}") }
+  end
+end
diff --git a/app/helpers/access_points_helper.rb b/app/helpers/access_points_helper.rb
index c5e9f672e..c954e6cad 100644
--- a/app/helpers/access_points_helper.rb
+++ b/app/helpers/access_points_helper.rb
@@ -1,28 +1,14 @@
 module AccessPointsHelper
-  def access_links_pairs(access_links)
-    hpairs = Hash.new
-    pairs = Array.new
-    access_links.each do |link|
-      key = pair_key(link)
-      pair = nil
-      if (hpairs.has_key? key)
-        pair = hpairs[key]
-      else
-        pair = AccessLinkPair.new
-        pairs << pair
-        hpairs[key] = pair
-      end
-      if (link.link_orientation_type == "access_point_to_stop_area")
-        pair.from_access_point = link
-      else
-        pair.to_access_point = link
-      end
-    end
-    pairs
+
+
+  def access_point_type_label_pairs
+    Chouette::AccessPoint
+    .access_point_types
+    .zip_map { |access_point_type| t("access_types.label.#{access_point_type}") }
   end
-  
+
   def pair_key(access_link)
     "#{access_link.access_point.id}-#{access_link.stop_area.id}"
   end
-  
+
 end
diff --git a/app/helpers/common_helpers.rb b/app/helpers/common_helpers.rb
new file mode 100644
index 000000000..29cabddac
--- /dev/null
+++ b/app/helpers/common_helpers.rb
@@ -0,0 +1,26 @@
+
+module CommonHelpers
+  # TODO: Needs refactoring, but does not seem to be under test
+  # so let us refactor this **after** test coverage.
+  def access_links_pairs(access_links)
+    hpairs = Hash.new
+    pairs = Array.new
+    access_links.each do |link|
+      key = pair_key(link)
+      pair = nil
+      if (hpairs.has_key? key)
+        pair = hpairs[key]
+      else
+        pair = AccessLinkPair.new
+        pairs << pair
+        hpairs[key] = pair
+      end
+      if (link.link_orientation_type == "access_point_to_stop_area")
+        pair.from_access_point = link
+      else
+        pair.to_access_point = link
+      end
+    end
+    pairs
+  end
+end
diff --git a/app/helpers/connection_links_helper.rb b/app/helpers/connection_links_helper.rb
new file mode 100644
index 000000000..d9c201028
--- /dev/null
+++ b/app/helpers/connection_links_helper.rb
@@ -0,0 +1,8 @@
+module ConnectionLinksHelper
+
+  def connection_link_type_label_pairs
+    Chouette::ConnectionLink
+      .connection_link_types
+      .zip_map { |type| t("connection_link_types.label.#{type}") }
+  end
+end
diff --git a/app/helpers/core_helper.rb b/app/helpers/core_helper.rb
new file mode 100644
index 000000000..af2f6664c
--- /dev/null
+++ b/app/helpers/core_helper.rb
@@ -0,0 +1,7 @@
+module CoreHelper
+  module ::Enumerable
+    def zip_map
+      map { |ele| [ele, yield(ele)] }
+    end
+  end
+end
diff --git a/app/helpers/networks_helper.rb b/app/helpers/networks_helper.rb
new file mode 100644
index 000000000..b881ce078
--- /dev/null
+++ b/app/helpers/networks_helper.rb
@@ -0,0 +1,7 @@
+module NetworksHelper
+
+  def source_type_name_label_pairs
+    Chouette::Network.source_type_names
+      .zip_map { |source_type_name| t("source_types.label.#{source_type_name}") }
+  end
+end
diff --git a/app/helpers/rule_parameter_sets_helper.rb b/app/helpers/rule_parameter_sets_helper.rb
index 538a5cddd..bb210d9cd 100644
--- a/app/helpers/rule_parameter_sets_helper.rb
+++ b/app/helpers/rule_parameter_sets_helper.rb
@@ -18,6 +18,11 @@ module RuleParameterSetsHelper
     t "false"
   end
   
+  def transport_mode_label_pairs
+    Chouette::TransportMode
+      .all
+      .zip_map { |mode| t("transport_modes.label.#{mode}") }
+  end
 end
 
 
diff --git a/app/helpers/stop_area_copies_helper.rb b/app/helpers/stop_area_copies_helper.rb
new file mode 100644
index 000000000..023a9d750
--- /dev/null
+++ b/app/helpers/stop_area_copies_helper.rb
@@ -0,0 +1,8 @@
+module StopAreaCopiesHelper
+  
+  def label_stop_area_types(*stop_area_types)
+    stop_area_types
+      .flatten
+      .zip_map { |stop_area_type| t("area_types.label.#{stop_area_type}") }
+  end
+end
diff --git a/app/helpers/stop_areas_helper.rb b/app/helpers/stop_areas_helper.rb
index 2188a272d..3e04fac7d 100644
--- a/app/helpers/stop_areas_helper.rb
+++ b/app/helpers/stop_areas_helper.rb
@@ -33,27 +33,6 @@ module StopAreasHelper
     @stop_area.stop_area_type == 'stop_place' || @stop_area.stop_area_type == 'commercial_stop_point'
   end
 
-  def access_links_pairs(access_links)
-    hpairs = Hash.new
-    pairs = Array.new
-    access_links.each do |link|
-      key = pair_key(link)
-      pair = nil
-      if (hpairs.has_key? key)
-        pair = hpairs[key]
-      else
-        pair = AccessLinkPair.new
-        pairs << pair
-        hpairs[key] = pair
-      end
-      if (link.link_orientation_type == "access_point_to_stop_area")
-        pair.from_access_point = link
-      else
-        pair.to_access_point = link
-      end
-    end
-    pairs
-  end
 
   def pair_key(access_link)
     "#{access_link.access_point.id}-#{access_link.stop_area.id}"
diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb
index e70f2954b..6877abd11 100644
--- a/app/helpers/vehicle_journeys_helper.rb
+++ b/app/helpers/vehicle_journeys_helper.rb
@@ -41,6 +41,12 @@ module VehicleJourneysHelper
     end
   end
   
+  def route_journey_pattern_label_pairs route
+    route
+      .journey_patterns
+      .zip_map { |jp| journey_name(jp) }
+  end
+
   def edit_vehicle_title( vehicle)
     return t('vehicle_journeys.edit.title_stopless', :name => vehicle_name( vehicle)) if vehicle.vehicle_journey_at_stops.empty?
     first_vjas = vehicle.vehicle_journey_at_stops.first