Added world map generation support to country polygonizer

Note that features will not be duplicated in world and countries files any more

indexer/indexer_tool/feature_bucketer.hpp

@@ -1,20 +1,17 @@
 #pragma once
 
+#include "world_map_generator.hpp"
+
 #include "../../base/base.hpp"
-#include "../../base/logging.hpp"
 
 #include "../../coding/file_writer.hpp"
 
 #include "../../geometry/rect2d.hpp"
 
 #include "../../indexer/feature.hpp"
-#include "../../indexer/feature_visibility.hpp"
-#include "../../defines.hpp"
 
 #include "../../std/string.hpp"
 
-#include <boost/scoped_ptr.hpp>
-
 namespace feature
 {
 
@@ -35,37 +32,28 @@ class CellFeatureBucketer
       CellIdConverter<BoundsT, CellIdT>::GetCellBounds(cell, minX, minY, maxX, maxY);
       m_Buckets[i].m_Rect = m2::RectD(minX, minY, maxX, maxY);
     }
-    // create separate world bucket if necessary
-    if (m_maxWorldZoom >= 0)
-      m_worldBucket.reset(new FeatureOutT(WORLD_FILE_NAME, m_FeatureOutInitData));
   }
 
 public:
   template <class TInfo>
   explicit CellFeatureBucketer(TInfo & info)
   : m_Level(info.cellBucketingLevel), m_FeatureOutInitData(info.datFilePrefix, info.datFileSuffix),
-    m_maxWorldZoom(info.maxScaleForWorldFeatures)
+    m_worldMap(info.maxScaleForWorldFeatures, m_FeatureOutInitData)
   {
     Init();
   }
 
+  /// @note this constructor doesn't support world file generation
   CellFeatureBucketer(int level, typename FeatureOutT::InitDataType const & initData)
-    : m_Level(level), m_FeatureOutInitData(initData), m_maxWorldZoom(-1)
+    : m_Level(level), m_FeatureOutInitData(initData), m_worldMap(-1, initData)
   {
     Init();
   }
 
   void operator () (feature_builder_t const & fb)
   {
-    int minScale = feature::MinDrawableScaleForFeature(fb.GetFeatureBase());
-    if (minScale == -1)
-    {
-      LOG(LWARNING, ("Non-drawable feature found, ignoring"));
-      return;
-    }
-    // separately store features needed for world map
-    if (m_worldBucket && m_maxWorldZoom >= minScale)
-      (*m_worldBucket)(fb);
+    if (m_worldMap(fb))
+      return; // we do not duplicate features in world and bucket files
 
     FeatureClipperT clipper(fb);
     // TODO: Is feature fully inside GetLimitRect()?
@@ -113,9 +101,7 @@ private:
   int m_Level;
   typename FeatureOutT::InitDataType m_FeatureOutInitData;
   vector<Bucket> m_Buckets;
-  /// if NULL, separate world data file is not generated
-  boost::scoped_ptr<FeatureOutT> m_worldBucket;
-  int m_maxWorldZoom;
+  WorldMapGenerator<FeatureOutT> m_worldMap;
 };
 
 class SimpleFeatureClipper

indexer/indexer_tool/feature_generator.cpp

@@ -302,13 +302,15 @@ bool GenerateImpl(GenerateInfo & info)
       FeaturePolygonizerType bucketer(info);
       TParser<FeaturePolygonizerType, holder_t> parser(bucketer, holder);
       ParseXMLFromStdIn(parser);
