Use PostGIS 1.5 and WKT and make compatible

Author: bjornharrtell

.travis.yml

@@ -4,10 +4,8 @@ node_js:
 env:
   - NODE_ENV="development"
 before_install:
-  - echo "yes" | sudo apt-add-repository ppa:0k53d-karl-f830m/postgis
-  - sudo apt-get update
   - sudo apt-get install -qq postgis
 before_script:
-  - psql -c "CREATE DATABASE test;" -U postgres
+  - psql -c "CREATE DATABASE test TEMPLATE template_postgis;" -U postgres
   - psql -f ./test/sql/init.sql -U postgres -d test
   - ./bin/postgresql-http-server --user postgres --database test &

lib/db.coffee

@@ -66,7 +66,9 @@ module.exports = (log, connectionString, database) ->
         count = 1
         for k,v of row
             fields.push "\"#{k}\""
-            params.push if k is 'geom' then "ST_GeomFromGeoJSON($#{count})" else "$#{count}"
+            params.push "$#{count}"
+            # TODO: use something like the below to accept GeoJSON instead of WKT
+            #params.push if k is 'geom' then "ST_GeomFromGeoJSON($#{count})" else "$#{count}"
             values.push v
             count += 1
 

test/specs/resources/rows.coffee

@@ -53,7 +53,7 @@ describe 'Rows resource', ->
                 'Content-Type': 'application/json'
             body:
                 name: 'updatedfirst',
-                geom: '{"type":"Point","coordinates":[-48.23456,20.12345]}'
+                geom: 'POINT (-48.23456 20.12345)'
             callback: (res, data) ->
                 assert res.statusCode is 200, "#{res.statusCode} should be 200"
                 done()

test/sql/init.sql

@@ -1,4 +1,5 @@
 CREATE EXTENSION postgis;
 DROP SCHEMA IF EXISTS testschema CASCADE;
 CREATE SCHEMA testschema;
-CREATE TABLE testschema.testtable (id SERIAL PRIMARY KEY, name varchar, geom GEOMETRY(Point));
+CREATE TABLE testschema.testtable (id SERIAL PRIMARY KEY, name varchar);
+SELECT AddGeometryColumn('testschema', 'testtable', 'geom', 0, 'POINT', 2);