From 5e86ce9b3e74bb0fcce92f94652c78c4499216a7 Mon Sep 17 00:00:00 2001 From: MoisesMachado Date: Fri, 9 May 2008 19:57:07 +0000 Subject: [PATCH] ActionItem129: eliminated sqlite_extensions.rb from application since its now on the plugin --- lib/sqlite_extension.rb | 44 -------------------------------------------- vendor/plugins/geokit/lib/geo_kit/sqlite_extension.rb | 8 ++++---- 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 lib/sqlite_extension.rb diff --git a/lib/sqlite_extension.rb b/lib/sqlite_extension.rb deleted file mode 100644 index ce63bb2..0000000 --- a/lib/sqlite_extension.rb +++ /dev/null @@ -1,44 +0,0 @@ -if ActiveRecord::Base.connection.adapter_name =~ /^sqlite$/i - - database = ActiveRecord::Base.connection.raw_connection - - database.create_function('sin', 1, :numeric) do |func, value| - func.set_result(Math.sin(value)) - end - - database.create_function('cos', 1, :numeric) do |func, value| - func.set_result(Math.cos(value)) - end - - database.create_function('pow', 2, :numeric) do |func, base, exponent| - func.set_result(base.to_f ** exponent.to_f) - end - - database.create_function('asin', 1, :numeric) do |func, value| - func.set_result(Math.asin(value)) - end - - database.create_function('acos', 1, :numeric) do |func, value| - func.set_result(Math.acos(value)) - end - - database.create_function('radians', 1, :numeric) do |func, value| - func.set_result(value.to_f * Math::PI / 180.0) - end - - database.create_function('sqrt', 1, :numeric) do |func, value| - func.set_result(Math.sqrt(value)) - end - - database.create_function('spheric_distance', 5, :real) do |func, lat1, long1, lat2, long2, radius| - func.set_result( - radius.to_f * Math.acos( - [1, - Math.cos(lat1.to_f) * Math.cos(long1.to_f) * Math.cos(lat2.to_f) * Math.cos(long2.to_f) + - Math.cos(lat1.to_f) * Math.sin(long1.to_f) * Math.cos(lat2.to_f) * Math.sin(long2.to_f) + - Math.sin(lat1.to_f) * Math.sin(lat2.to_f) - ].min - ) - ) - end -end diff --git a/vendor/plugins/geokit/lib/geo_kit/sqlite_extension.rb b/vendor/plugins/geokit/lib/geo_kit/sqlite_extension.rb index e12b416..e4dd9df 100644 --- a/vendor/plugins/geokit/lib/geo_kit/sqlite_extension.rb +++ b/vendor/plugins/geokit/lib/geo_kit/sqlite_extension.rb @@ -6,14 +6,14 @@ if ActiveRecord::Base.connection.adapter_name =~ /^sqlite$/i func.set_result(base.to_f ** exponent.to_f) end - database.create_function('radians', 1, :numeric) do |func, value| - func.set_result(value.to_f * Math::PI / 180.0) - end - database.create_function('sqrt', 1, :numeric) do |func, value| func.set_result(Math.sqrt(value)) end + database.create_function('radians', 1, :numeric) do |func, value| + func.set_result(value.to_f * Math::PI / 180.0) + end + database.create_function('spheric_distance', 5, :real) do |func, lat1, long1, lat2, long2, radius| func.set_result( radius.to_f * Math.acos( -- libgit2 0.21.2