Moved osm_decl.hpp from indexer to generator

Minor include fixes

base/string_utils.cpp

@@ -1,7 +1,6 @@
 #include "string_utils.hpp"
 #include "assert.hpp"
 
-#include "../std/sstream.hpp"
 #include "../std/iterator.hpp"
 
 namespace strings

coding/endianness.hpp

@@ -1,7 +1,6 @@
 #pragma once
-#include "../base/base.hpp"
 
-#include "../base/start_mem_debug.hpp"
+#include "../base/base.hpp"
 
 // #define ENDIAN_IS_BIG
 
@@ -33,5 +32,3 @@ template <typename T> inline T SwapIfBigEndian(T t)
   return t;
 #endif
 }
-
-#include "../base/stop_mem_debug.hpp"

coding/varint.hpp

@@ -1,5 +1,7 @@
 #pragma once
+
 #include "write_to_sink.hpp"
+
 #include "../base/assert.hpp"
 #include "../base/base.hpp"
 #include "../base/bits.hpp"

coding/write_to_sink.hpp

@@ -1,8 +1,6 @@
 #pragma once
-#include "endianness.hpp"
-#include "../base/base.hpp"
 
-#include "../base/start_mem_debug.hpp"
+#include "endianness.hpp"
 
 template <class TSink> void WriteToSink(TSink & sink, unsigned char c)
 {
@@ -75,5 +73,3 @@ struct WriterFunctor
     m_Sink.Write(&t, sizeof(T));
   }
 };
-
-#include "../base/stop_mem_debug.hpp"

generator/data_cache_file.hpp

@@ -1,8 +1,9 @@
 #pragma once
 
+#include "osm_decl.hpp"
+
 #include "../indexer/file_reader_stream.hpp"
 #include "../indexer/file_writer_stream.hpp"
-#include "../indexer/osm_decl.hpp"
 
 #include "../coding/file_reader.hpp"
 #include "../coding/file_writer.hpp"

generator/data_generator.cpp

@@ -1,17 +1,13 @@
 #include "data_generator.hpp"
 #include "data_cache_file.hpp"
 #include "first_pass_parser.hpp"
-
-#include "../indexer/osm_decl.hpp"
+#include "osm_decl.hpp"
 
 #include "../base/std_serialization.hpp"
 #include "../base/logging.hpp"
 
 #include "../std/bind.hpp"
 
-#include "../base/start_mem_debug.hpp"
-
-
 namespace data
 {
 

generator/feature_generator.cpp

@@ -2,11 +2,11 @@
 #include "data_cache_file.hpp"
 #include "osm_element.hpp"
 #include "polygonizer.hpp"
+#include "osm_decl.hpp"
 
 #include "../defines.hpp"
 
 #include "../indexer/data_header.hpp"
-#include "../indexer/osm_decl.hpp"
 #include "../indexer/mercator.hpp"
 #include "../indexer/cell_id.hpp"
 

generator/feature_generator.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
 #include "generate_info.hpp"
-
-#include "../indexer/osm_decl.hpp"
+#include "osm_decl.hpp"
 
 #include "../geometry/rect2d.hpp"
 

generator/feature_sorter.hpp

@@ -7,7 +7,6 @@
 #include "../indexer/scales.hpp"
 
 #include "../std/string.hpp"
-#include "../std/vector.hpp"
 
 namespace feature
 {

generator/first_pass_parser.hpp

@@ -1,13 +1,12 @@
 #pragma once
 
 #include "xml_element.hpp"
+#include "osm_decl.hpp"
 
-#include "../indexer/osm_decl.hpp"
 #include "../indexer/mercator.hpp"
 
 #include "../base/string_utils.hpp"
 
-
 template <class THolder>
 class FirstPassParser : public BaseOSMParser
 {

generator/generator.pro

@@ -27,7 +27,8 @@ SOURCES += \
     mwm_rect_updater.cpp \
     dumper.cpp \
     unpack_mwm.cpp \
-    feature_builder.cpp
+    feature_builder.cpp \
+    osm_decl.cpp \
 
 HEADERS += \
     feature_merger.hpp \
@@ -52,4 +53,5 @@ HEADERS += \
     dumper.hpp \
     generate_info.hpp \
     unpack_mwm.hpp \
-    feature_builder.hpp
+    feature_builder.hpp \
+    osm_decl.hpp \

generator/generator_tool/generator_tool.cpp

@@ -13,7 +13,6 @@
 #include "../../indexer/data_header.hpp"
 #include "../../indexer/features_vector.hpp"
 #include "../../indexer/index_builder.hpp"
-#include "../../indexer/osm_decl.hpp"
 #include "../../indexer/search_index_builder.hpp"
 
 #include "../../defines.hpp"

generator/osm_decl.cpp

@@ -1,13 +1,10 @@
 #include "osm_decl.hpp"
-#include "classificator.hpp"
+
+#include "../indexer/classificator.hpp"
 
 #include "../base/macros.hpp"
 
 #include "../std/target_os.hpp"
-#include "../std/iostream.hpp"
-
-#include "../base/start_mem_debug.hpp"
-
 
 namespace feature
 {

generator/osm_decl.hpp

@@ -45,7 +45,7 @@ namespace feature
   /// @param[in]  type  Type from feature.
   bool NeedUnite(uint32_t type);
   //@}
-};
+}
 
 class progress_policy
 {
@@ -63,6 +63,9 @@ public:
 struct WayElement
 {
   vector<uint64_t> nodes;
+  uint64_t m_wayOsmId;
+
+  explicit WayElement(uint64_t osmId) : m_wayOsmId(osmId) {}
 
   bool IsValid() const { return !nodes.empty(); }
 

generator/osm_element.hpp

@@ -3,8 +3,8 @@
 #include "osm2type.hpp"
 #include "xml_element.hpp"
 #include "feature_builder.hpp"
+#include "osm_decl.hpp"
 
-#include "../indexer/osm_decl.hpp"
 #include "../indexer/feature_visibility.hpp"
 
 #include "../base/string_utils.hpp"

indexer/indexer.pro

@@ -15,7 +15,6 @@ SOURCES += \
     drawing_rules.cpp \
     drawing_rule_def.cpp \
     scales.cpp \
-    osm_decl.cpp \
     feature.cpp \
     classificator_loader.cpp \
     scale_index.cpp \
@@ -51,7 +50,6 @@ HEADERS += \
     index.hpp \
     index_builder.hpp \
     scales.hpp \
-    osm_decl.hpp \
     classificator_loader.hpp \
     interval_index.hpp \
     interval_index_builder.hpp \