From e341ef56736616e134ddbe29e2f2fd60224c0432 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 11 Oct 2013 20:03:06 +0100 Subject: [PATCH] Remove never actually used code from five years ago --- app/controllers/api_controller.rb | 3 --- app/models/node.rb | 24 ------------------------ 2 files changed, 27 deletions(-) diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index cc9e32266..2c442c190 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -128,9 +128,6 @@ class ApiController < ApplicationController end @nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(MAX_NUMBER_OF_NODES+1) - # get all the nodes, by tag not yet working, waiting for change from NickB - # need to be @nodes (instance var) so tests in /spec can be performed - #@nodes = Node.search(bbox, params[:tag]) node_ids = @nodes.collect(&:id) if node_ids.length > MAX_NUMBER_OF_NODES diff --git a/app/models/node.rb b/app/models/node.rb index e592648de..e81f798b9 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -39,30 +39,6 @@ class Node < ActiveRecord::Base errors.add(:base, "Node is not in the world") unless in_world? end - # - # Search for nodes matching tags within bounding_box - # - # Also adheres to limitations such as within max_number_of_nodes - # - def self.search(bounding_box, tags = {}) - # @fixme a bit of a hack to search for only visible nodes - # couldn't think of another to add to tags condition - #conditions_hash = tags.merge({ 'visible' => 1 }) - - # using named placeholders http://www.robbyonrails.com/articles/2005/10/21/using-named-placeholders-in-ruby - #keys = [] - #values = {} - - #conditions_hash.each do |key,value| - # keys << "#{key} = :#{key}" - # values[key.to_sym] = value - #end - #conditions = keys.join(' AND ') - - find_by_area(bounding_box, :conditions => {:visible => true}, - :limit => MAX_NUMBER_OF_NODES+1) - end - # Read in xml as text and return it's Node object representation def self.from_xml(xml, create=false) begin -- 2.39.5