added paths to element json

app/services/data/load_stream_data.rb

@@ -18,13 +18,13 @@ class LoadStreamData
   # sets data and data_type
   # sets data and data_type
   # data_type: raw
   # data_type: raw
   # data:
   # data:
-  #   [{id: element_id, values: [[ts,y],[ts,y],nil,[ts,y]]},...]
+  #   [{id: element_id, type: raw values: [[ts,y],[ts,y],nil,[ts,y]]},...]
   # data_type: interval
   # data_type: interval
   # data:
   # data:
-  #   [{id: element_id, values: [[start,0],[end,0],nil,...]}]
+  #   [{id: element_id, type: raw, values: [[start,0],[end,0],nil,...]}]
   # data_type: decimated
   # data_type: decimated
   # data:
   # data:
-  #   [{id: element_id, values: [[ts,y,ymin,ymax],[ts,y,ymin,ymax],nil,...]}]
+  #   [{id: element_id, type: raw, values: [[ts,y,ymin,ymax],[ts,y,ymin,ymax],nil,...]}]
   #
   #
   def run(db_stream, start_time, end_time)
   def run(db_stream, start_time, end_time)
     resolution = db_stream.db.max_points_per_plot
     resolution = db_stream.db.max_points_per_plot
@@ -152,7 +152,7 @@ class LoadStreamData
 
 
   def __build_raw_data(db_stream, resp)
   def __build_raw_data(db_stream, resp)
     elements = db_stream.db_elements.order(:column)
     elements = db_stream.db_elements.order(:column)
-    data = elements.map { |e| { id: e.id, values: [] } }
+    data = elements.map { |e| { id: e.id, type: 'raw', values: [] } }
     resp.each do |row|
     resp.each do |row|
       if row.nil? # add an interval break to all the elements
       if row.nil? # add an interval break to all the elements
         data.each { |d| d[:values].push(nil) }
         data.each { |d| d[:values].push(nil) }
@@ -168,7 +168,7 @@ class LoadStreamData
 
 
   def __build_decimated_data(db_stream, resp)
   def __build_decimated_data(db_stream, resp)
     elements = db_stream.db_elements.order(:column)
     elements = db_stream.db_elements.order(:column)
-    data = elements.map { |e| { id: e.id, values: [] } }
+    data = elements.map { |e| { id: e.id, type: 'decimated', values: [] } }
     resp.each do |row|
     resp.each do |row|
       if row.nil? # add an interval break to all the elements
       if row.nil? # add an interval break to all the elements
         data.each { |d| d[:values].push(nil) }
         data.each { |d| d[:values].push(nil) }
@@ -193,7 +193,7 @@ class LoadStreamData
 
 
   def __build_interval_data(db_stream, resp)
   def __build_interval_data(db_stream, resp)
     elements = db_stream.db_elements.order(:column)
     elements = db_stream.db_elements.order(:column)
-    elements.map { |e| { id: e.id, values: resp } }
+    elements.map { |e| { id: e.id, type: 'interval', values: resp } }
   end
   end
 
 
   def __scale_value(value,element)
   def __scale_value(value,element)

app/views/db_elements/data.json.jbuilder

@@ -2,6 +2,7 @@ json.data do
   json.array! @service.data.each do |element_data|
   json.array! @service.data.each do |element_data|
     json.element_id element_data[:id]
     json.element_id element_data[:id]
     json.data element_data[:values]
     json.data element_data[:values]
+    json.type element_data[:type]
     json.start_time @start_time
     json.start_time @start_time
     json.end_time @end_time
     json.end_time @end_time
   end
   end