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

[OpenLR] Rename openlr_simple_decoder -> openlr_decoder.

Browse source
This commit is contained in:
Sergey Magidovich 2017-10-20 16:00:02 +03:00 • committed by Yuri Gorshenin
parent 21dd7fdc57
commit 035a7d2aff
6 changed files with 44 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openlr/CMakeLists.txt
View file

@ -4,12 +4,12 @@ set(
SRC
decoded_path.cpp
decoded_path.hpp
openlr_decoder.cpp
openlr_decoder.hpp
openlr_model.cpp
openlr_model.hpp
openlr_model_xml.cpp
openlr_model_xml.hpp
openlr_simple_decoder.cpp
openlr_simple_decoder.hpp
road_info_getter.cpp
road_info_getter.hpp
road_type_checkers.cpp

4
openlr/openlr.pro
View file

@ -9,18 +9,18 @@ include($$ROOT_DIR/common.pri)
SOURCES += \
decoded_path.cpp \
openlr_decoder.cpp \
openlr_model.cpp \
openlr_model_xml.cpp \
openlr_simple_decoder.cpp \
road_info_getter.cpp \
road_type_checkers.cpp \
router.cpp \
HEADERS += \
decoded_path.hpp \
openlr_decoder.hpp \
openlr_model.hpp \
openlr_model_xml.hpp \
openlr_simple_decoder.hpp \
road_info_getter.hpp \
road_type_checkers.hpp \
router.hpp \

18
openlr/openlr_simple_decoder.cpp → openlr/openlr_decoder.cpp
View file

@ -1,4 +1,4 @@
#include "openlr/openlr_simple_decoder.hpp"
#include "openlr/openlr_decoder.hpp"
#include "openlr/decoded_path.hpp"
#include "openlr/openlr_model.hpp"
@ -51,9 +51,9 @@ struct alignas(kCacheLineSize) Stats
};
} // namespace
// OpenLRSimpleDecoder::SegmentsFilter -------------------------------------------------------------
OpenLRSimpleDecoder::SegmentsFilter::SegmentsFilter(string const & idsPath,
bool const multipointsOnly)
// OpenLRDecoder::SegmentsFilter -------------------------------------------------------------
OpenLRDecoder::SegmentsFilter::SegmentsFilter(string const & idsPath,
bool const multipointsOnly)
: m_idsSet(false), m_multipointsOnly(multipointsOnly)
{
if (idsPath.empty())
@ -67,7 +67,7 @@ OpenLRSimpleDecoder::SegmentsFilter::SegmentsFilter(string const & idsPath,
m_idsSet = true;
}
bool OpenLRSimpleDecoder::SegmentsFilter::Matches(LinearSegment const & segment) const
bool OpenLRDecoder::SegmentsFilter::Matches(LinearSegment const & segment) const
{
if (m_multipointsOnly && segment.m_locationReference.m_points.size() == 2)
return false;
@ -76,15 +76,15 @@ bool OpenLRSimpleDecoder::SegmentsFilter::Matches(LinearSegment const & segment)
return true;
}
// OpenLRSimpleDecoder -----------------------------------------------------------------------------
OpenLRSimpleDecoder::OpenLRSimpleDecoder(
// OpenLRDecoder -----------------------------------------------------------------------------
OpenLRDecoder::OpenLRDecoder(
vector<Index> const & indexes, CountryParentNameGetterFn const & countryParentNameGetterFn)
: m_indexes(indexes), m_countryParentNameGetterFn(countryParentNameGetterFn)
{
}
void OpenLRSimpleDecoder::Decode(std::vector<LinearSegment> const & segments,
uint32_t const numThreads, std::vector<DecodedPath> & paths)
void OpenLRDecoder::Decode(std::vector<LinearSegment> const & segments,
uint32_t const numThreads, std::vector<DecodedPath> & paths)
{
double const kOffsetToleranceM = 10;

6
openlr/openlr_simple_decoder.hpp → openlr/openlr_decoder.hpp
View file

@ -19,7 +19,7 @@ struct DecodedPath;
DECLARE_EXCEPTION(DecoderError, RootException);
class OpenLRSimpleDecoder
class OpenLRDecoder
{
public:
using CountryParentNameGetterFn = std::function<std::string(std::string const &)>;
@ -37,8 +37,8 @@ public:
bool const m_multipointsOnly;
};
OpenLRSimpleDecoder(std::vector<Index> const & indexes,
CountryParentNameGetterFn const & countryParentNameGetterFn);
OpenLRDecoder(std::vector<Index> const & indexes,
CountryParentNameGetterFn const & countryParentNameGetterFn);
// Maps partner segments to mwm paths. |segments| should be sorted by partner id.
void Decode(std::vector<LinearSegment> const & segments, uint32_t const numThreads,

8
openlr/openlr_stat/openlr_stat.cpp
View file

@ -1,4 +1,4 @@
#include "openlr/openlr_simple_decoder.hpp"
#include "openlr/openlr_decoder.hpp"
#include "routing/road_graph.hpp"
@ -167,7 +167,7 @@ std::vector<LinearSegment> LoadSegments(pugi::xml_document & document)
exit(-1);
}
OpenLRSimpleDecoder::SegmentsFilter filter(FLAGS_ids_path, FLAGS_multipoints_only);
OpenLRDecoder::SegmentsFilter filter(FLAGS_ids_path, FLAGS_multipoints_only);
if (FLAGS_limit != kHandleAllSegments && FLAGS_limit >= 0 &&
static_cast<size_t>(FLAGS_limit) < segments.size())
{
@ -243,8 +243,8 @@ int main(int argc, char * argv[])
std::vector<Index> indexes(numThreads);
LoadIndexes(FLAGS_mwms_path, indexes);
OpenLRSimpleDecoder decoder(indexes, storage::CountryParentGetter(FLAGS_countries_filename,
GetPlatform().ResourcesDir()));
OpenLRDecoder decoder(indexes, storage::CountryParentGetter(FLAGS_countries_filename,
GetPlatform().ResourcesDir()));
pugi::xml_document document;
auto const load_result = document.load_file(FLAGS_input.data());

32
xcode/openlr/openlr.xcodeproj/project.pbxproj
View file

@ -9,8 +9,6 @@
/* Begin PBXBuildFile section */
671E79101E6A502200B2859B /* openlr_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79011E6A502200B2859B /* openlr_model.cpp */; };
671E79111E6A502200B2859B /* openlr_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E79021E6A502200B2859B /* openlr_model.hpp */; };
671E79141E6A502200B2859B /* openlr_simple_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79051E6A502200B2859B /* openlr_simple_decoder.cpp */; };
671E79151E6A502200B2859B /* openlr_simple_decoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E79061E6A502200B2859B /* openlr_simple_decoder.hpp */; };
671E79181E6A502200B2859B /* road_info_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79091E6A502200B2859B /* road_info_getter.cpp */; };
671E79191E6A502200B2859B /* road_info_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E790A1E6A502200B2859B /* road_info_getter.hpp */; };
671E791A1E6A502200B2859B /* road_type_checkers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E790B1E6A502200B2859B /* road_type_checkers.cpp */; };
@ -18,14 +16,18 @@
671E791C1E6A502200B2859B /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E790D1E6A502200B2859B /* router.cpp */; };
671E791D1E6A502200B2859B /* router.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E790E1E6A502200B2859B /* router.hpp */; };
671E791E1E6A502200B2859B /* way_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E790F1E6A502200B2859B /* way_point.hpp */; };
E92EE0821F98E8EC00B57D20 /* openlr_model_xml.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E92EE07C1F98E8EA00B57D20 /* openlr_model_xml.hpp */; };
E92EE0831F98E8EC00B57D20 /* decoded_path.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E92EE07D1F98E8EB00B57D20 /* decoded_path.hpp */; };
E92EE0841F98E8EC00B57D20 /* decoded_path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E92EE07E1F98E8EB00B57D20 /* decoded_path.cpp */; };
E92EE0851F98E8EC00B57D20 /* openlr_decoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E92EE07F1F98E8EB00B57D20 /* openlr_decoder.hpp */; };
E92EE0861F98E8EC00B57D20 /* openlr_model_xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E92EE0801F98E8EB00B57D20 /* openlr_model_xml.cpp */; };
E92EE0871F98E8EC00B57D20 /* openlr_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E92EE0811F98E8EC00B57D20 /* openlr_decoder.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
671E78F31E6A4FE400B2859B /* libopenlr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenlr.a; sourceTree = BUILT_PRODUCTS_DIR; };
671E79011E6A502200B2859B /* openlr_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_model.cpp; sourceTree = "<group>"; };
671E79021E6A502200B2859B /* openlr_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_model.hpp; sourceTree = "<group>"; };
671E79051E6A502200B2859B /* openlr_simple_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_simple_decoder.cpp; sourceTree = "<group>"; };
671E79061E6A502200B2859B /* openlr_simple_decoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_simple_decoder.hpp; sourceTree = "<group>"; };
671E79091E6A502200B2859B /* road_info_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_info_getter.cpp; sourceTree = "<group>"; };
671E790A1E6A502200B2859B /* road_info_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = road_info_getter.hpp; sourceTree = "<group>"; };
671E790B1E6A502200B2859B /* road_type_checkers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_type_checkers.cpp; sourceTree = "<group>"; };
@ -35,6 +37,12 @@
671E790F1E6A502200B2859B /* way_point.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = way_point.hpp; sourceTree = "<group>"; };
671E791F1E6A503F00B2859B /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
671E79201E6A503F00B2859B /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
E92EE07C1F98E8EA00B57D20 /* openlr_model_xml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_model_xml.hpp; sourceTree = "<group>"; };
E92EE07D1F98E8EB00B57D20 /* decoded_path.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = decoded_path.hpp; sourceTree = "<group>"; };
E92EE07E1F98E8EB00B57D20 /* decoded_path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoded_path.cpp; sourceTree = "<group>"; };
E92EE07F1F98E8EB00B57D20 /* openlr_decoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_decoder.hpp; sourceTree = "<group>"; };
E92EE0801F98E8EB00B57D20 /* openlr_model_xml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_model_xml.cpp; sourceTree = "<group>"; };
E92EE0811F98E8EC00B57D20 /* openlr_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_decoder.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -69,10 +77,14 @@
671E78F51E6A4FE400B2859B /* openlr */ = {
isa = PBXGroup;
children = (
E92EE07E1F98E8EB00B57D20 /* decoded_path.cpp */,
E92EE07D1F98E8EB00B57D20 /* decoded_path.hpp */,
E92EE0811F98E8EC00B57D20 /* openlr_decoder.cpp */,
E92EE07F1F98E8EB00B57D20 /* openlr_decoder.hpp */,
E92EE0801F98E8EB00B57D20 /* openlr_model_xml.cpp */,
E92EE07C1F98E8EA00B57D20 /* openlr_model_xml.hpp */,
671E79011E6A502200B2859B /* openlr_model.cpp */,
671E79021E6A502200B2859B /* openlr_model.hpp */,
671E79051E6A502200B2859B /* openlr_simple_decoder.cpp */,
671E79061E6A502200B2859B /* openlr_simple_decoder.hpp */,
671E79091E6A502200B2859B /* road_info_getter.cpp */,
671E790A1E6A502200B2859B /* road_info_getter.hpp */,
671E790B1E6A502200B2859B /* road_type_checkers.cpp */,
@ -94,10 +106,12 @@
files = (
671E791D1E6A502200B2859B /* router.hpp in Headers */,
671E791B1E6A502200B2859B /* road_type_checkers.hpp in Headers */,
E92EE0821F98E8EC00B57D20 /* openlr_model_xml.hpp in Headers */,
671E79111E6A502200B2859B /* openlr_model.hpp in Headers */,
671E79191E6A502200B2859B /* road_info_getter.hpp in Headers */,
E92EE0851F98E8EC00B57D20 /* openlr_decoder.hpp in Headers */,
E92EE0831F98E8EC00B57D20 /* decoded_path.hpp in Headers */,
671E791E1E6A502200B2859B /* way_point.hpp in Headers */,
671E79151E6A502200B2859B /* openlr_simple_decoder.hpp in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -159,9 +173,11 @@
buildActionMask = 2147483647;
files = (
671E79101E6A502200B2859B /* openlr_model.cpp in Sources */,
E92EE0861F98E8EC00B57D20 /* openlr_model_xml.cpp in Sources */,
E92EE0841F98E8EC00B57D20 /* decoded_path.cpp in Sources */,
671E79181E6A502200B2859B /* road_info_getter.cpp in Sources */,
671E791C1E6A502200B2859B /* router.cpp in Sources */,
671E79141E6A502200B2859B /* openlr_simple_decoder.cpp in Sources */,
E92EE0871F98E8EC00B57D20 /* openlr_decoder.cpp in Sources */,
671E791A1E6A502200B2859B /* road_type_checkers.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;