Refs #1295: convert erb to slim (api/kml)

14 files changed, 147 insertions, 189 deletions

diff --git a/app/views/api/kml/access_links/index.kml.erb b/app/views/api/kml/access_links/index.kml.erb
deleted file mode 100644
index 871646c68..000000000
--- a/app/views/api/kml/access_links/index.kml.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-    <name><%= h(Chouette::AccessLink.model_name.human) %></name>
-    <% @access_links.each do |access_link| %>
-      <Placemark id="<%= access_link.objectid %>" >
-        <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 %>">
-            <value><%= h(access_link.send( prop)) %></value>
-          </Data>
-        <% end %>
-        <Data name="access_point_objectid">
-          <value><%= h(access_link.access_point.objectid) %></value>
-        </Data>
-        <Data name="stop_area_objectid">
-          <value><%= h(access_link.stop_area.objectid) %></value>
-        </Data>
-        </ExtendedData>
-        <%= access_link.geometry_presenter.geometry.kml_representation.html_safe %>
-      </Placemark>
-    <% end %>
-  </Document>
-</kml>
-
diff --git a/app/views/api/kml/access_links/index.kml.slim b/app/views/api/kml/access_links/index.kml.slim
new file mode 100644
index 000000000..f402a7aa4
--- /dev/null
+++ b/app/views/api/kml/access_links/index.kml.slim
@@ -0,0 +1,21 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2" 
+  document
+    name = h(Chouette::AccessLink.model_name.human)
+    
+    - @access_links.each do |access_link|
+      placemark id="#{access_link.objectid}"
+        name = h(access_link.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}"
+              value = h(access_link.send( prop))
+
+          data name="access_point_objectid"
+            value = h(access_link.access_point.objectid)
+
+          data name="stop_area_objectid"
+            value = h(access_link.stop_area.objectid)
+
+        = access_link.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file
diff --git a/app/views/api/kml/access_points/index.kml.erb b/app/views/api/kml/access_points/index.kml.erb
deleted file mode 100644
index f48846f91..000000000
--- a/app/views/api/kml/access_points/index.kml.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-    <name><%= h(Chouette::AccessPoint.model_name.human) %></name>
-    <name>access</name>
-    <% @access_points.each do |access_point| %>
-      <Placemark id="<%= access_point.objectid %>" >
-        <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 %>">
-            <value><%= h(access_point.send( prop)) %></value>
-          </Data>
-        <% end %>
-        <Data name="stop_area_objectid">
-          <value><%= h(access_point.stop_area.objectid) %></value>
-        </Data>
-        </ExtendedData>
-        <%= access_point.geometry_presenter.geometry.kml_representation.html_safe %>
-      </Placemark>
-    <% end %>
-  </Document>
-</kml>
-
diff --git a/app/views/api/kml/access_points/index.kml.slim b/app/views/api/kml/access_points/index.kml.slim
new file mode 100644
index 000000000..4f47272e6
--- /dev/null
+++ b/app/views/api/kml/access_points/index.kml.slim
@@ -0,0 +1,19 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2" 
+  document
+    name = h(Chouette::AccessPoint.model_name.human)
+    name access
+    
+    - @access_points.each do |access_point|
+      placemark id="#{access_point.objectid}"
+        name = h(access_point.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}"
+              value = h(access_point.send( prop))
+
+          data name="stop_area_objectid"
+            value = h(access_point.stop_area.objectid)
+  
+        = access_point.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file
diff --git a/app/views/api/kml/connection_links/index.kml.erb b/app/views/api/kml/connection_links/index.kml.erb
deleted file mode 100644
index 8eb6c6ea2..000000000
--- a/app/views/api/kml/connection_links/index.kml.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-    <name><%= h(Chouette::ConnectionLink.model_name.human) %></name>
-    <% @connection_links.each do |connection_link| %>
-      <Placemark id="<%= connection_link.objectid %>" >
-        <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 %>">
-            <value><%= h(connection_link.send( prop)) %></value>
-          </Data>
-        <% end %>
-        <Data name="departure_objectid">
-          <value><%= h(connection_link.departure.objectid) %></value>
-        </Data>
-        <Data name="arrival_objectid">
-          <value><%= h(connection_link.arrival.objectid) %></value>
-        </Data>
-        </ExtendedData>
-        <%= connection_link.geometry_presenter.geometry.kml_representation.html_safe %>
-      </Placemark>
-    <% end %>
-  </Document>
-</kml>
-
diff --git a/app/views/api/kml/connection_links/index.kml.slim b/app/views/api/kml/connection_links/index.kml.slim
new file mode 100644
index 000000000..b5a6e9560
--- /dev/null
+++ b/app/views/api/kml/connection_links/index.kml.slim
@@ -0,0 +1,21 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2" 
+  document
+    name = h(Chouette::ConnectionLink.model_name.human)
+
+    - @connection_links.each do |connection_link|
+      placemark id="#{connection_link.objectid}"
+        name = h(connection_link.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}"
+              value = h(connection_link.send( prop))
+
+          data name="departure_objectid"
+            value = h(connection_link.departure.objectid)
+
+          data name="arrival_objectid"
+            value = h(connection_link.arrival.objectid)
+
+        = connection_link.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file
diff --git a/app/views/api/kml/journey_patterns/show.kml.erb b/app/views/api/kml/journey_patterns/show.kml.erb
deleted file mode 100644
index b743a9e53..000000000
--- a/app/views/api/kml/journey_patterns/show.kml.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-      <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 %>">
-          <value><%= h(@journey_pattern.send( prop)) %></value>
-        </Data>
-      <% end %>
-        <Data name="route_objectid">
-          <value><%= h(@journey_pattern.route.objectid) %></value>
-        </Data>
-      </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>
-        <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 %>">
-            <value><%= h(stop_area.send( prop)) %></value>
-          </Data>
-        <% end %>
-        <% if stop_area.parent %>
-          <Data name="parent_objectid">
-            <value><%= h(stop_area.parent.objectid) %></value>
-          </Data>
-        <% end %>
-          <Data name="stop">
-            <value><%= @journey_pattern.stop_points.include?( stop_point) ? "true" : "false" %></value>
-          </Data>
-        </ExtendedData>
-
-        <%= stop_area.geometry_presenter.geometry.kml_representation.html_safe %>
-      </Placemark>
-      <% end %>
-    <% end %>
-  </Document>
-</kml>
-
diff --git a/app/views/api/kml/journey_patterns/show.kml.slim b/app/views/api/kml/journey_patterns/show.kml.slim
new file mode 100644
index 000000000..f7e6dc9f4
--- /dev/null
+++ b/app/views/api/kml/journey_patterns/show.kml.slim
@@ -0,0 +1,31 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2" 
+  document
+    name = "#{h(Chouette::JourneyPattern.model_name.human)} : #{h(@journey_pattern.name)}"
+    extendeddata
+      - [:objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name].each do |prop|
+        data name="#{prop.to_s}"
+          value = h(@journey_pattern.send( prop))
+
+      data name="route_objectid"
+        value = h(@journey_pattern.route.objectid)
+
+    - @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)
+          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}"
+                value = h(stop_area.send( prop))
+              
+            - if stop_area.parent
+              data name="parent_objectid"
+                value = h(stop_area.parent.objectid)
+            
+            data name="stop"
+              value = @journey_pattern.stop_points.include?( stop_point) ? "true" : "false"
+
+          = stop_area.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file
diff --git a/app/views/api/kml/lines/show.kml.erb b/app/views/api/kml/lines/show.kml.erb
deleted file mode 100644
index ea5b4adcc..000000000
--- a/app/views/api/kml/lines/show.kml.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-    <name><%= h(Chouette::Line.model_name.human) %> : <%= h(@line.name) %></name>
-    <Placemark id="<%= @line.objectid %>" >
-      <name><%= h(@line.name) %></name>
-      <ExtendedData>
-      <% [ :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>
-      <% end %>
-        <Data name="company_objectid">
-          <value><%= h(@line.company.objectid) %></value>
-        </Data>
-        <Data name="network_objectid">
-          <value><%= h(@line.network.objectid) %></value>
-        </Data>
-      </ExtendedData>
-      <%= @line.geometry_presenter.geometry.kml_representation.html_safe %>
-    </Placemark>
-  </Document>
-</kml>
-
diff --git a/app/views/api/kml/lines/show.kml.slim b/app/views/api/kml/lines/show.kml.slim
new file mode 100644
index 000000000..d314b8f19
--- /dev/null
+++ b/app/views/api/kml/lines/show.kml.slim
@@ -0,0 +1,20 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2" 
+  document
+    name = "#{h(Chouette::Line.model_name.human)} : #{h(@line.name)}"
+    
+    placemark id="#{@line.objectid}"
+      name = h(@line.name)
+      extendeddata
+        - [ :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))
+
+        data name="company_objectid"
+          value = h(@line.company.objectid)
+
+        data name="network_objectid"
+          value = h(@line.network.objectid)
+
+      = @line.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file
diff --git a/app/views/api/kml/routes/show.kml.erb b/app/views/api/kml/routes/show.kml.erb
deleted file mode 100644
index 14cefabf2..000000000
--- a/app/views/api/kml/routes/show.kml.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-    <name><%= h(Chouette::Route.model_name.human) %> : <%= h(@route.name) %></name>
-    <Placemark id="<%= @route.objectid %>" >
-      <name><%= h(@route.name) %></name>
-      <ExtendedData>
-      <% [: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>
-      <% end %>
-        <Data name="line_objectid">
-          <value><%= h(@route.line.objectid) %></value>
-        </Data>
-      </ExtendedData>
-      <%= @route.geometry_presenter.geometry.kml_representation.html_safe %>
-    </Placemark>
-  </Document>
-</kml>
-
diff --git a/app/views/api/kml/routes/show.kml.slim b/app/views/api/kml/routes/show.kml.slim
new file mode 100644
index 000000000..3b08d81ce
--- /dev/null
+++ b/app/views/api/kml/routes/show.kml.slim
@@ -0,0 +1,16 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2"
+  document
+    name = "#{h(Chouette::Route.model_name.human)} : #{h(@route.name)}"
+    placemark id="#{@route.objectid}"
+      name = h(@route.name)
+      extendeddata
+        - [: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))
+
+        data name="line_objectid"
+          value = h(@route.line.objectid)
+
+      = @route.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file
diff --git a/app/views/api/kml/stop_areas/index.kml.erb b/app/views/api/kml/stop_areas/index.kml.erb
deleted file mode 100644
index 8056c47d6..000000000
--- a/app/views/api/kml/stop_areas/index.kml.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-    <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>
-        <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 %>">
-            <value><%= h(stop_area.send( prop)) %></value>
-          </Data>
-        <% end %>
-        <% if stop_area.parent %>
-          <Data name="parent_objectid">
-            <value><%= h(stop_area.parent.objectid) %></value>
-          </Data>
-        <% end %>
-        </ExtendedData>
-
-        <%= stop_area.geometry_presenter.geometry.kml_representation.html_safe %>
-      </Placemark>
-    <% end %>
-  </Document>
-</kml>
-
diff --git a/app/views/api/kml/stop_areas/index.kml.slim b/app/views/api/kml/stop_areas/index.kml.slim
new file mode 100644
index 000000000..64f7e08be
--- /dev/null
+++ b/app/views/api/kml/stop_areas/index.kml.slim
@@ -0,0 +1,19 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2" 
+  document
+    name = h( I18n.t("area_types.#{@area_type.underscore}") )
+    
+    - @stop_areas.select { |sa| sa.latitude && sa.longitude}.each do |stop_area|
+      placemark id="#{stop_area.objectid}"
+        name =  h(stop_area.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}"
+              value = h(stop_area.send( prop))
+
+          - if stop_area.parent
+            data name="parent_objectid"
+              value = h(stop_area.parent.objectid)
+
+        = stop_area.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file