remove projection attributes from stop areas and access points in database

7 files changed, 23 insertions, 23 deletions

diff --git a/app/views/access_points/_form.html.erb b/app/views/access_points/_form.html.erb
index cd728f0d6..8e546a878 100644
--- a/app/views/access_points/_form.html.erb
+++ b/app/views/access_points/_form.html.erb
@@ -26,8 +26,8 @@
     <%= form.inputs :name => t('access_points.show.geographic_data') do %> 
       <% if ! @referential.projection_type_label.empty? %>
         <%= form.inputs :name => @referential.projection_type_label do %> 
-          <%= form.input :x %>
-          <%= form.input :y %>
+          <%= form.input :projection_x %>
+          <%= form.input :projection_y %>
         <% end %>
       <% end %>
       <%= form.inputs :name => "WGS84" do %> 
diff --git a/app/views/access_points/show.html.erb b/app/views/access_points/show.html.erb
index 6361e2115..7f34ed0e0 100644
--- a/app/views/access_points/show.html.erb
+++ b/app/views/access_points/show.html.erb
@@ -56,18 +56,18 @@
     <% if @access_point.projection_type == nil && @access_point.long_lat_type == nil %>
 	    <span class='geo_data'><%= t('access_points.show.no_geographic_data') %></span>
     <% else %>
-	    <% if !@access_point.projection_type.nil? %>
+	    <% if !@access_point.projection.nil? %>
 	    <p>
-	      <span class='geo_data'><%= @access_point.human_attribute_name("projection_type") %>: </span>
-	      <%= @access_point.projection_type %>
+	      <span class='geo_data'><%= @access_point.human_attribute_name("projection") %>: </span>
+	      <%= @access_point.projection %>
 	    </p>
 	    <p>
-	      <span class='geo_data'><%= @access_point.human_attribute_name("x") %>: </span>
-	      <%= @access_point.x %>
+	      <span class='geo_data'><%= @access_point.human_attribute_name("projection_x") %>: </span>
+	      <%= @access_point.projection_x %>
 	    </p>
 	    <p>
-	      <span class='geo_data'><%= @access_point.human_attribute_name("y") %>: </span>
-	      <%= @access_point.y %>
+	      <span class='geo_data'><%= @access_point.human_attribute_name("projection_y") %>: </span>
+	      <%= @access_point.projection_y %>
 	    </p>
 	    <% end %>
 	    <% if !@access_point.long_lat_type.nil? %>
diff --git a/app/views/api/kml/stop_areas/_stop_area.kml.erb b/app/views/api/kml/stop_areas/_stop_area.kml.erb
index 1383fbf66..401bff052 100644
--- a/app/views/api/kml/stop_areas/_stop_area.kml.erb
+++ b/app/views/api/kml/stop_areas/_stop_area.kml.erb
@@ -11,9 +11,9 @@
       <longitude><%= stop_area.longitude.to_s.html_safe %></longitude>
       <latitude><%= stop_area.latitude.to_s.html_safe %></latitude>
       <long_lat_type><%= stop_area.long_lat_type.to_s.html_safe %></long_lat_type>
-      <x><%= stop_area.x.to_s.html_safe %></x>
-      <y><%= stop_area.y.to_s.html_safe %></y>
-      <projection_type><%= stop_area.projection_type.to_s.html_safe %></projection_type>
+      <x><%= stop_area.projection_x.to_s.html_safe %></x>
+      <y><%= stop_area.projection_y.to_s.html_safe %></y>
+      <projection_type><%= stop_area.projection.to_s.html_safe %></projection_type>
       <country_code><%= stop_area.country_code.to_s.html_safe %></country_code>
       <street_name><%= stop_area.street_name.to_s.html_safe %></street_name>
     
diff --git a/app/views/api/v1/access_points/show.rabl b/app/views/api/v1/access_points/show.rabl
index 07daffb44..1d413fb7c 100644
--- a/app/views/api/v1/access_points/show.rabl
+++ b/app/views/api/v1/access_points/show.rabl
@@ -2,7 +2,7 @@ object @access_point
 extends "api/v1/trident_objects/show"
 
 [ :longitude, :latitude, :long_lat_type, :street_name, :country_code, 
-    :x , :y , :projection_type, :name, :access_type, 
+    :projection_x , :projection_y , :projection, :name, :access_type, 
     :openning_time, :closing_time, 
     :mobility_restricted_suitability, :stairs_availability, :lift_availability, :comment].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
diff --git a/app/views/api/v1/stop_areas/show.rabl b/app/views/api/v1/stop_areas/show.rabl
index 976d96342..1a0acecc5 100644
--- a/app/views/api/v1/stop_areas/show.rabl
+++ b/app/views/api/v1/stop_areas/show.rabl
@@ -3,7 +3,7 @@ extends "api/v1/trident_objects/show"
 
 [ :name, :area_type,:nearest_topic_name, :fare_code, :registration_number, 
   :longitude, :latitude, :long_lat_type,
-  :country_code, :street_name, :x, :y, :projection_type, :comment
+  :country_code, :street_name, :projection_x, :projection_y, :projection, :comment
 ].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb
index 5fca012f3..e649070ab 100644
--- a/app/views/stop_areas/_form.html.erb
+++ b/app/views/stop_areas/_form.html.erb
@@ -15,8 +15,8 @@
 	    <%= form.inputs :name => t('stop_areas.show.geographic_data') do %> 
 	      <% if ! @referential.projection_type_label.empty? %>
 	        <%= form.inputs :name => @referential.projection_type_label do %> 
-	          <%= form.input :x %>
-	          <%= form.input :y %>
+	          <%= form.input :projection_x %>
+	          <%= form.input :projection_y %>
 	        <% end %>
 	      <% end %>
 	      <%= form.inputs :name => "WGS84" do %> 
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index 9d0db8af8..b98378d71 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -42,18 +42,18 @@
 	    <% if @stop_area.projection_type == nil && @stop_area.long_lat_type == nil %>
 		    <span class='geo_data'><%= t('stop_areas.show.no_geographic_data') %></span>
 	    <% else %>
-		    <% if !@stop_area.projection_type.nil? %>
+		    <% if !@stop_area.projection.nil? %>
 		    <p>
-		      <span class='geo_data'><%= @stop_area.human_attribute_name("projection_type") %>: </span>
-		      <%= @stop_area.projection_type %>
+		      <span class='geo_data'><%= @stop_area.human_attribute_name("projection") %>: </span>
+		      <%= @stop_area.projection %>
 		    </p>
 		    <p>
-		      <span class='geo_data'><%= @stop_area.human_attribute_name("x") %>: </span>
-		      <%= @stop_area.x %>
+		      <span class='geo_data'><%= @stop_area.human_attribute_name("projection_x") %>: </span>
+		      <%= @stop_area.projection_x %>
 		    </p>
 		    <p>
-		      <span class='geo_data'><%= @stop_area.human_attribute_name("y") %>: </span>
-		      <%= @stop_area.y %>
+		      <span class='geo_data'><%= @stop_area.human_attribute_name("projection_y") %>: </span>
+		      <%= @stop_area.projection_y %>
 		    </p>
 		    <% end %>
 		    <% if !@stop_area.long_lat_type.nil? %>