From 9d9a06d6ee36e0ddd74bd22435cf557bbd8dcab2 Mon Sep 17 00:00:00 2001 From: Paul Norman Date: Tue, 9 Sep 2014 16:22:48 -0700 Subject: [PATCH 1/3] Add missing periods --- INSTALL.md | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 85ef1a6564..4d4c49582f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,7 +8,7 @@ It's probably easiest to grab an PBF of OSM data from [Mapzen](https://mapzen.co osm2pgsql -d gis ~/path/to/data.osm.pbf --style openstreetmap-carto.style ``` -You can find a more detailed guide to setting up a database and loading data with osm2pgsql at [switch2osm.org](http://switch2osm.org/loading-osm-data/) +You can find a more detailed guide to setting up a database and loading data with osm2pgsql at [switch2osm.org](http://switch2osm.org/loading-osm-data/). Additionally you need some shapefiles. diff --git a/README.md b/README.md index 5f8d07eedf..9e8612ed30 100644 --- a/README.md +++ b/README.md @@ -8,17 +8,17 @@ These stylesheets can be used in your own cartography projects, and are designed customised. They work with [TileMill](http://www.mapbox.com/tilemill/) and also with the command-line [CartoCSS](https://github.com/mapbox/carto) processor. Since August 2013 these stylesheets have been used on the OSMF tileservers (tile.openstreetmap.org), and -are updated from each point release. They supersede the previous [XML-based stylesheets](https://trac.openstreetmap.org/browser/subversion/applications/rendering/mapnik) +are updated from each point release. They supersede the previous [XML-based stylesheets](https://trac.openstreetmap.org/browser/subversion/applications/rendering/mapnik). # Installation You need a PostGIS database populated with OpenStreetMap data in the standard -osm2pgsql database layout, along with auxillary shapefiles. See [INSTALL.md](INSTALL.md) +osm2pgsql database layout, along with auxillary shapefiles. See [INSTALL.md](INSTALL.md). # Contributing Contributions to this project are welcome, see [CONTRIBUTING.md](CONTRIBUTING.md) -for full details +for full details. # Versioning From 2670a1b4b4905ccf9c5c8f49bbbcbe170666b1c5 Mon Sep 17 00:00:00 2001 From: Paul Norman Date: Tue, 9 Sep 2014 16:26:30 -0700 Subject: [PATCH 2/3] More Markdownification --- INSTALL.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 4d4c49582f..56fa3cb3f9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -24,13 +24,13 @@ To download the shapefiles you can run the following script from this directory. You can also download them manually at the following paths: -* `simplified-land-polygons.shp` [download](http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip) -* `land-polygon.shp` [download](http://data.openstreetmapdata.com/land-polygons-split-3857.zip) -* `builtup_area.shp` [download](http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz) -* `ne_110m_admin_0_boundary_lines_land.shp` [download](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip) -* `ne_10m_populated_places_fixed.shp` [download](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip) (and see below) +* [``simplified-land-polygons.shp``](http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip) +* [``land-polygon.shp``](http://data.openstreetmapdata.com/land-polygons-split-3857.zip) +* [``builtup_area.shp``](http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz) +* [``ne_110m_admin_0_boundary_lines_land.shp``](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip) +* [``ne_10m_populated_places_fixed.shp``](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip) (and see [below](#populated-places-shapefile)) -Put these shapefiles at path/to/openstreetmap-carto/data +Put these shapefiles at ``path/to/openstreetmap-carto/data``. ### Populated places shapefile From fdc32e1fb9f47de472359c6c419709d22e5dea93 Mon Sep 17 00:00:00 2001 From: Paul Norman Date: Tue, 9 Sep 2014 16:30:09 -0700 Subject: [PATCH 3/3] Explain about the shapefiles a bit more --- INSTALL.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 56fa3cb3f9..abc903ac6a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -24,12 +24,14 @@ To download the shapefiles you can run the following script from this directory. You can also download them manually at the following paths: -* [``simplified-land-polygons.shp``](http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip) -* [``land-polygon.shp``](http://data.openstreetmapdata.com/land-polygons-split-3857.zip) +* [``simplified-land-polygons.shp``](http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip) (updated daily) +* [``land-polygon.shp``](http://data.openstreetmapdata.com/land-polygons-split-3857.zip) (updated daily) * [``builtup_area.shp``](http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz) * [``ne_110m_admin_0_boundary_lines_land.shp``](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip) * [``ne_10m_populated_places_fixed.shp``](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip) (and see [below](#populated-places-shapefile)) +The repeated www.naturalearthdata.com in the Natural Earth shapefiles is correct. + Put these shapefiles at ``path/to/openstreetmap-carto/data``. ### Populated places shapefile