Add stop area type to map on hover stop area Refs #0029232

6 files changed, 6 insertions, 1 deletions

diff --git a/app/maps/application_map.rb b/app/maps/application_map.rb
index 662e7b941..ac5450197 100644
--- a/app/maps/application_map.rb
+++ b/app/maps/application_map.rb
@@ -139,7 +139,7 @@ class ApplicationMap
           var popup = new OpenLayers.Popup.Anchored('chicken',
                                                  new OpenLayers.LonLat(feature.geometry.x, feature.geometry.y),
                                                  null,
-                                                 \"<div class='popup_hover'><b>\" + feature.attributes.name +\"</b></div> \", null, false, null);
+                                                 \"<div class='popup_hover'><p><b>\" + feature.attributes.name +\"</b><p>\" + feature.attributes.stop_area_type_label + \"</div> \", null, false, null);
           popup.autoSize = true;
           popup.displayClass = 'popup_hover';
 
diff --git a/app/views/group_of_lines/show.kml.erb b/app/views/group_of_lines/show.kml.erb
index 6b1a34688..6952db240 100644
--- a/app/views/group_of_lines/show.kml.erb
+++ b/app/views/group_of_lines/show.kml.erb
@@ -5,6 +5,7 @@
     <Placemark id="<%= stop_area.id %>" >
       <name><%= stop_area.name %></name>
       <stop_area_type><%= stop_area.area_type.underscore %></stop_area_type>
+      <stop_area_type_label><%= t("area_types.label.#{stop_area.stop_area_type}") %></stop_area_type_label>
       <%= (stop_area.position or stop_area.default_position).kml_representation.html_safe %>
     </Placemark>
   <% end %>
diff --git a/app/views/lines/show.kml.erb b/app/views/lines/show.kml.erb
index 1ea08fa5a..8e1c82eef 100644
--- a/app/views/lines/show.kml.erb
+++ b/app/views/lines/show.kml.erb
@@ -5,6 +5,7 @@
     <Placemark id="<%= stop_area.id %>" >
       <name><%= stop_area.name %></name>
       <stop_area_type><%= stop_area.area_type.underscore %></stop_area_type>
+      <stop_area_type_label><%= t("area_types.label.#{stop_area.stop_area_type}") %></stop_area_type_label>
       <%= (stop_area.position or stop_area.default_position).kml_representation.html_safe %>
     </Placemark>
   <% end %>
diff --git a/app/views/networks/show.kml.erb b/app/views/networks/show.kml.erb
index c99b46a7a..34d4598fe 100644
--- a/app/views/networks/show.kml.erb
+++ b/app/views/networks/show.kml.erb
@@ -5,6 +5,7 @@
     <Placemark id="<%= stop_area.id %>" >
       <name><%= stop_area.name %></name>
       <stop_area_type><%= stop_area.area_type.underscore %></stop_area_type>
+      <stop_area_type_label><%= t("area_types.label.#{stop_area.stop_area_type}") %></stop_area_type_label>
       <%= (stop_area.position or stop_area.default_position).kml_representation.html_safe %>
     </Placemark>
   <% end %>
diff --git a/app/views/routes/show.kml.erb b/app/views/routes/show.kml.erb
index 91ffb9918..e6ef8b81d 100644
--- a/app/views/routes/show.kml.erb
+++ b/app/views/routes/show.kml.erb
@@ -9,6 +9,7 @@
     <% @route.stop_areas.where("latitude is not null and longitude is not null").each_with_index do |stop_area, index| %>
       <Placemark id="<%= stop_area.id %>" >
         <name><%= "#{stop_area.name} (#{index+1})" %></name>
+        <stop_area_type_label><%= t("area_types.label.#{stop_area.stop_area_type}") %></stop_area_type_label>
         <% if stop_area.id==@route.stop_areas.first.id %>
         <departure>true</departure>
         <% elsif stop_area.id==@route.stop_areas.last.id %>
diff --git a/app/views/stop_areas/index.kml.erb b/app/views/stop_areas/index.kml.erb
index 69a31db32..f43f130b6 100644
--- a/app/views/stop_areas/index.kml.erb
+++ b/app/views/stop_areas/index.kml.erb
@@ -5,6 +5,7 @@
       <Placemark id="<%= stop_area.id %>" >
         <name><%= stop_area.name %></name>
         <stop_area_type><%= stop_area.stop_area_type %></stop_area_type>
+        <stop_area_type_label><%= t("area_types.label.#{stop_area.stop_area_type}") %></stop_area_type_label>
         <%= stop_area.geometry.kml_representation.html_safe %>
       </Placemark>
     <% end %>