Merge rails_port as of r4613 & fix tests.

[rails.git] / db / functions / quadtile.c

diff --git a/db/functions/quadtile.c b/db/functions/quadtile.c
index 7d17f6f76475076306df6e252fcb294162dea2e5..d60189245bd3f2ef5c09fe61a91bc87beab01868 100644 (file)
--- a/db/functions/quadtile.c
+++ b/db/functions/quadtile.c
@@ -24,8 +24,8 @@ void tile_for_point_deinit(UDF_INIT *initid)
 
 long long tile_for_point(UDF_INIT *initid, UDF_ARGS *args, char *is_null, char *error)
 {
 
 long long tile_for_point(UDF_INIT *initid, UDF_ARGS *args, char *is_null, char *error)
 {

-   long long lon = *(long long *)args->args[0];
-   long long lat = *(long long *)args->args[1];
+   long long lat = *(long long *)args->args[0];
+   long long lon = *(long long *)args->args[1];

 
 

-   return xy2tile(lon2x(lon / 1000000.0), lat2y(lat / 1000000.0));
+   return xy2tile(lon2x(lon / 10000000.0), lat2y(lat / 10000000.0));

 }
 }