Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Incorporate XML fixes into models

  • Loading branch information...
commit 31bc2e4119f61a480a072641afcfea13bad7976e 1 parent d8a80b7
@onewland onewland authored
Showing with 129 additions and 135 deletions.
  1. +2 −2 prototypes/using-aurora/coffeescripts/CapacityProfileSet.coffee
  2. +3 −3 prototypes/using-aurora/coffeescripts/Controlled.coffee
  3. +10 −10 prototypes/using-aurora/coffeescripts/Controller.coffee
  4. +2 −2 prototypes/using-aurora/coffeescripts/ControllerSet.coffee
  5. +1 −1  prototypes/using-aurora/coffeescripts/Data_sources.coffee
  6. +2 −2 prototypes/using-aurora/coffeescripts/DemandProfileSet.coffee
  7. +1 −2  prototypes/using-aurora/coffeescripts/Description.coffee
  8. +1 −1  prototypes/using-aurora/coffeescripts/DirectionsCache.coffee
  9. +3 −3 prototypes/using-aurora/coffeescripts/DirectionsCacheEntry.coffee
  10. +1 −1  prototypes/using-aurora/coffeescripts/Display_position.coffee
  11. +2 −2 prototypes/using-aurora/coffeescripts/EncodedPolyline.coffee
  12. +11 −11 prototypes/using-aurora/coffeescripts/Event.coffee
  13. +2 −2 prototypes/using-aurora/coffeescripts/EventSet.coffee
  14. +1 −1  prototypes/using-aurora/coffeescripts/From.coffee
  15. +2 −2 prototypes/using-aurora/coffeescripts/InitialDensityProfile.coffee
  16. +1 −1  prototypes/using-aurora/coffeescripts/Input.coffee
  17. +1 −1  prototypes/using-aurora/coffeescripts/Inputs.coffee
  18. +1 −1  prototypes/using-aurora/coffeescripts/Intersection.coffee
  19. +1 −1  prototypes/using-aurora/coffeescripts/IntersectionCache.coffee
  20. +1 −2  prototypes/using-aurora/coffeescripts/Levels.coffee
  21. +7 −7 prototypes/using-aurora/coffeescripts/Link.coffee
  22. +1 −1  prototypes/using-aurora/coffeescripts/LinkGeometry.coffee
  23. +1 −1  prototypes/using-aurora/coffeescripts/LinkList.coffee
  24. +1 −1  prototypes/using-aurora/coffeescripts/LinkPairs.coffee
  25. +1 −2  prototypes/using-aurora/coffeescripts/Lkid.coffee
  26. +5 −6 prototypes/using-aurora/coffeescripts/Monitor.coffee
  27. +1 −1  prototypes/using-aurora/coffeescripts/MonitorList.coffee
  28. +3 −3 prototypes/using-aurora/coffeescripts/Monitored.coffee
  29. +11 −11 prototypes/using-aurora/coffeescripts/Network.coffee
  30. +1 −1  prototypes/using-aurora/coffeescripts/NetworkList.coffee
  31. +5 −5 prototypes/using-aurora/coffeescripts/Node.coffee
  32. +1 −1  prototypes/using-aurora/coffeescripts/NodeList.coffee
  33. +1 −1  prototypes/using-aurora/coffeescripts/ODList.coffee
  34. +1 −1  prototypes/using-aurora/coffeescripts/Od.coffee
  35. +1 −1  prototypes/using-aurora/coffeescripts/Onramps.coffee
  36. +1 −1  prototypes/using-aurora/coffeescripts/Outputs.coffee
  37. +1 −1  prototypes/using-aurora/coffeescripts/Parameters.coffee
  38. +1 −1  prototypes/using-aurora/coffeescripts/PathList.coffee
  39. +1 −1  prototypes/using-aurora/coffeescripts/Phase.coffee
  40. +1 −1  prototypes/using-aurora/coffeescripts/Plan.coffee
  41. +1 −1  prototypes/using-aurora/coffeescripts/PlanList.coffee
  42. +1 −1  prototypes/using-aurora/coffeescripts/PlanSequence.coffee
  43. +1 −2  prototypes/using-aurora/coffeescripts/Points.coffee
  44. +1 −1  prototypes/using-aurora/coffeescripts/Position.coffee
  45. +1 −1  prototypes/using-aurora/coffeescripts/Qcontroller.coffee
  46. +9 −9 prototypes/using-aurora/coffeescripts/Scenario.coffee
  47. +6 −6 prototypes/using-aurora/coffeescripts/Sensor.coffee
  48. +1 −1  prototypes/using-aurora/coffeescripts/SensorList.coffee
  49. +3 −3 prototypes/using-aurora/coffeescripts/Settings.coffee
  50. +1 −1  prototypes/using-aurora/coffeescripts/Signal.coffee
  51. +1 −1  prototypes/using-aurora/coffeescripts/SignalList.coffee
  52. +2 −2 prototypes/using-aurora/coffeescripts/SplitRatioProfileSet.coffee
  53. +1 −1  prototypes/using-aurora/coffeescripts/Splitratios.coffee
  54. +1 −1  prototypes/using-aurora/coffeescripts/To.coffee
  55. +1 −2  prototypes/using-aurora/coffeescripts/Units.coffee
  56. +1 −1  prototypes/using-aurora/coffeescripts/VehicleTypes.coffee
  57. +1 −1  prototypes/using-aurora/coffeescripts/Wfm.coffee
  58. +1 −1  prototypes/using-aurora/coffeescripts/Zones.coffee
