Merge pull request #1239 from joto/cleanup-flex-tests

Cleanup flex tests

Author: lonvia

tests/CMakeLists.txt

@@ -75,11 +75,12 @@ if (HAVE_LUA)
     set_test(test-output-flex-area)
     set_test(test-output-flex-attr)
     set_test(test-output-flex-bbox)
-    set_test(test-output-flex-extra)
     set_test(test-output-flex-invalid-geom)
+    set_test(test-output-flex-line)
     set_test(test-output-flex-lua-fail)
     set_test(test-output-flex-nogeom)
     set_test(test-output-flex-uni)
+    set_test(test-output-flex-stage2)
     set_test(test-output-flex-tablespace LABELS Tablespace)
     set_test(test-output-flex-types)
     set_test(test-output-flex-update)

tests/data/test_output_flex.lua

@@ -36,18 +36,6 @@ tables.route = osm2pgsql.define_table{
     }
 }
 
-function is_empty(some_table)
-    return next(some_table) == nil
-end
-
-function clean_tags(tags)
-    tags.odbl = nil
-    tags.created_by = nil
-    tags.source = nil
-    tags['source:ref'] = nil
-    tags['source:name'] = nil
-end
-
 function is_polygon(tags)
     if tags.aeroway
         or tags.amenity
@@ -83,55 +71,60 @@ function is_polygon(tags)
     end
 end
 
-function osm2pgsql.process_node(data)
-    clean_tags(data.tags)
-    if is_empty(data.tags) then
+local delete_keys = {
+    'odbl',
+    'created_by',
+    'source'
+}
+
+local clean_tags = osm2pgsql.make_clean_tags_func(delete_keys)
+
+function osm2pgsql.process_node(object)
+    if clean_tags(object.tags) then
         return
     end
 
     tables.point:add_row({
-        tags = data.tags
+        tags = object.tags
     })
 end
 
-function osm2pgsql.process_way(data)
-    clean_tags(data.tags)
-    if is_empty(data.tags) then
+function osm2pgsql.process_way(object)
+    if clean_tags(object.tags) then
         return
     end
 
-    if is_polygon(data.tags) then
+    if is_polygon(object.tags) then
         tables.polygon:add_row({
-            tags = data.tags,
-            name = data.tags.name,
+            tags = object.tags,
+            name = object.tags.name,
             geom = { create = 'area' }
         })
     else
         tables.line:add_row({
-            tags = data.tags,
-            name = data.tags.name
+            tags = object.tags,
+            name = object.tags.name
         })
     end
 end
 
-function osm2pgsql.process_relation(data)
-    clean_tags(data.tags)
-    if is_empty(data.tags) then
+function osm2pgsql.process_relation(object)
+    if clean_tags(object.tags) then
         return
     end
 
-    if data.tags.type == 'multipolygon' or data.tags.type == 'boundary' then
+    if object.tags.type == 'multipolygon' or object.tags.type == 'boundary' then
         tables.polygon:add_row({
-            tags = data.tags,
-            name = data.tags.name,
+            tags = object.tags,
+            name = object.tags.name,
             geom = { create = 'area', multi = false }
         })
         return
     end
 
-    if data.tags.type == 'route' then
+    if object.tags.type == 'route' then
         tables.route:add_row({
-            tags = data.tags,
+            tags = object.tags,
             geom = { create = 'line' }
         })
     end

tests/data/test_output_flex_area.lua

@@ -0,0 +1,33 @@
+
+local polygons = osm2pgsql.define_table{
+    name = 'osm2pgsql_test_polygon',
+    ids = { type = 'area', id_column = 'osm_id' },
+    columns = {
+        { column = 'name', type = 'text' },
+        { column = 'geom', type = 'geometry' },
+        { column = 'area', type = 'area' },
+    }
+}
+
+function is_empty(some_table)
+    return next(some_table) == nil
+end
+
+function osm2pgsql.process_way(object)
+    if is_empty(object.tags) then
+        return
+    end
+
+    polygons:add_row({
+        name = object.tags.name,
+        geom = { create = 'area' }
+    })
+end
+
+function osm2pgsql.process_relation(object)
+    polygons:add_row({
+        name = object.tags.name,
+        geom = { create = 'area', multi = false }
+    })
+end
+

tests/data/test_output_flex_attr.lua

@@ -1,6 +1,6 @@
 
-table = osm2pgsql.define_table{
-    name = 'osm2pgsql_test_ways_attr',
+local attr_table = osm2pgsql.define_table{
+    name = 'osm2pgsql_test_attr',
     ids = { type = 'way', id_column = 'way_id' },
     columns = {
         { column = 'tags', type = 'hstore' },
@@ -13,8 +13,8 @@ table = osm2pgsql.define_table{
     }
 }
 
-function osm2pgsql.process_way(data)
-    data.geom = { create = 'line' }
-    table:add_row(data)
+function osm2pgsql.process_way(object)
+    object.geom = { create = 'line' }
+    attr_table:add_row(object)
 end
 

tests/data/test_output_flex_fail.lua

@@ -0,0 +1,45 @@
+
+local tables = {}
+
+tables.line = osm2pgsql.define_table{
+    name = 'osm2pgsql_test_line',
+    ids = { type = 'way', id_column = 'osm_id' },
+    columns = {
+        { column = 'tags', type = 'hstore' },
+        { column = 'geom', type = 'linestring' },
+    }
+}
+
+tables.polygon = osm2pgsql.define_table{
+    name = 'osm2pgsql_test_polygon',
+    ids = { type = 'area', id_column = 'osm_id' },
+    columns = {
+        { column = 'tags', type = 'hstore' },
+        { column = 'geom', type = 'geometry' }
+    }
+}
+
+function osm2pgsql.process_way(object)
+    if not next(object.tags) then
+        return
+    end
+
+    if object.tags.natural then
+        tables.polygon:add_row({
+            tags = object.tags,
+            geom = { create = 'area' }
+        })
+    else
+        tables.line:add_row({
+            tags = object.tags
+        })
+    end
+end
+
+function osm2pgsql.process_relation(object)
+    tables.polygon:add_row({
+        tags = object.tags,
+        geom = { create = 'area', multi = false }
+    })
+end
+

tests/data/test_output_flex_invalid_geom.lua

@@ -0,0 +1,24 @@
+
+local tables = {}
+
+tables.line = osm2pgsql.define_way_table('osm2pgsql_test_line', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'geom', type = 'linestring' }
+})
+
+tables.split = osm2pgsql.define_way_table('osm2pgsql_test_split', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'geom', type = 'linestring' }
+})
+
+function osm2pgsql.process_way(object)
+    tables.line:add_row({
+        tags= object.tags,
+        geom = { create = 'line' }
+    })
+    tables.split:add_row({
+        tags = object.tags,
+        geom = { create = 'line', split_at = 1.0 }
+    })
+end
+

tests/data/test_output_flex_line.lua

@@ -0,0 +1,18 @@
+
+local test_table = osm2pgsql.define_table{
+    name = 'osm2pgsql_test_polygon',
+    ids = { type = 'area', id_column = 'osm_id' },
+    columns = {
+        { column = 'tags', type = 'hstore' },
+        { column = 'geom', type = 'geometry' },
+        { column = 'area', type = 'area' },
+    }
+}
+
+function osm2pgsql.process_way(object)
+    test_table:add_row({
+        tags = object.tags
+        -- missing geom transform here should lead to an error
+    })
+end
+