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:
authorvng <viktor.govako@gmail.com>2011-10-08 12:32:59 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:25:37 +0300
commit67b27d0d9e633d45e84f48c55e335812d306614b (patch)
treee63ad623afbb143da407f90d5f8669f22808fd69 /generator
parent451fb89cc01b16c2c9e5693b07e4b9c72ba234f8 (diff)
Fix getting of cell's name and id for coastlines.
Diffstat (limited to 'generator')
-rw-r--r--generator/coastlines_generator.cpp2
-rw-r--r--generator/feature_builder.cpp6
-rw-r--r--generator/feature_builder.hpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp
index 182beec5d7..08587dbd5a 100644
--- a/generator/coastlines_generator.cpp
+++ b/generator/coastlines_generator.cpp
@@ -198,7 +198,7 @@ bool CoastlineFeaturesGenerator::GetFeature(CellIdT const & cell, FeatureBuilder
return false;
// assign feature
- fb.SetCoastCell(cell.ToInt64(CellIdT::DEPTH_LEVELS));
+ fb.SetCoastCell(cell.ToInt64(m_highLevel + 1), cell.ToString());
doDiff.AssignGeometry(fb);
fb.SetArea();
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index bdc891d1fa..b05f0f26fc 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -337,12 +337,12 @@ int FeatureBuilder1::GetMinFeatureDrawScale() const
return (minScale == -1 ? 1000 : minScale);
}
-void FeatureBuilder1::SetCoastCell(int64_t cell)
+void FeatureBuilder1::SetCoastCell(int64_t iCell, string const & strCell)
{
- m_coastCell = cell;
+ m_coastCell = iCell;
FeatureParams params;
- params.name.AddString(0, strings::to_string(cell));
+ params.name.AddString(0, strCell);
SetParams(params);
}
diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp
index d3e2be106f..05754ad91c 100644
--- a/generator/feature_builder.hpp
+++ b/generator/feature_builder.hpp
@@ -123,7 +123,7 @@ public:
int GetMinFeatureDrawScale() const;
- void SetCoastCell(int64_t cell);
+ void SetCoastCell(int64_t iCell, string const & strCell);
inline bool GetCoastCell(int64_t & cell) const
{
if (m_coastCell != -1)