map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[editor] Fixed duplication of similar tags like phone and contact:phone.

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-20 16:54:56 +03:00 • committed by Sergey Yershov
parent fecb5b165d
commit b7fccca23a
3 changed files with 100 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/editor_config.hpp
View file

@ -50,6 +50,10 @@ public:
void Reload();
// TODO(mgsergio): Implement this getter to avoid hard-code in XMLFeature::ApplyPatch.
// It should return [[phone, contact:phone], [website, contact:website, url], ...].
//vector<vector<string>> GetAlternativeFields() const;
private:
string const m_fileName;
pugi::xml_document m_document;

70
editor/editor_tests/xml_feature_test.cpp
View file

@ -253,3 +253,73 @@ UNIT_TEST(XMLFeature_Geometry)
feature.SetGeometry(geometry);
TEST_EQUAL(feature.GetGeometry(), geometry, ());
}
UNIT_TEST(XMLFeature_ApplyPatch)
{
auto const kOsmFeature = R"(<?xml version="1.0"?>
<osm>
<node id="1" lat="1" lon="2" timestamp="2015-11-27T21:13:32Z" version="1">
<tag k="amenity" v="cafe"/>
</node>
</osm>
)";
auto const kPatch = R"(<?xml version="1.0"?>
<node lat="1" lon="2" timestamp="2015-11-27T21:13:32Z">
<tag k="website" v="maps.me"/>
</node>
)";
XMLFeature const baseOsmFeature = XMLFeature::FromOSM(kOsmFeature).front();
{
XMLFeature noAnyTags = baseOsmFeature;
noAnyTags.ApplyPatch(XMLFeature(kPatch));
TEST(noAnyTags.HasKey("website"), ());
}
{
XMLFeature hasMainTag = baseOsmFeature;
hasMainTag.SetTagValue("website", "mapswith.me");
hasMainTag.ApplyPatch(XMLFeature(kPatch));
TEST_EQUAL(hasMainTag.GetTagValue("website"), "maps.me", ());
size_t tagsCount = 0;
hasMainTag.ForEachTag([&tagsCount](string const &, string const &){ ++tagsCount; });
TEST_EQUAL(2, tagsCount, ("website should be replaced, not duplicated."));
}
{
XMLFeature hasAltTag = baseOsmFeature;
hasAltTag.SetTagValue("contact:website", "mapswith.me");
hasAltTag.ApplyPatch(XMLFeature(kPatch));
TEST(!hasAltTag.HasTag("website"), ("Existing alt tag should be used."));
TEST_EQUAL(hasAltTag.GetTagValue("contact:website"), "maps.me", ());
}
{
XMLFeature hasAltTag = baseOsmFeature;
hasAltTag.SetTagValue("url", "mapswithme.com");
hasAltTag.ApplyPatch(XMLFeature(kPatch));
TEST(!hasAltTag.HasTag("website"), ("Existing alt tag should be used."));
TEST_EQUAL(hasAltTag.GetTagValue("url"), "maps.me", ());
}
{
XMLFeature hasTwoAltTags = baseOsmFeature;
hasTwoAltTags.SetTagValue("contact:website", "mapswith.me");
hasTwoAltTags.SetTagValue("url", "mapswithme.com");
hasTwoAltTags.ApplyPatch(XMLFeature(kPatch));
TEST(!hasTwoAltTags.HasTag("website"), ("Existing alt tag should be used."));
TEST_EQUAL(hasTwoAltTags.GetTagValue("contact:website"), "maps.me", ());
TEST_EQUAL(hasTwoAltTags.GetTagValue("url"), "mapswithme.com", ());
}
{
XMLFeature hasMainAndAltTag = baseOsmFeature;
hasMainAndAltTag.SetTagValue("website", "osmrulezz.com");
hasMainAndAltTag.SetTagValue("url", "mapswithme.com");
hasMainAndAltTag.ApplyPatch(XMLFeature(kPatch));
TEST_EQUAL(hasMainAndAltTag.GetTagValue("website"), "maps.me", ());
TEST_EQUAL(hasMainAndAltTag.GetTagValue("url"), "mapswithme.com", ());
}
}

27
editor/xml_feature.cpp
View file

@ -161,8 +161,33 @@ string XMLFeature::ToOSMString() const
void XMLFeature::ApplyPatch(XMLFeature const & featureWithChanges)
{
featureWithChanges.ForEachTag([this](string const & k, string const & v)
// TODO(mgsergio): Get these alt tags from the config.
vector<vector<string>> const alternativeTags =
{
{"phone", "contact:phone"},
{"website", "contact:website", "url"},
{"fax", "contact:fax"},
{"email", "contact:email"}
};
featureWithChanges.ForEachTag([&alternativeTags, this](string const & k, string const & v)
{
// Avoid duplication for similar alternative osm tags.
for (auto const & alt : alternativeTags)
{
ASSERT(!alt.empty(), ());
if (k == alt.front())
{
for (auto const & tag : alt)
{
// Reuse already existing tag if it's present.
if (HasTag(tag))
{
SetTagValue(tag, v);
return;
}
}
}
}
SetTagValue(k, v);
});
}