diff --git a/README.md b/README.md index b0501ec..444b5fc 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,9 @@ Download them to the `shp` directory in the osm-bright folder. You can do this w wget http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip wget http://data.openstreetmapdata.com/land-polygons-split-3857.zip +If you are going to use the osm2pqsql style you will need another (but smaller shapefile) + wget http://mapbox-geodata.s3.amazonaws.com/natural-earth-1.4.0/cultural/10m-populated-places-simple.zip + Once downloaded, extract them from their zip files. ### 2. Run the shapefiles through shapeindex diff --git a/configure.py.sample b/configure.py.sample index 81a0b71..9516ac6 100755 --- a/configure.py.sample +++ b/configure.py.sample @@ -41,3 +41,9 @@ config["postgis"]["extent"] = "-20037508.34,-20037508.34,20037508.34,20037508.34 config["land-high"] = path.join(getcwd(),"shp/land-polygons-split-3857/land_polygons.shp") config["land-low"] = path.join(getcwd(),"shp/simplified-land-polygons-complete-3857/simplified_land_polygons.shp") +# Places shapefile required for the osm2pgsql style +# - http://mapbox-geodata.s3.amazonaws.com/natural-earth-1.4.0/cultural/10m-populated-places-simple.zip +# or +# - http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip + +config["ne_places"] = path.join(getcwd(),"shp/ne_10m_populated_places/ne_10m_populated_places.shp") diff --git a/make.py b/make.py index 40637a3..497474b 100755 --- a/make.py +++ b/make.py @@ -46,6 +46,8 @@ def build(): layer["Datasource"]["file"] = config["land-low"] elif layer["id"] == "land-high": layer["Datasource"]["file"] = config["land-high"] + elif layer["id"] == "ne_places": + layer["Datasource"]["file"] = config["ne_places"] else: # Assume all other layers are PostGIS layers for opt, val in config["postgis"].iteritems(): @@ -88,6 +90,7 @@ def pull(): defaultconfig["name"] = "OSM Bright" defaultconfig["land-high"] = "http://data.openstreetmapdata.com/land-polygons-split-3857.zip" defaultconfig["land-low"] = "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip" + defaultconfig["ne_places"] = "http://mapbox-geodata.s3.amazonaws.com/natural-earth-1.4.0/cultural/10m-populated-places-simple.zip" project["name"] = defaultconfig["name"] for layer in project["Layer"]: @@ -95,6 +98,8 @@ def pull(): layer["Datasource"]["file"] = defaultconfig["land-low"] elif layer["id"] == "land-high": layer["Datasource"]["file"] = defaultconfig["land-high"] + elif layer["id"] == "ne_places": + layer["Datasource"]["file"] = defaultconfig["ne_places"] else: # Assume all other layers are PostGIS layers for opt, val in defaultconfig["postgis"].iteritems():