[generator] Fixed adding duplicated types.

1 files changed, 3 insertions, 5 deletions

diff --git a/generator/final_processor_country.cpp b/generator/final_processor_country.cpp
index 645077de21..aae240e282 100644
--- a/generator/final_processor_country.cpp
+++ b/generator/final_processor_country.cpp
@@ -254,20 +254,18 @@ void CountryFinalProcessor::ProcessBuildingParts()
     m4::Tree<FeatureBuilder> buildingPartsKDTree;
 
     ForEachFeatureRawFormat<serialization_policy::MaxAccuracy>(path, [&](auto && fb, auto /* pos */) {
-      if (!(fb.IsArea() && fb.IsValid()))
-        return;
-
-      if (fb.HasType(buildingPartClassifType))
+      if (fb.IsArea() && fb.HasType(buildingPartClassifType))
         buildingPartsKDTree.Add(fb);
     });
 
     FeatureBuilderWriter<serialization_policy::MaxAccuracy> writer(path, true /* mangleName */);
     ForEachFeatureRawFormat<serialization_policy::MaxAccuracy>(path, [&](auto && fb, auto /* pos */) {
-      if (fb.IsArea() && fb.IsValid() &&
+      if (fb.IsArea() &&
           fb.HasType(buildingClassifType) &&
           DoesBuildingConsistOfParts(fb, buildingPartsKDTree))
       {
         fb.AddType(buildingWithPartsClassifType);
+        fb.GetParams().FinishAddingTypes();
       }
 
       writer.Write(fb);