API returns user info if public
This commit is contained in:
parent
a61e2ed690
commit
2f55a3f0a8
6 changed files with 6 additions and 2 deletions
|
@ -10,7 +10,6 @@ class Node < ActiveRecord::Base
|
||||||
has_many :old_nodes, :foreign_key => :id
|
has_many :old_nodes, :foreign_key => :id
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
|
||||||
|
|
||||||
def self.from_xml(xml, create=false)
|
def self.from_xml(xml, create=false)
|
||||||
p = XML::Parser.new
|
p = XML::Parser.new
|
||||||
p.string = xml
|
p.string = xml
|
||||||
|
@ -88,6 +87,7 @@ class Node < ActiveRecord::Base
|
||||||
el1['id'] = self.id.to_s
|
el1['id'] = self.id.to_s
|
||||||
el1['lat'] = self.latitude.to_s
|
el1['lat'] = self.latitude.to_s
|
||||||
el1['lon'] = self.longitude.to_s
|
el1['lon'] = self.longitude.to_s
|
||||||
|
el1['user'] = self.user.display_name if self.user.data_public?
|
||||||
Node.split_tags(el1, self.tags)
|
Node.split_tags(el1, self.tags)
|
||||||
el1['visible'] = self.visible.to_s
|
el1['visible'] = self.visible.to_s
|
||||||
el1['timestamp'] = self.timestamp.xmlschema
|
el1['timestamp'] = self.timestamp.xmlschema
|
||||||
|
|
|
@ -20,6 +20,7 @@ class OldNode < ActiveRecord::Base
|
||||||
el1['id'] = self.id.to_s
|
el1['id'] = self.id.to_s
|
||||||
el1['lat'] = self.latitude.to_s
|
el1['lat'] = self.latitude.to_s
|
||||||
el1['lon'] = self.longitude.to_s
|
el1['lon'] = self.longitude.to_s
|
||||||
|
el1['user'] = self.user.display_name if self.user.data_public?
|
||||||
Node.split_tags(el1, self.tags)
|
Node.split_tags(el1, self.tags)
|
||||||
el1['visible'] = self.visible.to_s
|
el1['visible'] = self.visible.to_s
|
||||||
el1['timestamp'] = self.timestamp.xmlschema
|
el1['timestamp'] = self.timestamp.xmlschema
|
||||||
|
|
|
@ -20,6 +20,7 @@ class OldSegment < ActiveRecord::Base
|
||||||
el1['id'] = self.id.to_s
|
el1['id'] = self.id.to_s
|
||||||
el1['from'] = self.node_a.to_s
|
el1['from'] = self.node_a.to_s
|
||||||
el1['to'] = self.node_b.to_s
|
el1['to'] = self.node_b.to_s
|
||||||
|
el1['user'] = self.user.display_name if self.user.data_public?
|
||||||
Segment.split_tags(el1, self.tags)
|
Segment.split_tags(el1, self.tags)
|
||||||
el1['visible'] = self.visible.to_s
|
el1['visible'] = self.visible.to_s
|
||||||
el1['timestamp'] = self.timestamp.xmlschema
|
el1['timestamp'] = self.timestamp.xmlschema
|
||||||
|
|
|
@ -81,6 +81,7 @@ class OldWay < ActiveRecord::Base
|
||||||
el1['id'] = self.id.to_s
|
el1['id'] = self.id.to_s
|
||||||
el1['visible'] = self.visible.to_s
|
el1['visible'] = self.visible.to_s
|
||||||
el1['timestamp'] = self.timestamp.xmlschema
|
el1['timestamp'] = self.timestamp.xmlschema
|
||||||
|
el1['user'] = self.user.display_name if self.user.data_public?
|
||||||
|
|
||||||
self.old_segments.each do |seg| # FIXME need to make sure they come back in the right order
|
self.old_segments.each do |seg| # FIXME need to make sure they come back in the right order
|
||||||
e = XML::Node.new 'seg'
|
e = XML::Node.new 'seg'
|
||||||
|
|
|
@ -82,6 +82,7 @@ class Segment < ActiveRecord::Base
|
||||||
el1['id'] = self.id.to_s
|
el1['id'] = self.id.to_s
|
||||||
el1['from'] = self.node_a.to_s
|
el1['from'] = self.node_a.to_s
|
||||||
el1['to'] = self.node_b.to_s
|
el1['to'] = self.node_b.to_s
|
||||||
|
el1['user'] = self.user.display_name if self.user.data_public?
|
||||||
Segment.split_tags(el1, self.tags)
|
Segment.split_tags(el1, self.tags)
|
||||||
el1['visible'] = self.visible.to_s
|
el1['visible'] = self.visible.to_s
|
||||||
el1['timestamp'] = self.timestamp.xmlschema
|
el1['timestamp'] = self.timestamp.xmlschema
|
||||||
|
|
|
@ -62,7 +62,7 @@ class Way < ActiveRecord::Base
|
||||||
el1['id'] = self.id.to_s
|
el1['id'] = self.id.to_s
|
||||||
el1['visible'] = self.visible.to_s
|
el1['visible'] = self.visible.to_s
|
||||||
el1['timestamp'] = self.timestamp.xmlschema
|
el1['timestamp'] = self.timestamp.xmlschema
|
||||||
|
el1['user'] = self.user.display_name if self.user.data_public?
|
||||||
# make sure segments are output in sequence_id order
|
# make sure segments are output in sequence_id order
|
||||||
ordered_segments = []
|
ordered_segments = []
|
||||||
self.way_segments.each do |seg|
|
self.way_segments.each do |seg|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue