X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fc25c3d412829774abf0454e4dcc92e41f47454c..b471d757cad20ddb6d7815aa82f0d7ca674e9ef7:/app/models/old_way.rb diff --git a/app/models/old_way.rb b/app/models/old_way.rb index c2af4f21c..db8a6df40 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -1,8 +1,8 @@ class OldWay < ActiveRecord::Base include ConsistencyValidations - set_table_name 'ways' - set_primary_keys :way_id, :version + self.table_name = "ways" + self.primary_keys = "way_id", "version" belongs_to :changeset @@ -137,7 +137,7 @@ class OldWay < ActiveRecord::Base id = n; reuse = curnode.visible if oldnode.lat != curnode.lat or oldnode.lon != curnode.lon or oldnode.tags != curnode.tags then # node has changed: if it's in other ways, give it a new id - if curnode.ways-[self.node_id] then id=-1; reuse=false end + if curnode.ways-[self.way_id] then id=-1; reuse=false end end points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse] end