Refactoring: Remove parameter from filter_rel_member_tags()

The parameter 'allow_typeless' is always false.

Author: joto

src/tagtransform-c.cpp

@@ -217,26 +217,24 @@ bool c_tagtransform_t::filter_tags(osmium::OSMObject const &o, int *polygon,
 bool c_tagtransform_t::filter_rel_member_tags(
     taglist_t const &rel_tags, osmium::memory::Buffer const &,
     rolelist_t const &, int *make_boundary, int *make_polygon, int *roads,
-    taglist_t &out_tags, bool allow_typeless)
+    taglist_t &out_tags)
 {
-    //if it has a relation figure out what kind it is
     std::string const *type = rel_tags.get("type");
+    if (!type) {
+        return true;
+    }
+
     bool is_route = false;
     bool is_boundary = false;
     bool is_multipolygon = false;
-    if (type) {
-        //what kind of relation is it
-        if (*type == "route") {
-            is_route = true;
-        } else if (*type == "boundary") {
-            is_boundary = true;
-        } else if (*type == "multipolygon") {
-            is_multipolygon = true;
-        } else if (!allow_typeless) {
-            return true;
-        }
-    } //you didnt have a type and it was required
-    else if (!allow_typeless) {
+
+    if (*type == "route") {
+        is_route = true;
+    } else if (*type == "boundary") {
+        is_boundary = true;
+    } else if (*type == "multipolygon") {
+        is_multipolygon = true;
+    } else {
         return true;
     }
 

src/tagtransform-c.hpp

@@ -27,8 +27,7 @@ class c_tagtransform_t : public tagtransform_t
                                 osmium::memory::Buffer const &members,
                                 rolelist_t const &member_roles,
                                 int *make_boundary, int *make_polygon,
-                                int *roads, taglist_t &out_tags,
-                                bool allow_typeless = false) override;
+                                int *roads, taglist_t &out_tags) override;
 
 private:
     bool check_key(std::vector<taginfo> const &infos, char const *k,

src/tagtransform-lua.cpp

@@ -151,7 +151,7 @@ bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, int *polygon,
 bool lua_tagtransform_t::filter_rel_member_tags(
     taglist_t const &rel_tags, osmium::memory::Buffer const &members,
     rolelist_t const &member_roles, int *make_boundary, int *make_polygon,
-    int *roads, taglist_t &out_tags, bool)
+    int *roads, taglist_t &out_tags)
 {
     size_t const num_members = member_roles.size();
     lua_getglobal(L, m_rel_mem_func.c_str());

src/tagtransform-lua.hpp

@@ -36,8 +36,7 @@ class lua_tagtransform_t : public tagtransform_t
                                 osmium::memory::Buffer const &members,
                                 rolelist_t const &member_roles,
                                 int *make_boundary, int *make_polygon,
-                                int *roads, taglist_t &out_tags,
-                                bool allow_typeless = false) override;
+                                int *roads, taglist_t &out_tags) override;
 
 private:
     void open_style();

src/tagtransform.hpp

@@ -36,8 +36,7 @@ class tagtransform_t
                                         osmium::memory::Buffer const &members,
                                         rolelist_t const &member_roles,
                                         int *make_boundary, int *make_polygon,
-                                        int *roads, taglist_t &out_tags,
-                                        bool allow_typeless = false) = 0;
+                                        int *roads, taglist_t &out_tags) = 0;
 };
 
 #endif // OSM2PGSQL_TAGTRANSFORM_HPP