more madness

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index aaad3fe11a80dda263f8b6063b2f3778a866cb82..4afba1484fd58fd9f39ff6dca1b7f6b3d7bf4afe 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -123,7 +123,7 @@ class AmfController < ApplicationController
     points = nodes_not_used_in_area.collect { |n| [n.id, n.lon_potlatch(baselong,masterscale), n.lat_potlatch(basey,masterscale), n.tags_as_hash] }
 
     # find the relations used by those nodes and ways
     points = nodes_not_used_in_area.collect { |n| [n.id, n.lon_potlatch(baselong,masterscale), n.lat_potlatch(basey,masterscale), n.tags_as_hash] }
 
     # find the relations used by those nodes and ways

-    relation_ids = (Relation.find_for_nodes_and_ways(nodes_in_area.collect {|n| n.id}, way_ids)||[]).collect {|n| n.id}.uniq
+    relation_ids = (Relation.find_for_nodes_and_ways(nodes_in_area.collect {|n| n.id}, way_ids)).collect {|n| n.id}.uniq

 
     [way_ids,points,relation_ids]
   end
 
     [way_ids,points,relation_ids]
   end

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 0d10b77284358cd4975d8c2b7a76b7b1716c176d..93e9379b68694901152881b1ba0c5e1d541d0e66 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -102,19 +102,21 @@ class Relation < ActiveRecord::Base
     return el1
   end 
 
     return el1
   end 
 

+    
+  # collect relationships. currently done in one big block at the end;
+  # may need to move this upwards if people want automatic completion of
+  # relationships, i.e. deliver referenced objects like we do with ways... 
+  # FIXME: rip out the fucking SQL

   def self.find_for_nodes_and_ways(node_ids, way_ids)
   def self.find_for_nodes_and_ways(node_ids, way_ids)

-    # collect relationships. currently done in one big block at the end;
-    # may need to move this upwards if people want automatic completion of
-    # relationships, i.e. deliver referenced objects like we do with ways...
-       return [] if node_ids.empty? and node_ids.empty?
+    return [] if node_ids.empty? and node_ids.empty?

     relations = Array.new
     if node_ids.length > 0
     relations = Array.new
     if node_ids.length > 0

-        relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +
+      relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +

             "e.visible=1 and " +
             "em.id = e.id and em.member_type='node' and em.member_id in (#{node_ids.join(',')})")
     end
     if way_ids.length > 0
             "e.visible=1 and " +
             "em.id = e.id and em.member_type='node' and em.member_id in (#{node_ids.join(',')})")
     end
     if way_ids.length > 0

-        relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +
+      relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +

             "e.visible=1 and " +
             "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})")
     end
             "e.visible=1 and " +
             "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})")
     end


@@ -124,20 +126,20 @@ class Relation < ActiveRecord::Base
   # FIXME is this really needed?
   def members
     unless @members
   # FIXME is this really needed?
   def members
     unless @members

-        @members = Array.new
-        self.relation_members.each do |member|
-            @members += [[member.member_type,member.member_id,member.member_role]]
-        end
+      @members = Array.new
+      self.relation_members.each do |member|
+        @members += [[member.member_type,member.member_id,member.member_role]]
+      end

     end
     @members
   end
 
   def tags
     unless @tags
     end
     @members
   end
 
   def tags
     unless @tags

-        @tags = Hash.new
-        self.relation_tags.each do |tag|
-            @tags[tag.k] = tag.v
-        end
+      @tags = Hash.new
+      self.relation_tags.each do |tag|
+        @tags[tag.k] = tag.v
+      end

     end
     @tags
   end
     end
     @tags
   end


@@ -171,11 +173,11 @@ class Relation < ActiveRecord::Base
       RelationTag.delete_all(['id = ?', self.id])
 
       tags.each do |k,v|
       RelationTag.delete_all(['id = ?', self.id])
 
       tags.each do |k,v|

-       tag = RelationTag.new
-       tag.k = k
-       tag.v = v
-       tag.id = self.id
-       tag.save!
+        tag = RelationTag.new
+        tag.k = k
+        tag.v = v
+        tag.id = self.id
+        tag.save!

       end
 
       members = self.members
       end
 
       members = self.members


@@ -183,12 +185,12 @@ class Relation < ActiveRecord::Base
       RelationMember.delete_all(['id = ?', self.id])
 
       members.each do |n|
       RelationMember.delete_all(['id = ?', self.id])
 
       members.each do |n|

-       mem = RelationMember.new
-       mem.id = self.id
-       mem.member_type = n[0];
-       mem.member_id = n[1];
-       mem.member_role = n[2];
-       mem.save!
+        mem = RelationMember.new
+        mem.id = self.id
+        mem.member_type = n[0];
+        mem.member_id = n[1];
+        mem.member_role = n[2];
+        mem.save!

       end
 
       old_relation = OldRelation.from_relation(self)
       end
 
       old_relation = OldRelation.from_relation(self)