Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2018-11-26 16:44:37 +0300
committerMaksim Andrianov <maksimandrianov1@gmail.com>2018-11-26 19:11:42 +0300
commit356ac180326847a73985d69938e7baaef02882c1 (patch)
treecd81c771122a799b1c982bc28d7dd8b87d2aad4a /map/address_finder.cpp
parent9744c0c04170b07bc848611b8cca7358d3f057bb (diff)
[coding] Removed the CellId epsilon.
In was used as eps in meters in some cases and eps in mercator in others. Its value was hard to justify and so were its use cases. We're better off with less epsilons for now. Also renamed Metres to Meters in the mercator code.
Diffstat (limited to 'map/address_finder.cpp')
-rw-r--r--map/address_finder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/map/address_finder.cpp b/map/address_finder.cpp
index ce3e0c88ae..353406e217 100644
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@@ -99,7 +99,7 @@ namespace
if (!types.Has(m_coastType) && NeedProcess(types))
{
// Convert from meters to degrees for backward compatibility.
- double const d = feature::GetMinDistanceMeters(f, m_pt, m_scale) * MercatorBounds::degreeInMetres;
+ double const d = feature::GetMinDistanceMeters(f, m_pt, m_scale) * MercatorBounds::degreeInMeters;
ASSERT_GREATER_OR_EQUAL(d, 0.0, ());
if (IsInclude(d, types))
@@ -308,7 +308,7 @@ namespace
virtual double GetResultDistance(double d, feature::TypesHolder const & types) const
{
- return (d + GetCompareEpsilonImpl(types.GetGeoType(), 5.0 * MercatorBounds::degreeInMetres));
+ return (d + GetCompareEpsilonImpl(types.GetGeoType(), 5.0 * MercatorBounds::degreeInMeters));
}
virtual double NeedProcess(feature::TypesHolder const & types) const