cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 15165:15373 from trunk.

Browse source
This commit is contained in:
Tom Hughes 2009-05-31 11:32:32 +00:00
parent e9bea64bf6
commit 3d906fe8c6
25 changed files with 191 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
db/migrate/005_tile_tracepoints.rb
View file

@ -6,9 +6,9 @@ class TileTracepoints < ActiveRecord::Migration
add_index "gps_points", ["tile"], :name => "points_tile_idx"
remove_index "gps_points", :name => "points_idx"
begin
if ENV["USE_DB_FUNCTIONS"]
Tracepoint.update_all("latitude = latitude * 10, longitude = longitude * 10, tile = tile_for_point(latitude * 10, longitude * 10)")
rescue ActiveRecord::StatementInvalid => ex
else
Tracepoint.find(:all).each do |tp|
tp.latitude = tp.latitude * 10
tp.longitude = tp.longitude * 10

4
db/migrate/006_tile_nodes.rb
View file

@ -2,7 +2,7 @@ require 'lib/migrate'
class TileNodes < ActiveRecord::Migration
def self.upgrade_table(from_table, to_table, model)
begin
if ENV["USE_DB_FUNCTIONS"]
execute <<-END_SQL
INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),
@ -11,7 +11,7 @@ class TileNodes < ActiveRecord::Migration
CAST(ROUND(longitude * 10000000) AS INTEGER))
FROM #{from_table}
END_SQL
rescue ActiveRecord::StatementInvalid => ex
else
execute <<-END_SQL
INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),