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:
authorIlya Zverev <zverik@textual.ru>2016-04-07 15:59:52 +0300
committerIlya Zverev <zverik@textual.ru>2016-04-11 12:43:58 +0300
commit7d4c92db17dd2bff09c4f690b1fed09906e2b18b (patch)
treebda7f6d5aa7d6d01922183f582f2ae8b2a6ebed4
parentb5b83d55f0240651fd75020561bd44c6098bf83a (diff)
[generator] Add bench and shelter to replaced tags
-rw-r--r--data/replaced_tags.txt2
-rw-r--r--defines.hpp2
-rw-r--r--generator/osm_source.cpp2
-rw-r--r--indexer/feature_data.cpp2
4 files changed, 6 insertions, 2 deletions
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index f8138b0d18..c7ac29314d 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -1,4 +1,6 @@
atm=yes : amenity=atm
+bench=yes : amenity=bench
+shelter=yes : amenity=shelter
restaurant=yes : amenity=restaurant
hotel=yes : tourism=hotel
building=entrance : entrance=yes
diff --git a/defines.hpp b/defines.hpp
index f19764f472..9e19115b78 100644
--- a/defines.hpp
+++ b/defines.hpp
@@ -69,4 +69,4 @@
#define GPS_TRACK_FILENAME "gps_track.dat"
-#define PEPLACED_TAGS_FILE "replaced_tags.txt"
+#define REPLACED_TAGS_FILE "replaced_tags.txt"
diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index 7fa94bf4e1..8d564d5aae 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -510,7 +510,7 @@ bool GenerateFeaturesImpl(feature::GenerateInfo & info)
TagAdmixer tagAdmixer(info.GetIntermediateFileName("ways", ".csv"),
info.GetIntermediateFileName("towns", ".csv"));
- TagReplacer tagReplacer(GetPlatform().ResourcesDir() + PEPLACED_TAGS_FILE);
+ TagReplacer tagReplacer(GetPlatform().ResourcesDir() + REPLACED_TAGS_FILE);
// Here we can add new tags to element!!!
auto const fn = [&](OsmElement * e)
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index c4284fb55e..71606ca0fa 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -92,6 +92,8 @@ public:
// 2-arity
char const * arr2[][2] = {
{ "amenity", "atm" },
+ { "amenity", "bench" },
+ { "amenity", "shelter" },
{ "building", "address" },
};