protect string values in kml export, put reference to objectid instead of db id

6 files changed, 61 insertions, 299 deletions

diff --git a/app/views/api/kml/access_links/index.kml.erb b/app/views/api/kml/access_links/index.kml.erb
index 2a08f75cd..5de679beb 100644
--- a/app/views/api/kml/access_links/index.kml.erb
+++ b/app/views/api/kml/access_links/index.kml.erb
@@ -4,67 +4,20 @@
     <name>liens acces arrets</name>
     <% @access_links.each do |access_link| %>    
       <Placemark id="<%= access_link.objectid %>" >
-        <name><%=  access_link.name %></name>    
+        <name><%= h(access_link.name) %></name>    
         <ExtendedData>
-          <Data name="access_point_id">
-            <value><%= access_link.access_point_id %></value>
-          </Data>
-          <Data name="stop_area_id">
-            <value><%= access_link.stop_area_id %></value>
-          </Data>
-          <Data name="object_id">
-            <value><%= access_link.objectid %></value>
-          </Data>
-          <Data name="object_version">
-            <value><%= access_link.object_version %></value>
-          </Data>
-          <Data name="creation_time">
-            <value><%= access_link.creation_time %></value>
-          </Data>
-          <Data name="creator_id">
-            <value><%= access_link.creator_id %></value>
-          </Data>
-          <Data name="name">
-            <value><%= access_link.name %></value>
-          </Data>
-          <Data name="comment">
-            <value><%= access_link.comment %></value>
-          </Data>
-          <Data name="link_distance">
-            <value><%= access_link.link_distance %></value>
-          </Data>
-                    <Data name="link_type">
-            <value><%= access_link.link_type %></value>
-          </Data>
-          <Data name="default_duration">
-            <value><%= access_link.default_duration %></value>
-          </Data>
-          <Data name="frequent_traveller_duration">
-            <value><%= access_link.frequent_traveller_duration %></value>
-          </Data>
-          <Data name="occasional_traveller_duration">
-            <value><%= access_link.occasional_traveller_duration %></value>
-          </Data>
-          <Data name="mobility_restricted_traveller_duration">
-            <value><%= access_link.mobility_restricted_traveller_duration %></value>
-          </Data>
-          <Data name="mobility_restricted_suitability">
-            <value><%= access_link.mobility_restricted_suitability %></value>
-          </Data>
-          <Data name="stairs_availability">
-            <value><%= access_link.stairs_availability %></value>
-          </Data>
-          <Data name="lift_availability">
-            <value><%= access_link.lift_availability %></value>
-          </Data>          
-          <Data name="int_user_needs">
-            <value><%= access_link.int_user_needs %></value>
-          </Data>          
-          <Data name="link_orientation">
-            <value><%= access_link.link_orientation %></value>
-          </Data>
+        <% [ :access_link_type, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation].each do |prop| %>
+          <Data name="<%= prop.to_s %>">
+            <value><%= h(access_link.send( prop)) %></value>
+          </Data>
+        <% end %>
+        <Data name="access_point_objectid">
+          <value><%= h(access_link.access_point.object_id) %></value>
+        </Data>
+        <Data name="stop_area_objectid">
+          <value><%= h(access_link.stop_area.object_id) %></value>
+        </Data>
         </ExtendedData>        
-    
         <%= access_link.geometry_presenter.geometry.kml_representation.html_safe %>
       </Placemark>
     <% end %>
diff --git a/app/views/api/kml/access_points/index.kml.erb b/app/views/api/kml/access_points/index.kml.erb
index ac04dfc56..2a78d9a03 100644
--- a/app/views/api/kml/access_points/index.kml.erb
+++ b/app/views/api/kml/access_points/index.kml.erb
@@ -4,64 +4,17 @@
     <name>access</name>
     <% @access_points.each do |access_point| %>    
       <Placemark id="<%= access_point.objectid %>" >
-        <name><%=  access_point.name %></name>    
+        <name><%= h(access_point.name) %></name>    
         <ExtendedData>
