Merge 7922:8377 from trunk.

[rails.git] / app / controllers / swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 47f692b08a9b327bcb36b9a660bca6207a7841c3..54f8382eaf1f125d38e2c5ae7cf4278f56a42d0b 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -187,11 +187,11 @@ class SwfController < ApplicationController
        # (this is duplicated from amf_controller, should probably share)
        
        def lat2coord(a,basey,masterscale)
        # (this is duplicated from amf_controller, should probably share)
        
        def lat2coord(a,basey,masterscale)

-               -(lat2y(a)-basey)*masterscale+250
+               -(lat2y(a)-basey)*masterscale

        end
        
        def long2coord(a,baselong,masterscale)
        end
        
        def long2coord(a,baselong,masterscale)

-               (a-baselong)*masterscale+350
+               (a-baselong)*masterscale

        end
        
        def lat2y(a)
        end
        
        def lat2y(a)