- Set world generation scales to 9.

- Highway merging during world generation.

generator/world_map_generator.hpp

@@ -119,7 +119,20 @@ public:
     static size_t const MAX_TYPES_IN_PATH = 3;
     char const * arrMerge[][MAX_TYPES_IN_PATH] = {
       {"natural", "coastline", ""},
-      {"boundary", "administrative", "2"}
+      {"boundary", "administrative", "2"},
+
+      {"highway", "motorway", ""},
+      {"highway", "motorway_link", ""},
+      {"highway", "motorway", "oneway"},
+      {"highway", "motorway_link", "oneway"},
+
+      {"highway", "primary", ""},
+      {"highway", "primary_link", ""},
+
+      {"highway", "trunk", ""},
+      {"highway", "trunk_link", ""},
+
+      {"natural", "water", ""}
     };
 
     for (size_t i = 0; i < ARRAY_SIZE(arrMerge); ++i)

indexer/feature_impl.hpp

@@ -22,8 +22,8 @@ namespace feature
   }
 
 
-  static int g_arrWorldScales[] = { 2, 4, 5, 6 };       // 6 = scales::GetUpperWorldScale()
-  static int g_arrCountryScales[] = { 7, 10, 14, 17 };  // 17 = scales::GetUpperScale()
+  static int g_arrWorldScales[] = { 2, 5, 7, 9 };       // 9 = scales::GetUpperWorldScale()
+  static int g_arrCountryScales[] = { 10, 12, 14, 17 };  // 17 = scales::GetUpperScale()
 
   inline string GetTagForIndex(char const * prefix, int ind)
   {

indexer/scales.hpp

@@ -5,7 +5,7 @@
 namespace scales
 {
   inline int GetUpperScale() { return 17; }
-  inline int GetUpperWorldScale() { return 6; }
+  inline int GetUpperWorldScale() { return 9; }
 
   double GetM2PFactor(int level);
   int GetScaleLevel(double ratio);

tools/unix/build_common_planet.sh

@@ -110,7 +110,7 @@ fi
 # 2nd pass - not paralleled
 $PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES --bucketing_level=$BUCKETING_LEVEL \
-  --generate_features --generate_world_scale=5 \
+  --generate_features --generate_world_scale=9 \
   --data_path=$DATA_PATH
 
 # 3rd pass - do in parallel

tools/unix/polygons.sh

@@ -117,7 +117,7 @@ fi
 # 2nd pass - not paralleled
 $PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES --split_by_polygons --simplify_countries_level=$SIMPLIFY \
-  --generate_features --generate_world_scale=6 --merge_coastlines=true \
+  --generate_features --generate_world_scale=9 --merge_coastlines=true \
   --data_path=$DATA_PATH
 
 # 3rd pass - do in parallel