safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

use postgis as an extension for versions >= 2.0

Browse Source
This commit is contained in:
Sarah Hoffmann
2013-10-10 23:10:18 +02:00
parent f054836e05
commit 8675a2607a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/setup.php
View File

@@ -125,7 +125,13 @@
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');
}
$sVersionString = $oDB->getOne('select postgis_full_version()'); $sVersionString = $oDB->getOne('select postgis_full_version()');
preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches); preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2]) if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])
@@ -134,7 +140,6 @@
exit; exit;
} }
pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql'); pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql'); pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql'); pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');