Merge remote-tracking branch 'openstreetmap/pull/788'

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 98ff62f5f389a4148a3748a9af399cee8a20db91..99d435d33a7d78dec9e00af3f38d263d57b2cfc5 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -3,9 +3,8 @@ class WayTag < ActiveRecord::Base
   self.primary_keys = "way_id", "k"
 
   belongs_to :way
-  
-  validates_presence_of :way
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => :way_id
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+
+  validates :way, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :way_id }
 end