master merge #7
Merged
master merge #7
Conversation
This file contains hidden or 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
needed for waterways in gazetteer output, fixes osm-search/Nominatim#133
add libbz2-dev for ubuntu installs
Fixes typos in the README
Update README
After osm2pgsql-dev@d1b6c5e#diff-a4a10b448709d2cc5dc0c85fb36a2b1c the RAM cache size can be zero, but ``am_cache_nodes_set_sparse`` often accesses ``sparseBlock[0]``. It gives serious memory access erros and failures during testing (detected with Intel Inspector XE when fixing Windows builds osm2pgsql-dev#17 ). I am not sure the proposed fix is the best solution, but something should be done with this error.
When more than one geometry column exists in a table, the sanity check was failing when running osm2pgsql in append mode. This constrains the number of rows and srid check to the way column specifically.
Based on an unpublished blog post I never finished off
osm2pgsql can be part of a useful toolchain for generating shapefiles, but little is documented about this, so this adds a basic paragraph.
osm2pgsql has a *lot* of command-line options
Readme and docs rewrite
…ry-check constrain geometry check to way column
Fix memory errors
also fixes a tiny memory leak with landuses
build_geometry was renamed to geometry-builder Conflicts: build_geometry.cpp build_geometry.h output-gazetteer.cpp
Conflicts: README output-gazetteer.cpp output-pgsql.c
|
I've tested this and, with the regression fix from openstreetmap #181, all the tests pass. Otherwise, it's a pretty big merge, but looks OK to me. |
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.
I did it as two commits because the first one was more complex
cc @zerebubuth @hollinger