forked from organicmaps/organicmaps
Reduced comparison
This commit is contained in:
Sergey Magidovich
Sergey Yershov
parent
60d5785836
commit
9d602fbfbc
8 changed files with 404 additions and 265 deletions
|
|
@ -3,6 +3,7 @@
|
|||
#include "indexer/feature.hpp"
|
||||
|
||||
#include "editor/changeset_wrapper.hpp"
|
||||
#include "editor/osm_feature_matcher.hpp"
|
||||
|
||||
#include "std/algorithm.hpp"
|
||||
#include "std/sstream.hpp"
|
||||
|
|
@ -14,223 +15,6 @@
|
|||
|
||||
using editor::XMLFeature;
|
||||
|
||||
using TGeometry = set<m2::PointD>;
|
||||
|
||||
namespace
|
||||
{
|
||||
bool LatLonEqual(ms::LatLon const & a, ms::LatLon const & b)
|
||||
{
|
||||
double constexpr eps = MercatorBounds::GetCellID2PointAbsEpsilon();
|
||||
return a.EqualDxDy(b, eps);
|
||||
}
|
||||
|
||||
double ScoreLatLon(XMLFeature const & xmlFt, ms::LatLon const & latLon)
|
||||
{
|
||||
// TODO: Find proper score values;
|
||||
return LatLonEqual(latLon, xmlFt.GetCenter()) ? 10 : -10;
|
||||
}
|
||||
|
||||
double ScoreGeometry(pugi::xml_document const & osmResponse, pugi::xml_node const & way,
|
||||
TGeometry geometry)
|
||||
{
|
||||
int matched = 0;
|
||||
int total = 0;
|
||||
// TODO(mgsergio): optimize using sorting and scaning eps-squares.
|
||||
// The idea is to build squares with side = eps on points from the first set.
|
||||
// Sort them by y and x in y groups.
|
||||
// Then pass points from the second set through constructed struct and register events
|
||||
// like square started, square ended, point encounted.
|
||||
|
||||
for (auto const xNodeRef : way.select_nodes("nd/@ref"))
|
||||
{
|
||||
++total;
|
||||
string const nodeRef = xNodeRef.attribute().value();
|
||||
auto const node = osmResponse.select_node(("node[@ref='" + nodeRef + "']").data()).node();
|
||||
if (!node)
|
||||
{
|
||||
LOG(LDEBUG, ("OSM response have ref", nodeRef,
|
||||
"but have no node with such id.", osmResponse));
|
||||
continue; // TODO: or break and return -1000?
|
||||
}
|
||||
|
||||
XMLFeature xmlFt(node);
|
||||
for (auto pointIt = begin(geometry); pointIt != end(geometry); ++pointIt)
|
||||
{
|
||||
if (LatLonEqual(xmlFt.GetCenter(), MercatorBounds::ToLatLon(*pointIt)))
|
||||
{
|
||||
++matched;
|
||||
geometry.erase(pointIt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return static_cast<double>(matched) / total * 100;
|
||||
}
|
||||
|
||||
double ScoreNames(XMLFeature const & xmlFt, StringUtf8Multilang const & names)
|
||||
{
|
||||
double score = 0;
|
||||
names.ForEach([&score, &xmlFt](uint8_t const langCode, string const & name)
|
||||
{
|
||||
if (xmlFt.GetName(langCode) == name)
|
||||
score += 1;
|
||||
return true;
|
||||
});
|
||||
|
||||
// TODO(mgsergio): Deafult name match should have greater wieght. Should it?
|
||||
|
||||
return score;
|
||||
}
|
||||
|
||||
vector<string> GetOsmOriginalTagsForType(feature::Metadata::EType const et)
|
||||
{
|
||||
static multimap<feature::Metadata::EType, string> const kFmd2Osm = {
|
||||
{feature::Metadata::EType::FMD_CUISINE, "cuisine"},
|
||||
{feature::Metadata::EType::FMD_OPEN_HOURS, "opening_hours"},
|
||||
{feature::Metadata::EType::FMD_PHONE_NUMBER, "phone"},
|
||||
{feature::Metadata::EType::FMD_PHONE_NUMBER, "contact:phone"},
|
||||
{feature::Metadata::EType::FMD_FAX_NUMBER, "fax"},
|
||||
{feature::Metadata::EType::FMD_FAX_NUMBER, "contact:fax"},
|
||||
{feature::Metadata::EType::FMD_STARS, "stars"},
|
||||
{feature::Metadata::EType::FMD_OPERATOR, "operator"},
|
||||
{feature::Metadata::EType::FMD_URL, "url"},
|
||||
{feature::Metadata::EType::FMD_WEBSITE, "website"},
|
||||
{feature::Metadata::EType::FMD_WEBSITE, "contact:website"},
|
||||
// TODO: {feature::Metadata::EType::FMD_INTERNET, ""},
|
||||
{feature::Metadata::EType::FMD_ELE, "ele"},
|
||||
{feature::Metadata::EType::FMD_TURN_LANES, "turn:lanes"},
|
||||
{feature::Metadata::EType::FMD_TURN_LANES_FORWARD, "turn:lanes:forward"},
|
||||
{feature::Metadata::EType::FMD_TURN_LANES_BACKWARD, "turn:lanes:backward"},
|
||||
{feature::Metadata::EType::FMD_EMAIL, "email"},
|
||||
{feature::Metadata::EType::FMD_EMAIL, "contact:email"},
|
||||
{feature::Metadata::EType::FMD_POSTCODE, "addr:postcode"},
|
||||
{feature::Metadata::EType::FMD_WIKIPEDIA, "wikipedia"},
|
||||
{feature::Metadata::EType::FMD_MAXSPEED, "maxspeed"},
|
||||
{feature::Metadata::EType::FMD_FLATS, "addr:flats"},
|
||||
{feature::Metadata::EType::FMD_HEIGHT, "height"},
|
||||
{feature::Metadata::EType::FMD_MIN_HEIGHT, "min_height"},
|
||||
{feature::Metadata::EType::FMD_MIN_HEIGHT, "building:min_level"},
|
||||
{feature::Metadata::EType::FMD_DENOMINATION, "denomination"},
|
||||
{feature::Metadata::EType::FMD_BUILDING_LEVELS, "building:levels"},
|
||||
};
|
||||
|
||||
vector<string> result;
|
||||
auto const range = kFmd2Osm.equal_range(et);
|
||||
for (auto it = range.first; it != range.second; ++it)
|
||||
result.emplace_back(it->second);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
double ScoreMetadata(XMLFeature const & xmlFt, feature::Metadata const & metadata)
|
||||
{
|
||||
double score = 0;
|
||||
|
||||
for (auto const type : metadata.GetPresentTypes())
|
||||
{
|
||||
for (auto const osm_tag : GetOsmOriginalTagsForType(static_cast<feature::Metadata::EType>(type)))
|
||||
{
|
||||
if (xmlFt.GetTagValue(osm_tag) == metadata.Get(type))
|
||||
{
|
||||
score += 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return score;
|
||||
}
|
||||
|
||||
bool TypesEqual(XMLFeature const & xmlFt, feature::TypesHolder const & types)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, FeatureType const & ft)
|
||||
{
|
||||
double bestScore = -1;
|
||||
pugi::xml_node bestMatchNode;
|
||||
|
||||
for (auto const & xNode : osmResponse.select_nodes("node"))
|
||||
{
|
||||
try
|
||||
{
|
||||
XMLFeature xmlFt(xNode.node());
|
||||
|
||||
if (!TypesEqual(xmlFt, feature::TypesHolder(ft)))
|
||||
continue;
|
||||
|
||||
double nodeScore = ScoreLatLon(xmlFt, MercatorBounds::ToLatLon(ft.GetCenter()));
|
||||
if (nodeScore < 0)
|
||||
continue;
|
||||
|
||||
nodeScore += ScoreNames(xmlFt, ft.GetNames());
|
||||
nodeScore += ScoreMetadata(xmlFt, ft.GetMetadata());
|
||||
|
||||
if (bestScore < nodeScore)
|
||||
{
|
||||
bestScore = nodeScore;
|
||||
bestMatchNode = xNode.node();
|
||||
}
|
||||
}
|
||||
catch (editor::XMLFeatureNoLatLonError const & ex)
|
||||
{
|
||||
LOG(LWARNING, ("No lat/lon attribute in osm response node.", ex.Msg()));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(mgsergio): Add a properly defined threshold.
|
||||
// if (bestScore < minimumScoreThreshold)
|
||||
// return pugi::xml_node;
|
||||
|
||||
return bestMatchNode;
|
||||
}
|
||||
|
||||
pugi::xml_node GetBestOsmWay(pugi::xml_document const & osmResponse, FeatureType const & ft,
|
||||
TGeometry const & geometry)
|
||||
{
|
||||
double bestScore = -1;
|
||||
pugi::xml_node bestMatchWay;
|
||||
|
||||
for (auto const & xWay : osmResponse.select_nodes("Way"))
|
||||
{
|
||||
try
|
||||
{
|
||||
XMLFeature xmlFt(xWay.node());
|
||||
|
||||
if (!TypesEqual(xmlFt, feature::TypesHolder(ft)))
|
||||
continue;
|
||||
|
||||
double nodeScore = ScoreGeometry(osmResponse, xWay.node(), geometry);
|
||||
if (nodeScore < 0)
|
||||
continue;
|
||||
|
||||
nodeScore += ScoreNames(xmlFt, ft.GetNames());
|
||||
nodeScore += ScoreMetadata(xmlFt, ft.GetMetadata());
|
||||
|
||||
if (bestScore < nodeScore)
|
||||
{
|
||||
bestScore = nodeScore;
|
||||
bestMatchWay = xWay.node();
|
||||
}
|
||||
}
|
||||
catch (editor::XMLFeatureNoLatLonError const & ex)
|
||||
{
|
||||
LOG(LWARNING, ("No lat/lon attribute in osm response node.", ex.Msg()));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(mgsergio): Add a properly defined threshold.
|
||||
// if (bestScore < minimumScoreThreshold)
|
||||
// return pugi::xml_node;
|
||||
|
||||
return bestMatchWay;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
string DebugPrint(pugi::xml_document const & doc)
|
||||
{
|
||||
ostringstream stream;
|
||||
|
|
@ -266,60 +50,48 @@ void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & ll, pugi::xml_document
|
|||
MYTHROW(OsmXmlParseException, ("Can't parse OSM server response for GetXmlFeaturesAtLatLon request", response.second));
|
||||
}
|
||||
|
||||
XMLFeature ChangesetWrapper::GetMatchingFeatureFromOSM(XMLFeature const & ourPatch, FeatureType const & feature)
|
||||
XMLFeature ChangesetWrapper::GetMatchingNodeFeatureFromOSM(m2::PointD const & center)
|
||||
{
|
||||
if (feature.GetFeatureType() == feature::EGeomType::GEOM_POINT)
|
||||
// Match with OSM node.
|
||||
ms::LatLon const ll = MercatorBounds::ToLatLon(center);
|
||||
pugi::xml_document doc;
|
||||
// Throws!
|
||||
LoadXmlFromOSM(ll, doc);
|
||||
|
||||
// feature must be the original one, not patched!
|
||||
pugi::xml_node const bestNode = GetBestOsmNode(doc, ll);
|
||||
if (bestNode.empty())
|
||||
MYTHROW(OsmObjectWasDeletedException,
|
||||
("OSM does not have any nodes at the coordinates", ll, ", server has returned:", doc));
|
||||
|
||||
return XMLFeature(bestNode);
|
||||
}
|
||||
|
||||
XMLFeature ChangesetWrapper::GetMatchingAreaFeatureFromOSM(set<m2::PointD> const & geometry)
|
||||
{
|
||||
// TODO: Make two/four requests using points on inscribed rectagle.
|
||||
for (auto const & pt : geometry)
|
||||
{
|
||||
// Match with OSM node.
|
||||
ms::LatLon const ll = ourPatch.GetCenter();
|
||||
ms::LatLon const ll = MercatorBounds::ToLatLon(pt);
|
||||
pugi::xml_document doc;
|
||||
// Throws!
|
||||
LoadXmlFromOSM(ll, doc);
|
||||
|
||||
// feature must be the original one, not patched!
|
||||
pugi::xml_node const bestNode = GetBestOsmNode(doc, feature);
|
||||
if (bestNode.empty())
|
||||
MYTHROW(OsmObjectWasDeletedException, ("OSM does not have any nodes at the coordinates", ll, ", server has returned:", doc));
|
||||
// TODO(AlexZ): Select best matching OSM way from possible many ways.
|
||||
pugi::xml_node const bestWay = GetBestOsmWay(doc, geometry);
|
||||
if (bestWay.empty())
|
||||
continue;
|
||||
|
||||
return XMLFeature(bestNode);
|
||||
XMLFeature const way(bestWay);
|
||||
if (!way.IsArea())
|
||||
continue;
|
||||
|
||||
// TODO: Check that this way is really match our feature.
|
||||
|
||||
return way;
|
||||
}
|
||||
else if (feature.GetFeatureType() == feature::EGeomType::GEOM_AREA)
|
||||
{
|
||||
using m2::PointD;
|
||||
// Set filters out duplicate points for closed ways or triangles' vertices.
|
||||
TGeometry geometry;
|
||||
feature.ForEachTriangle([&geometry](PointD const & p1, PointD const & p2, PointD const & p3)
|
||||
{
|
||||
geometry.insert(p1);
|
||||
geometry.insert(p2);
|
||||
geometry.insert(p3);
|
||||
}, FeatureType::BEST_GEOMETRY);
|
||||
|
||||
ASSERT_GREATER_OR_EQUAL(geometry.size(), 3, ("Is it an area feature?"));
|
||||
|
||||
for (auto const & pt : geometry)
|
||||
{
|
||||
ms::LatLon const ll = MercatorBounds::ToLatLon(pt);
|
||||
pugi::xml_document doc;
|
||||
// Throws!
|
||||
LoadXmlFromOSM(ll, doc);
|
||||
|
||||
// TODO(AlexZ): Select best matching OSM way from possible many ways.
|
||||
pugi::xml_node const bestWay = GetBestOsmWay(doc, feature, geometry);
|
||||
if (bestWay.empty())
|
||||
continue;
|
||||
|
||||
XMLFeature const way(bestWay);
|
||||
if (!way.IsArea())
|
||||
continue;
|
||||
|
||||
// TODO: Check that this way is really match our feature.
|
||||
|
||||
return way;
|
||||
}
|
||||
MYTHROW(OsmObjectWasDeletedException, ("OSM does not have any matching way for feature", feature));
|
||||
}
|
||||
MYTHROW(LinearFeaturesAreNotSupportedException, ("We don't edit linear features yet."));
|
||||
MYTHROW(OsmObjectWasDeletedException,
|
||||
("OSM does not have any matching way for feature"));
|
||||
}
|
||||
|
||||
void ChangesetWrapper::ModifyNode(XMLFeature node)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
#include "base/exception.hpp"
|
||||
|
||||
#include "std/set.hpp"
|
||||
|
||||
class FeatureType;
|
||||
|
||||
namespace osm
|
||||
|
|
@ -29,7 +31,8 @@ public:
|
|||
|
||||
/// Throws many exceptions from above list, plus including XMLNode's parsing ones.
|
||||
/// OsmObjectWasDeletedException means that node was deleted from OSM server by someone else.
|
||||
editor::XMLFeature GetMatchingFeatureFromOSM(editor::XMLFeature const & ourPatch, FeatureType const & feature);
|
||||
editor::XMLFeature GetMatchingNodeFeatureFromOSM(m2::PointD const & center);
|
||||
editor::XMLFeature GetMatchingAreaFeatureFromOSM(set<m2::PointD> const & geomerty);
|
||||
|
||||
/// Throws exceptions from above list.
|
||||
void ModifyNode(editor::XMLFeature node);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ SOURCES += \
|
|||
changeset_wrapper.cpp \
|
||||
opening_hours_ui.cpp \
|
||||
osm_auth.cpp \
|
||||
osm_feature_matcher.cpp \
|
||||
server_api.cpp \
|
||||
ui2oh.cpp \
|
||||
xml_feature.cpp \
|
||||
|
|
@ -20,6 +21,7 @@ HEADERS += \
|
|||
changeset_wrapper.hpp \
|
||||
opening_hours_ui.hpp \
|
||||
osm_auth.hpp \
|
||||
osm_feature_matcher.hpp \
|
||||
server_api.hpp \
|
||||
ui2oh.hpp \
|
||||
xml_feature.hpp \
|
||||
|
|
|
|||
|
|
@ -19,3 +19,4 @@ SOURCES += \
|
|||
xml_feature_test.cpp \
|
||||
ui2oh_test.cpp \
|
||||
osm_auth_test.cpp \
|
||||
osm_feature_matcher_test.cpp \
|
||||
|
|
|
|||
85
editor/editor_tests/osm_feature_matcher_test.cpp
Normal file
85
editor/editor_tests/osm_feature_matcher_test.cpp
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
#include "testing/testing.hpp"
|
||||
|
||||
#include "editor/osm_feature_matcher.hpp"
|
||||
#include "editor/xml_feature.hpp"
|
||||
|
||||
#include "3party/pugixml/src/pugixml.hpp"
|
||||
|
||||
|
||||
static char const * const osmRawResponse = R"SEP(
|
||||
<osm version="0.6" generator="CGImap 0.4.0 (22123 thorn-03.openstreetmap.org)" copyright="OpenStreetMap and contributors">
|
||||
<bounds minlat="53.8976570" minlon="27.5576615" maxlat="53.8976570" maxlon="27.5576615"/>
|
||||
<node id="277171984" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:39Z" user="iglezz" uid="450366" lat="53.8978034" lon="27.5577642"/>
|
||||
<node id="277171986" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:39Z" user="iglezz" uid="450366" lat="53.8978710" lon="27.5576815"/>
|
||||
<node id="2673014345" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977652" lon="27.5578039"/>
|
||||
<node id="277171999" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:39Z" user="iglezz" uid="450366" lat="53.8977484" lon="27.5573596"/>
|
||||
<node id="277172019" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:39Z" user="iglezz" uid="450366" lat="53.8977254" lon="27.5578377"/>
|
||||
<node id="277172022" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:39Z" user="iglezz" uid="450366" lat="53.8976041" lon="27.5575181"/>
|
||||
<node id="277172096" visible="true" version="5" changeset="20577443" timestamp="2014-02-15T14:37:39Z" user="iglezz" uid="450366" lat="53.8972383" lon="27.5581521"/>
|
||||
<node id="277172108" visible="true" version="5" changeset="20577443" timestamp="2014-02-15T14:37:39Z" user="iglezz" uid="450366" lat="53.8971731" lon="27.5579751"/>
|
||||
<node id="420748954" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:42Z" user="iglezz" uid="450366" lat="53.8973934" lon="27.5579876"/>
|
||||
<node id="420748956" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:42Z" user="iglezz" uid="450366" lat="53.8976570" lon="27.5576615"/>
|
||||
<node id="420748957" visible="true" version="2" changeset="20577443" timestamp="2014-02-15T14:37:42Z" user="iglezz" uid="450366" lat="53.8973811" lon="27.5579541"/>
|
||||
<way id="25432677" visible="true" version="16" changeset="36051033" timestamp="2015-12-19T17:36:15Z" user="i+f" uid="3070773">
|
||||
<nd ref="277171999"/>
|
||||
<nd ref="277171986"/>
|
||||
<nd ref="277171984"/>
|
||||
<nd ref="2673014345"/>
|
||||
<nd ref="277172019"/>
|
||||
<nd ref="420748956"/>
|
||||
<nd ref="277172022"/>
|
||||
<nd ref="277171999"/>
|
||||
<tag k="addr:housenumber" v="16"/>
|
||||
<tag k="addr:postcode" v="220030"/>
|
||||
<tag k="addr:street" v="улица Карла Маркса"/>
|
||||
<tag k="building" v="yes"/>
|
||||
<tag k="name" v="Беллесбумпром"/>
|
||||
<tag k="office" v="company"/>
|
||||
<tag k="website" v="bellesbumprom.by"/>
|
||||
</way>
|
||||
<way id="35995664" visible="true" version="7" changeset="35318978" timestamp="2015-11-14T23:39:54Z" user="osm-belarus" uid="86479">
|
||||
<nd ref="420748956"/>
|
||||
<nd ref="420748957"/>
|
||||
<nd ref="420748954"/>
|
||||
<nd ref="277172096"/>
|
||||
<nd ref="277172108"/>
|
||||
<nd ref="277172022"/>
|
||||
<nd ref="420748956"/>
|
||||
<tag k="addr:housenumber" v="31"/>
|
||||
<tag k="addr:postcode" v="220030"/>
|
||||
<tag k="addr:street" v="Комсомольская улица"/>
|
||||
<tag k="building" v="residential"/>
|
||||
</way>
|
||||
</osm>
|
||||
)SEP";
|
||||
|
||||
|
||||
UNIT_TEST(GetBestOsmWay_test)
|
||||
{
|
||||
pugi::xml_document osmResponse;
|
||||
TEST(osmResponse.load_buffer(osmRawResponse, ::strlen(osmRawResponse)), ());
|
||||
set<m2::PointD> geometry = {
|
||||
{53.8977484, 27.557359},
|
||||
{53.8978710, 27.557681},
|
||||
{53.8978034, 27.557764},
|
||||
{53.8977652, 27.557803},
|
||||
{53.8977254, 27.557837},
|
||||
{53.8976570, 27.557661},
|
||||
{53.8976041, 27.557518},
|
||||
{53.8977484, 27.557359}
|
||||
};
|
||||
|
||||
auto const bestWay = osm::GetBestOsmWay(osmResponse, geometry);
|
||||
TEST_EQUAL(editor::XMLFeature(bestWay).GetName(), "Беллесбумпром", ());
|
||||
}
|
||||
|
||||
|
||||
UNIT_TEST(GetBestOsmNode_test)
|
||||
{
|
||||
pugi::xml_document osmResponse;
|
||||
TEST(osmResponse.load_buffer(osmRawResponse, ::strlen(osmRawResponse)), ());
|
||||
|
||||
auto const bestWay = osm::GetBestOsmWay(osmResponse, geometry);
|
||||
TEST_EQUAL(editor::XMLFeature(bestWay).GetCenter(), "Беллесбумпром", ());
|
||||
|
||||
}
|
||||
218
editor/osm_feature_matcher.cpp
Normal file
218
editor/osm_feature_matcher.cpp
Normal file
|
|
@ -0,0 +1,218 @@
|
|||
#include "base/logging.hpp"
|
||||
|
||||
#include "editor/osm_feature_matcher.hpp"
|
||||
|
||||
namespace osm
|
||||
{
|
||||
bool LatLonEqual(ms::LatLon const & a, ms::LatLon const & b)
|
||||
{
|
||||
double constexpr eps = MercatorBounds::GetCellID2PointAbsEpsilon();
|
||||
return a.EqualDxDy(b, eps);
|
||||
}
|
||||
|
||||
double ScoreLatLon(XMLFeature const & xmlFt, ms::LatLon const & latLon)
|
||||
{
|
||||
// TODO: Find proper score values;
|
||||
return LatLonEqual(latLon, xmlFt.GetCenter()) ? 10 : -10;
|
||||
}
|
||||
|
||||
double ScoreGeometry(pugi::xml_document const & osmResponse, pugi::xml_node const & way,
|
||||
set<m2::PointD> geometry)
|
||||
{
|
||||
int matched = 0;
|
||||
int total = 0;
|
||||
// TODO(mgsergio): optimize using sorting and scaning eps-squares.
|
||||
// The idea is to build squares with side = eps on points from the first set.
|
||||
// Sort them by y and x in y groups.
|
||||
// Then pass points from the second set through constructed struct and register events
|
||||
// like square started, square ended, point encounted.
|
||||
|
||||
for (auto const xNodeRef : way.select_nodes("nd/@ref"))
|
||||
{
|
||||
++total;
|
||||
string const nodeRef = xNodeRef.attribute().value();
|
||||
auto const node = osmResponse.select_node(("node[@ref='" + nodeRef + "']").data()).node();
|
||||
if (!node)
|
||||
{
|
||||
LOG(LDEBUG, ("OSM response have ref", nodeRef,
|
||||
"but have no node with such id.", osmResponse));
|
||||
continue; // TODO: or break and return -1000?
|
||||
}
|
||||
|
||||
XMLFeature xmlFt(node);
|
||||
for (auto pointIt = begin(geometry); pointIt != end(geometry); ++pointIt)
|
||||
{
|
||||
if (LatLonEqual(xmlFt.GetCenter(), MercatorBounds::ToLatLon(*pointIt)))
|
||||
{
|
||||
++matched;
|
||||
geometry.erase(pointIt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return static_cast<double>(matched) / total * 100;
|
||||
}
|
||||
|
||||
// double ScoreNames(XMLFeature const & xmlFt, StringUtf8Multilang const & names)
|
||||
// {
|
||||
// double score = 0;
|
||||
// names.ForEach([&score, &xmlFt](uint8_t const langCode, string const & name)
|
||||
// {
|
||||
// if (xmlFt.GetName(langCode) == name)
|
||||
// score += 1;
|
||||
// return true;
|
||||
// });
|
||||
|
||||
// // TODO(mgsergio): Deafult name match should have greater wieght. Should it?
|
||||
|
||||
// return score;
|
||||
// }
|
||||
|
||||
// vector<string> GetOsmOriginalTagsForType(feature::Metadata::EType const et)
|
||||
// {
|
||||
// static multimap<feature::Metadata::EType, string> const kFmd2Osm = {
|
||||
// {feature::Metadata::EType::FMD_CUISINE, "cuisine"},
|
||||
// {feature::Metadata::EType::FMD_OPEN_HOURS, "opening_hours"},
|
||||
// {feature::Metadata::EType::FMD_PHONE_NUMBER, "phone"},
|
||||
// {feature::Metadata::EType::FMD_PHONE_NUMBER, "contact:phone"},
|
||||
// {feature::Metadata::EType::FMD_FAX_NUMBER, "fax"},
|
||||
// {feature::Metadata::EType::FMD_FAX_NUMBER, "contact:fax"},
|
||||
// {feature::Metadata::EType::FMD_STARS, "stars"},
|
||||
// {feature::Metadata::EType::FMD_OPERATOR, "operator"},
|
||||
// {feature::Metadata::EType::FMD_URL, "url"},
|
||||
// {feature::Metadata::EType::FMD_WEBSITE, "website"},
|
||||
// {feature::Metadata::EType::FMD_WEBSITE, "contact:website"},
|
||||
// // TODO: {feature::Metadata::EType::FMD_INTERNET, ""},
|
||||
// {feature::Metadata::EType::FMD_ELE, "ele"},
|
||||
// {feature::Metadata::EType::FMD_TURN_LANES, "turn:lanes"},
|
||||
// {feature::Metadata::EType::FMD_TURN_LANES_FORWARD, "turn:lanes:forward"},
|
||||
// {feature::Metadata::EType::FMD_TURN_LANES_BACKWARD, "turn:lanes:backward"},
|
||||
// {feature::Metadata::EType::FMD_EMAIL, "email"},
|
||||
// {feature::Metadata::EType::FMD_EMAIL, "contact:email"},
|
||||
// {feature::Metadata::EType::FMD_POSTCODE, "addr:postcode"},
|
||||
// {feature::Metadata::EType::FMD_WIKIPEDIA, "wikipedia"},
|
||||
// {feature::Metadata::EType::FMD_MAXSPEED, "maxspeed"},
|
||||
// {feature::Metadata::EType::FMD_FLATS, "addr:flats"},
|
||||
// {feature::Metadata::EType::FMD_HEIGHT, "height"},
|
||||
// {feature::Metadata::EType::FMD_MIN_HEIGHT, "min_height"},
|
||||
// {feature::Metadata::EType::FMD_MIN_HEIGHT, "building:min_level"},
|
||||
// {feature::Metadata::EType::FMD_DENOMINATION, "denomination"},
|
||||
// {feature::Metadata::EType::FMD_BUILDING_LEVELS, "building:levels"},
|
||||
// };
|
||||
|
||||
// vector<string> result;
|
||||
// auto const range = kFmd2Osm.equal_range(et);
|
||||
// for (auto it = range.first; it != range.second; ++it)
|
||||
// result.emplace_back(it->second);
|
||||
|
||||
// return result;
|
||||
// }
|
||||
|
||||
// double ScoreMetadata(XMLFeature const & xmlFt, feature::Metadata const & metadata)
|
||||
// {
|
||||
// double score = 0;
|
||||
|
||||
// for (auto const type : metadata.GetPresentTypes())
|
||||
// {
|
||||
// for (auto const osm_tag : GetOsmOriginalTagsForType(static_cast<feature::Metadata::EType>(type)))
|
||||
// {
|
||||
// if (xmlFt.GetTagValue(osm_tag) == metadata.Get(type))
|
||||
// {
|
||||
// score += 1;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// return score;
|
||||
// }
|
||||
|
||||
// bool TypesEqual(XMLFeature const & xmlFt, feature::TypesHolder const & types)
|
||||
// {
|
||||
// // TODO: Use mapcss-mapping.csv to correctly match types.
|
||||
// return true;
|
||||
// }
|
||||
|
||||
pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon const latLon)
|
||||
{
|
||||
double bestScore = -1;
|
||||
pugi::xml_node bestMatchNode;
|
||||
|
||||
for (auto const & xNode : osmResponse.select_nodes("osm/node"))
|
||||
{
|
||||
try
|
||||
{
|
||||
XMLFeature xmlFt(xNode.node());
|
||||
|
||||
// if (!TypesEqual(xmlFt, feature::TypesHolder(ft)))
|
||||
// continue;
|
||||
|
||||
double nodeScore = ScoreLatLon(xmlFt, latLon);
|
||||
if (nodeScore < 0)
|
||||
continue;
|
||||
|
||||
// nodeScore += ScoreNames(xmlFt, ft.GetNames());
|
||||
// nodeScore += ScoreMetadata(xmlFt, ft.GetMetadata());
|
||||
|
||||
if (bestScore < nodeScore)
|
||||
{
|
||||
bestScore = nodeScore;
|
||||
bestMatchNode = xNode.node();
|
||||
}
|
||||
}
|
||||
catch (editor::XMLFeatureNoLatLonError const & ex)
|
||||
{
|
||||
LOG(LWARNING, ("No lat/lon attribute in osm response node.", ex.Msg()));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(mgsergio): Add a properly defined threshold.
|
||||
// if (bestScore < minimumScoreThreshold)
|
||||
// return pugi::xml_node;
|
||||
|
||||
return bestMatchNode;
|
||||
}
|
||||
|
||||
pugi::xml_node GetBestOsmWay(pugi::xml_document const & osmResponse, set<m2::PointD> const & geometry)
|
||||
{
|
||||
double bestScore = -1;
|
||||
pugi::xml_node bestMatchWay;
|
||||
|
||||
for (auto const & xWay : osmResponse.select_nodes("osm/way"))
|
||||
{
|
||||
try
|
||||
{
|
||||
XMLFeature xmlFt(xWay.node());
|
||||
|
||||
// if (!TypesEqual(xmlFt, feature::TypesHolder(ft)))
|
||||
// continue;
|
||||
|
||||
double nodeScore = ScoreGeometry(osmResponse, xWay.node(), geometry);
|
||||
if (nodeScore < 0)
|
||||
continue;
|
||||
|
||||
// nodeScore += ScoreNames(xmlFt, ft.GetNames());
|
||||
// nodeScore += ScoreMetadata(xmlFt, ft.GetMetadata());
|
||||
|
||||
if (bestScore < nodeScore)
|
||||
{
|
||||
bestScore = nodeScore;
|
||||
bestMatchWay = xWay.node();
|
||||
}
|
||||
}
|
||||
catch (editor::XMLFeatureNoLatLonError const & ex)
|
||||
{
|
||||
LOG(LWARNING, ("No lat/lon attribute in osm response node.", ex.Msg()));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(mgsergio): Add a properly defined threshold.
|
||||
// if (bestScore < minimumScoreThreshold)
|
||||
// return pugi::xml_node;
|
||||
|
||||
return bestMatchWay;
|
||||
}
|
||||
|
||||
} // namespace osm
|
||||
31
editor/osm_feature_matcher.hpp
Normal file
31
editor/osm_feature_matcher.hpp
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
#pragma once
|
||||
|
||||
#include "editor/xml_feature.hpp"
|
||||
|
||||
#include "geometry/mercator.hpp"
|
||||
|
||||
#include "std/set.hpp"
|
||||
|
||||
namespace osm
|
||||
{
|
||||
using editor::XMLFeature;
|
||||
|
||||
bool LatLonEqual(ms::LatLon const & a, ms::LatLon const & b);
|
||||
|
||||
double ScoreLatLon(XMLFeature const & xmlFt, ms::LatLon const & latLon);
|
||||
|
||||
double ScoreGeometry(pugi::xml_document const & osmResponse, pugi::xml_node const & way,
|
||||
set<m2::PointD> geometry);
|
||||
|
||||
// double ScoreNames(XMLFeature const & xmlFt, StringUtf8Multilang const & names);
|
||||
|
||||
// vector<string> GetOsmOriginalTagsForType(feature::Metadata::EType const et);
|
||||
|
||||
// double ScoreMetadata(XMLFeature const & xmlFt, feature::Metadata const & metadata);
|
||||
|
||||
// bool TypesEqual(XMLFeature const & xmlFt, feature::TypesHolder const & types);
|
||||
|
||||
pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon const latLon);
|
||||
|
||||
pugi::xml_node GetBestOsmWay(pugi::xml_document const & osmResponse, set<m2::PointD> const & geometry);
|
||||
} // namespace osm
|
||||
|
|
@ -243,6 +243,32 @@ bool AreFeaturesEqualButStreet(FeatureType const & a, FeatureType const & b)
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
XMLFeature GetMatchingFeatureFromOSM(osm::ChangesetWrapper & cw,
|
||||
unique_ptr<FeatureType const> featurePtr)
|
||||
{
|
||||
ASSERT(featurePtr->GetFeatureType() != feature::GEOM_LINE, ("Line features are not supported yet."));
|
||||
if (featurePtr->GetFeatureType() == feature::GEOM_POINT)
|
||||
{
|
||||
return cw.GetMatchingNodeFeatureFromOSM(featurePtr->GetCenter());
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set filters out duplicate points for closed ways or triangles' vertices.
|
||||
set<m2::PointD> geometry;
|
||||
featurePtr->ForEachTriangle([&geometry](m2::PointD const & p1,
|
||||
m2::PointD const & p2, m2::PointD const & p3)
|
||||
{
|
||||
geometry.insert(p1);
|
||||
geometry.insert(p2);
|
||||
geometry.insert(p3);
|
||||
}, FeatureType::BEST_GEOMETRY);
|
||||
|
||||
ASSERT_GREATER_OR_EQUAL(geometry.size(), 3, ("Is it an area feature?"));
|
||||
|
||||
return cw.GetMatchingAreaFeatureFromOSM(geometry);
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
namespace osm
|
||||
|
|
@ -693,7 +719,8 @@ void Editor::UploadChanges(string const & key, string const & secret, TChangeset
|
|||
|
||||
try
|
||||
{
|
||||
XMLFeature osmFeature = changeset.GetMatchingFeatureFromOSM(feature, fti.m_feature);
|
||||
XMLFeature osmFeature = GetMatchingFeatureFromOSM(changeset,
|
||||
m_getOriginalFeatureFn(fti.m_feature.GetID()));
|
||||
XMLFeature const osmFeatureCopy = osmFeature;
|
||||
osmFeature.ApplyPatch(feature);
|
||||
// Check to avoid duplicates.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue