From e192c779862acdde8b0191faca8a2910f2008719 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 21 Apr 2009 21:37:27 +0000 Subject: [PATCH] Use correct names for member types. --- app/controllers/amf_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index d8d7ce3c4..c7eb4ae4c 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -796,7 +796,7 @@ class AmfController < ApplicationController def deleteitemrelations(user, changeset_id, objid, type, version) #:doc: relations = RelationMember.find(:all, - :conditions => ['member_type = ? and member_id = ?', type, objid], + :conditions => ['member_type = ? and member_id = ?', type.classify, objid], :include => :relation).collect { |rm| rm.relation }.uniq relations.each do |rel| @@ -884,7 +884,7 @@ class AmfController < ApplicationController SELECT DISTINCT cr.id AS relid,cr.version AS version FROM current_relations cr INNER JOIN current_relation_members crm ON crm.id=cr.id - INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='node' + INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='Node' WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")} EOF unless way_ids.empty? @@ -893,7 +893,7 @@ class AmfController < ApplicationController SELECT DISTINCT cr.id AS relid,cr.version AS version FROM current_relations cr INNER JOIN current_relation_members crm ON crm.id=cr.id - WHERE crm.member_type='way' + WHERE crm.member_type='Way' AND crm.member_id IN (#{way_ids.join(',')}) EOF end -- 2.43.2