hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1251 from mtmail/remove-naturalearth-boundary-fallback

Browse Source 
remove Natural Earth dataset
This commit is contained in:
Sarah Hoffmann
2018-11-28 22:29:41 +01:00
committed by GitHub
parent e28fa6c787 a7e26e8f59
commit e5cb5d439d
4 changed files with 16 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
data/country_naturalearthdata.sql
View File

File diff suppressed because one or more lines are too long

16
docs/admin/Migration.md
View File

@@ -6,6 +6,22 @@ to newer versions of Nominatim.
SQL statements should be executed from the postgres commandline. Execute SQL statements should be executed from the postgres commandline. Execute
`psql nominatim` to enter command line mode. `psql nominatim` to enter command line mode.
## 3.2.0 -> master
### Natural Earth country boundaries no longer needed as fallback
```
DROP TABLE country_naturalearthdata;
```
Finally, update all SQL functions:
```sh
./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
```
## 3.1.0 -> 3.2.0 ## 3.1.0 -> 3.2.0
### New reverse algorithm ### New reverse algorithm

1
lib/setup/SetupClass.php
View File

@@ -150,7 +150,6 @@ class SetupFunctions
exit(1); exit(1);
} }
$this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql'); $this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
$this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
$this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql.gz'); $this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql.gz');
$this->pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql'); $this->pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql');

16
sql/functions.sql
View File

@@ -561,14 +561,6 @@ BEGIN
RETURN nearcountry.country_code; RETURN nearcountry.country_code;
END LOOP; END LOOP;
-- RAISE WARNING 'natural earth: %', ST_AsText(place_centre);
-- Natural earth data
FOR nearcountry IN select country_code from country_naturalearthdata where st_covers(geometry, place_centre) limit 1
LOOP
RETURN nearcountry.country_code;
END LOOP;
-- RAISE WARNING 'near osm fallback: %', ST_AsText(place_centre); -- RAISE WARNING 'near osm fallback: %', ST_AsText(place_centre);
-- --
@@ -577,14 +569,6 @@ BEGIN
RETURN nearcountry.country_code; RETURN nearcountry.country_code;
END LOOP; END LOOP;
-- RAISE WARNING 'near natural earth: %', ST_AsText(place_centre);
-- Natural earth data
FOR nearcountry IN select country_code from country_naturalearthdata where st_dwithin(geometry, place_centre, 0.5) limit 1
LOOP
RETURN nearcountry.country_code;
END LOOP;
RETURN NULL; RETURN NULL;
END; END;
$$ $$