map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Renaming RestrictionDumper to RestrictionWriter.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-11-09 10:02:03 +03:00
parent ca5f8dae0d
commit ca0432c4a0
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generator/generator.pro
View file

@ -37,8 +37,8 @@ SOURCES += \
osm_source.cpp \
region_meta.cpp \
restriction_collector.cpp \
restriction_dumper.cpp \
restriction_generator.cpp \
restriction_writer.cpp \
routing_generator.cpp \
search_index_builder.cpp \
sponsored_scoring.cpp \
@ -77,8 +77,8 @@ HEADERS += \
polygonizer.hpp \
region_meta.hpp \
restriction_collector.hpp \
restriction_dumper.hpp \
restriction_generator.hpp \
restriction_writer.hpp \
routing_generator.hpp \
search_index_builder.hpp \
sponsored_dataset.hpp \

12
generator/osm_translator.hpp
View file

@ -3,7 +3,7 @@
#include "generator/feature_builder.hpp"
#include "generator/osm2type.hpp"
#include "generator/osm_element.hpp"
#include "generator/restriction_dumper.hpp"
#include "generator/restriction_writer.hpp"
#include "generator/ways_merger.hpp"
#include "indexer/classificator.hpp"
@ -29,7 +29,7 @@ namespace
class RelationTagsBase
{
public:
RelationTagsBase(routing::RestrictionDumper & restrictionDumper)
RelationTagsBase(routing::RestrictionWriter & restrictionDumper)
: m_restrictionDumper(restrictionDumper), m_cache(14)
{
}
@ -77,7 +77,7 @@ protected:
protected:
uint64_t m_featureID;
OsmElement * m_current;
routing::RestrictionDumper & m_restrictionDumper;
routing::RestrictionWriter & m_restrictionDumper;
private:
my::Cache<uint64_t, RelationElement> m_cache;
@ -88,7 +88,7 @@ class RelationTagsNode : public RelationTagsBase
using TBase = RelationTagsBase;
public:
RelationTagsNode(routing::RestrictionDumper & restrictionDumper)
RelationTagsNode(routing::RestrictionWriter & restrictionDumper)
: RelationTagsBase(restrictionDumper)
{
}
@ -131,7 +131,7 @@ protected:
class RelationTagsWay : public RelationTagsBase
{
public:
RelationTagsWay(routing::RestrictionDumper & restrictionDumper)
RelationTagsWay(routing::RestrictionWriter & restrictionDumper)
: RelationTagsBase(restrictionDumper)
{
}
@ -213,7 +213,7 @@ class OsmToFeatureTranslator
uint32_t m_coastType;
unique_ptr<FileWriter> m_addrWriter;
routing::RestrictionDumper m_restrictionDumper;
routing::RestrictionWriter m_restrictionDumper;
RelationTagsNode m_nodeRelations;
RelationTagsWay m_wayRelations;

8
generator/restriction_dumper.cpp → generator/restriction_writer.cpp
View file

@ -1,4 +1,4 @@
#include "generator/restriction_dumper.hpp"
#include "generator/restriction_writer.hpp"
#include "generator/intermediate_elements.hpp"
#include "generator/osm_id.hpp"
#include "generator/restriction_collector.hpp"
@ -47,7 +47,7 @@ bool TagToType(string const & tag, Restriction::Type & type)
namespace routing
{
void RestrictionDumper::Open(string const & fullPath)
void RestrictionWriter::Open(string const & fullPath)
{
LOG(LINFO, ("Saving road restrictions in osm id terms to", fullPath));
m_stream.open(fullPath, std::ofstream::out);
@ -56,9 +56,9 @@ void RestrictionDumper::Open(string const & fullPath)
LOG(LINFO, ("Cannot open file", fullPath));
}
bool RestrictionDumper::IsOpened() { return m_stream.is_open() && !m_stream.fail(); }
bool RestrictionWriter::IsOpened() { return m_stream.is_open() && !m_stream.fail(); }
void RestrictionDumper::Write(RelationElement const & relationElement)
void RestrictionWriter::Write(RelationElement const & relationElement)
{
if (!IsOpened())
return;

2
generator/restriction_dumper.hpp → generator/restriction_writer.hpp
View file

@ -7,7 +7,7 @@ class RelationElement;
namespace routing
{
class RestrictionDumper
class RestrictionWriter
{
public:
void Open(string const & fullPath);