add support for showing osmarender layer instead of mapnik layer, style the vector...

[rails.git] / app / models / old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index c63738fc48e3b8e4a89c8fbf5c425a6905d67b32..2c3e93b2075fc5de263923694f50221123734ec1 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,4 +1,4 @@
-class OldNode < ActiveRecord::Base
+class OldNode < GeoRecord
   set_table_name 'nodes'
   
   validates_presence_of :user_id, :timestamp
@@ -8,34 +8,6 @@ class OldNode < ActiveRecord::Base
 
   belongs_to :user
  
-  before_save :update_tile
-
-  def self.find_by_area(minlat, minlon, maxlat, maxlon, options)
-    self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do
-      return self.find(:all, options)
-    end
-  end
-
-  def update_tile
-    self.tile = QuadTile.tile_for_point(lat, lon)
-  end
-
-  def lat=(l)
-    self.latitude = (l * 10000000).round
-  end
-
-  def lon=(l)
-    self.longitude = (l * 10000000).round
-  end
-
-  def lat
-    return self.latitude.to_f / 10000000
-  end
-
-  def lon
-    return self.longitude.to_f / 10000000
-  end
-
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
@@ -64,7 +36,14 @@ class OldNode < ActiveRecord::Base
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     el1['user'] = self.user.display_name if self.user.data_public?
-    Node.split_tags(el1, self.tags)
+
+    Tags.split(self.tags) do |k,v|
+      el2 = XML::Node.new('tag')
+      el2['k'] = k.to_s
+      el2['v'] = v.to_s
+      el1 << el2
+    end
+
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1