Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Database-reload #2128

Merged
merged 28 commits into from
Jul 1, 2016
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d48106e
Database reload
matthijsmelissen May 16, 2016
e0aa01d
Add highway=rest_area to list of tags treated as polygon
matthijsmelissen May 17, 2016
1ec1cfc
Merge duplicate code to determine if object is polygon
matthijsmelissen May 17, 2016
02edb0a
Explicitly make variables in .lua script local
matthijsmelissen May 17, 2016
e5660e6
Whitespace in .lua file
matthijsmelissen May 17, 2016
d524487
Move filtering out objects with 0 tags to beginning of function in .l…
matthijsmelissen May 17, 2016
d276c90
Code simplification
matthijsmelissen May 17, 2016
1b82cb6
Typo
matthijsmelissen May 22, 2016
343d1c9
Small performance optimization
matthijsmelissen May 22, 2016
8d0489e
Small code optimization
matthijsmelissen May 30, 2016
d34bebc
Small code optimization
matthijsmelissen May 30, 2016
21d9b80
Combine boundary relation checks
pnorman May 30, 2016
118c5cf
Move columns that are not used in WHERE statements to osm2pgsql
matthijsmelissen May 30, 2016
6798824
Merge remote-tracking branch 'pnorman/combine_boundary_checks' into l…
matthijsmelissen May 30, 2016
ae3f38e
Convet layer to integer and user layer instead of z_order
matthijsmelissen May 30, 2016
04956b4
Clean up and speed up filter_tags_generic
pnorman Jun 2, 2016
d0b1f53
Use luadoc strings
pnorman Jun 2, 2016
73496d8
Only handle area=yes
pnorman Jun 2, 2016
a43cb7a
Refactor polygon special case lists for simpler code
pnorman Jun 2, 2016
659840c
Name polygon function isarea
pnorman Jun 2, 2016
10bff06
Use local vars for polygon stuff
pnorman Jun 2, 2016
5175195
Search through possible polygon tags
pnorman Jun 15, 2016
be2eb57
Refactor lua z_order and roads code
pnorman Jun 16, 2016
4499350
Add testing framework
pnorman Jun 16, 2016
3621bd7
Merge branch 'isarea' of https://github.com/pnorman/openstreetmap-car…
matthijsmelissen Jun 18, 2016
dc36874
Merge branch 'lua_z_order' of https://github.com/pnorman/openstreetma…
matthijsmelissen Jun 18, 2016
f2030f2
Use spaces, not tabs
matthijsmelissen Jun 18, 2016
2ec88f3
Regenerate .mml
matthijsmelissen Jun 26, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ You need OpenStreetMap data loaded into a PostGIS database (see below for [depen
It's probably easiest to grab an PBF of OSM data from [Mapzen](https://mapzen.com/metro-extracts/) or [geofabrik](http://download.geofabrik.de/). Once you've set up your PostGIS database, import with osm2pgsql:

```
osm2pgsql -d gis ~/path/to/data.osm.pbf --style openstreetmap-carto.style
osm2pgsql -G --hstore -d gis ~/path/to/data.osm.pbf --style openstreetmap-carto.style --tag-transform-script ~/osm/openstreetmap-carto.lua
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be --tag-transform-script openstreetmap-carto.lua

```

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/).
Expand Down
Loading