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

12 files changed, 126 insertions, 116 deletions

diff --git a/app/assets/javascripts/access_points.js.coffee b/app/assets/javascripts/access_points.js.coffee
index 5cff80b7c..ee5e89def 100644
--- a/app/assets/javascripts/access_points.js.coffee
+++ b/app/assets/javascripts/access_points.js.coffee
@@ -1,34 +1,33 @@
 jQuery ->
   x_y_change = (event) -> 
-    if referential_projection != undefined
-      referential_point = new OpenLayers.Geometry.Point($('input#access_point_longitude').val(), $('input#access_point_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), referential_projection )      
-      
-      $('input#access_point_projection_x').val(referential_point.x)
-      $('input#access_point_projection_y').val(referential_point.y)
-          
-    feature = map.getLayersByName("access_point")[0].getFeatureByFid($('input#access_point_id').val())  
-    google_point = new OpenLayers.LonLat($('input#access_point_longitude').val(), $('input#access_point_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
-    feature.move(google_point)
-    map.setCenter(google_point, 16, false, true)      
+    c = $('input#access_point_coordinates').val().split(",")
+    if c.length == 2
+      if referential_projection != undefined
+        referential_point = new OpenLayers.Geometry.Point(c[1], c[0]).transform(new OpenLayers.Projection("EPSG:4326"), referential_projection )      
+        
+        $('input#access_point_projection_xy').val(referential_point.x.toString()+","+referential_point.y.toString())
+            
+      feature = map.getLayersByName("access_point")[0].getFeatureByFid($('input#access_point_id').val())  
+      google_point = new OpenLayers.LonLat(c[1], c[0]).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
+      feature.move(google_point)
+      map.setCenter(google_point, 16, false, true)      
 
-  $('input#access_point_longitude').change(x_y_change)
-  $('input#access_point_latitude').change(x_y_change)
+  $('input#access_point_coordinates').change(x_y_change)
    
   lon_lat_change = (event) -> 
-    if referential_projection != undefined
-      wgs84_point = new OpenLayers.Geometry.Point($('input#access_point_projection_x').val(), $('input#access_point_projection_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))    
-     
-      $('input#access_point_longitude').val( wgs84_point.x)
-      $('input#access_point_latitude').val( wgs84_point.y)
-
-    feature = map.getLayersByName("stop_area")[0].getFeatureByFid($('input#access_point_id').val())  
-    google_point =  new OpenLayers.LonLat(wgs84_point.x, wgs84_point.y).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
-    feature.move(google_point)
-    map.setCenter(google_point, 16, false, true)      
-
-  $('input#access_point_projection_x').change(lon_lat_change)
-  $('input#access_point_projection_y').change(lon_lat_change)
+    c = $('input#access_point_projection_xy').val().split(",")
+    if c.length == 2
+      if referential_projection != undefined
+        wgs84_point = new OpenLayers.Geometry.Point(c[0], c[1]).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))    
+       
+        $('input#access_point_coordinates').val( wgs84_point.y.toString()+","+wgs84_point.x)
   
+      feature = map.getLayersByName("access_point")[0].getFeatureByFid($('input#access_point_id').val())  
+      google_point =  new OpenLayers.LonLat(wgs84_point.x, wgs84_point.y).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
+      feature.move(google_point)
+      map.setCenter(google_point, 16, false, true)      
+
+  $('input#access_point_projection_xy').change(lon_lat_change)  
   
   # switch visibility of access_links
   switch_generics = (event) -> 
diff --git a/app/assets/javascripts/stop_areas/edit.js.coffee b/app/assets/javascripts/stop_areas/edit.js.coffee
index 44f6da982..d1d945ebf 100644
--- a/app/assets/javascripts/stop_areas/edit.js.coffee
+++ b/app/assets/javascripts/stop_areas/edit.js.coffee
@@ -1,31 +1,31 @@
 $(".stop_areas.edit").ready ->                    
 
   x_y_change = (event) -> 
-    if referential_projection != undefined
-      referential_point = new OpenLayers.Geometry.Point($('input#stop_area_longitude').val(), $('input#stop_area_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), referential_projection )      
-      
-      $('input#stop_area_projection_x').val(referential_point.x)
-      $('input#stop_area_projection_y').val(referential_point.y)
-          
-    feature = map.getLayersByName("stop_area")[0].getFeatureByFid($('input#stop_area_id').val())  
-    google_point = new OpenLayers.LonLat($('input#stop_area_longitude').val(), $('input#stop_area_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
-    feature.move(google_point)
-    map.setCenter(google_point, 16, false, true)      
+    c = $('input#stop_area_coordinates').val().split(",")
+    if c.length == 2
+      if referential_projection != undefined
+        referential_point = new OpenLayers.Geometry.Point(c[1], c[0]).transform(new OpenLayers.Projection("EPSG:4326"), referential_projection )      
+        
+        $('input#stop_area_projection_xy').val(referential_point.x.toString()+","+referential_point.y.toString())
+            
+      feature = map.getLayersByName("stop_area")[0].getFeatureByFid($('input#stop_area_id').val())  
+      google_point = new OpenLayers.LonLat(c[1], c[0]).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
+      feature.move(google_point)
+      map.setCenter(google_point, 16, false, true)      
 
-  $('input#stop_area_longitude').change(x_y_change)
-  $('input#stop_area_latitude').change(x_y_change)
+  $('input#stop_area_coordinates').change(x_y_change)
    
   lon_lat_change = (event) -> 
-    if referential_projection != undefined
-      wgs84_point = new OpenLayers.Geometry.Point($('input#stop_area_projection_x').val(), $('input#stop_area_projection_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))    
-     
-      $('input#stop_area_longitude').val( wgs84_point.x)
-      $('input#stop_area_latitude').val( wgs84_point.y)
+    c = $('input#stop_area_projection_xy').val().split(",")
+    if c.length == 2
+      if referential_projection != undefined
+        wgs84_point = new OpenLayers.Geometry.Point(c[0], c[1]).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))    
+       
+        $('input#stop_area_coordinates').val( wgs84_point.y.toString()+","+wgs84_point.x)
+  
+      feature = map.getLayersByName("stop_area")[0].getFeatureByFid($('input#stop_area_id').val())  
+      google_point =  new OpenLayers.LonLat(wgs84_point.x, wgs84_point.y).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
+      feature.move(google_point)
+      map.setCenter(google_point, 16, false, true)      
 
-    feature = map.getLayersByName("stop_area")[0].getFeatureByFid($('input#stop_area_id').val())  
-    google_point =  new OpenLayers.LonLat(wgs84_point.x, wgs84_point.y).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
-    feature.move(google_point)
-    map.setCenter(google_point, 16, false, true)      
-
-  $('input#stop_area_projection_x').change(lon_lat_change)
-  $('input#stop_area_projection_y').change(lon_lat_change)
+  $('input#stop_area_projection_xy').change(lon_lat_change)
diff --git a/app/maps/access_point_map.rb b/app/maps/access_point_map.rb
index f31dcf5a3..0103d9edb 100644
--- a/app/maps/access_point_map.rb
+++ b/app/maps/access_point_map.rb
@@ -10,10 +10,10 @@ class AccessPointMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    page.assign "parent_layer", kml_layer(access_point.stop_area,  :style_map => Design::StopAreasStyleMap.new(helpers).style_map)
-    page << map.add_layer(:parent_layer)
     page.assign "edit_access_point_layer", kml_layer(access_point, { :default => editable? }, :style_map => Design::EditAccessPointStyleMap.new(helpers).style_map)
     page << map.add_layer(:edit_access_point_layer)
+    page.assign "parent_layer", kml_layer(access_point.stop_area,  :style_map => Design::StopAreasStyleMap.new(helpers).style_map)
+    page << map.add_layer(:parent_layer)
     
     
     if editable?
@@ -23,14 +23,12 @@ class AccessPointMap < ApplicationMap
       edit_access_point_layer.events.on({ 
                         'afterfeaturemodified': function(event) { 
                           geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
-                          $('#access_point_longitude').val(geometry.x);
-                          $('#access_point_latitude').val(geometry.y);
+                          $('#access_point_coordinates').val(geometry.y.toString()+ ","+ geometry.x.toString());
 
                           if(referential_projection != undefined)
                           {
                             projection_geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), referential_projection );
-                            $('#access_point_projection_x').val(projection_geometry.x);
-                            $('#access_point_projection_y').val(projection_geometry.y);                                                   }
+                            $('#access_point_projection_xy').val(projection_geometry.x.toString()+ ","+ projection_geometry.y.toString());                                                   }
                          }
                       });
 EOF
diff --git a/app/maps/stop_area_map.rb b/app/maps/stop_area_map.rb
index 6c3dd5feb..3fff4a110 100644
--- a/app/maps/stop_area_map.rb
+++ b/app/maps/stop_area_map.rb
@@ -34,14 +34,12 @@ class StopAreaMap < ApplicationMap
           edit_stop_area_layer.events.on({ 
                           'afterfeaturemodified': function(event) { 
                             geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
-                            $('#stop_area_longitude').val(geometry.x);
-                            $('#stop_area_latitude').val(geometry.y);
+                            $('#stop_area_coordinates').val(geometry.y.toString()+ ","+ geometry.x.toString());
 
                             if(referential_projection != undefined)
                             {
                               projection_geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), referential_projection );
-                              $('#stop_area_projection_x').val(projection_geometry.x);
-                              $('#stop_area_projection_y').val(projection_geometry.y);                                                   }
+                              $('#stop_area_projection_xy').val(projection_geometry.x.toString()+ ","+ projection_geometry.y.toString());                                                   }
                            }
                         });
 EOF
diff --git a/app/models/referential.rb b/app/models/referential.rb
index b3c37554f..4209a6fac 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -221,7 +221,7 @@ Rails.application.config.after_initialize do
 
   class Chouette::StopArea
 
-    attr_accessible :projection_x,:projection_y
+    attr_accessible :projection_x,:projection_y,:projection_xy
     attr_accessible :address
     attr_reader :address
 
@@ -232,24 +232,13 @@ Rails.application.config.after_initialize do
     end
 
     # add projection_type set on pre-insert and pre_update action
-    before_validation :set_projections
+    before_save :set_projections
     def set_projections
-      if ! self.latitude.nil? && ! self.longitude.nil?
+      if ! self.coordinates.blank?
         self.long_lat_type = 'WGS84'
       else
         self.long_lat_type = nil
       end
-#      if ! self.referential.projection_type.nil? && !self.referential.projection_type.empty?
-#        if ! self.x.nil?  && ! self.y.nil?
-#          self.projection_type = referential.projection_type_label
-#        else
-#          self.projection_type = nil
-#        end
-#      else
-#          self.projection_type = nil
-#          self.x = nil
-#          self.y = nil
-#      end
     end
 
     def projection
@@ -266,7 +255,6 @@ Rails.application.config.after_initialize do
         nil
       else
         @point ||= GeoRuby::SimpleFeatures::Point::from_lat_lng(Geokit::LatLng.new(self.latitude,self.longitude)).project_to(self.projection.to_i)
-
         @point.x
       end
     end
@@ -278,39 +266,39 @@ Rails.application.config.after_initialize do
         @point.y
       end
     end
+    def projection_xy
+      if self.long_lat_type.nil? || self.projection.nil?
+        nil
+      else
+        @point ||= GeoRuby::SimpleFeatures::Point::from_lat_lng(Geokit::LatLng.new(self.latitude,self.longitude)).project_to(self.projection.to_i)
+        @point.x.to_s+","+@point.y.to_s
+      end
+    end
     def projection_x=(dummy)
       # dummy method
     end
     def projection_y=(dummy)
       # dummy method
     end
+    def projection_xy=(dummy)
+      # dummy method
+    end
 
   end
 
   Chouette::AccessPoint
 
   class Chouette::AccessPoint
-    attr_accessible :projection_x,:projection_y
+    attr_accessible :projection_x,:projection_y,:projection_xy
 
     # add projection_type set on pre-insert and pre_update action
-    before_validation :set_projections
+    before_save :set_projections
     def set_projections
-      if ! self.latitude.nil? && ! self.longitude.nil?
+      if ! self.coordinates.blank?
         self.long_lat_type = 'WGS84'
       else
         self.long_lat_type = nil
       end
-#      if ! self.referential.projection_type.nil? && !self.referential.projection_type.empty?
-#        if ! self.x.nil?  && ! self.y.nil?
-#          self.projection_type = referential.projection_type_label
-#        else
-#          self.projection_type = nil
-#        end
-#      else
-#          self.projection_type = nil
-#          self.x = nil
-#          self.y = nil
-#      end
     end
 
     def projection
@@ -327,7 +315,6 @@ Rails.application.config.after_initialize do
         nil
       else
         @point ||= GeoRuby::SimpleFeatures::Point::from_lat_lng(Geokit::LatLng.new(self.latitude,self.longitude)).project_to(self.projection.to_i)
-
         @point.x
       end
     end
@@ -339,12 +326,23 @@ Rails.application.config.after_initialize do
         @point.y
       end
     end
+    def projection_xy
+      if self.long_lat_type.nil? || self.projection.nil?
+        nil
+      else
+        @point ||= GeoRuby::SimpleFeatures::Point::from_lat_lng(Geokit::LatLng.new(self.latitude,self.longitude)).project_to(self.projection.to_i)
+        @point.x.to_s+","+@point.y.to_s
+      end
+    end
     def projection_x=(dummy)
       # dummy method
     end
     def projection_y=(dummy)
       # dummy method
     end
+    def projection_xy=(dummy)
+      # dummy method
+    end
   end
 
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 1b9ec7416..ae6cceeee 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,6 +17,7 @@ class User < ActiveRecord::Base
 
   before_validation(:on => :create) do
     self.password ||= Devise.friendly_token.first(6)
+    self.password_confirmation ||= self.password
   end
   
   # remove organisation and referentials if last user of it
diff --git a/app/views/access_points/_form.html.erb b/app/views/access_points/_form.html.erb
index e25379d8f..adbfd0348 100644
--- a/app/views/access_points/_form.html.erb
+++ b/app/views/access_points/_form.html.erb
@@ -9,29 +9,29 @@
     :collection => Chouette::AccessPoint.access_point_types, :include_blank => false, :member_label => Proc.new { |access_point_type| t("access_types.label.#{access_point_type}") }  %>
         <%= form.input :street_name %>              
         <%= form.input :country_code %>              
+        <%= form.input :zip_code %>              
+        <%= form.input :city_name %>              
         <%= form.input :comment %>
         <%= form.input :openning_time, :as => :time_picker, :input_html => { :class => "form-control input-sm timepicker_basic"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
         <%= form.input :closing_time, :as => :time_picker, :input_html => { :class => "form-control input-sm timepicker_basic"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
         <%= form.input :mobility_restricted_suitability,:as => :boolean %>
         <%= form.input :stairs_availability,:as => :boolean %>
         <%= form.input :lift_availability,:as => :boolean %>
-        <%= form.input :objectid, :required => !@access_point.new_record? %>
+        <%= form.input :objectid, :required => !@access_point.new_record?, :input_html => { :title => t("formtastic.titles.access_point.objectid")}  %>
         
         <%= form.inputs :name => t('access_points.show.geographic_data') do %> 
           <% if ! @referential.projection_type_label.empty? %>
             <div class="panel panel-default">
-              <div class="panel-heading">@referential.projection_type_label</div>
+              <div class="panel-heading"><%= @referential.projection_type_label %></div>
               <div class="panel-body">
-	              <%= form.input :projection_x %>
-	              <%= form.input :projection_y %>
+	              <%= form.input :projection_xy, :input_html => { :title => t("formtastic.titles.access_point.projection_xy")} %>
               </div>
             </div>	       
           <% end %>
           <div class="panel panel-default">
             <div class="panel-heading">WGS84</div>
             <div class="panel-body">
-	            <%= form.input :longitude %>
-	            <%= form.input :latitude %>
+	            <%= form.input :coordinates, :input_html => { :title => t("formtastic.titles.access_point.coordinates")} %>
             </div>
           </div>       
         <% end %>
diff --git a/app/views/access_points/show.html.erb b/app/views/access_points/show.html.erb
index d674ef88b..7cd7b4920 100644
--- a/app/views/access_points/show.html.erb
+++ b/app/views/access_points/show.html.erb
@@ -25,6 +25,14 @@
       <%= @access_point.country_code %>
     </p>
     <p>
+      <label><%= @access_point.human_attribute_name("zip_code") %>: </label>
+      <%= @access_point.zip_code %>
+    </p>
+    <p>
+      <label><%= @access_point.human_attribute_name("city_name") %>: </label>
+      <%= @access_point.city_name %>
+    </p>
+    <p>
       <label><%= @access_point.human_attribute_name("access_point_type") %>: </label>
       <%= t("access_types.label.#{@access_point.access_point_type}") %>
     </p>
@@ -85,10 +93,6 @@
 	    </p>
 	    <% end %>
     <% end %>
-    <p>
-      <label><%= @access_point.human_attribute_name("objectid") %>: </label>
-      <%= @access_point.objectid %>
-    </p>
   </div>
                            
 </div>
@@ -133,6 +137,7 @@
                          
 <% content_for :sidebar do %>
 <ul class="actions">
+  <li><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "add" %></li>
   <li><%= link_to t('access_points.actions.edit'), edit_referential_stop_area_access_point_path(@referential, @stop_area, @access_point), :class => "edit" %></li>
   <li><%= link_to  t('access_points.actions.destroy'), referential_stop_area_access_point_path(@referential, @stop_area, @access_point), :method => :delete, :data => {:confirm =>  t('access_points.actions.destroy_confirm')}, :class => "remove" %></li>
 </ul>
diff --git a/app/views/help/index.textile b/app/views/help/index.textile
index 8907abe4d..3e0af420b 100644
--- a/app/views/help/index.textile
+++ b/app/views/help/index.textile
@@ -30,8 +30,11 @@ h4. Version 2.4.1
 ** L'export GTFS exige que l'indice de ligne soit renseigné (Mantis 26726)
 ** L'import GTFS ne tient pas compte des courses commençant après minuit (Mantis 25824)
 ** Mise en place d'un script produisant l'aide en ligne sous forme de docx (Mantis 26604)
-** L'import GTFS plante sur une course qui dessert plus de 2 fois le même arrêt (Mantis 26755)
+** L'import GTFS ne fonctionne pas sur une course qui dessert plus de 2 fois le même arrêt (Mantis 26755)
 ** L'export NeTEx produit un fichier invalide si le champ VersionDate du réseau est vide (Mantis 26434)
+** Liens cassés dans les pages d'aide (Mantis 26690)
+** La validation ne fonctionne pas si un arrêt n'est pas géolocalisé (Mantis 26931) 
+** L'import ne fonctionne pas si l'encodage du catalogue d'un ZIP n'est pas compatible UTF-8 (Mantis 27011) 
 
 h4. Version 2.4.0
 
diff --git a/app/views/routes/_form.html.erb b/app/views/routes/_form.html.erb
index 508593d07..ff4a4403e 100644
--- a/app/views/routes/_form.html.erb
+++ b/app/views/routes/_form.html.erb
@@ -13,9 +13,11 @@
 		<%= form.semantic_fields_for :stop_points, :include_id => false, :label => "TOTO" do |p| %>
           <%= render "stop_point_fields",  :f => p, :test1 => "oiuoiu" %>
 		<% end %>
-    <div class="links">
+      <div class="links">
 	    <%= link_to_add_association t("routes.actions.add_stop_point"), form, :stop_points, :class => 'add_stop_point' %>
-    </div>
+      <br/>
+        <%= link_to t('routes.actions.new_stop_point'), new_referential_stop_area_path(@referential), {:class => "add", :target => "_blank"} %>
+      </div>
 	</div>
 
    <%= form.actions do %>
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb
index a51c11da5..38545e0ea 100644
--- a/app/views/stop_areas/_form.html.erb
+++ b/app/views/stop_areas/_form.html.erb
@@ -15,21 +15,21 @@
           <div class="panel panel-default">
             <div class="panel-heading"><%= @referential.projection_type_label %></div>
             <div class="panel-body">
-	      <%= form.input :projection_x %>
-	      <%= form.input :projection_y %>
+	      <%= form.input :projection_xy, :input_html => { :title => t("formtastic.titles.stop_area.projection_xy")} %>
             </div>
           </div>	       
-	<% end %>
+	    <% end %>
         <div class="panel panel-default">
           <div class="panel-heading">WGS84</div>
           <div class="panel-body">
-	    <%= form.input :longitude %>
-	    <%= form.input :latitude %>
+	    <%= form.input :coordinates, :input_html => { :title => t("formtastic.titles.stop_area.coordinates")} %>
           </div>
         </div>       
-        <%= form.input :registration_number %>
+        <%= form.input :registration_number, :input_html => { :title => t("formtastic.titles.stop_area.registration_number")} %>
         <%= form.input :street_name %>              
         <%= form.input :country_code %>              
+        <%= form.input :zip_code %>              
+        <%= form.input :city_name %>              
         <%= form.input :fare_code %>              
         <%= form.input :nearest_topic_name %>              
         <%= form.input :comment, :as => :text %>              
@@ -40,7 +40,7 @@
 	  <%= form.input :lift_availability,:as => :boolean %>	     
         <% end %>
 
-        <%= form.input :objectid, :required => !@stop_area.new_record? %>  
+        <%= form.input :objectid, :required => !@stop_area.new_record?, :input_html => { :title => t("formtastic.titles.stop_area.objectid")} %>  
 
       <% end %>
 
@@ -94,9 +94,10 @@
   );
 
   $('.typeahead').on('typeahead:selected', function($e, datum) {
-    $('input[name="stop_area[longitude]"]').val(datum.lon);
-    $('input[name="stop_area[latitude]"]').val(datum.lat);
+    $('input[name="stop_area[coordinates]"]').val(datum.lat+","+datum.lon);
+    $('input[name="stop_area[coordinates]"]').change();
     $('input[name="stop_area[street_name]"]').val(datum.road);
-    $('input[name="stop_area[country_code]"]').val(datum.postcode);
+    $('input[name="stop_area[zip_code]"]').val(datum.postcode);
+    $('input[name="stop_area[city_name]"]').val(datum.city);
   })
 </script>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index d812ff4e3..dc2e60349 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -26,6 +26,14 @@
       <%= @stop_area.country_code %>
     </p>
     <p>
+      <label><%= @stop_area.human_attribute_name("zip_code") %>: </label>
+      <%= @stop_area.zip_code %>
+    </p>
+    <p>
+      <label><%= @stop_area.human_attribute_name("city_name") %>: </label>
+      <%= @stop_area.city_name %>
+    </p>
+    <p>
       <label><%= @stop_area.human_attribute_name("fare_code") %>: </label>
       <%= @stop_area.fare_code %>
     </p>
@@ -84,10 +92,6 @@
 		    <% end %>
 	    <% end %>
     <% end %>
-    <p>
-      <label><%= @stop_area.human_attribute_name("objectid") %>: </label>
-      <%= @stop_area.objectid %>
-    </p>
   </div>
 </div>
 <p class="after_map" />
@@ -110,6 +114,7 @@
     <table>
     <tr><td>	
 	<ul class="actions">
+      <li><%= link_to t('stop_areas.actions.new'), new_referential_stop_area_path(@referential), :class => "add" %></li>
 	  <li><%= link_to t('stop_areas.actions.edit'), edit_referential_stop_area_path(@referential, @stop_area), :class => "edit" %></li>
 	  <li><%= link_to  t('stop_areas.actions.destroy'), referential_stop_area_path(@referential, @stop_area), :method => :delete, :data => {:confirm =>  t('stop_areas.actions.destroy_confirm')}, :class => "remove" %></li>
 	</ul>