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

Merge pull request #11154 from cc-engineering/generator.geo_objects.no-index-addressless-poi

Browse source 
[generator:geo_objects] No index addressless POI
This commit is contained in:
LaGrunge 2019-07-04 18:17:32 +03:00 • committed by GitHub
commit 353d2debf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
generator/locality_sorter.cpp
View file

@ -1,5 +1,6 @@
#include "generator/locality_sorter.hpp"
#include "generator/geo_objects/geo_objects_filter.hpp"
#include "generator/geometry_holder.hpp"
#include "generator/utils.hpp"
@ -242,8 +243,18 @@ bool GenerateGeoObjectsData(string const & featuresFile, string const & nodesFil
return false;
auto const needSerialize = [&nodeIds](FeatureBuilder & fb) {
return fb.IsPoint() || fb.IsArea() ||
(!fb.GetOsmIds().empty() && nodeIds.count(fb.GetMostGenericOsmId().GetEncodedId()) != 0);
if (!fb.IsPoint() && !fb.IsArea())
return false;
using generator::geo_objects::GeoObjectsFilter;
if (GeoObjectsFilter::IsBuilding(fb) || GeoObjectsFilter::HasHouse(fb))
return true;
if (GeoObjectsFilter::IsPoi(fb))
return nodeIds.count(fb.GetMostGenericOsmId().GetEncodedId());
return false;
};
DataHeader header;