@@ -1,6 +1,6 @@ GEOPOST_ROOT = File.dirname(__FILE__) -GEOCODED_ROOT = "/home/tempest/geocoded" -DRIVETIME_ROOT = "/home/tempest/drivetime" +GEOCODED_ROOT = "/home/nonstop/geocoded" +DRIVETIME_ROOT = "/home/nonstop/drivetime" $LOAD_PATH << File.expand_path(File.dirname(__FILE__)) lib/putsgis.rb @@ -108,7 +108,9 @@ module PutsGIS :geom_col => :temporal_geom, :geom => false, :fkey => :id, + :join_conditions => {}, :in => true, + :order => false, :select => :all, :distance => false, :drive => nil, @@ -186,7 +188,14 @@ module PutsGIS sql << "#{table}.#{fkey} #{notin}" sql << "(SELECT DISTINCT on (#{table}.#{fkey}) #{table}.#{fkey} FROM #{object_table} INNER JOIN #{table} ON #{table}.#{fkey}=#{object_table}.#{self.to_s.downcase}_#{fkey} - WHERE (#{function}(#{object_table}.#{geom_kind},(SELECT #{geom_kind} FROM #{geom_b} WHERE id = #{geom_b_id})) = #{options[:outcome]}))" + WHERE ((#{function}(#{object_table}.#{geom_kind},(SELECT #{geom_kind} FROM #{geom_b} WHERE id = #{geom_b_id})) = #{options[:outcome]})" + if options[:join_conditions].any? + options[:join_conditions].each_pair do |key,value| + sql_value = value + sql << "AND #{object_table}.#{key} #{sql_value}))" + end + end + if subquery.any? function = "ST_#{subquery[:function].to_s.camelize}" case subquery[:geom_kind] @@ -216,7 +225,7 @@ module PutsGIS if options[:distance] distance = ",#{units(options[:distance],options[:units])}" end - sql << "WHERE (#{function}(#{table_name}.#{geom_kind},(#{select_geom})#{distance}) = #{options[:outcome]})" + sql << "WHERE (#{function}(#{table_name}.#{geom_kind},(#{select_geom})#{distance}) = #{options[:outcome]})" end if options[:destination] destination = options[:destination].to_s.pluralize @@ -232,6 +241,8 @@ module PutsGIS options[:conditions].each_pair do |key,value| if value.to_s.split('')[0] =~ /^>|^</ sql_value = value + elsif value == :not_null + sql_value = "IS NOT NULL" else sql_value = "= '#{value}'" end @@ -242,6 +253,7 @@ module PutsGIS sql[2] = sql[2].gsub(/AND/,'AND (') sql[-1] = sql[-1].gsub(/$/,')') end + sql << "ORDER BY RANDOM()" if options[:order] = :rand if options[:select] != :all connection.select_values sql.join(' ') else lib/putsgis/putsgis.rb 107883f8f4d3729e799318afe68cc061b36adf5d Jamie Brough jb@tempestattack.com http://github.com/broughcut/acts_as_line/commit/1493226ab41986a4f7c57b18c628bf0abdc251ed 1493226ab41986a4f7c57b18c628bf0abdc251ed 2008-04-10T03:16:31-07:00 2008-04-10T03:16:31-07:00 custom revisions for own project cde05fe1575ee905839669e4da8280da67d3da7f Jamie Brough jb@tempestattack.com