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 <alex@maps.me>2016-03-29 20:49:24 +0300
committerAlex Zolotarev <alex@maps.me>2016-03-29 20:49:24 +0300
commit373b233a7b7ac45ce6b941be245b982a7a514587 (patch)
treec690aee5799f623b2669d3cd2e4efbdfc103cdff /indexer/feature.cpp
parent94abd84159b8ea9c05579afdbd33bc55cafe8ab2 (diff)
[editor] Correctly save “Unknown” state for internet.
Diffstat (limited to 'indexer/feature.cpp')
-rw-r--r--indexer/feature.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index a90d83e57f..c6a2bdde3d 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -145,10 +145,19 @@ editor::XMLFeature FeatureType::ToXML(bool serializeType) const
// TODO(mgsergio): Use correct sorting instead of SortBySpec based on the config.
th.SortBySpec();
Classificator & cl = classif();
+ static const uint32_t internetType = cl.GetTypeByPath({"internet_access"});
// TODO(mgsergio): Either improve "OSM"-compatible serialization for more complex types,
// or save all our types directly, to restore and reuse them in migration of modified features.
for (uint32_t const type : th)
{
+ { // Avoid serialization of "internet" type, it is set separately in the Editor.
+ // Otherwise we can't reset "internet" to "Unknown" state.
+ uint32_t truncatedType = type;
+ ftype::TruncValue(truncatedType, 1);
+ if (truncatedType == internetType)
+ continue;
+ }
+
string const strType = cl.GetReadableObjectName(type);
strings::SimpleTokenizer iter(strType, "-");
string const k = *iter;