forked from organicmaps/organicmaps
Code review.
This commit is contained in:
Sergey Magidovich
Sergey Yershov
parent
0e5c98a65c
commit
368dc6ede0
6 changed files with 188 additions and 204 deletions
|
|
@ -1,16 +1,16 @@
|
|||
#include "base/logging.hpp"
|
||||
|
||||
#include "indexer/feature.hpp"
|
||||
|
||||
#include "editor/changeset_wrapper.hpp"
|
||||
#include "editor/osm_feature_matcher.hpp"
|
||||
|
||||
#include "std/algorithm.hpp"
|
||||
#include "std/sstream.hpp"
|
||||
#include "std/map.hpp"
|
||||
#include "indexer/feature.hpp"
|
||||
|
||||
#include "geometry/mercator.hpp"
|
||||
|
||||
#include "base/assert.hpp"
|
||||
#include "base/logging.hpp"
|
||||
|
||||
#include "std/algorithm.hpp"
|
||||
#include "std/sstream.hpp"
|
||||
|
||||
#include "private.h"
|
||||
|
||||
using editor::XMLFeature;
|
||||
|
|
@ -60,13 +60,15 @@ XMLFeature ChangesetWrapper::GetMatchingNodeFeatureFromOSM(m2::PointD const & ce
|
|||
|
||||
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)
|
||||
XMLFeature ChangesetWrapper::GetMatchingAreaFeatureFromOSM(vector<m2::PointD> const & geometry)
|
||||
{
|
||||
// TODO: Make two/four requests using points on inscribed rectagle.
|
||||
for (auto const & pt : geometry)
|
||||
|
|
@ -81,16 +83,14 @@ XMLFeature ChangesetWrapper::GetMatchingAreaFeatureFromOSM(set<m2::PointD> const
|
|||
continue;
|
||||
|
||||
XMLFeature const way(bestWay);
|
||||
if (!way.IsArea())
|
||||
continue;
|
||||
ASSERT(way.IsArea(), ("Best way must be area."));
|
||||
|
||||
// AlexZ: TODO: Check that this way is really match our feature.
|
||||
// If we had some way to check it, why not to use it in selecting our feature?
|
||||
|
||||
return way;
|
||||
}
|
||||
MYTHROW(OsmObjectWasDeletedException,
|
||||
("OSM does not have any matching way for feature"));
|
||||
MYTHROW(OsmObjectWasDeletedException, ("OSM does not have any matching way for feature"));
|
||||
}
|
||||
|
||||
void ChangesetWrapper::ModifyNode(XMLFeature node)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
#pragma once
|
||||
|
||||
#include "base/exception.hpp"
|
||||
|
||||
#include "editor/server_api.hpp"
|
||||
#include "editor/xml_feature.hpp"
|
||||
|
||||
#include "base/exception.hpp"
|
||||
#include "geometry/point2d.hpp"
|
||||
|
||||
#include "std/set.hpp"
|
||||
#include "std/vector.hpp"
|
||||
|
||||
class FeatureType;
|
||||
|
||||
|
|
@ -32,7 +35,7 @@ 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 GetMatchingNodeFeatureFromOSM(m2::PointD const & center);
|
||||
editor::XMLFeature GetMatchingAreaFeatureFromOSM(set<m2::PointD> const & geomerty);
|
||||
editor::XMLFeature GetMatchingAreaFeatureFromOSM(vector<m2::PointD> const & geomerty);
|
||||
|
||||
/// Throws exceptions from above list.
|
||||
void ModifyNode(editor::XMLFeature node);
|
||||
|
|
|
|||
|
|
@ -5,100 +5,98 @@
|
|||
|
||||
#include "3party/pugixml/src/pugixml.hpp"
|
||||
|
||||
|
||||
static char const * const osmRawResponseWay = 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>
|
||||
<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";
|
||||
|
||||
static char const * const osmRawResponseNode = R"SEP(
|
||||
<osm version="0.6" generator="CGImap 0.4.0 (5501 thorn-02.openstreetmap.org)" copyright="OpenStreetMap and contributors">
|
||||
<bounds minlat="53.8977000" minlon="27.5578900" maxlat="53.8977700" maxlon="27.5579800"/>
|
||||
<node id="2673014342" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8976095" lon="27.5579360"/>
|
||||
<node id="2673014343" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977023" lon="27.5582512"/>
|
||||
<node id="2673014344" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977366" lon="27.5579628"/>
|
||||
<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="2673014347" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977970" lon="27.5579116"/>
|
||||
<node id="2673014349" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977977" lon="27.5581702"/>
|
||||
<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="3900254358" visible="true" version="1" changeset="36051033" timestamp="2015-12-19T17:36:14Z" user="i+f" uid="3070773" lat="53.8977398" lon="27.5579251">
|
||||
<tag k="name" v="Главное управление капитального строительства"/>
|
||||
<tag k="office" v="company"/>
|
||||
<tag k="website" v="guks.by"/>
|
||||
</node>
|
||||
<way id="261703253" visible="true" version="2" changeset="35318978" timestamp="2015-11-14T23:30:51Z" user="osm-belarus" uid="86479">
|
||||
<nd ref="2673014345"/>
|
||||
<nd ref="2673014347"/>
|
||||
<nd ref="2673014344"/>
|
||||
<nd ref="2673014349"/>
|
||||
<nd ref="2673014343"/>
|
||||
<nd ref="2673014342"/>
|
||||
<nd ref="277172019"/>
|
||||
<nd ref="2673014345"/>
|
||||
<tag k="addr:housenumber" v="16"/>
|
||||
<tag k="addr:postcode" v="220030"/>
|
||||
<tag k="addr:street" v="улица Карла Маркса"/>
|
||||
<tag k="building" v="residential"/>
|
||||
</way>
|
||||
<bounds minlat="53.8977000" minlon="27.5578900" maxlat="53.8977700" maxlon="27.5579800"/>
|
||||
<node id="2673014342" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8976095" lon="27.5579360"/>
|
||||
<node id="2673014343" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977023" lon="27.5582512"/>
|
||||
<node id="2673014344" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977366" lon="27.5579628"/>
|
||||
<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="2673014347" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977970" lon="27.5579116"/>
|
||||
<node id="2673014349" visible="true" version="1" changeset="20577443" timestamp="2014-02-15T14:37:11Z" user="iglezz" uid="450366" lat="53.8977977" lon="27.5581702"/>
|
||||
<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="3900254358" visible="true" version="1" changeset="36051033" timestamp="2015-12-19T17:36:14Z" user="i+f" uid="3070773" lat="53.8977398" lon="27.5579251">
|
||||
<tag k="name" v="Главное управление капитального строительства"/>
|
||||
<tag k="office" v="company"/>
|
||||
<tag k="website" v="guks.by"/>
|
||||
</node>
|
||||
<way id="261703253" visible="true" version="2" changeset="35318978" timestamp="2015-11-14T23:30:51Z" user="osm-belarus" uid="86479">
|
||||
<nd ref="2673014345"/>
|
||||
<nd ref="2673014347"/>
|
||||
<nd ref="2673014344"/>
|
||||
<nd ref="2673014349"/>
|
||||
<nd ref="2673014343"/>
|
||||
<nd ref="2673014342"/>
|
||||
<nd ref="277172019"/>
|
||||
<nd ref="2673014345"/>
|
||||
<tag k="addr:housenumber" v="16"/>
|
||||
<tag k="addr:postcode" v="220030"/>
|
||||
<tag k="addr:street" v="улица Карла Маркса"/>
|
||||
<tag k="building" v="residential"/>
|
||||
</way>
|
||||
</osm>
|
||||
)SEP";
|
||||
|
||||
|
||||
UNIT_TEST(GetBestOsmWay_test)
|
||||
UNIT_TEST(GetBestOsmWay_Test)
|
||||
{
|
||||
{
|
||||
pugi::xml_document osmResponse;
|
||||
TEST(osmResponse.load_buffer(osmRawResponseWay, ::strlen(osmRawResponseWay)), ());
|
||||
set<m2::PointD> geometry = {
|
||||
MercatorBounds::FromLatLon(53.8977484, 27.557359),
|
||||
MercatorBounds::FromLatLon(53.8978710, 27.557681),
|
||||
MercatorBounds::FromLatLon(53.8978034, 27.557764),
|
||||
MercatorBounds::FromLatLon(53.8977652, 27.557803),
|
||||
MercatorBounds::FromLatLon(53.8977254, 27.557837),
|
||||
MercatorBounds::FromLatLon(53.8976570, 27.557661),
|
||||
MercatorBounds::FromLatLon(53.8976041, 27.557518),
|
||||
vector<m2::PointD> const geometry = {
|
||||
MercatorBounds::FromLatLon(53.8977484, 27.557359),
|
||||
MercatorBounds::FromLatLon(53.8978710, 27.557681),
|
||||
MercatorBounds::FromLatLon(53.8978034, 27.557764),
|
||||
MercatorBounds::FromLatLon(53.8977652, 27.557803),
|
||||
MercatorBounds::FromLatLon(53.8977254, 27.557837),
|
||||
MercatorBounds::FromLatLon(53.8976570, 27.557661),
|
||||
MercatorBounds::FromLatLon(53.8976041, 27.557518),
|
||||
};
|
||||
|
||||
auto const bestWay = osm::GetBestOsmWay(osmResponse, geometry);
|
||||
|
|
@ -107,14 +105,14 @@ UNIT_TEST(GetBestOsmWay_test)
|
|||
{
|
||||
pugi::xml_document osmResponse;
|
||||
TEST(osmResponse.load_buffer(osmRawResponseWay, ::strlen(osmRawResponseWay)), ());
|
||||
set<m2::PointD> geometry = {
|
||||
MercatorBounds::FromLatLon(53.8975484, 27.557359), // diff
|
||||
MercatorBounds::FromLatLon(53.8978710, 27.557681),
|
||||
MercatorBounds::FromLatLon(53.8975034, 27.557764), // diff
|
||||
MercatorBounds::FromLatLon(53.8977652, 27.557803),
|
||||
MercatorBounds::FromLatLon(53.8975254, 27.557837), // diff
|
||||
MercatorBounds::FromLatLon(53.8976570, 27.557661),
|
||||
MercatorBounds::FromLatLon(53.8976041, 27.557318), // diff
|
||||
vector<m2::PointD> const geometry = {
|
||||
MercatorBounds::FromLatLon(53.8975484, 27.557359), // diff
|
||||
MercatorBounds::FromLatLon(53.8978710, 27.557681),
|
||||
MercatorBounds::FromLatLon(53.8975034, 27.557764), // diff
|
||||
MercatorBounds::FromLatLon(53.8977652, 27.557803),
|
||||
MercatorBounds::FromLatLon(53.8975254, 27.557837), // diff
|
||||
MercatorBounds::FromLatLon(53.8976570, 27.557661),
|
||||
MercatorBounds::FromLatLon(53.8976041, 27.557318), // diff
|
||||
};
|
||||
|
||||
auto const bestWay = osm::GetBestOsmWay(osmResponse, geometry);
|
||||
|
|
@ -122,15 +120,15 @@ UNIT_TEST(GetBestOsmWay_test)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
UNIT_TEST(GetBestOsmNode_test)
|
||||
UNIT_TEST(GetBestOsmNode_Test)
|
||||
{
|
||||
{
|
||||
pugi::xml_document osmResponse;
|
||||
TEST(osmResponse.load_buffer(osmRawResponseNode, ::strlen(osmRawResponseNode)), ());
|
||||
|
||||
auto const bestNode = osm::GetBestOsmNode(osmResponse, ms::LatLon(53.8977398, 27.5579251));
|
||||
TEST_EQUAL(editor::XMLFeature(bestNode).GetName(), "Главное управление капитального строительства", ());
|
||||
TEST_EQUAL(editor::XMLFeature(bestNode).GetName(),
|
||||
"Главное управление капитального строительства", ());
|
||||
}
|
||||
{
|
||||
pugi::xml_document osmResponse;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,20 @@
|
|||
#include "base/logging.hpp"
|
||||
|
||||
#include "editor/osm_feature_matcher.hpp"
|
||||
|
||||
namespace osm
|
||||
#include "base/logging.hpp"
|
||||
|
||||
using editor::XMLFeature;
|
||||
|
||||
namespace
|
||||
{
|
||||
double constexpr kPointDiffEps = MercatorBounds::GetCellID2PointAbsEpsilon();
|
||||
constexpr double kPointDiffEps = MercatorBounds::GetCellID2PointAbsEpsilon();
|
||||
|
||||
bool LatLonEqual(ms::LatLon const & a, ms::LatLon const & b)
|
||||
{
|
||||
return a.EqualDxDy(b, kPointDiffEps);
|
||||
}
|
||||
|
||||
/// @returns value form (-Inf, 1]. Negative values are used as penalty,
|
||||
/// positive as score.
|
||||
double ScoreLatLon(XMLFeature const & xmlFt, ms::LatLon const & latLon)
|
||||
{
|
||||
auto const a = MercatorBounds::FromLatLon(xmlFt.GetCenter());
|
||||
|
|
@ -18,8 +22,24 @@ double ScoreLatLon(XMLFeature const & xmlFt, ms::LatLon const & latLon)
|
|||
return 1.0 - (a.Length(b) / kPointDiffEps);
|
||||
}
|
||||
|
||||
template <typename TFunc>
|
||||
void ForEachWaysNode(pugi::xml_document const & osmResponse, pugi::xml_node const & way,
|
||||
TFunc && func)
|
||||
{
|
||||
for (auto const xNodeRef : way.select_nodes("nd/@ref"))
|
||||
{
|
||||
string const nodeRef = xNodeRef.attribute().value();
|
||||
auto const node = osmResponse.select_node(("osm/node[@id='" + nodeRef + "']").data()).node();
|
||||
ASSERT(node, ("OSM response have ref", nodeRef, "but have no node with such id.", osmResponse));
|
||||
XMLFeature xmlFt(node);
|
||||
func(xmlFt);
|
||||
}
|
||||
}
|
||||
|
||||
/// @returns value form [-0.5, 0.5]. Negative values are used as penalty,
|
||||
/// positive as score.
|
||||
double ScoreGeometry(pugi::xml_document const & osmResponse, pugi::xml_node const & way,
|
||||
set<m2::PointD> geometry)
|
||||
vector<m2::PointD> geometry)
|
||||
{
|
||||
int matched = 0;
|
||||
int total = 0;
|
||||
|
|
@ -28,35 +48,27 @@ double ScoreGeometry(pugi::xml_document const & osmResponse, pugi::xml_node cons
|
|||
// 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(("osm/node[@id='" + 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);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
ForEachWaysNode(osmResponse, way, [&matched, &total, &geometry](XMLFeature const & xmlFt)
|
||||
{
|
||||
++total;
|
||||
for (auto pointIt = begin(geometry); pointIt != end(geometry); ++pointIt)
|
||||
{
|
||||
if (LatLonEqual(xmlFt.GetCenter(), MercatorBounds::ToLatLon(*pointIt)))
|
||||
{
|
||||
++matched;
|
||||
geometry.erase(pointIt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return static_cast<double>(matched) / total - 0.5;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon const latLon)
|
||||
namespace osm
|
||||
{
|
||||
pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon const & latLon)
|
||||
{
|
||||
double bestScore = -1;
|
||||
pugi::xml_node bestMatchNode;
|
||||
|
|
@ -67,18 +79,10 @@ pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon
|
|||
{
|
||||
XMLFeature xmlFt(xNode.node());
|
||||
|
||||
// TODO:
|
||||
// if (!TypesEqual(xmlFt, feature::TypesHolder(ft)))
|
||||
// continue;
|
||||
|
||||
double nodeScore = ScoreLatLon(xmlFt, latLon);
|
||||
double const nodeScore = ScoreLatLon(xmlFt, latLon);
|
||||
if (nodeScore < 0)
|
||||
continue;
|
||||
|
||||
// TODO:
|
||||
// nodeScore += ScoreNames(xmlFt, ft.GetNames());
|
||||
// nodeScore += ScoreMetadata(xmlFt, ft.GetMetadata());
|
||||
|
||||
if (bestScore < nodeScore)
|
||||
{
|
||||
bestScore = nodeScore;
|
||||
|
|
@ -99,39 +103,24 @@ pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon
|
|||
return bestMatchNode;
|
||||
}
|
||||
|
||||
pugi::xml_node GetBestOsmWay(pugi::xml_document const & osmResponse, set<m2::PointD> const & geometry)
|
||||
pugi::xml_node GetBestOsmWay(pugi::xml_document const & osmResponse,
|
||||
vector<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());
|
||||
XMLFeature xmlFt(xWay.node());
|
||||
|
||||
// TODO:
|
||||
// if (!TypesEqual(xmlFt, feature::TypesHolder(ft)))
|
||||
// continue;
|
||||
|
||||
double nodeScore = ScoreGeometry(osmResponse, xWay.node(), geometry);
|
||||
if (nodeScore < 0)
|
||||
continue;
|
||||
|
||||
// TODO:
|
||||
// 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()));
|
||||
double const nodeScore = ScoreGeometry(osmResponse, xWay.node(), geometry);
|
||||
if (nodeScore < 0)
|
||||
continue;
|
||||
|
||||
if (bestScore < nodeScore)
|
||||
{
|
||||
bestScore = nodeScore;
|
||||
bestMatchWay = xWay.node();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,21 +3,15 @@
|
|||
#include "editor/xml_feature.hpp"
|
||||
|
||||
#include "geometry/mercator.hpp"
|
||||
#include "geometry/point2d.hpp"
|
||||
|
||||
#include "std/set.hpp"
|
||||
#include "std/vector.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);
|
||||
|
||||
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);
|
||||
/// @returns closest to the latLon node from osm or empty node if none is close enough.
|
||||
pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon const & latLon);
|
||||
/// @returns a way from osm with similar geometry or empy node if can't find such way.
|
||||
pugi::xml_node GetBestOsmWay(pugi::xml_document const & osmResponse,
|
||||
vector<m2::PointD> const & geometry);
|
||||
} // namespace osm
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include "base/exception.hpp"
|
||||
#include "base/logging.hpp"
|
||||
#include "base/stl_helpers.hpp"
|
||||
#include "base/string_utils.hpp"
|
||||
#include "base/timer.hpp"
|
||||
|
||||
|
|
@ -262,30 +263,29 @@ bool AreFeaturesEqualButStreet(FeatureType const & a, FeatureType const & b)
|
|||
XMLFeature GetMatchingFeatureFromOSM(osm::ChangesetWrapper & cw,
|
||||
unique_ptr<FeatureType const> featurePtr)
|
||||
{
|
||||
ASSERT(featurePtr->GetFeatureType() != feature::GEOM_LINE, ("Line features are not supported yet."));
|
||||
ASSERT_NOT_EQUAL(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);
|
||||
// Warning: geometry is cached in FeatureTyped. So if it wasn't BEST_GEOMETRY
|
||||
// We can never have it. Features here came from editors loader and should
|
||||
// have BEST_GEOMETRY geometry.
|
||||
}, FeatureType::BEST_GEOMETRY);
|
||||
|
||||
ASSERT_GREATER_OR_EQUAL(geometry.size(), 3, ("Is it an area feature?"));
|
||||
vector<m2::PointD> geometry;
|
||||
featurePtr->ForEachTriangle(
|
||||
[&geometry](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
|
||||
{
|
||||
geometry.push_back(p1);
|
||||
geometry.push_back(p2);
|
||||
geometry.push_back(p3);
|
||||
// Warning: geometry is cached in FeatureType. So if it wasn't BEST_GEOMETRY,
|
||||
// we can never have it. Features here came from editors loader and should
|
||||
// have BEST_GEOMETRY geometry.
|
||||
},
|
||||
FeatureType::BEST_GEOMETRY);
|
||||
// Filters out duplicate points for closed ways or triangles' vertices.
|
||||
my::SortUnique(geometry);
|
||||
|
||||
return cw.GetMatchingAreaFeatureFromOSM(geometry);
|
||||
}
|
||||
ASSERT_GREATER_OR_EQUAL(geometry.size(), 3, ("Is it an area feature?"));
|
||||
|
||||
return cw.GetMatchingAreaFeatureFromOSM(geometry);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
|
|
@ -751,8 +751,8 @@ void Editor::UploadChanges(string const & key, string const & secret, TChangeset
|
|||
feature.SetTagValue(kAddrStreetTag, fti.m_street);
|
||||
try
|
||||
{
|
||||
XMLFeature osmFeature = GetMatchingFeatureFromOSM(changeset,
|
||||
m_getOriginalFeatureFn(fti.m_feature.GetID()));
|
||||
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