Skip to content

Commit

Permalink
Merge pull request gravitystorm#933 from pnorman/docs-grammar
Browse files Browse the repository at this point in the history
Docs grammar
  • Loading branch information
gravitystorm committed Sep 10, 2014
2 parents c2ef817 + fdc32e1 commit cfdc110
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
16 changes: 9 additions & 7 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -24,13 +24,15 @@ 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) (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))

Put these shapefiles at path/to/openstreetmap-carto/data
The repeated www.naturalearthdata.com in the Natural Earth shapefiles is correct.

Put these shapefiles at ``path/to/openstreetmap-carto/data``.

### Populated places shapefile

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit cfdc110

Please sign in to comment.