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:
authorArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-08-19 18:50:59 +0300
committerArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-08-19 18:50:59 +0300
commit003fa128b5c7d3e049f4bd95e3b68ab021d422c7 (patch)
treec6831d94c4dbec79f56120a785631a9e686a8353 /indexer/editable_map_object.cpp
parent8add28eba33004c47bed783e0ce54a8c5501b6a8 (diff)
propagate FMD_INTERNET from type for MapObjects
Diffstat (limited to 'indexer/editable_map_object.cpp')
-rw-r--r--indexer/editable_map_object.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp
index 56a26b7194..20d4ecfec1 100644
--- a/indexer/editable_map_object.cpp
+++ b/indexer/editable_map_object.cpp
@@ -228,7 +228,7 @@ void EditableMapObject::SetType(uint32_t featureType)
// TODO(mgsergio): Replace by correct sorting from editor's config.
copy.SortBySpec();
m_types.Remove(*copy.begin());
- m_types.operator ()(featureType);
+ m_types.Add(featureType);
}
}
@@ -280,6 +280,13 @@ void EditableMapObject::SetWebsite(string website)
void EditableMapObject::SetInternet(Internet internet)
{
m_metadata.Set(feature::Metadata::FMD_INTERNET, DebugPrint(internet));
+
+ static const uint32_t wifiType = classif().GetTypeByPath({"internet_access", "wlan"});
+
+ if (m_types.Has(wifiType) && internet != Internet::Wlan)
+ m_types.Remove(wifiType);
+ else if (!m_types.Has(wifiType) && internet == Internet::Wlan)
+ m_types.Add(wifiType);
}
void EditableMapObject::SetStars(int stars)