From 11df52dc3b2ba7a5a3262c5d781658d7568321e2 Mon Sep 17 00:00:00 2001
From: Andy Eschbacher <andy.eschbacher@gmail.com>
Date: Wed, 27 Apr 2016 10:28:53 -0700
Subject: [PATCH] remove cartodb dependency

---
 src/pg/observatory.control            |  2 +-
 src/pg/sql/40_observatory_utility.sql | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pg/observatory.control b/src/pg/observatory.control
index 3d17f0c..d36579f 100644
--- a/src/pg/observatory.control
+++ b/src/pg/observatory.control
@@ -1,5 +1,5 @@
 comment = 'CartoDB Observatory backend extension'
 default_version = '0.0.1'
-requires = 'postgis, cartodb'
+requires = 'postgis'
 superuser = true
 schema = cdb_observatory
diff --git a/src/pg/sql/40_observatory_utility.sql b/src/pg/sql/40_observatory_utility.sql
index 01dcf8e..c5bad9d 100644
--- a/src/pg/sql/40_observatory_utility.sql
+++ b/src/pg/sql/40_observatory_utility.sql
@@ -58,12 +58,12 @@ BEGIN
     select row_number() over () as no, a.column_id as column_id from (select unnest($2) as column_id) a
   )
  SELECT row_to_json(a) from (
-   select  colname, 
-            tablename, 
-            aggregate, 
-            name, 
+   select  colname,
+            tablename,
+            aggregate,
+            name,
             type,
-            c.description 
+            c.description
            FROM column_ids, observatory.OBS_column c, observatory.OBS_column_table ct, observatory.OBS_table t
            WHERE column_ids.column_id  = c.id
              AND c.id = ct.column_id
@@ -116,7 +116,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory._TestPoint()
 AS $$
 BEGIN
   -- new york city
-  RETURN CDB_LatLng(40.704512, -73.936669);
+  RETURN ST_SetSRID(ST_Point( -73.936669, 40.704512), 4326);
 END;
 $$ LANGUAGE plpgsql;