[generator] review fixes

generator/regions/country_specifier.hpp

@@ -12,13 +12,13 @@ namespace regions
 class CountrySpecifier
 {
 public:
+  virtual ~CountrySpecifier() = default;
   virtual void AdjustRegionsLevel(Node::PtrList & outers);
   PlaceLevel GetLevel(Region const & region) const;
 
   // Return -1 - |l| is under place of |r|, 0 - undefined relation, 1 - |r| is under place of |l|.
   // Non-transitive.
   virtual int RelateByWeight(LevelRegion const & l, LevelRegion const & r) const;
-  virtual ~CountrySpecifier() = default;
   static PlaceLevel GetLevel(PlaceType placeType);
 
 private:

generator/regions/country_specifier_builder.cpp

@@ -4,7 +4,7 @@ namespace generator
 {
 namespace regions
 {
-std::unique_ptr<CountrySpecifier> CountrySpecifierBuilder::GetCountrySpecifier(
+std::unique_ptr<CountrySpecifier> CountrySpecifierBuilder::MakeCountrySpecifier(
 std::string const & country) const
 {
   auto it = m_specifiers.find(country);

generator/regions/country_specifier_builder.hpp

@@ -19,7 +19,9 @@ public:
     static CountrySpecifierBuilder instance;
     return instance;
   }
-  std::unique_ptr<CountrySpecifier> GetCountrySpecifier(std::string const & country) const;
+
+  std::unique_ptr<CountrySpecifier> MakeCountrySpecifier(std::string const & country) const;
+
   template <class T>
   void Register()
   {

generator/regions/regions_builder.cpp

@@ -296,7 +296,7 @@ Node::PtrList RegionsBuilder::BuildCountry(std::string const & countryName) cons
   };
   std::copy_if(std::begin(countries), std::end(countries), std::back_inserter(outers), pred);
 
-  auto countrySpecifier = CountrySpecifierBuilder::GetInstance().GetCountrySpecifier(countryName);
+  auto countrySpecifier = CountrySpecifierBuilder::GetInstance().MakeCountrySpecifier(countryName);
   auto countryTrees = BuildCountryRegionTrees(outers, *countrySpecifier);
 
   PlacePointsIntegrator pointsIntegrator{m_placePointsMap, *countrySpecifier};

generator/regions/specs/afghanistan.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AfghanistanSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/albania.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AlbaniaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/algeria.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AlgeriaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/andorra.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AndorraSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/angola.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AngolaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/antigua_and_barbuda.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AntiguaAndBarbudaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/argentina.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class ArgentinaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/aruba.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class ArubaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/australia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AustraliaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/austria.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AustriaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/azerbaijan.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class AzerbaijanSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/bahamas.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BahamasSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/bahrain.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BahrainSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/bangladesh.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BangladeshSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/barbados.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BarbadosSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/belarus.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BelarusSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/belgium.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BelgiumSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/belize.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BelizeSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/benin.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BeninSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/bhutan.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BhutanSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/bolivia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BoliviaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/bosnia_and_herzegovina.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BosniaAndHerzegovinaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/brazil.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BrazilSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/brunei.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BruneiSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/bulgaria.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BulgariaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/burkina_faso.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BurkinaFasoSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/burundi.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class BurundiSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/cameroon.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CameroonSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/canada.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CanadaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/chad.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class ChadSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/chile.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class ChileSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/china.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class ChinaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/colombia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class ColombiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/costa_rica.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CostaRicaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/cote_divoire.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CoteDivoireSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/croatia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CroatiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/cuba.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CubaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/cyprus.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CyprusSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/czech_republic.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class CzechRepublicSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/denmark.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class DenmarkSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/dominican_republic.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class DominicanRepublicSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/egypt.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class EgyptSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/estonia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class EstoniaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/ethiopia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class EthiopiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/finland.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class FinlandSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/france.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class FranceSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/french_polynesia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class FrenchPolynesiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/gabon.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class GabonSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/gambia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class GambiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/georgia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class GeorgiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/germany.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class GermanySpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/ghana.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class GhanaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/greece.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class GreeceSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/guinea.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class GuineaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/haiti.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class HaitiSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/hong_kong.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class HongKongSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/hungary.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class HungarySpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/iceland.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IcelandSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/india.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IndiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/indonesia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IndonesiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/iran.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IranSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/iraq.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IraqSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/ireland.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IrelandSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/isle_of_man.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IsleOfManSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/israel.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class IsraelSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/italy.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class ItalySpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/japan.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class JapanSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/jordan.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class JordanSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/kosovo.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class KosovoSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/laos.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LaosSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/latvia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LatviaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/lebanon.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LebanonSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/lesotho.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LesothoSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/liberia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LiberiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/libya.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LibyaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/lithuania.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LithuaniaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/luxembourg.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class LuxembourgSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/macedonia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MacedoniaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/madagascar.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MadagascarSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/malawi.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MalawiSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/malaysia.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MalaysiaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/mali.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MaliSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/mauritania.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MauritaniaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/moldova.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MoldovaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/morocco.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MoroccoSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/mozambique.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MozambiqueSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/myanmar.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class MyanmarSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/nepal.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class NepalSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/netherlands.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class NetherlandsSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/new_zealand.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class NewZealandSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/niger.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class NigerSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/nigeria.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class NigeriaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/north_korea.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class NorthKoreaSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/norway.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class NorwaySpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/philippines.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class PhilippinesSpecifier final : public CountrySpecifier
 {
 public:

generator/regions/specs/poland.inl

@@ -1,12 +1,10 @@
-#include "generator/place_node.hpp"
-
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/country_specifier.hpp"
-#include "generator/regions/region.hpp"
 #include "generator/regions/country_specifier_builder.hpp"
+#include "generator/regions/region.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -14,7 +12,6 @@ namespace regions
 {
 namespace specs
 {
-
 class PolandSpecifier final : public CountrySpecifier
 {
 public: