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

Add named constants for feature geometry getting.

Browse source
This commit is contained in:
vng 2012-02-21 20:25:05 +03:00 • committed by Alex Zolotarev
parent 0d6c85b09b
commit 78169147bb
6 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
generator/statistics.cpp
View file

@ -86,9 +86,9 @@ namespace stats
m_info.m_inner[1].Add(innerStats.m_Strips);
m_info.m_inner[2].Add(innerStats.m_Size);
// get geometry size for the best geometry (-1)
FeatureType::geom_stat_t const geom = f.GetGeometrySize(-1);
FeatureType::geom_stat_t const trg = f.GetTrianglesSize(-1);
// get geometry size for the best geometry
FeatureType::geom_stat_t const geom = f.GetGeometrySize(FeatureType::BEST_GEOMETRY);
FeatureType::geom_stat_t const trg = f.GetTrianglesSize(FeatureType::BEST_GEOMETRY);
m_info.AddToSet(geom.m_count, geom.m_size, m_info.m_byPointsCount);
m_info.AddToSet(trg.m_count / 3, trg.m_size, m_info.m_byTrgCount);

3
indexer/feature.hpp
View file

@ -158,6 +158,9 @@ public:
/// @name Geometry.
//@{
/// This constant values should be equal with feature::LoaderBase implementation.
enum { BEST_GEOMETRY = -1, WORST_GEOMETRY = -2 };
m2::RectD GetLimitRect(int scale) const;
bool IsEmptyGeometry(int scale) const;

6
indexer/feature_covering.cpp
View file

@ -99,11 +99,11 @@ namespace covering
vector<int64_t> CoverFeature(FeatureType const & f, int cellDepth, uint64_t cellPenaltyArea)
{
FeatureIntersector featureIntersector;
f.ForEachPointRef(featureIntersector, -1);
f.ForEachTriangleRef(featureIntersector, -1);
f.ForEachPointRef(featureIntersector, FeatureType::BEST_GEOMETRY);
f.ForEachTriangleRef(featureIntersector, FeatureType::BEST_GEOMETRY);
CHECK(!featureIntersector.m_Trg.empty() || !featureIntersector.m_Polyline.empty(), \
(f.DebugString(-1)));
(f.DebugString(FeatureType::BEST_GEOMETRY)));
if (featureIntersector.m_Trg.empty() && featureIntersector.m_Polyline.size() == 1)
{

6
indexer/scale_index_builder.hpp
View file

@ -2,6 +2,7 @@
#include "scale_index.hpp"
#include "feature_covering.hpp"
#include "feature_visibility.hpp"
#include "feature.hpp"
#include "interval_index_builder.hpp"
#include "cell_id.hpp"
@ -18,6 +19,7 @@
#include "../std/vector.hpp"
#include "../std/utility.hpp"
class CellFeaturePair
{
public:
@ -49,8 +51,8 @@ class FeatureCoverer
{
int GetGeometryScale() const
{
// Do not pass actual level. We should build index for the best geometry (pass -1).
return -1;
// Do not pass actual level. We should build index for the best geometry.
return FeatureType::BEST_GEOMETRY;
//return m_ScaleRange.second-1;
}

4
indexer/search_index_builder.cpp
View file

@ -154,7 +154,7 @@ class FeatureInserter
case feature::GEOM_LINE:
{
CalcPolyCenter doCalc;
f.ForEachPointRef(doCalc, -1);
f.ForEachPointRef(doCalc, FeatureType::BEST_GEOMETRY);
return doCalc.GetCenter();
}
@ -162,7 +162,7 @@ class FeatureInserter
{
ASSERT_EQUAL ( type, feature::GEOM_AREA, () );
CalcMassCenter doCalc;
f.ForEachTriangleRef(doCalc, -1);
f.ForEachTriangleRef(doCalc, FeatureType::BEST_GEOMETRY);
return doCalc.GetCenter();
}
}

2
map/map_tests/debug_features_test.cpp
View file

@ -15,5 +15,5 @@ UNIT_TEST(DebugFeaturesTest_World_6941024)
// FeatureType f;
// vec.Get(6941024, f);
// f.GetLimitRect(-1);
// f.GetLimitRect(FeatureType::BEST_GEOMETRY);
}