Refactoring vehicle_journey#index json format

1 files changed, 4 insertions, 20 deletions

diff --git a/app/views/vehicle_journeys/show.rabl b/app/views/vehicle_journeys/show.rabl
index 91d552c4f..9caf13301 100644
--- a/app/views/vehicle_journeys/show.rabl
+++ b/app/views/vehicle_journeys/show.rabl
@@ -9,30 +9,14 @@ child(:journey_pattern) do |journey_pattern|
 end
 
 child(:time_tables, :object_root => false) do |time_tables|
-  node do |tt|
-    [:objectid, :comment].map do |att|
-      node(att) { tt.send(att) }
-    end
-    node :calendar do |tt|
-      {
-        id: tt.calendar.id,
-        name: tt.calendar.name,
-        date_ranges: tt.calendar.date_ranges,
-        dates: tt.calendar.dates,
-        shared: tt.calendar.shared
-      }
-    end
+  attributes :objectid, :comment
+  child(:calendar) do
+    attributes :id, :name, :date_ranges, :dates, :shared
   end
 end
 
 child :footnotes, :object_root => false do |footnotes|
-  node do |footnote|
-    {
-      id: footnote.id,
-      code: footnote.code,
-      label: footnote.label
-    }
-  end
+  attributes :id, :code, :label
 end
 
 child :vehicle_journey_at_stops, :object_root => false do |vehicle_stops|