Add documentation and improve legibility style.lua #345
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matthijsmelissen
force-pushed
the
documentation
branch
from
fb3257e to
b205d90
Compare
matthijsmelissen
force-pushed
the
documentation
branch
from
b205d90 to
535755c
Compare
matthijsmelissen
added a commit
to matthijsmelissen/osm2pgsql
that referenced
this pull request
Apr 28, 2015
This allows the decision whether an object is treated as polygon or linestring to be set in the style.lua file. In particular, it treats man_made=embankment and natural=cliff as linestring, and highway=services as polygon. Including this in the default style.lua file has the following advantages: * It serves as an easy-to-extend example of how the polygon/linestring decision can be made based on key. * It provides sane defaults - it can be expeced that most users of the style want to treat man_made=embankment and natural=cliff as linestring, and highway=services as polygon. This resolves the following downstream bugs in openstreetmap-carto: * gravitystorm/openstreetmap-carto#892 * gravitystorm/openstreetmap-carto#268 * gravitystorm/openstreetmap-carto#137 This builds on osm2pgsql-dev#345, and thus assumes osm2pgsql-dev#345 is merged first.
matthijsmelissen
added a commit
to matthijsmelissen/osm2pgsql
that referenced
this pull request
Apr 28, 2015
This allows the decision whether an object is treated as polygon or linestring to be set in the style.lua file. In particular, it treats man_made=embankment and natural=cliff as linestring, and highway=services as polygon. Including this in the default style.lua file has the following advantages: * It serves as an easy-to-extend example of how the polygon/linestring decision can be made based on key. * It provides sane defaults - it can be expected that most users of the style want to treat man_made=embankment and natural=cliff as linestring, and highway=services as polygon. This resolves the following downstream bugs in openstreetmap-carto: * gravitystorm/openstreetmap-carto#892 * gravitystorm/openstreetmap-carto#268 * gravitystorm/openstreetmap-carto#137 This builds on osm2pgsql-dev#345, and thus assumes osm2pgsql-dev#345 is merged first.
| keyvalues, roads = add_z_order(keyvalues) | ||
|
|
||
| return filter, keyvalues, membersuperseeded, boundary, polygon, roads | ||
| return filter, keyvalues, membersuperseded, boundary, polygon, roads |
There was a problem hiding this comment.
boundary needs changing here too
There was a problem hiding this comment.
Thanks, fixed.
This variable name was overlooked when changing variable names in 535755c.
matthijsmelissen
added a commit
to matthijsmelissen/osm2pgsql
that referenced
this pull request
Apr 28, 2015
This allows the decision whether an object is treated as polygon or linestring to be set in the style.lua file. In particular, it treats man_made=embankment and natural=cliff as linestring, and highway=services as polygon. Including this in the default style.lua file has the following advantages: * It serves as an easy-to-extend example of how the polygon/linestring decision can be made based on key. * It provides sane defaults - it can be expected that most users of the style want to treat man_made=embankment and natural=cliff as linestring, and highway=services as polygon. This resolves the following downstream bugs in openstreetmap-carto: * gravitystorm/openstreetmap-carto#892 * gravitystorm/openstreetmap-carto#268 * gravitystorm/openstreetmap-carto#137 This builds on osm2pgsql-dev#345, and thus assumes osm2pgsql-dev#345 is merged first.
| polygon_keys = { 'building', 'landuse', 'amenity', 'harbour', 'historic', 'leisure', | ||
| 'man_made', 'military', 'natural', 'office', 'place', 'power', | ||
| 'public_transport', 'shop', 'sport', 'tourism', 'waterway', | ||
| 'wetland', 'water', 'aeroway' } | ||
|
|
||
| -- Objects without any of the following keys will be deleted |
There was a problem hiding this comment.
with --hstore-all is this true?
There was a problem hiding this comment.
Will check.
There was a problem hiding this comment.
Yes, this is true. Objects without any key in this list will be skipped, even if there is a column name for that key.
Moreover, objects that do have a key in the list, but no column name (for example an object tagged with capital=yes and hstore_tag=test) will be skipped too.
pnorman
added a commit
that referenced
this pull request
May 24, 2015
Add documentation and improve legibility style.lua
matthijsmelissen
added a commit
to matthijsmelissen/osm2pgsql
that referenced
this pull request
Feb 21, 2016
This allows the decision whether an object is treated as polygon or linestring to be set in the style.lua file. In particular, it treats man_made=embankment and natural=cliff as linestring, and highway=services as polygon. Including this in the default style.lua file has the following advantages: * It serves as an easy-to-extend example of how the polygon/linestring decision can be made based on key. * It provides sane defaults - it can be expected that most users of the style want to treat man_made=embankment and natural=cliff as linestring, and highway=services as polygon. This resolves the following downstream bugs in openstreetmap-carto: * gravitystorm/openstreetmap-carto#892 * gravitystorm/openstreetmap-carto#268 * gravitystorm/openstreetmap-carto#137 This builds on osm2pgsql-dev#345, and thus assumes osm2pgsql-dev#345 is merged first.
matthijsmelissen
added a commit
to matthijsmelissen/osm2pgsql
that referenced
this pull request
Apr 3, 2016
This allows the decision whether an object is treated as polygon or linestring to be set in the style.lua file. In particular, it treats man_made=embankment and natural=cliff as linestring, and highway=services as polygon. Including this in the default style.lua file has the following advantages: * It serves as an easy-to-extend example of how the polygon/linestring decision can be made based on key. * It provides sane defaults - it can be expected that most users of the style want to treat man_made=embankment and natural=cliff as linestring, and highway=services as polygon. This resolves the following downstream bugs in openstreetmap-carto: * gravitystorm/openstreetmap-carto#892 * gravitystorm/openstreetmap-carto#268 * gravitystorm/openstreetmap-carto#137 This builds on osm2pgsql-dev#345, and thus assumes osm2pgsql-dev#345 is merged first.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds documentation to style.lua.
It also has some small changes to improve the legibility: it moves the configurable arrays to the top, and it changes some variable names.