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

- Polygons now are using doubles instead of uints

Browse source 
- Added optimization: if feature is included only in one country, it's automatically added to this country
This commit is contained in:
Alex Zolotarev 2011-01-27 22:09:37 +02:00 • committed by Alex Zolotarev
parent 1e2efd7a07
commit e6cf0a8589
3 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
indexer/indexer_tool/kml_parser.cpp
View file

@ -85,14 +85,6 @@ namespace kml
}
};
m2::PointU MercatorPointToPointU(m2::PointD const & pt)
{
typedef CellIdConverter<MercatorBounds, RectId> CellIdConverterType;
uint32_t const ix = static_cast<uint32_t>(CellIdConverterType::XToCellIdX(pt.x));
uint32_t const iy = static_cast<uint32_t>(CellIdConverterType::YToCellIdY(pt.y));
return m2::PointU(ix, iy);
}
void KmlParser::Pop(string const & element)
{
if (element == "Placemark")
@ -134,7 +126,7 @@ namespace kml
{
m_country.push_back(Region());
for (MercPointsContainerT::iterator it = points.begin(); it != points.end(); ++it)
m_country.back().AddPoint(MercatorPointToPointU(*it));
m_country.back().AddPoint(*it);
}
}
else

2
indexer/indexer_tool/kml_parser.hpp
View file

@ -8,7 +8,7 @@
namespace kml
{
typedef m2::RegionU Region;
typedef m2::RegionD Region;
typedef m4::Tree<Region> RegionsContainerT;
struct CountryPolygons

71
indexer/indexer_tool/polygonizer.hpp
View file

@ -2,13 +2,15 @@
#include "../../base/base.hpp"
#include "../../indexer/feature.hpp"
#include "../../indexer/feature_visibility.hpp"
#include "../../indexer/cell_id.hpp"
#include "../../coding/file_writer.hpp"
#include "../../geometry/rect2d.hpp"
#include "../../indexer/feature.hpp"
#include "../../indexer/feature_visibility.hpp"
#include "../../indexer/cell_id.hpp"
#include "../../base/buffer_vector.hpp"
#include "../../std/string.hpp"
@ -22,8 +24,6 @@ namespace feature
template <class FeatureOutT, class BoundsT, typename CellIdT>
class Polygonizer
{
typedef CellIdConverter<BoundsT, RectId> CellIdConverterType;
public:
template <class TInfo>
Polygonizer(TInfo & info)
@ -43,12 +43,6 @@ namespace feature
for_each(m_Buckets.begin(), m_Buckets.end(), DeleteFunctor());
}
static m2::PointU Mercator2CellId(m2::PointD const & pt)
{
return m2::PointU(static_cast<uint32_t>(CellIdConverterType::XToCellIdX(pt.x)),
static_cast<uint32_t>(CellIdConverterType::YToCellIdY(pt.y)));
}
struct PointChecker
{
kml::RegionsContainerT const & m_regions;
@ -59,10 +53,7 @@ namespace feature
bool operator()(m2::PointD const & pt)
{
kml::Region::value_type const point = Mercator2CellId(pt);
m_regions.ForEachInRect(m2::RectD(point, point), bind<void>(ref(*this), _1, cref(point)));
m_regions.ForEachInRect(m2::RectD(pt, pt), bind<void>(ref(*this), _1, cref(pt)));
return !m_belongs;
}
@ -73,30 +64,52 @@ namespace feature
}
};
class InsertCountriesPtr
{
typedef buffer_vector<kml::CountryPolygons const *, 32> vec_type;
vec_type & m_vec;
public:
InsertCountriesPtr(vec_type & vec) : m_vec(vec) {}
void operator() (kml::CountryPolygons const & c)
{
m_vec.push_back(&c);
}
};
void operator () (FeatureBuilder1 const & fb)
{
m2::RectD const r = fb.GetLimitRect();
m_countries.ForEachInRect(
m2::RectD(Mercator2CellId(r.LeftBottom()), Mercator2CellId(r.RightTop())),
bind<void>(ref(*this), _1, cref(fb)));
buffer_vector<kml::CountryPolygons const *, 32> vec;
m_countries.ForEachInRect(fb.GetLimitRect(), InsertCountriesPtr(vec));
if (vec.size() == 1)
EmitFeature(vec[0], fb);
else
{
for (size_t i = 0; i < vec.size(); ++i)
this->operator()(vec[i], fb);
}
}
void operator() (kml::CountryPolygons const & country, FeatureBuilder1 const & fb)
void operator() (kml::CountryPolygons const * country, FeatureBuilder1 const & fb)
{
PointChecker doCheck(country.m_regions);
PointChecker doCheck(country->m_regions);
fb.ForEachTruePointRef(doCheck);
if (doCheck.m_belongs)
{
if (country.m_index == -1)
{
m_Names.push_back(country.m_name);
m_Buckets.push_back(new FeatureOutT(country.m_name, m_FeatureOutInitData));
country.m_index = m_Buckets.size()-1;
}
EmitFeature(country, fb);
}
(*(m_Buckets[country.m_index]))(fb);
void EmitFeature(kml::CountryPolygons const * country, FeatureBuilder1 const & fb)
{
if (country->m_index == -1)
{
m_Names.push_back(country->m_name);
m_Buckets.push_back(new FeatureOutT(country->m_name, m_FeatureOutInitData));
country->m_index = m_Buckets.size()-1;
}
(*(m_Buckets[country->m_index]))(fb);
}
private: