pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #10769 from cc-engineering/generator.geo_objects.poi-house-find

Browse source 
[generator:geo_objects] Refactor POI house searching
This commit is contained in:
Sergey Yershov 2019-04-24 18:56:08 +03:00 • committed by GitHub
commit d357a6cccc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
generator/geo_objects/geo_objects.cpp
View file

@ -40,20 +40,12 @@ namespace
{
using IndexReader = ReaderPtr<Reader>;
bool HouseHasAddress(base::Json json)
bool HouseHasAddress(base::Json const & json)
{
auto properties = json_object_get(json.get(), "properties");
auto address = json_object_get(properties, "address");
std::string const kHouseField = "building";
char const * key = nullptr;
json_t * value = nullptr;
json_object_foreach(address, key, value)
{
if (key == kHouseField && !json_is_null(value))
return true;
}
return false;
auto && properties = base::GetJSONObligatoryField(json.get(), "properties");
auto && address = base::GetJSONObligatoryField(properties, "address");
auto && building = base::GetJSONOptionalField(address, "building");
return building && !base::JSONIsNull(building);
}
void UpdateCoordinates(m2::PointD const & point, base::Json json)
@ -105,13 +97,7 @@ MakeGeoObjectValueWithAddress(FeatureBuilder1 const & fb, KeyValue const & keyVa
boost::optional<base::Json>
FindHousePoi(FeatureBuilder1 const & fb, GeoObjectInfoGetter const & geoObjectInfoGetter)
{
auto const isBuilding = [](base::Json const & object) {
auto properties = json_object_get(object.get(), "properties");
auto address = json_object_get(properties, "address");
return json_object_get(address, "building");
};
return geoObjectInfoGetter.Find(fb.GetKeyPoint(), isBuilding);
return geoObjectInfoGetter.Find(fb.GetKeyPoint(), HouseHasAddress);
}
std::unique_ptr<char, JSONFreeDeleter>
@ -186,9 +172,6 @@ void BuildGeoObjectsWithoutAddresses(GeoObjectInfoGetter const & geoObjectInfoGe
if (!house)
return;
if (!HouseHasAddress(*house))
return;
auto const value = MakeGeoObjectValueWithoutAddress(fb, *house);
auto const id = static_cast<int64_t>(fb.GetMostGenericOsmId().GetEncodedId());
streamGeoObjectsKv << id << " " << value.get() << "\n";