-          <Data name="object_id">
-            <value><%= access_point.objectid %></value>
-          </Data>
-          <Data name="object_version">
-            <value><%= access_point.object_version %></value>
-          </Data>
-          <Data name="creation_time">
-            <value><%= access_point.creation_time %></value>
-          </Data>
-          <Data name="creator_id">
-            <value><%= access_point.creator_id %></value>
-          </Data>
-          <Data name="name">
-            <value><%= access_point.name %></value>
-          </Data>
-          <Data name="comment">
-            <value><%= access_point.comment %></value>
-          </Data>
-          <Data name="longitude">
-            <value><%= access_point.longitude %></value>
-          </Data>
-          <Data name="latitude">
-            <value><%= access_point.latitude %></value>
-          </Data>
-          <Data name="long_lat_type">
-            <value><%= access_point.long_lat_type %></value>
-          </Data>
-          <Data name="country_code">
-            <value><%= access_point.country_code %></value>
-          </Data>
-          <Data name="street_name">
-            <value><%= access_point.street_name %></value>
-          </Data>
-          <Data name="contained_in">
-            <value><%= access_point.contained_in %></value>
-          </Data>
-          <Data name="openning_time">
-            <value><%= access_point.openning_time %></value>
-          </Data>
-          <Data name="closing_time">
-            <value><%= access_point.closing_time %></value>
-          </Data>
-          <Data name="access_type">
-            <value><%= access_point.access_type %></value>
-          </Data>          
-          <Data name="lift_availability">
-            <value><%= access_point.lift_availability %></value>
-          </Data>          
-          <Data name="mobility_restricted_suitability">
-            <value><%= access_point.mobility_restricted_suitability %></value>
-          </Data>          
-          <Data name="stairs_availability">
-            <value><%= access_point.stairs_availability %></value>
-          </Data>          
+        <% [ :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability].each do |prop| %>
+          <Data name="<%= prop.to_s %>">
+            <value><%= h(access_point.send( prop)) %></value>
+          </Data>
+        <% end %>
+        <Data name="stop_area_objectid">
+          <value><%= h(access_point.stop_area.object_id) %></value>
+        </Data>
         </ExtendedData>        
-    
         <%= access_point.geometry_presenter.geometry.kml_representation.html_safe %>
       </Placemark>
     <% end %>
diff --git a/app/views/api/kml/connection_links/index.kml.erb b/app/views/api/kml/connection_links/index.kml.erb
index 30144047a..8c35dcc95 100644
--- a/app/views/api/kml/connection_links/index.kml.erb
+++ b/app/views/api/kml/connection_links/index.kml.erb
@@ -4,64 +4,20 @@
     <name>correspondances</name>
     <% @connection_links.each do |connection_link| %>    
       <Placemark id="<%= connection_link.objectid %>" >
-        <name><%=  connection_link.name %></name>    
+        <name><%= h(connection_link.name) %></name>    
         <ExtendedData>
