diff --git a/.gitignore b/.gitignore index dee82b4..7d4dcf4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.*~ osm_pbf/*.pbf osm_pbf/*.state.txt +osm_pbf/*.poly settings/last.state.txt diff --git a/docker-imposm3/importer.py b/docker-imposm3/importer.py index 5cea9d9..f8aa99a 100644 --- a/docker-imposm3/importer.py +++ b/docker-imposm3/importer.py @@ -102,7 +102,7 @@ for f in listdir(default['OSM_PBF']): if f.endswith('.state.txt'): state_file = join(default['OSM_PBF'], f) - if f.endswith('.osm.pbf'): + if f.endswith('.pbf'): osm_file = join(default['OSM_PBF'], f) if not osm_file: diff --git a/docker-osmupdate/download.py b/docker-osmupdate/download.py index f7ae97f..c0180a8 100644 --- a/docker-osmupdate/download.py +++ b/docker-osmupdate/download.py @@ -67,7 +67,7 @@ for f in listdir(default['OSM_PBF']): if f.endswith('.state.txt'): state_file = join(default['OSM_PBF'], f) - if f.endswith('.osm.pbf'): + if f.endswith('.pbf'): osm_file = join(default['OSM_PBF'], f) if f.endswith('.poly'): diff --git a/osm_pbf/readme.md b/osm_pbf/readme.md deleted file mode 100644 index a6eec6f..0000000 --- a/osm_pbf/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -This folder should contain a *.pbf and *.state.txt. - -The first pbf file encoutered will be imported, for this reason we recommend -to only place one pbf in this folder so you can be sure which will be imported. diff --git a/readme.md b/readme.md index 4bd650c..da3e480 100644 --- a/readme.md +++ b/readme.md @@ -9,10 +9,10 @@ I will write the example as generically as possible so that you can substitute your own country or region here. ``` -mkdir osm -cd osm +cd osm_pbf wget -c -O country.pbf http://download.openstreetmap.fr/extracts/africa/south_africa.osm.pbf wget -c -O country.state.txt http://download.openstreetmap.fr/extracts/africa/south_africa.state.txt +wget -c -O polygon.poly http://download.geofabrik.de/africa/south-africa-and-lesotho.poly ``` ```