From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 24 Oct 2016 18:39:49 +0000 (+0200)
Subject: fix parameter list for renamed postgis functions
X-Git-Tag: v3.0.0~98
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/a61f852cd2c9fa5f0e3d221590f32bb2403d617b

fix parameter list for renamed postgis functions

fixes #560
---

diff --git a/utils/setup.php b/utils/setup.php
index d08f3bd7..06216587 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -126,10 +126,10 @@ if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
     if ($fPostgisVersion < 2.1) {
         // Functions were renamed in 2.1 and throw an annoying deprecation warning
         pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint');
-        pgsqlRunScript('ALTER FUNCTION ST_Line_Locate_Point(geometry, double precision) RENAME TO ST_LineLocatePoint');
+        pgsqlRunScript('ALTER FUNCTION ST_Line_Locate_Point(geometry, geometry) RENAME TO ST_LineLocatePoint');
     }
     if ($fPostgisVersion < 2.2) {
-        pgsqlRunScript('ALTER FUNCTION ST_Distance_Spheroid(geometry, double precision) RENAME TO ST_DistanceSpheroid');
+        pgsqlRunScript('ALTER FUNCTION ST_Distance_Spheroid(geometry, geometry, spheroid) RENAME TO ST_DistanceSpheroid');
     }
 
     pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');