-          <Data name="departure_id">
-            <value><%= connection_link.departure_id %></value>
-          </Data>
-          <Data name="arrival_id">
-            <value><%= connection_link.arrival_id %></value>
-          </Data>
-          <Data name="object_id">
-            <value><%= connection_link.objectid %></value>
-          </Data>
-          <Data name="object_version">
-            <value><%= connection_link.object_version %></value>
-          </Data>
-          <Data name="creation_time">
-            <value><%= connection_link.creation_time %></value>
-          </Data>
-          <Data name="creator_id">
-            <value><%= connection_link.creator_id %></value>
-          </Data>
-          <Data name="name">
-            <value><%= connection_link.name %></value>
-          </Data>
-          <Data name="comment">
-            <value><%= connection_link.comment %></value>
-          </Data>
-          <Data name="link_distance">
-            <value><%= connection_link.link_distance %></value>
-          </Data>
-          <Data name="link_type">
-            <value><%= connection_link.link_type %></value>
-          </Data>
-          <Data name="default_duration">
-            <value><%= connection_link.default_duration %></value>
-          </Data>
-          <Data name="frequent_traveller_duration">
-            <value><%= connection_link.frequent_traveller_duration %></value>
-          </Data>
-          <Data name="occasional_traveller_duration">
-            <value><%= connection_link.occasional_traveller_duration %></value>
-          </Data>
-          <Data name="mobility_restricted_traveller_duration">
-            <value><%= connection_link.mobility_restricted_traveller_duration %></value>
-          </Data>
-          <Data name="mobility_restricted_suitability">
-            <value><%= connection_link.mobility_restricted_suitability %></value>
-          </Data>
-          <Data name="stairs_availability">
-            <value><%= connection_link.stairs_availability %></value>
-          </Data>
-          <Data name="lift_availability">
-            <value><%= connection_link.lift_availability %></value>
-          </Data>          
-          <Data name="int_user_needs">
-            <value><%= connection_link.int_user_needs %></value>
-          </Data>          
+        <% [ :connection_link_type, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| %>
+          <Data name="<%= prop.to_s %>">
+            <value><%= h(connection_link.send( prop)) %></value>
+          </Data>
+        <% end %>
+        <Data name="departure_objectid">
+          <value><%= h(connection_link.departure.object_id) %></value>
+        </Data>
+        <Data name="arrival_objectid">
+          <value><%= h(connection_link.arrival.object_id) %></value>
+        </Data>
         </ExtendedData>        
-    
         <%= connection_link.geometry_presenter.geometry.kml_representation.html_safe %>
       </Placemark>
     <% end %>
diff --git a/app/views/api/kml/lines/show.kml.erb b/app/views/api/kml/lines/show.kml.erb
index 7f123874c..b29a5b75c 100644
--- a/app/views/api/kml/lines/show.kml.erb
+++ b/app/views/api/kml/lines/show.kml.erb
@@ -1,47 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
-    <name><%= @line.name %></name>
+    <name><%= h(@line.name) %></name>
     <Placemark id="<%= @line.objectid %>" >
-      <name><%= @line.name %></name>
+      <name><%= h(@line.name) %></name>
       <ExtendedData>
-        <Data name="object_id">
-          <value><%= @line.objectid %></value>
+      <% [ :transport_mode, :objectid, :object_version, :creation_time, :creator_id, :name, :number, :published_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs].each do |prop| %>
+        <Data name="<%= prop.to_s %>">
+          <value><%= h(@line.send( prop)) %></value>
         </Data>
-        <Data name="object_version">
-          <value><%= @line.object_version %></value>
+      <% end %>
+        <Data name="company_objectid">
+          <value><%= h(@line.company.object_id) %></value>
         </Data>
-        <Data name="creation_time">
-          <value><%= @line.creation_time %></value>
+        <Data name="network_objectid">
+          <value><%= h(@line.network.object_id) %></value>
         </Data>
-        <Data name="creator_id">
-          <value><%= @line.creator_id %></value>
-        </Data>
-        <Data name="name">
-          <value><%= @line.name %></value>
-        </Data>
-        <Data name="number">
-          <value><%= @line.number %></value>
-        </Data>
-        <Data name="published_name">
-          <value><%= @line.published_name %></value>
-        </Data>
-        <Data name="transport_mode_name">
-          <value><%= @line.transport_mode_name %></value>
-        </Data>
-        <Data name="registration_number">
-          <value><%= @line.registration_number %></value>
-        </Data>
-        <Data name="comment">
-          <value><%= @line.comment %></value>
-        </Data>
-        <Data name="mobility_restricted_suitability">
-          <value><%= @line.mobility_restricted_suitability %></value>
-        </Data>
-        <Data name="int_user_needs">
-          <value><%= @line.int_user_needs %></value>
-        </Data>
-      </ExtendedData>          
+      </ExtendedData>        
       <%= @line.geometry_presenter.geometry.kml_representation.html_safe %>
     </Placemark>
   </Document>
diff --git a/app/views/api/kml/routes/show.kml.erb b/app/views/api/kml/routes/show.kml.erb
index 310eb418b..2f7031854 100644
--- a/app/views/api/kml/routes/show.kml.erb
+++ b/app/views/api/kml/routes/show.kml.erb
@@ -2,45 +2,17 @@
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
     <Placemark id="<%= @route.objectid %>" >
-      <name><%= @route.name %></name>
+      <name><%= h(@route.name) %></name>
       <ExtendedData>
-        <Data name="object_id">
-          <value><%= @route.objectid %></value>
+      <% [:direction_code, :wayback_code, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :published_name, :number, :direction, :wayback].each do |prop| %>
+        <Data name="<%= prop.to_s %>">
+          <value><%= h(@route.send( prop)) %></value>
         </Data>
-        <Data name="object_version">
-          <value><%= @route.object_version %></value>
+      <% end %>
+        <Data name="line_objectid">
+          <value><%= h(@route.line.object_id) %></value>
         </Data>
-        <Data name="creation_time">
-          <value><%= @route.creation_time %></value>
-        </Data>
-        <Data name="creator_id">
-          <value><%= @route.creator_id %></value>
-        </Data>
-        <Data name="name">
-          <value><%= @route.name %></value>
-        </Data>
-        <Data name="direction_code">
-          <value><%= @route.direction_code %></value>
-        </Data>
-        <Data name="comment">
-          <value><%= @route.comment %></value>
-        </Data>        
-        <Data name="published_name">
-          <value><%= @route.published_name %></value>
-        </Data>        
-        <Data name="number">
-          <value><%= @route.number %></value>
-        </Data>        
-        <Data name="direction">
-          <value><%= @route.direction %></value>
-        </Data>        
-        <Data name="number">
-          <value><%= @route.number %></value>
-        </Data>        
-        <Data name="wayback">
-          <value><%= @route.wayback %></value>
-        </Data>        
-      </ExtendedData>  
+      </ExtendedData>        
       <%= @route.geometry_presenter.geometry.kml_representation.html_safe %>
     </Placemark>
   </Document>
diff --git a/app/views/api/kml/stop_areas/index.kml.erb b/app/views/api/kml/stop_areas/index.kml.erb
index 1a9ed171c..ed3642890 100644
--- a/app/views/api/kml/stop_areas/index.kml.erb
+++ b/app/views/api/kml/stop_areas/index.kml.erb
@@ -3,65 +3,18 @@
   <Document>
     <% @stop_areas.select { |sa| sa.latitude && sa.longitude}.each do |stop_area| %>    
       <Placemark id="<%= stop_area.objectid %>" >
-        <name><%=  stop_area.name %></name>    
+        <name><%=  h(stop_area.name) %></name>    
         <ExtendedData>
-          <Data name="object_id">
-            <value><%= stop_area.objectid %></value>
+        <% [:objectid, :object_version, :creation_time, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| %>
+          <Data name="<%= prop.to_s %>">
+            <value><%= h(stop_area.send( prop)) %></value>
           </Data>
-          <Data name="object_version">
-            <value><%= stop_area.object_version %></value>
-          </Data>
-          <Data name="object_id">
-            <value><%= stop_area.objectid %></value>
-          </Data>
-          <Data name="creation_time">
-            <value><%= stop_area.creation_time %></value>
-          </Data>
-          <Data name="creator_id">
-            <value><%= stop_area.creator_id %></value>
-          </Data>
-          <Data name="name">
-            <value><%= stop_area.name %></value>
-          </Data>
-          <Data name="comment">
-            <value><%= stop_area.comment %></value>
-          </Data>
-          <Data name="area_type">
-            <value><%= stop_area.area_type %></value>
-          </Data>
-          <Data name="registration_number">
-            <value><%= stop_area.registration_number %></value>
-          </Data>
-          <Data name="nearest_topic_name">
-            <value><%= stop_area.nearest_topic_name %></value>
-          </Data>
-          <Data name="fare_code">
-            <value><%= stop_area.fare_code %></value>
-          </Data>
-          <Data name="longitude">
-            <value><%= stop_area.longitude %></value>
-          </Data>
-          <Data name="latitude">
-            <value><%= stop_area.latitude %></value>
-          </Data>
-          <Data name="long_lat_type">
-            <value><%= stop_area.long_lat_type %></value>
-          </Data>
-          <Data name="projection_x">
-            <value><%= stop_area.projection_x %></value>
-          </Data>
-          <Data name="projection_y">
-            <value><%= stop_area.projection_y %></value>
-          </Data>
-          <Data name="projection">
-            <value><%= stop_area.projection %></value>
-          </Data>
-          <Data name="country_code">
-            <value><%= stop_area.country_code %></value>
-          </Data>
-          <Data name="street_name">
-            <value><%= stop_area.street_name %></value>
+        <% end %>
+        <% if stop_area.parent %>
+          <Data name="parent_objectid">
+            <value><%= h(stop_area.parent.object_id) %></value>
           </Data>
+        <% end %>
         </ExtendedData>        
     
         <%= stop_area.geometry_presenter.geometry.kml_representation.html_safe %>