diff options
author | Sergey Yershov <yershov@corp.mail.ru> | 2015-07-21 11:16:00 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:58:22 +0300 |
commit | 3f2074401b22bce2aaba17f4672aae77b3fa549f (patch) | |
tree | 54127273488b479714cd402dbe041a35d0951615 /generator | |
parent | 9d8db80eccd4a0bcdf39072f4510f5466f35a3c3 (diff) |
Fix incorrect applying command line parameters in case generating only world
Diffstat (limited to 'generator')
-rw-r--r-- | generator/feature_generator.hpp | 2 | ||||
-rw-r--r-- | generator/osm_source.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/generator/feature_generator.hpp b/generator/feature_generator.hpp index 9b2e0728cb..7c5055f804 100644 --- a/generator/feature_generator.hpp +++ b/generator/feature_generator.hpp @@ -31,7 +31,7 @@ protected: /// @return feature offset in the file, which is used as an ID later uint32_t WriteFeatureBase(vector<char> const & bytes, FeatureBuilder1 const & fb); - void WriteRawFeatureGeometry(FeatureBuilder1 const & fb); + void Flush(); public: diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index ee25f11eed..9ae7eb3197 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -226,7 +226,8 @@ namespace CHECK(!info.m_makeCoasts || !info.m_createWorld, ("We can't do make_coasts and generate_world at the same time")); - if (!info.m_makeCoasts) + // TODO: In this case we need more carefully check command line parameters for one country + if (!info.m_makeCoasts && info.m_splitByPolygons) { m_countries.reset(new CountriesGenerator(info)); @@ -235,7 +236,8 @@ namespace m_coastsHolder.reset(new feature::FeaturesCollector(info.GetTmpFileName(WORLD_COASTS_FILE_NAME))); } } - else + + if (info.m_makeCoasts) { m_coasts.reset(new CoastlineFeaturesGenerator(Type(NATURAL_COASTLINE))); |