Merge pull request #137 from rustprooflabs/osm2pgsqlv1_5_0_release

Osm2pgsql v1.5.0 release
rustprooflabs · Jun 2, 2021 · b81106d · b81106d
2 parents ec37c86 + 0efbc63
commit b81106d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -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
 
@@ -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

diff --git a/flex-config/style/building.lua b/flex-config/style/building.lua
@@ -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' },
@@ -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' },

diff --git a/flex-config/style/infrastructure.lua b/flex-config/style/infrastructure.lua
@@ -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},
@@ -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},
@@ -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},

diff --git a/flex-config/style/pgosm-meta.lua b/flex-config/style/pgosm-meta.lua
@@ -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 },