Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index d5f6047e894f1bdd2c8592da91a0ee9007746a91..e23a22111bacb33628054671845cce415d4f0655 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -125,7 +125,17 @@
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 

-               pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+               $fPostgisVersion = (float) CONST_Postgis_Version;
+               if ($fPostgisVersion < 2.0) {
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
+               } else {
+                       pgsqlRunScript('CREATE EXTENSION postgis');
+               }
+               if ($fPostgisVersion < 2.1) {
+                       // Function was renamed in 2.1 and throws an annoying deprecation warning
+                       pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint');
+               }

                $sVersionString = $oDB->getOne('select postgis_full_version()');
                preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
                if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])
                $sVersionString = $oDB->getOne('select postgis_full_version()');
                preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
                if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])


@@ -134,7 +144,6 @@
                        exit;
                }
 
                        exit;
                }
 

-               pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');

                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');


@@ -189,6 +198,7 @@
                $sTemplate = str_replace('{modulepath}', CONST_BasePath.'/module', $sTemplate);
                if ($aCMDResult['enable-diff-updates']) $sTemplate = str_replace('RETURN NEW; -- @DIFFUPDATES@', '--', $sTemplate);
                if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
                $sTemplate = str_replace('{modulepath}', CONST_BasePath.'/module', $sTemplate);
                if ($aCMDResult['enable-diff-updates']) $sTemplate = str_replace('RETURN NEW; -- @DIFFUPDATES@', '--', $sTemplate);
                if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);

+               if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);

                pgsqlRunScript($sTemplate);
        }
 
                pgsqlRunScript($sTemplate);
        }