Cleanup and simplify uni test

Author: joto

tests/data/test_output_flex_uni.lua

@@ -4,7 +4,6 @@ local test_table = osm2pgsql.define_table{
     ids = { type = 'any', type_column = 'osm_type', id_column = 'osm_id' },
     columns = {
         { column = 'tags', type = 'hstore' },
-        { column = 'name', type = 'text' },
         { column = 'geom', type = 'geometry' },
     }
 }
@@ -13,103 +12,42 @@ 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
-        or tags.area
-        or tags.building
-        or tags.harbour
-        or tags.historic
-        or tags.landuse
-        or tags.leisure
-        or tags.man_made
-        or tags.military
-        or tags.natural
-        or tags.office
-        or tags.place
-        or tags.power
-        or tags.public_transport
-        or tags.shop
-        or tags.sport
-        or tags.tourism
-        or tags.water
-        or tags.waterway
-        or tags.wetland
-        or tags['abandoned:aeroway']
-        or tags['abandoned:amenity']
-        or tags['abandoned:building']
-        or tags['abandoned:landuse']
-        or tags['abandoned:power']
-        or tags['area:highway']
-        then
-        return true
-    else
-        return false
-    end
-end
-
-function osm2pgsql.process_node(data)
-    clean_tags(data.tags)
-    if is_empty(data.tags) then
+function osm2pgsql.process_node(object)
+    if is_empty(object.tags) then
         return
     end
 
     test_table:add_row({
-        tags = data.tags,
+        tags = object.tags,
         geom = { create = 'point' }
     })
 end
 
-function osm2pgsql.process_way(data)
-    clean_tags(data.tags)
-    if is_empty(data.tags) then
+function osm2pgsql.process_way(object)
+    if is_empty(object.tags) then
         return
     end
 
-    if is_polygon(data.tags) then
+    if object.tags.building then
         test_table:add_row({
-            tags = data.tags,
-            name = data.tags.name,
+            tags = object.tags,
             geom = { create = 'area' }
         })
     else
         test_table:add_row({
-            tags = data.tags,
-            name = data.tags.name,
+            tags = object.tags,
             geom = { create = 'line' }
         })
     end
 end
 
-function osm2pgsql.process_relation(data)
-    clean_tags(data.tags)
-    if is_empty(data.tags) then
-        return
-    end
-
-    if data.tags.type == 'multipolygon' or data.tags.type == 'boundary' then
+function osm2pgsql.process_relation(object)
+    if object.tags.type == 'multipolygon' then
         test_table:add_row({
-            tags = data.tags,
-            name = data.tags.name,
+            tags = object.tags,
             geom = { create = 'area', multi = false }
         })
         return
     end
-
-    if data.tags.type == 'route' then
-        test_table:add_row({
-            tags = data.tags,
-            name = data.tags.name,
-            geom = { create = 'line' }
-        })
-    end
 end
 

tests/test-output-flex-uni.cpp

@@ -5,11 +5,13 @@
 
 static testing::db::import_t db;
 
+static char const *const conf_file = "test_output_flex_uni.lua";
+
 struct options_slim_default
 {
     static options_t options()
     {
-        return testing::opt_t().slim().flex("test_output_flex_uni.lua");
+        return testing::opt_t().slim().flex(conf_file);
     }
 };
 
@@ -137,8 +139,6 @@ TEMPLATE_TEST_CASE("ways as linestrings and polygons", "", options_slim_default,
     auto conn = db.db().connect();
 
     REQUIRE(0 == conn.get_count("osm2pgsql_test_data", "osm_type != 'W'"));
-    //    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
-    //    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon"));
     REQUIRE(
         1 ==
         conn.get_count(