Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Zolotarev <deathbaba@gmail.com>2011-08-29 19:15:06 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:22:42 +0300
commita6a759b1cd73c812a63dd365a76cb672615e36ba (patch)
tree7fa1b6fc53158c6a37186023a8945452b6ccc143
parent2ae492f3a7d11ea1bac20b293a802ee6c9939f97 (diff)
Moved osm_decl.hpp from indexer to generator
Minor include fixes
-rw-r--r--base/string_utils.cpp1
-rw-r--r--coding/endianness.hpp5
-rw-r--r--coding/varint.hpp2
-rw-r--r--coding/write_to_sink.hpp6
-rw-r--r--generator/data_cache_file.hpp3
-rw-r--r--generator/data_generator.cpp6
-rw-r--r--generator/feature_generator.cpp2
-rw-r--r--generator/feature_generator.hpp3
-rw-r--r--generator/feature_sorter.hpp1
-rw-r--r--generator/first_pass_parser.hpp3
-rw-r--r--generator/generator.pro6
-rw-r--r--generator/generator_tool/generator_tool.cpp1
-rw-r--r--generator/osm_decl.cpp (renamed from indexer/osm_decl.cpp)7
-rw-r--r--generator/osm_decl.hpp (renamed from indexer/osm_decl.hpp)5
-rw-r--r--generator/osm_element.hpp2
-rw-r--r--indexer/indexer.pro2
16 files changed, 21 insertions, 34 deletions
diff --git a/base/string_utils.cpp b/base/string_utils.cpp
index 526268e302..43d9f73cb6 100644
--- a/base/string_utils.cpp
+++ b/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
diff --git a/coding/endianness.hpp b/coding/endianness.hpp
index 698a788855..748772caa2 100644
--- a/coding/endianness.hpp
+++ b/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"
diff --git a/coding/varint.hpp b/coding/varint.hpp
index 9f27bc591a..85b49abda0 100644
--- a/coding/varint.hpp
+++ b/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"
diff --git a/coding/write_to_sink.hpp b/coding/write_to_sink.hpp
index 8d1adf5faa..48043b0b88 100644
--- a/coding/write_to_sink.hpp
+++ b/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"
diff --git a/generator/data_cache_file.hpp b/generator/data_cache_file.hpp
index 086b70804b..b8ef6ac5ba 100644
--- a/generator/data_cache_file.hpp
+++ b/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"
diff --git a/generator/data_generator.cpp b/generator/data_generator.cpp
index b02fd9551c..14cbdfb8f8 100644
--- a/generator/data_generator.cpp
+++ b/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
{
diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp
index c7bbabe577..5e8dbdd292 100644
--- a/generator/feature_generator.cpp
+++ b/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"
diff --git a/generator/feature_generator.hpp b/generator/feature_generator.hpp
index c57662bd12..f775c3c45d 100644
--- a/generator/feature_generator.hpp
+++ b/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"
diff --git a/generator/feature_sorter.hpp b/generator/feature_sorter.hpp
index f64d55f612..39e2c60a35 100644
--- a/generator/feature_sorter.hpp
+++ b/generator/feature_sorter.hpp
@@ -7,7 +7,6 @@
#include "../indexer/scales.hpp"
#include "../std/string.hpp"
-#include "../std/vector.hpp"
namespace feature
{
diff --git a/generator/first_pass_parser.hpp b/generator/first_pass_parser.hpp
index 0d115e59c4..a38e879beb 100644
--- a/generator/first_pass_parser.hpp
+++ b/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
{
diff --git a/generator/generator.pro b/generator/generator.pro
index aee3bda4e6..48e3d60df6 100644
--- a/generator/generator.pro
+++ b/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 \
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 89658ff38f..2c1e7046b2 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/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"
diff --git a/indexer/osm_decl.cpp b/generator/osm_decl.cpp
index c53f1ab86a..9a39f6cbfd 100644
--- a/indexer/osm_decl.cpp
+++ b/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
{
diff --git a/indexer/osm_decl.hpp b/generator/osm_decl.hpp
index 295595b61e..f438ccfa90 100644
--- a/indexer/osm_decl.hpp
+++ b/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(); }
diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index 037ee83e0a..01164a1fcc 100644
--- a/generator/osm_element.hpp
+++ b/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"
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index bc2d754a59..61158577f1 100644
--- a/indexer/indexer.pro
+++ b/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 \