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.

Sign up for GitHub

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

Osm2pgsql v1.5.0 release #137

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Osm2pgsql v1.5.0 release #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ea409
Update README for new tagged osm2pgsql release
rustprooflabs Jun 2, 2021
0efbc63
Updates for new sql_type option for Pg specific types
rustprooflabs Jun 2, 2021
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
18 changes: 1 addition & 17 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ the most commonly used OpenStreetMap data, such as roads, buildings, and points
The approach to processing is to do as much processing in the `<name>.lua` script
with post-processing steps creating indexes, constraints and comments in a companion `<name>.sql` script.

> Note: While osm2pgsql is still marked as experimental, this project is already being used to support production workloads.

## Project decisions

Expand All @@ -30,21 +28,7 @@ Minimum versions supported:

* Postgres 12
* PostGIS 3.0
* osm2pgsql 1.4.2+ --> commit 94dae34 or newer


### :warning: Breaking change

The osm2pgsql project added built-in JSON support after the tagged
v1.4.2 release. This change ([commit](https://github.com/openstreetmap/osm2pgsql/commit/94dae34b7aa1463339cdb6768d28a6e8ee53ef65))
is not yet in a tagged release of osm2pgsql, only the
latest `master` branch.

This is only a concern when running on a server where you install osm2pgsql
from a package manager. Following the instructions in
[MANUAL-STEPS-RUN.md](MANUAL-STEPS-RUN.md) installs the latest
version of osm2pgsql from source and avoids this issue.
Also, using the PgOSM Flex Docker image makes this a non-issue.
* osm2pgsql 1.5.0


## PgOSM via Docker
Expand Down
4 changes: 2 additions & 2 deletions flex-config/style/building.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ tables.building_point = osm2pgsql.define_table({
{ column = 'osm_subtype', type = 'text'},
{ column = 'name', type = 'text' },
{ column = 'levels', type = 'int'},
{ column = 'height', type = 'numeric'},
{ column = 'height', sql_type = 'numeric'},
{ column = 'housenumber', type = 'text'},
{ column = 'street', type = 'text' },
{ column = 'city', type = 'text' },
Expand All @@ -36,7 +36,7 @@ tables.building_polygon = osm2pgsql.define_table({
{ column = 'osm_subtype', type = 'text'},
{ column = 'name', type = 'text' },
{ column = 'levels', type = 'int'},
{ column = 'height', type = 'numeric'},
{ column = 'height', sql_type = 'numeric'},
{ column = 'housenumber', type = 'text'},
{ column = 'street', type = 'text' },
{ column = 'city', type = 'text' },
Expand Down
6 changes: 3 additions & 3 deletions flex-config/style/infrastructure.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tables.infrastructure_point = osm2pgsql.define_table({
{ column = 'osm_subtype', type = 'text'},
{ column = 'name', type = 'text' },
{ column = 'ele', type = 'int' },
{ column = 'height', type = 'numeric'},
{ column = 'height', sql_type = 'numeric'},
{ column = 'operator', type = 'text'},
{ column = 'material', type = 'text'},
{ column = 'geom', type = 'point' , projection = srid},
Expand All @@ -40,7 +40,7 @@ tables.infrastructure_line = osm2pgsql.define_table({
{ column = 'osm_subtype', type = 'text'},
{ column = 'name', type = 'text' },
{ column = 'ele', type = 'int' },
{ column = 'height', type = 'numeric'},
{ column = 'height', sql_type = 'numeric'},
{ column = 'operator', type = 'text'},
{ column = 'material', type = 'text'},
{ column = 'geom', type = 'linestring' , projection = srid},
Expand All @@ -57,7 +57,7 @@ tables.infrastructure_polygon = osm2pgsql.define_table({
{ column = 'osm_subtype', type = 'text'},
{ column = 'name', type = 'text' },
{ column = 'ele', type = 'int' },
{ column = 'height', type = 'numeric'},
{ column = 'height', sql_type = 'numeric'},
{ column = 'operator', type = 'text'},
{ column = 'material', type = 'text'},
{ column = 'geom', type = 'multipolygon' , projection = srid},
Expand Down
2 changes: 1 addition & 1 deletion flex-config/style/pgosm-meta.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tables.pgosm_flex_meta = osm2pgsql.define_table({
name = 'pgosm_flex',
schema = schema_name,
columns = {
{ column = 'osm_date', type = 'date', not_null = true },
{ column = 'osm_date', sql_type = 'date', not_null = true },
{ column = 'default_date', type = 'bool', not_null = true },
{ column = 'region', type = 'text', not_null = true},
{ column = 'pgosm_flex_version', type = 'text', not_null = true },
Expand Down