fix KML Export: Document/name

7 files changed, 24 insertions, 22 deletions

diff --git a/app/views/api/kml/access_links/index.kml.erb b/app/views/api/kml/access_links/index.kml.erb
index 1a93fb99e..e625a1a21 100644
--- a/app/views/api/kml/access_links/index.kml.erb
+++ b/app/views/api/kml/access_links/index.kml.erb
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
-    <name>liens acces arrets</name>
-    <% @access_links.each do |access_link| %>    
+    <name><%= h(Chouette::AccessLink.model_name.human) %> : <%= h(@journey_pattern.name) %></name>
+    <% @access_links.each do |access_link| %>
       <Placemark id="<%= access_link.objectid %>" >
-        <name><%= h(access_link.name) %></name>    
+        <name><%= h(access_link.name) %></name>
         <ExtendedData>
         <% [ :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 %>">
@@ -17,7 +17,7 @@
         <Data name="stop_area_objectid">
           <value><%= h(access_link.stop_area.objectid) %></value>
         </Data>
-        </ExtendedData>        
+        </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 7686df398..5e98260b6 100644
--- a/app/views/api/kml/access_points/index.kml.erb
+++ b/app/views/api/kml/access_points/index.kml.erb
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
+    <name><%= h(Chouette::AccessPoint.model_name.human) %> : <%= h(@journey_pattern.name) %></name>
     <name>access</name>
-    <% @access_points.each do |access_point| %>    
+    <% @access_points.each do |access_point| %>
       <Placemark id="<%= access_point.objectid %>" >
-        <name><%= h(access_point.name) %></name>    
+        <name><%= h(access_point.name) %></name>
         <ExtendedData>
         <% [ :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 %>">
@@ -14,7 +15,7 @@
         <Data name="stop_area_objectid">
           <value><%= h(access_point.stop_area.objectid) %></value>
         </Data>
-        </ExtendedData>        
+        </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 b1e2e9a1f..2c900aca0 100644
--- a/app/views/api/kml/connection_links/index.kml.erb
+++ b/app/views/api/kml/connection_links/index.kml.erb
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
-    <name>correspondances</name>
-    <% @connection_links.each do |connection_link| %>    
+    <name><%= h(Chouette::ConnectionLink.model_name.human) %> : <%= h(@journey_pattern.name) %></name>
+    <% @connection_links.each do |connection_link| %>
       <Placemark id="<%= connection_link.objectid %>" >
-        <name><%= h(connection_link.name) %></name>    
+        <name><%= h(connection_link.name) %></name>
         <ExtendedData>
         <% [ :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 %>">
@@ -17,7 +17,7 @@
         <Data name="arrival_objectid">
           <value><%= h(connection_link.arrival.objectid) %></value>
         </Data>
-        </ExtendedData>        
+        </ExtendedData>
         <%= connection_link.geometry_presenter.geometry.kml_representation.html_safe %>
       </Placemark>
     <% end %>
diff --git a/app/views/api/kml/journey_patterns/show.kml.erb b/app/views/api/kml/journey_patterns/show.kml.erb
index 6c269ab0e..b743a9e53 100644
--- a/app/views/api/kml/journey_patterns/show.kml.erb
+++ b/app/views/api/kml/journey_patterns/show.kml.erb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
-      <name><%= h(@journey_pattern.name) %></name>
+      <name><%= h(Chouette::JourneyPattern.model_name.human) %> : <%= h(@journey_pattern.name) %></name>
       <ExtendedData>
       <% [:objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name].each do |prop| %>
         <Data name="<%= prop.to_s %>">
@@ -11,12 +11,12 @@
         <Data name="route_objectid">
           <value><%= h(@journey_pattern.route.objectid) %></value>
         </Data>
-      </ExtendedData>        
+      </ExtendedData>
     <% @journey_pattern.route.stop_points.each_with_index do |stop_point, index| %>
       <% stop_area = stop_point.stop_area %>
       <% if stop_area.geometry %>
       <Placemark id="<%= stop_area.objectid %>" >
-        <name><%=  h(stop_area.name) %></name>    
+        <name><%=  h(stop_area.name) %></name>
         <ExtendedData>
         <% [ :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 %>">
@@ -31,8 +31,8 @@
           <Data name="stop">
             <value><%= @journey_pattern.stop_points.include?( stop_point) ? "true" : "false" %></value>
           </Data>
-        </ExtendedData>        
-    
+        </ExtendedData>
+
         <%= stop_area.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 cfa62ec28..ea5b4adcc 100644
--- a/app/views/api/kml/lines/show.kml.erb
+++ b/app/views/api/kml/lines/show.kml.erb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
-    <name><%= Chouette::Line.model_name.human %> : <%= h(@line.name) %></name>
+    <name><%= h(Chouette::Line.model_name.human) %> : <%= h(@line.name) %></name>
     <Placemark id="<%= @line.objectid %>" >
       <name><%= h(@line.name) %></name>
       <ExtendedData>
diff --git a/app/views/api/kml/routes/show.kml.erb b/app/views/api/kml/routes/show.kml.erb
index 191955a6b..14cefabf2 100644
--- a/app/views/api/kml/routes/show.kml.erb
+++ b/app/views/api/kml/routes/show.kml.erb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
-    <name><%= Chouette::Route.model_name.human %> : <%= h(@route.name) %></name>
+    <name><%= h(Chouette::Route.model_name.human) %> : <%= h(@route.name) %></name>
     <Placemark id="<%= @route.objectid %>" >
       <name><%= h(@route.name) %></name>
       <ExtendedData>
diff --git a/app/views/api/kml/stop_areas/index.kml.erb b/app/views/api/kml/stop_areas/index.kml.erb
index 51993bed3..8056c47d6 100644
--- a/app/views/api/kml/stop_areas/index.kml.erb
+++ b/app/views/api/kml/stop_areas/index.kml.erb
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2">
   <Document>
-    <% @stop_areas.select { |sa| sa.latitude && sa.longitude}.each do |stop_area| %>    
+    <name><%= h( I18n.t("area_types.#{@area_type.underscore}") ) %></name>
+    <% @stop_areas.select { |sa| sa.latitude && sa.longitude}.each do |stop_area| %>
       <Placemark id="<%= stop_area.objectid %>" >
-        <name><%=  h(stop_area.name) %></name>    
+        <name><%=  h(stop_area.name) %></name>
         <ExtendedData>
         <% [: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 %>">
@@ -15,8 +16,8 @@
             <value><%= h(stop_area.parent.objectid) %></value>
           </Data>
         <% end %>
-        </ExtendedData>        
-    
+        </ExtendedData>
+
         <%= stop_area.geometry_presenter.geometry.kml_representation.html_safe %>
       </Placemark>
     <% end %>