View
4 prototypes/using-aurora/coffeescripts/CapacityProfileSet.coffee
@@ -10,9 +10,9 @@ class window.aurora.CapacityProfileSet extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.CapacityProfileSet()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- capacity = xml.find('capacity')
+ capacity = xml.children('capacity')
obj.set('capacity', _.map($(capacity), (capacity_i) -> $a.Capacity.from_xml2($(capacity_i), deferred, object_with_id)))
id = $(xml).attr('id')
obj.set('id', id)
View
6 prototypes/using-aurora/coffeescripts/Controlled.coffee
@@ -10,11 +10,11 @@ class window.aurora.Controlled extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Controlled()
- links = xml.find('links')
+ links = xml.children('links')
obj.set('links', $a.Links.from_xml2(links, deferred, object_with_id))
- nodes = xml.find('nodes')
+ nodes = xml.children('nodes')
obj.set('nodes', $a.Nodes.from_xml2(nodes, deferred, object_with_id))
- monitors = xml.find('monitors')
+ monitors = xml.children('monitors')
obj.set('monitors', $a.Monitors.from_xml2(monitors, deferred, object_with_id))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
20 prototypes/using-aurora/coffeescripts/Controller.coffee
@@ -10,13 +10,13 @@ class window.aurora.Controller extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Controller()
- components = xml.find('components')
+ components = xml.children('components')
obj.set('components', $a.Components.from_xml2(components, deferred, object_with_id))
- zones = xml.find('zones')
+ zones = xml.children('zones')
obj.set('zones', $a.Zones.from_xml2(zones, deferred, object_with_id))
- onramps = xml.find('onramps')
+ onramps = xml.children('onramps')
obj.set('onramps', $a.Onramps.from_xml2(onramps, deferred, object_with_id))
- parameters = xml.find('parameters')
+ parameters = xml.children('parameters')
obj.set('parameters', _.reduce(parameters.find("parameter"),
(acc,par_xml) ->
wrapped_xml = $(par_xml);
@@ -24,17 +24,17 @@ class window.aurora.Controller extends Backbone.Model
acc
{}
))
- limits = xml.find('limits')
+ limits = xml.children('limits')
obj.set('limits', $a.Limits.from_xml2(limits, deferred, object_with_id))
- qcontroller = xml.find('qcontroller')
+ qcontroller = xml.children('qcontroller')
obj.set('qcontroller', $a.Qcontroller.from_xml2(qcontroller, deferred, object_with_id))
- table = xml.find('table')
+ table = xml.children('table')
obj.set('table', $a.Table.from_xml2(table, deferred, object_with_id))
- display_position = xml.find('display_position')
+ display_position = xml.children('display_position')
obj.set('display_position', $a.Display_position.from_xml2(display_position, deferred, object_with_id))
- PlanSequence = xml.find('PlanSequence')
+ PlanSequence = xml.children('PlanSequence')
obj.set('plansequence', $a.PlanSequence.from_xml2(PlanSequence, deferred, object_with_id))
- PlanList = xml.find('PlanList')
+ PlanList = xml.children('PlanList')
obj.set('planlist', $a.PlanList.from_xml2(PlanList, deferred, object_with_id))
name = $(xml).attr('name')
obj.set('name', name)
View
4 prototypes/using-aurora/coffeescripts/ControllerSet.coffee
@@ -10,9 +10,9 @@ class window.aurora.ControllerSet extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.ControllerSet()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- controller = xml.find('controller')
+ controller = xml.children('controller')
obj.set('controller', _.map($(controller), (controller_i) -> $a.Controller.from_xml2($(controller_i), deferred, object_with_id)))
id = $(xml).attr('id')
obj.set('id', id)
View
2  prototypes/using-aurora/coffeescripts/Data_sources.coffee
@@ -10,7 +10,7 @@ class window.aurora.Data_sources extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Data_sources()
- source = xml.find('source')
+ source = xml.children('source')
obj.set('source', _.map($(source), (source_i) -> $a.Source.from_xml2($(source_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
4 prototypes/using-aurora/coffeescripts/DemandProfileSet.coffee
@@ -10,9 +10,9 @@ class window.aurora.DemandProfileSet extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.DemandProfileSet()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- demand = xml.find('demand')
+ demand = xml.children('demand')
obj.set('demand', _.map($(demand), (demand_i) -> $a.Demand.from_xml2($(demand_i), deferred, object_with_id)))
id = $(xml).attr('id')
obj.set('id', id)
View
3  prototypes/using-aurora/coffeescripts/Description.coffee
@@ -10,8 +10,7 @@ class window.aurora.Description extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Description()
-
- obj.set('text', )
+ obj.set('text', xml.text())
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
obj
View
2  prototypes/using-aurora/coffeescripts/DirectionsCache.coffee
@@ -10,7 +10,7 @@ class window.aurora.DirectionsCache extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.DirectionsCache()
- DirectionsCacheEntry = xml.find('DirectionsCacheEntry')
+ DirectionsCacheEntry = xml.children('DirectionsCacheEntry')
obj.set('directionscacheentry', _.map($(DirectionsCacheEntry), (DirectionsCacheEntry_i) -> $a.DirectionsCacheEntry.from_xml2($(DirectionsCacheEntry_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
6 prototypes/using-aurora/coffeescripts/DirectionsCacheEntry.coffee
@@ -10,11 +10,11 @@ class window.aurora.DirectionsCacheEntry extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.DirectionsCacheEntry()
- From = xml.find('From')
+ From = xml.children('From')
obj.set('from', $a.From.from_xml2(From, deferred, object_with_id))
- To = xml.find('To')
+ To = xml.children('To')
obj.set('to', $a.To.from_xml2(To, deferred, object_with_id))
- EncodedPolyline = xml.find('EncodedPolyline')
+ EncodedPolyline = xml.children('EncodedPolyline')
obj.set('encodedpolyline', $a.EncodedPolyline.from_xml2(EncodedPolyline, deferred, object_with_id))
avoidHighways = $(xml).attr('avoidHighways')
obj.set('avoidHighways', (avoidHighways.toString().toLowerCase() == 'true') if avoidHighways?)
View
2  prototypes/using-aurora/coffeescripts/Display_position.coffee
@@ -10,7 +10,7 @@ class window.aurora.Display_position extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Display_position()
- point = xml.find('point')
+ point = xml.children('point')
obj.set('point', _.map($(point), (point_i) -> $a.Point.from_xml2($(point_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
4 prototypes/using-aurora/coffeescripts/EncodedPolyline.coffee
@@ -10,9 +10,9 @@ class window.aurora.EncodedPolyline extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.EncodedPolyline()
- Points = xml.find('Points')
+ Points = xml.children('Points')
obj.set('points', $a.Points.from_xml2(Points, deferred, object_with_id))
- Levels = xml.find('Levels')
+ Levels = xml.children('Levels')
obj.set('levels', $a.Levels.from_xml2(Levels, deferred, object_with_id))
zoomFactor = $(xml).attr('zoomFactor')
obj.set('zoomFactor', Number(zoomFactor))
View
22 prototypes/using-aurora/coffeescripts/Event.coffee
@@ -10,27 +10,27 @@ class window.aurora.Event extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Event()
- demand = xml.find('demand')
+ demand = xml.children('demand')
obj.set('demand', $a.Demand.from_xml2(demand, deferred, object_with_id))
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- fd = xml.find('fd')
+ fd = xml.children('fd')
obj.set('fd', $a.Fd.from_xml2(fd, deferred, object_with_id))
- srm = xml.find('srm')
+ srm = xml.children('srm')
obj.set('srm', $a.Srm.from_xml2(srm, deferred, object_with_id))
- qmax = xml.find('qmax')
+ qmax = xml.children('qmax')
obj.set('qmax', $a.Qmax.from_xml2(qmax, deferred, object_with_id))
- lkid = xml.find('lkid')
+ lkid = xml.children('lkid')
obj.set('lkid', $a.Lkid.from_xml2(lkid, deferred, object_with_id))
- controller = xml.find('controller')
+ controller = xml.children('controller')
obj.set('controller', $a.Controller.from_xml2(controller, deferred, object_with_id))
- wfm = xml.find('wfm')
+ wfm = xml.children('wfm')
obj.set('wfm', $a.Wfm.from_xml2(wfm, deferred, object_with_id))
- control = xml.find('control')
+ control = xml.children('control')
obj.set('control', $a.Control.from_xml2(control, deferred, object_with_id))
- lane_count_change = xml.find('lane_count_change')
+ lane_count_change = xml.children('lane_count_change')
obj.set('lane_count_change', $a.Lane_count_change.from_xml2(lane_count_change, deferred, object_with_id))
- display_position = xml.find('display_position')
+ display_position = xml.children('display_position')
obj.set('display_position', $a.Display_position.from_xml2(display_position, deferred, object_with_id))
tstamp = $(xml).attr('tstamp')
obj.set('tstamp', Number(tstamp))
View
4 prototypes/using-aurora/coffeescripts/EventSet.coffee
@@ -10,9 +10,9 @@ class window.aurora.EventSet extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.EventSet()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- event = xml.find('event')
+ event = xml.children('event')
obj.set('event', _.map($(event), (event_i) -> $a.Event.from_xml2($(event_i), deferred, object_with_id)))
id = $(xml).attr('id')
obj.set('id', id)
View
2  prototypes/using-aurora/coffeescripts/From.coffee
@@ -10,7 +10,7 @@ class window.aurora.From extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.From()
- ALatLng = xml.find('ALatLng')
+ ALatLng = xml.children('ALatLng')
obj.set('alatlng', $a.ALatLng.from_xml2(ALatLng, deferred, object_with_id))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
4 prototypes/using-aurora/coffeescripts/InitialDensityProfile.coffee
@@ -10,9 +10,9 @@ class window.aurora.InitialDensityProfile extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.InitialDensityProfile()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- density = xml.find('density')
+ density = xml.children('density')
obj.set('density', _.map($(density), (density_i) -> $a.Density.from_xml2($(density_i), deferred, object_with_id)))
id = $(xml).attr('id')
obj.set('id', id)
View
2  prototypes/using-aurora/coffeescripts/Input.coffee
@@ -10,7 +10,7 @@ class window.aurora.Input extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Input()
- weavingfactors = xml.find('weavingfactors')
+ weavingfactors = xml.children('weavingfactors')
obj.set('weavingfactors', $a.Weavingfactors.from_xml2(weavingfactors, deferred, object_with_id))
link_id = $(xml).attr('link_id')
obj.set('link_id', link_id)
View
2  prototypes/using-aurora/coffeescripts/Inputs.coffee
@@ -10,7 +10,7 @@ class window.aurora.Inputs extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Inputs()
- input = xml.find('input')
+ input = xml.children('input')
obj.set('input', _.map($(input), (input_i) -> $a.Input.from_xml2($(input_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Intersection.coffee
@@ -10,7 +10,7 @@ class window.aurora.Intersection extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Intersection()
- stage = xml.find('stage')
+ stage = xml.children('stage')
obj.set('stage', _.map($(stage), (stage_i) -> $a.Stage.from_xml2($(stage_i), deferred, object_with_id)))
node_id = $(xml).attr('node_id')
obj.set('node_id', node_id)
View
2  prototypes/using-aurora/coffeescripts/IntersectionCache.coffee
@@ -10,7 +10,7 @@ class window.aurora.IntersectionCache extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.IntersectionCache()
- IntersectionCacheEntry = xml.find('IntersectionCacheEntry')
+ IntersectionCacheEntry = xml.children('IntersectionCacheEntry')
obj.set('intersectioncacheentry', _.map($(IntersectionCacheEntry), (IntersectionCacheEntry_i) -> $a.IntersectionCacheEntry.from_xml2($(IntersectionCacheEntry_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
3  prototypes/using-aurora/coffeescripts/Levels.coffee
@@ -10,8 +10,7 @@ class window.aurora.Levels extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Levels()
-
- obj.set('text', )
+ obj.set('text', xml.text())
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
obj
View
14 prototypes/using-aurora/coffeescripts/Link.coffee
@@ -10,19 +10,19 @@ class window.aurora.Link extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Link()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- begin = xml.find('begin')
+ begin = xml.children('begin')
obj.set('begin', $a.Begin.from_xml2(begin, deferred, object_with_id))
- end = xml.find('end')
+ end = xml.children('end')
obj.set('end', $a.End.from_xml2(end, deferred, object_with_id))
- fd = xml.find('fd')
+ fd = xml.children('fd')
obj.set('fd', $a.Fd.from_xml2(fd, deferred, object_with_id))
- dynamics = xml.find('dynamics')
+ dynamics = xml.children('dynamics')
obj.set('dynamics', $a.Dynamics.from_xml2(dynamics, deferred, object_with_id))
- qmax = xml.find('qmax')
+ qmax = xml.children('qmax')
obj.set('qmax', $a.Qmax.from_xml2(qmax, deferred, object_with_id))
- LinkGeometry = xml.find('LinkGeometry')
+ LinkGeometry = xml.children('LinkGeometry')
obj.set('linkgeometry', $a.LinkGeometry.from_xml2(LinkGeometry, deferred, object_with_id))
name = $(xml).attr('name')
obj.set('name', name)
View
2  prototypes/using-aurora/coffeescripts/LinkGeometry.coffee
@@ -10,7 +10,7 @@ class window.aurora.LinkGeometry extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.LinkGeometry()
- EncodedPolyline = xml.find('EncodedPolyline')
+ EncodedPolyline = xml.children('EncodedPolyline')
obj.set('encodedpolyline', $a.EncodedPolyline.from_xml2(EncodedPolyline, deferred, object_with_id))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/LinkList.coffee
@@ -10,7 +10,7 @@ class window.aurora.LinkList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.LinkList()
- link = xml.find('link')
+ link = xml.children('link')
obj.set('link', _.map($(link), (link_i) -> $a.Link.from_xml2($(link_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/LinkPairs.coffee
@@ -10,7 +10,7 @@ class window.aurora.LinkPairs extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.LinkPairs()
- pair = xml.find('pair')
+ pair = xml.children('pair')
obj.set('pair', _.map($(pair), (pair_i) -> $a.Pair.from_xml2($(pair_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
3  prototypes/using-aurora/coffeescripts/Lkid.coffee
@@ -10,8 +10,7 @@ class window.aurora.Lkid extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Lkid()
-
- obj.set('text', )
+ obj.set('text', xml.text())
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
obj
View
11 prototypes/using-aurora/coffeescripts/Monitor.coffee
@@ -10,13 +10,13 @@ class window.aurora.Monitor extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Monitor()
- monitored = xml.find('monitored')
+ monitored = xml.children('monitored')
obj.set('monitored', $a.Monitored.from_xml2(monitored, deferred, object_with_id))
- controlled = xml.find('controlled')
+ controlled = xml.children('controlled')
obj.set('controlled', $a.Controlled.from_xml2(controlled, deferred, object_with_id))
- controller = xml.find('controller')
+ controller = xml.children('controller')
obj.set('controller', $a.Controller.from_xml2(controller, deferred, object_with_id))
- LinkPairs = xml.find('LinkPairs')
+ LinkPairs = xml.children('LinkPairs')
obj.set('linkpairs', $a.LinkPairs.from_xml2(LinkPairs, deferred, object_with_id))
name = $(xml).attr('name')
obj.set('name', name)
@@ -24,8 +24,7 @@ class window.aurora.Monitor extends Backbone.Model
obj.set('type', type)
id = $(xml).attr('id')
obj.set('id', id)
-
- obj.set('text', )
+ obj.set('text', xml.text())
if object_with_id.monitor
object_with_id.monitor[obj.id] = obj
if obj.resolve_references
View
2  prototypes/using-aurora/coffeescripts/MonitorList.coffee
@@ -10,7 +10,7 @@ class window.aurora.MonitorList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.MonitorList()
- monitor = xml.find('monitor')
+ monitor = xml.children('monitor')
obj.set('monitor', _.map($(monitor), (monitor_i) -> $a.Monitor.from_xml2($(monitor_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
6 prototypes/using-aurora/coffeescripts/Monitored.coffee
@@ -10,11 +10,11 @@ class window.aurora.Monitored extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Monitored()
- links = xml.find('links')
+ links = xml.children('links')
obj.set('links', $a.Links.from_xml2(links, deferred, object_with_id))
- nodes = xml.find('nodes')
+ nodes = xml.children('nodes')
obj.set('nodes', $a.Nodes.from_xml2(nodes, deferred, object_with_id))
- monitors = xml.find('monitors')
+ monitors = xml.children('monitors')
obj.set('monitors', $a.Monitors.from_xml2(monitors, deferred, object_with_id))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
22 prototypes/using-aurora/coffeescripts/Network.coffee
@@ -10,27 +10,27 @@ class window.aurora.Network extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Network()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- position = xml.find('position')
+ position = xml.children('position')
obj.set('position', $a.Position.from_xml2(position, deferred, object_with_id))
- MonitorList = xml.find('MonitorList')
+ MonitorList = xml.children('MonitorList')
obj.set('monitorlist', $a.MonitorList.from_xml2(MonitorList, deferred, object_with_id))
- NetworkList = xml.find('NetworkList')
+ NetworkList = xml.children('NetworkList')
obj.set('networklist', $a.NetworkList.from_xml2(NetworkList, deferred, object_with_id))
- NodeList = xml.find('NodeList')
+ NodeList = xml.children('NodeList')
obj.set('nodelist', $a.NodeList.from_xml2(NodeList, deferred, object_with_id))
- LinkList = xml.find('LinkList')
+ LinkList = xml.children('LinkList')
obj.set('linklist', $a.LinkList.from_xml2(LinkList, deferred, object_with_id))
- SignalList = xml.find('SignalList')
+ SignalList = xml.children('SignalList')
obj.set('signallist', $a.SignalList.from_xml2(SignalList, deferred, object_with_id))
- ODList = xml.find('ODList')
+ ODList = xml.children('ODList')
obj.set('odlist', $a.ODList.from_xml2(ODList, deferred, object_with_id))
- SensorList = xml.find('SensorList')
+ SensorList = xml.children('SensorList')
obj.set('sensorlist', $a.SensorList.from_xml2(SensorList, deferred, object_with_id))
- DirectionsCache = xml.find('DirectionsCache')
+ DirectionsCache = xml.children('DirectionsCache')
obj.set('directionscache', $a.DirectionsCache.from_xml2(DirectionsCache, deferred, object_with_id))
- IntersectionCache = xml.find('IntersectionCache')
+ IntersectionCache = xml.children('IntersectionCache')
obj.set('intersectioncache', $a.IntersectionCache.from_xml2(IntersectionCache, deferred, object_with_id))
name = $(xml).attr('name')
obj.set('name', name)
View
2  prototypes/using-aurora/coffeescripts/NetworkList.coffee
@@ -10,7 +10,7 @@ class window.aurora.NetworkList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.NetworkList()
- network = xml.find('network')
+ network = xml.children('network')
obj.set('network', _.map($(network), (network_i) -> $a.Network.from_xml2($(network_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
10 prototypes/using-aurora/coffeescripts/Node.coffee
@@ -10,15 +10,15 @@ class window.aurora.Node extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Node()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- postmile = xml.find('postmile')
+ postmile = xml.children('postmile')
obj.set('postmile', $a.Postmile.from_xml2(postmile, deferred, object_with_id))
- outputs = xml.find('outputs')
+ outputs = xml.children('outputs')
obj.set('outputs', $a.Outputs.from_xml2(outputs, deferred, object_with_id))
- inputs = xml.find('inputs')
+ inputs = xml.children('inputs')
obj.set('inputs', $a.Inputs.from_xml2(inputs, deferred, object_with_id))
- position = xml.find('position')
+ position = xml.children('position')
obj.set('position', $a.Position.from_xml2(position, deferred, object_with_id))
name = $(xml).attr('name')
obj.set('name', name)
View
2  prototypes/using-aurora/coffeescripts/NodeList.coffee
@@ -10,7 +10,7 @@ class window.aurora.NodeList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.NodeList()
- node = xml.find('node')
+ node = xml.children('node')
obj.set('node', _.map($(node), (node_i) -> $a.Node.from_xml2($(node_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/ODList.coffee
@@ -10,7 +10,7 @@ class window.aurora.ODList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.ODList()
- od = xml.find('od')
+ od = xml.children('od')
obj.set('od', _.map($(od), (od_i) -> $a.Od.from_xml2($(od_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Od.coffee
@@ -10,7 +10,7 @@ class window.aurora.Od extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Od()
- PathList = xml.find('PathList')
+ PathList = xml.children('PathList')
obj.set('pathlist', $a.PathList.from_xml2(PathList, deferred, object_with_id))
begin = $(xml).attr('begin')
obj.set('begin', begin)
View
2  prototypes/using-aurora/coffeescripts/Onramps.coffee
@@ -10,7 +10,7 @@ class window.aurora.Onramps extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Onramps()
- onramp = xml.find('onramp')
+ onramp = xml.children('onramp')
obj.set('onramp', _.map($(onramp), (onramp_i) -> $a.Onramp.from_xml2($(onramp_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Outputs.coffee
@@ -10,7 +10,7 @@ class window.aurora.Outputs extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Outputs()
- output = xml.find('output')
+ output = xml.children('output')
obj.set('output', _.map($(output), (output_i) -> $a.Output.from_xml2($(output_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Parameters.coffee
@@ -10,7 +10,7 @@ class window.aurora.Parameters extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Parameters()
- parameter = xml.find('parameter')
+ parameter = xml.children('parameter')
obj.set('parameter', _.map($(parameter), (parameter_i) -> $a.Parameter.from_xml2($(parameter_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/PathList.coffee
@@ -10,7 +10,7 @@ class window.aurora.PathList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.PathList()
- path = xml.find('path')
+ path = xml.children('path')
obj.set('path', _.map($(path), (path_i) -> $a.Path.from_xml2($(path_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Phase.coffee
@@ -10,7 +10,7 @@ class window.aurora.Phase extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Phase()
- links = xml.find('links')
+ links = xml.children('links')
obj.set('links', $a.Links.from_xml2(links, deferred, object_with_id))
nema = $(xml).attr('nema')
obj.set('nema', Number(nema))
View
2  prototypes/using-aurora/coffeescripts/Plan.coffee
@@ -10,7 +10,7 @@ class window.aurora.Plan extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Plan()
- intersection = xml.find('intersection')
+ intersection = xml.children('intersection')
obj.set('intersection', _.map($(intersection), (intersection_i) -> $a.Intersection.from_xml2($(intersection_i), deferred, object_with_id)))
id = $(xml).attr('id')
obj.set('id', id)
View
2  prototypes/using-aurora/coffeescripts/PlanList.coffee
@@ -10,7 +10,7 @@ class window.aurora.PlanList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.PlanList()
- plan = xml.find('plan')
+ plan = xml.children('plan')
obj.set('plan', _.map($(plan), (plan_i) -> $a.Plan.from_xml2($(plan_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/PlanSequence.coffee
@@ -10,7 +10,7 @@ class window.aurora.PlanSequence extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.PlanSequence()
- plan_reference = xml.find('plan_reference')
+ plan_reference = xml.children('plan_reference')
obj.set('plan_reference', _.map($(plan_reference), (plan_reference_i) -> $a.Plan_reference.from_xml2($(plan_reference_i), deferred, object_with_id)))
transition_delay = $(xml).attr('transition_delay')
obj.set('transition_delay', Number(transition_delay))
View
3  prototypes/using-aurora/coffeescripts/Points.coffee
@@ -10,8 +10,7 @@ class window.aurora.Points extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Points()
-
- obj.set('text', )
+ obj.set('text', xml.text())
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
obj
View
2  prototypes/using-aurora/coffeescripts/Position.coffee
@@ -10,7 +10,7 @@ class window.aurora.Position extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Position()
- point = xml.find('point')
+ point = xml.children('point')
obj.set('point', _.map($(point), (point_i) -> $a.Point.from_xml2($(point_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Qcontroller.coffee
@@ -10,7 +10,7 @@ class window.aurora.Qcontroller extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Qcontroller()
- parameters = xml.find('parameters')
+ parameters = xml.children('parameters')
obj.set('parameters', _.reduce(parameters.find("parameter"),
(acc,par_xml) ->
wrapped_xml = $(par_xml);
View
18 prototypes/using-aurora/coffeescripts/Scenario.coffee
@@ -10,23 +10,23 @@ class window.aurora.Scenario extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Scenario()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- network = xml.find('network')
+ network = xml.children('network')
obj.set('network', $a.Network.from_xml2(network, deferred, object_with_id))
- settings = xml.find('settings')
+ settings = xml.children('settings')
obj.set('settings', $a.Settings.from_xml2(settings, deferred, object_with_id))
- InitialDensityProfile = xml.find('InitialDensityProfile')
+ InitialDensityProfile = xml.children('InitialDensityProfile')
obj.set('initialdensityprofile', $a.InitialDensityProfile.from_xml2(InitialDensityProfile, deferred, object_with_id))
- SplitRatioProfileSet = xml.find('SplitRatioProfileSet')
+ SplitRatioProfileSet = xml.children('SplitRatioProfileSet')
obj.set('splitratioprofileset', $a.SplitRatioProfileSet.from_xml2(SplitRatioProfileSet, deferred, object_with_id))
- CapacityProfileSet = xml.find('CapacityProfileSet')
+ CapacityProfileSet = xml.children('CapacityProfileSet')
obj.set('capacityprofileset', $a.CapacityProfileSet.from_xml2(CapacityProfileSet, deferred, object_with_id))
- EventSet = xml.find('EventSet')
+ EventSet = xml.children('EventSet')
obj.set('eventset', $a.EventSet.from_xml2(EventSet, deferred, object_with_id))
- DemandProfileSet = xml.find('DemandProfileSet')
+ DemandProfileSet = xml.children('DemandProfileSet')
obj.set('demandprofileset', $a.DemandProfileSet.from_xml2(DemandProfileSet, deferred, object_with_id))
- ControllerSet = xml.find('ControllerSet')
+ ControllerSet = xml.children('ControllerSet')
obj.set('controllerset', $a.ControllerSet.from_xml2(ControllerSet, deferred, object_with_id))
id = $(xml).attr('id')
obj.set('id', id)
View
12 prototypes/using-aurora/coffeescripts/Sensor.coffee
@@ -10,15 +10,15 @@ class window.aurora.Sensor extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Sensor()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- position = xml.find('position')
+ position = xml.children('position')
obj.set('position', $a.Position.from_xml2(position, deferred, object_with_id))
- display_position = xml.find('display_position')
+ display_position = xml.children('display_position')
obj.set('display_position', $a.Display_position.from_xml2(display_position, deferred, object_with_id))
- links = xml.find('links')
+ links = xml.children('links')
obj.set('links', $a.Links.from_xml2(links, deferred, object_with_id))
- parameters = xml.find('parameters')
+ parameters = xml.children('parameters')
obj.set('parameters', _.reduce(parameters.find("parameter"),
(acc,par_xml) ->
wrapped_xml = $(par_xml);
@@ -26,7 +26,7 @@ class window.aurora.Sensor extends Backbone.Model
acc
{}
))
- data_sources = xml.find('data_sources')
+ data_sources = xml.children('data_sources')
obj.set('data_sources', $a.Data_sources.from_xml2(data_sources, deferred, object_with_id))
id = $(xml).attr('id')
obj.set('id', id)
View
2  prototypes/using-aurora/coffeescripts/SensorList.coffee
@@ -10,7 +10,7 @@ class window.aurora.SensorList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.SensorList()
- sensor = xml.find('sensor')
+ sensor = xml.children('sensor')
obj.set('sensor', _.map($(sensor), (sensor_i) -> $a.Sensor.from_xml2($(sensor_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
6 prototypes/using-aurora/coffeescripts/Settings.coffee
@@ -10,11 +10,11 @@ class window.aurora.Settings extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Settings()
- display = xml.find('display')
+ display = xml.children('display')
obj.set('display', $a.Display.from_xml2(display, deferred, object_with_id))
- VehicleTypes = xml.find('VehicleTypes')
+ VehicleTypes = xml.children('VehicleTypes')
obj.set('vehicletypes', $a.VehicleTypes.from_xml2(VehicleTypes, deferred, object_with_id))
- units = xml.find('units')
+ units = xml.children('units')
obj.set('units', $a.Units.from_xml2(units, deferred, object_with_id))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Signal.coffee
@@ -10,7 +10,7 @@ class window.aurora.Signal extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Signal()
- phase = xml.find('phase')
+ phase = xml.children('phase')
obj.set('phase', _.map($(phase), (phase_i) -> $a.Phase.from_xml2($(phase_i), deferred, object_with_id)))
node_id = $(xml).attr('node_id')
obj.set('node_id', node_id)
View
2  prototypes/using-aurora/coffeescripts/SignalList.coffee
@@ -10,7 +10,7 @@ class window.aurora.SignalList extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.SignalList()
- signal = xml.find('signal')
+ signal = xml.children('signal')
obj.set('signal', _.map($(signal), (signal_i) -> $a.Signal.from_xml2($(signal_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
4 prototypes/using-aurora/coffeescripts/SplitRatioProfileSet.coffee
@@ -10,9 +10,9 @@ class window.aurora.SplitRatioProfileSet extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.SplitRatioProfileSet()
- description = xml.find('description')
+ description = xml.children('description')
obj.set('description', $a.Description.from_xml2(description, deferred, object_with_id))
- splitratios = xml.find('splitratios')
+ splitratios = xml.children('splitratios')
obj.set('splitratios', _.map($(splitratios), (splitratios_i) -> $a.Splitratios.from_xml2($(splitratios_i), deferred, object_with_id)))
id = $(xml).attr('id')
obj.set('id', id)
View
2  prototypes/using-aurora/coffeescripts/Splitratios.coffee
@@ -10,7 +10,7 @@ class window.aurora.Splitratios extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Splitratios()
- srm = xml.find('srm')
+ srm = xml.children('srm')
obj.set('srm', _.map($(srm), (srm_i) -> $a.Srm.from_xml2($(srm_i), deferred, object_with_id)))
node_id = $(xml).attr('node_id')
obj.set('node_id', node_id)
View
2  prototypes/using-aurora/coffeescripts/To.coffee
@@ -10,7 +10,7 @@ class window.aurora.To extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.To()
- ALatLng = xml.find('ALatLng')
+ ALatLng = xml.children('ALatLng')
obj.set('alatlng', $a.ALatLng.from_xml2(ALatLng, deferred, object_with_id))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
3  prototypes/using-aurora/coffeescripts/Units.coffee
@@ -10,8 +10,7 @@ class window.aurora.Units extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Units()
-
- obj.set('text', )
+ obj.set('text', xml.text())
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
obj
View
2  prototypes/using-aurora/coffeescripts/VehicleTypes.coffee
@@ -10,7 +10,7 @@ class window.aurora.VehicleTypes extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.VehicleTypes()
- vtype = xml.find('vtype')
+ vtype = xml.children('vtype')
obj.set('vtype', _.map($(vtype), (vtype_i) -> $a.Vtype.from_xml2($(vtype_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Wfm.coffee
@@ -10,7 +10,7 @@ class window.aurora.Wfm extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Wfm()
- weavingfactors = xml.find('weavingfactors')
+ weavingfactors = xml.children('weavingfactors')
obj.set('weavingfactors', _.map($(weavingfactors), (weavingfactors_i) -> $a.Weavingfactors.from_xml2($(weavingfactors_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
View
2  prototypes/using-aurora/coffeescripts/Zones.coffee
@@ -10,7 +10,7 @@ class window.aurora.Zones extends Backbone.Model
@from_xml2: (xml, deferred, object_with_id) ->
return null if (not xml? or xml.length == 0)
obj = new window.aurora.Zones()
- zone = xml.find('zone')
+ zone = xml.children('zone')
obj.set('zone', _.map($(zone), (zone_i) -> $a.Zone.from_xml2($(zone_i), deferred, object_with_id)))
if obj.resolve_references
obj.resolve_references(deferred, object_with_id)
Please sign in to comment.
Something went wrong with that request. Please try again.