Merge pull request #1789 from joto/more-flex-config-updates

Update the rest of the flex example configs to new insert() syntax

Author: lonvia

flex-config/bbox.lua

@@ -95,9 +95,10 @@ function osm2pgsql.process_node(object)
         return
     end
 
-    tables.pois:add_row({
+    tables.pois:insert({
+        tags = object.tags,
         bbox = format_bbox(object),
-        tags = object.tags
+        geom = object:as_point()
     })
 end
 
@@ -108,16 +109,16 @@ function osm2pgsql.process_way(object)
 
     -- A closed way that also has the right tags for an area is a polygon.
     if object.is_closed and has_area_tags(object.tags) then
-        tables.polygons:add_row({
+        tables.polygons:insert({
             tags = object.tags,
             bbox = format_bbox(object),
-            geom = { create = 'area' }
+            geom = object:as_polygon()
         })
     else
-        tables.ways:add_row({
+        tables.ways:insert({
             tags = object.tags,
             bbox = format_bbox(object),
-            geom = { create = 'line' }
+            geom = object:as_linestring()
         })
     end
 end
@@ -131,21 +132,21 @@ function osm2pgsql.process_relation(object)
 
     -- Store boundary relations as multilinestrings
     if relation_type == 'boundary' then
-        tables.boundaries:add_row({
+        tables.boundaries:insert({
             type = object.tags.boundary,
             bbox = format_bbox(object),
             tags = object.tags,
-            geom = { create = 'line' }
+            geom = object:as_multilinestring()
         })
         return
     end
 
     -- Store multipolygon relations as polygons
     if relation_type == 'multipolygon' then
-        tables.polygons:add_row({
+        tables.polygons:insert({
             bbox = format_bbox(object),
             tags = object.tags,
-            geom = { create = 'area' }
+            geom = object:as_multipolygon()
         })
     end
 end

flex-config/compatible.lua

@@ -351,6 +351,7 @@ function gen_columns(text_columns, with_hstore, area, geometry_type)
 
     add_column('way', geometry_type)
     columns[#columns].projection = srid
+    columns[#columns].not_null = true
 
     return columns
 end
@@ -556,7 +557,18 @@ function osm2pgsql.process_node(object)
         output[hstore_column] = get_hstore_column(object.tags)
     end
 
-    tables.point:add_row(output)
+    output.way = object:as_point()
+    tables.point:insert(output)
+end
+
+function add_line(output, geom, roads)
+    for sgeom in geom:segmentize(max_length):geometries() do
+        output.way = sgeom
+        tables.line:insert(output)
+        if roads then
+            tables.roads:insert(output)
+        end
+    end
 end
 
 function osm2pgsql.process_way(object)
@@ -617,14 +629,10 @@ function osm2pgsql.process_way(object)
     end
 
     if polygon and object.is_closed then
-        output.way = { create = 'area' }
-        tables.polygon:add_row(output)
+        output.way = object:as_polygon()
+        tables.polygon:insert(output)
     else
-        output.way = { create = 'line', split_at = max_length }
-        tables.line:add_row(output)
-        if roads then
-            tables.roads:add_row(output)
-        end
+        add_line(output, object:as_linestring(), roads)
     end
 end
 
@@ -718,19 +726,20 @@ function osm2pgsql.process_relation(object)
     end
 
     if not make_polygon then
-        output.way = { create = 'line', split_at = max_length }
-        tables.line:add_row(output)
-        if roads then
-            tables.roads:add_row(output)
-        end
+        add_line(output, object:as_multilinestring(), roads)
     end
 
     if make_boundary or make_polygon then
-        output.way = { create = 'area' }
-        if not multi_geometry then
-            output.way.split_at = 'multi'
+        local geom = object:as_multipolygon()
+        if multi_geometry then
+            output.way = geom
+            tables.polygon:insert(output)
+        else
+            for sgeom in geom:geometries() do
+                output.way = sgeom
+                tables.polygon:insert(output)
+            end
         end
-        tables.polygon:add_row(output)
     end
 end