Merge remote-tracking branch 'upstream/pull/2863'

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

diff --git a/db/functions/maptile.c b/db/functions/maptile.c
index f96f9c23e5e052078c90c2348ae70852b41bd2d2..358a3ba75247602f05d52d4debc48433cf5fee34 100644 (file)
--- a/db/functions/maptile.c
+++ b/db/functions/maptile.c
@@ -1,39 +1,36 @@
-#include <my_global.h>
-#include <my_sys.h>
-#include <m_string.h>
-#include <mysql.h>
+#include <math.h>
+#include <postgres.h>
+#include <fmgr.h>

 
 

-my_bool maptile_for_point_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
+Datum
+maptile_for_point(PG_FUNCTION_ARGS)

 {
 {

-   if ( args->arg_count != 3 ||
-        args->arg_type[0] != INT_RESULT ||
-        args->arg_type[1] != INT_RESULT ||
-        args->arg_type[2] != INT_RESULT )
-   {
-      strcpy( message, "Your maptile_for_point arguments are bogus!" );
-      return 1;
-   }
-
-   return 0;
-}
-
-void maptile_for_point_deinit(UDF_INIT *initid)
-{
-   return;
-}
-
-long long maptile_for_point(UDF_INIT *initid, UDF_ARGS *args, char *is_null, char *error)
-{
-   double       lat = *(long long *)args->args[0] / 10000000.0;
-   double       lon = *(long long *)args->args[1] / 10000000.0;
-   long long    zoom = *(long long *)args->args[2];
-   double       scale = pow(2, zoom);
-   double       r_per_d = M_PI / 180;
+   double lat = PG_GETARG_INT64(0) / 10000000.0;
+   double lon = PG_GETARG_INT64(1) / 10000000.0;
+   int zoom = PG_GETARG_INT32(2);
+   double scale = pow(2, zoom);
+   double r_per_d = M_PI / 180;

    unsigned int x;
    unsigned int y;
 
    x = floor((lon + 180.0) * scale / 360.0);
    y = floor((1 - log(tan(lat * r_per_d) + 1.0 / cos(lat * r_per_d)) / M_PI) * scale / 2.0);
 
    unsigned int x;
    unsigned int y;
 
    x = floor((lon + 180.0) * scale / 360.0);
    y = floor((1 - log(tan(lat * r_per_d) + 1.0 / cos(lat * r_per_d)) / M_PI) * scale / 2.0);
 

-   return (x << zoom) | y;
+   PG_RETURN_INT32((x << zoom) | y);

 }
 }

+
+PG_FUNCTION_INFO_V1(maptile_for_point);
+
+/*
+ * To bind this into PGSQL, try something like:
+ *
+ * CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4
+ *  AS '/path/to/rails-port/db/functions/libpgosm', 'maptile_for_point'
+ *  LANGUAGE C STRICT;
+ *
+ * (without all the *s)
+ */
+
+#ifdef PG_MODULE_MAGIC
+PG_MODULE_MAGIC;
+#endif