+      info.bucketNames = bucketer.Names();
     }
     else
     {
       CHECK_GREATER_OR_EQUAL(info.cellBucketingLevel, 0, ());
       CHECK_LESS(info.cellBucketingLevel, 10, ());
 
-      typedef CellFeatureBucketer<FeaturesCollector, SimpleFeatureClipper, MercatorBounds, RectId> FeatureBucketerType;
+      typedef CellFeatureBucketer<FeaturesCollector, SimpleFeatureClipper,
+              MercatorBounds, RectId> FeatureBucketerType;
       FeatureBucketerType bucketer(info);
       TParser<FeatureBucketerType, holder_t> parser(bucketer, holder);
       ParseXMLFromStdIn(parser);

indexer/indexer_tool/indexer_tool.pro

@@ -24,7 +24,7 @@ SOURCES += \
   update_generator.cpp \
   grid_generator.cpp \
   statistics.cpp \
-  kml_parser.cpp \
+  kml_parser.cpp
 
 HEADERS += \
   osm_element.hpp \
@@ -39,3 +39,4 @@ HEADERS += \
   statistics.hpp \
   kml_parser.hpp \
   polygonizer.hpp \
+    world_map_generator.hpp

indexer/indexer_tool/polygonizer.hpp

@@ -17,6 +17,7 @@
 #include <boost/scoped_ptr.hpp>
 
 #include "kml_parser.hpp"
+#include "world_map_generator.hpp"
 
 namespace feature
 {
@@ -26,11 +27,11 @@ namespace feature
   {
   public:
     template <class TInfo>
-    Polygonizer(TInfo & info)
-    : m_FeatureOutInitData(info.datFilePrefix, info.datFileSuffix), m_Names(info.bucketNames)
+    Polygonizer(TInfo & info) : m_FeatureOutInitData(info.datFilePrefix, info.datFileSuffix),
+      m_worldMap(info.maxScaleForWorldFeatures, m_FeatureOutInitData)
     {
       CHECK(kml::LoadCountriesList(info.datFilePrefix, m_countries, info.simplifyCountriesLevel),
-            ("Error loading polygons"));
+            ("Error loading country polygons files"));
 
       //LOG_SHORT(LINFO, ("Loaded polygons count for regions:"));
       //for (size_t i = 0; i < m_countries.size(); ++i)
@@ -79,6 +80,9 @@ namespace feature
 
     void operator () (FeatureBuilder1 const & fb)
     {
+      if (m_worldMap(fb))
+        return; // do not duplicate feature in any country if it's stored in world map
+
       buffer_vector<kml::CountryPolygons const *, 32> vec;
       m_countries.ForEachInRect(fb.GetLimitRect(), InsertCountriesPtr(vec));
 
@@ -112,6 +116,11 @@ namespace feature
       (*(m_Buckets[country->m_index]))(fb);
     }
 
+    vector<string> const & Names()
+    {
+      return m_Names;
+    }
+
   private:
     typename FeatureOutT::InitDataType m_FeatureOutInitData;
 
@@ -119,5 +128,7 @@ namespace feature
     vector<string> m_Names;
 
     kml::CountriesContainerT m_countries;
+
+    WorldMapGenerator<FeatureOutT> m_worldMap;
   };
 }

indexer/indexer_tool/world_map_generator.hpp

@@ -0,0 +1,41 @@
+#pragma once
+
+#include "../../defines.hpp"
+
+#include "../../indexer/feature.hpp"
+#include "../../indexer/feature_visibility.hpp"
+
+#include <boost/scoped_ptr.hpp>
+
+template <class FeatureOutT>
+class WorldMapGenerator
+{
+  /// if NULL, separate world data file is not generated
+  boost::scoped_ptr<FeatureOutT> m_worldBucket;
+  /// features visible before or at this scale level will go to World map
+  int m_maxWorldScale;
+
+public:
+  WorldMapGenerator(int maxWorldScale, typename FeatureOutT::InitDataType featureOutInitData)
+  : m_maxWorldScale(maxWorldScale)
+  {
+    if (maxWorldScale >= 0)
+      m_worldBucket.reset(new FeatureOutT(WORLD_FILE_NAME, featureOutInitData));
+  }
+
+  bool operator()(FeatureBuilder1 const & fb)
+  {
+    if (m_worldBucket)
+    {
+      int minScale = feature::MinDrawableScaleForFeature(fb.GetFeatureBase());
+      CHECK_GREATER(minScale, -1, ("Non-drawable feature found!?"));
+      // separately store features needed for world map
+      if (m_maxWorldScale >= minScale)
+      {
+        (*m_worldBucket)(fb);
+        return true;
+      }
+    }
+    return false;
+  }
+};

tools/unix/build_common_planet.sh

@@ -14,8 +14,7 @@ PROCESSORS=4
 # displays usage and exits
 function Usage {
   echo ''
-  echo "Usage: $0 [path_to_data_folder_with_classsif_and_planet.osm.bz2] [bucketing_level] [optional_path_to_intermediate_data] [world_only]"
-  echo "Note, that for coastlines bucketing_level should be 0"
+  echo "Usage: $0 [path_to_data_folder_with_classsif_and_planet.osm.bz2] [bucketing_level] [optional_path_to_intermediate_data]"
   echo "Planet squares size is (2^bucketing_level x 2^bucketing_level)"
   echo "If optional intermediate path is given, only second pass will be executed"
   exit 0
@@ -100,12 +99,6 @@ then
   PV=pv
 fi
 
-WORLD_ONLY=false
-if [ $# -ge 4  ]; then
-  WORLD_ONLY=true
-fi
-
-
 # skip 1st pass if intermediate data path was given
 if [ $# -lt 3 ]; then
   # 1st pass - not paralleled
@@ -117,7 +110,7 @@ fi
 # 2nd pass - not paralleled
 $PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES --bucketing_level=$BUCKETING_LEVEL \
-  --generate_features --worldmap_max_zoom=5 --world_only=$WORLD_ONLY \
+  --generate_features --generate_world_scale=5 \
   --data_path=$DATA_PATH
 
 # 3rd pass - do in parallel