also remove all old-style MP tag copying

Author: lonvia

style.lua

@@ -236,10 +236,6 @@ function filter_tags_relation_member (keyvalues, keyvaluemembers, roles, memberc
     linestring = 0 -- Will object be treated as linestring?
     polygon = 0    -- Will object be treated as polygon?
     roads = 0      -- Will object be added to planet_osm_roads?
-    membersuperseded = {}
-    for i = 1, membercount do
-        membersuperseded[i] = 0 -- Will member be ignored when handling areas?
-    end
 
     type = keyvalues["type"]
 
@@ -257,59 +253,18 @@ function filter_tags_relation_member (keyvalues, keyvaluemembers, roles, memberc
     elseif (type == "multipolygon") then
         -- Treat as polygon
         polygon = 1
-        polytagcount = 0;
+        filter = 1
         -- Count the number of polygon tags of the object
         for i,k in ipairs(polygon_keys) do
             if keyvalues[k] then
-                polytagcount = 1
+                filter = 0
                 break
             end
         end
-        -- If there are no polygon tags, add tags from all outer elements to the multipolygon itself
-        if (polytagcount == 0) then
-            for i = 1,membercount do
-                if (roles[i] == "outer") then
-                    for k,v in pairs(keyvaluemembers[i]) do
-                        keyvalues[k] = v
-                    end
-                end
-            end
-
-            f, keyvalues = filter_tags_generic(keyvalues, 1)
-            -- check again if there are still polygon tags left
-            polytagcount = 0
-            for i,k in ipairs(polygon_keys) do
-                if keyvalues[k] then
-                    polytagcount = 1
-                    break
-                end
-            end
-            if polytagcount == 0 then
-                filter = 1
-            end
-        end
-        -- For any member of the multipolygon, set membersuperseded to 1 (i.e. don't deal with it as area as well),
-        -- except when the member has a key/value combination such that
-        --   1) the key occurs in generic_keys
-        --   2) the key/value combination is not also a key/value combination of the multipolygon itself
-        for i = 1,membercount do
-            superseded = 1
-            for k,v in pairs(keyvaluemembers[i]) do
-                if ((keyvalues[k] == nil) or (keyvalues[k] ~= v)) then
-                    for j,k2 in ipairs(generic_keys) do
-                        if (k == k2) then
-                            superseded = 0;
-                            break
-                        end
-                    end
-                end
-            end
-            membersuperseded[i] = superseded
-        end
     end
 
     -- Add z_order key/value combination and determine if the object should also be added to planet_osm_roads
     keyvalues, roads = add_z_order(keyvalues)
 
-    return filter, keyvalues, membersuperseded, linestring, polygon, roads
+    return filter, keyvalues, {}, linestring, polygon, roads
 end

tagtransform-c.cpp

@@ -314,71 +314,16 @@ bool c_tagtransform_t::filter_rel_member_tags(
     } else if (is_multipolygon) {
         *make_polygon = 1;
 
-        // Check if the relation has any polygon-like tags. In that case
-        // we have a new-style polygon.
-        bool newstyle_mp = false;
+        // Check if any of the tags is polygon-like
+        int flags = 0;
+        bool filter = false;
         for (const auto &tag : out_tags) {
-            if (tag.key == "area") {
-                newstyle_mp = true;
-            } else {
-                for (const auto &info : infos) {
-                    if (info.name == tag.key) {
-                        newstyle_mp = info.flags & FLAG_POLYGON;
-                        break;
-                    }
-                }
-            }
-            if (newstyle_mp) {
-                break;
-            }
+            check_key(infos, tag.key.c_str(), &filter, &flags, false);
         }
 
-        // Old-style MP: copy the tags from the outer way(s). Only use tags
-        // that appear in all outer rings.
-        if (!newstyle_mp) {
-            taglist_t poly_tags;
-            bool first_outerway = true;
-            size_t i = 0;
-            for (auto const &w : members.select<osmium::Way>()) {
-                if (member_roles[i] && strcmp(member_roles[i], "inner") == 0)
-                    continue;
-
-                /* insert all tags of the first outerway to the potential list of copied tags. */
-                if (first_outerway) {
-                    for (auto const &tag : w.tags()) {
-                        poly_tags.emplace_back(tag.key(), tag.value());
-                    }
-                    first_outerway = false;
-                } else {
-                    /* Check if all of the tags in the list of potential tags are present on this way,
-                       otherwise remove from the list of potential tags. Tags need to be present on
-                       all outer ways to be copied over to the relation */
-                    auto it = poly_tags.begin();
-                    while (it != poly_tags.end()) {
-                        if (!w.tags().has_key(it->key.c_str()))
-                            /* This tag is not present on all member outer ways, so don't copy it over to relation */
-                            it = poly_tags.erase(it);
-                        else
-                            ++it;
-                    }
-                }
-                ++i;
-            }
-            // Copy the list identified outer way tags over to the relation
-            // filtering for wanted tags on the way.
-            bool filter;
-            int flags = 0;
-            for (const auto &poly_tag : poly_tags) {
-                if (check_key(infos, poly_tag.key.c_str(), &filter, &flags,
-                              false)) {
-                    out_tags.push_dedupe(poly_tag);
-                }
-            }
-
-            if (!(flags & FLAG_POLYGON)) {
-                out_tags.clear();
-                return true;
-            }
+        if (!(flags & FLAG_POLYGON)) {
+            out_tags.clear();
+            return true;
         }
     }