kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fix access labels indent.

Browse source 
Remove old and/or useless comments.
This commit is contained in:
Sergey Magidovich 2015-11-03 13:22:16 +03:00
parent cb3f451e9d
commit 28007a20ab
5 changed files with 40 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
3party/opening_hours/osm_parsers.hpp
View file

@ -31,7 +31,7 @@ namespace phx = boost::phoenix;
class test_impl
{
public:
public:
template <typename T>
struct result { typedef void type; };
@ -43,43 +43,6 @@ class test_impl
};
phx::function<test_impl> const test = test_impl();
// inline boost::posix_time::time_period make_time_period(boost::gregorian::date const & d,
// osmoh::TimeSpan const & ts)
// {
// using boost::posix_time::ptime;
// using boost::posix_time::hours;
// using boost::posix_time::minutes;
// using boost::posix_time::time_period;
// /// TODO(yershov@): Need create code for calculate real values
// ptime sunrise(d, hours(6));
// ptime sunset(d, hours(19));
// ptime t1, t2;
// if (ts.from.flags & osmoh::Time::Sunrise)
// t1 = sunrise;
// else if (ts.from.flags & osmoh::Time::Sunset)
// t1 = sunset;
// else
// t1 = ptime(d, hours((ts.from.flags & osmoh::Time::Hours) ? ts.from.hours : 0) + minutes((ts.from.flags & osmoh::Time::Minutes) ? ts.from.minutes : 0));
// t2 = t1;
// if (ts.to.flags & osmoh::Time::Sunrise)
// t2 = sunrise;
// else if (ts.to.flags & osmoh::Time::Sunset)
// t2 = sunset;
// else
// {
// t2 = ptime(d, hours((ts.to.flags & osmoh::Time::Hours) ? ts.to.hours : 24) + minutes((ts.to.flags & osmoh::Time::Minutes) ? ts.to.minutes : 0));
// if (t2 < t1)
// t2 += hours(24);
// }
// return time_period(t1, t2);
// }
namespace parsing
{
namespace qi = boost::spirit::qi;
@ -90,11 +53,11 @@ using space_type = charset::space_type;
template <class Iterator>
class year_selector : public qi::grammar<Iterator, osmoh::TYearRanges(), space_type>
{
protected:
protected:
qi::rule<Iterator, osmoh::YearRange(), space_type> year_range;
qi::rule<Iterator, osmoh::TYearRanges(), space_type> main;
public:
public:
year_selector() : year_selector::base_type(main)
{
using qi::uint_;
@ -124,11 +87,11 @@ class year_selector : public qi::grammar<Iterator, osmoh::TYearRanges(), space_t
template <typename Iterator>
class week_selector : public qi::grammar<Iterator, osmoh::TWeekRanges(), space_type>
{
protected:
protected:
qi::rule<Iterator, osmoh::WeekRange(), space_type> week;
qi::rule<Iterator, osmoh::TWeekRanges(), space_type> main;
public:
public:
week_selector() : week_selector::base_type(main)
{
using qi::uint_;
@ -154,7 +117,7 @@ class week_selector : public qi::grammar<Iterator, osmoh::TWeekRanges(), space_t
template <typename Iterator>
class month_selector : public qi::grammar<Iterator, TMonthdayRanges(), space_type>
{
protected:
protected:
qi::rule<Iterator, int32_t(), space_type, qi::locals<int32_t>> day_offset;
qi::rule<Iterator, DateOffset(), space_type, qi::locals<bool>> date_offset;
@ -168,7 +131,7 @@ class month_selector : public qi::grammar<Iterator, TMonthdayRanges(), space_typ
qi::rule<Iterator, MonthdayRange(), space_type> monthday_range;
qi::rule<Iterator, TMonthdayRanges(), space_type> main;
public:
public:
month_selector() : month_selector::base_type(main)
{
using qi::_1;
@ -260,11 +223,10 @@ class month_selector : public qi::grammar<Iterator, TMonthdayRanges(), space_typ
}
};
template <typename Iterator>
class weekday_selector : public qi::grammar<Iterator, osmoh::Weekdays(), space_type>
{
protected:
protected:
qi::rule<Iterator, osmoh::NthEntry::Nth(), space_type> nth;
qi::rule<Iterator, osmoh::NthEntry(), space_type> nth_entry;
qi::rule<Iterator, int32_t(), space_type, qi::locals<int8_t>> day_offset;
@ -274,7 +236,7 @@ class weekday_selector : public qi::grammar<Iterator, osmoh::Weekdays(), space_t
qi::rule<Iterator, osmoh::THolidays(), space_type> holiday_sequence;
qi::rule<Iterator, osmoh::Weekdays(), space_type> main;
public:
public:
weekday_selector() : weekday_selector::base_type(main)
{
using qi::_a;
@ -339,7 +301,7 @@ class weekday_selector : public qi::grammar<Iterator, osmoh::Weekdays(), space_t
template <typename Iterator>
class time_selector : public qi::grammar<Iterator, osmoh::TTimespans(), space_type>
{
protected:
protected:
qi::rule<Iterator, osmoh::Time(), space_type> hour_minutes;
qi::rule<Iterator, osmoh::Time(), space_type> extended_hour_minutes;
qi::rule<Iterator, osmoh::Time(), space_type> variable_time;
@ -348,32 +310,7 @@ class time_selector : public qi::grammar<Iterator, osmoh::TTimespans(), space_ty
qi::rule<Iterator, osmoh::Timespan(), space_type> timespan;
qi::rule<Iterator, osmoh::TTimespans(), space_type> main;
// class validate_timespan_impl
// {
// public:
// template <typename T>
// struct result { typedef bool type; };
// bool operator() (osmoh::TimeSpan const & ts) const
// {
// using boost::posix_time::ptime;
// using boost::posix_time::time_duration;
// using boost::posix_time::hours;
// using boost::posix_time::minutes;
// using boost::posix_time::time_period;
// bool result = true;
// if (ts.period.flags)
// {
// time_period tp = osmoh::make_time_period(boost::gregorian::day_clock::local_day(), ts);
// result = (tp.length() >= time_duration(ts.period.hours, ts.period.minutes, 0 /* seconds */));
// }
// return result;
// }
// };
public:
public:
time_selector() : time_selector::base_type(main)
{
using qi::int_;
@ -384,13 +321,10 @@ class time_selector : public qi::grammar<Iterator, osmoh::TTimespans(), space_ty
using qi::_val;
using qi::eps;
using qi::lit;
// using qi::_pass;
using charset::char_;
using boost::phoenix::bind;
using boost::phoenix::construct;
// phx::function<validate_timespan_impl> const validate_timespan = validate_timespan_impl();
hour_minutes =
(hours >> lit(':') >> minutes) [bind(&osmoh::Time::SetHours, _val, _1),
_val = _val + _2]
@ -442,7 +376,6 @@ class time_selector : public qi::grammar<Iterator, osmoh::TTimespans(), space_ty
| time[bind(&osmoh::Timespan::SetStart, _val, _1)]
;
// main %= timespan[_pass = validate_timespan(_1)] % ',';
main %= timespan % ',';
BOOST_SPIRIT_DEBUG_NODE(main);
@ -493,7 +426,6 @@ public:
using Modifier = osmoh::RuleSequence::Modifier;
comment %= '"' >> +(char_ - '"') >> '"'
// | lexeme['(' >> +(char_ - ')') >> ')']
;
separator %= charset::string(";")
@ -529,8 +461,6 @@ public:
| comment [bind(&osmoh::RuleSequence::SetModifier, _r1, Modifier::Unknown),
bind(&osmoh::RuleSequence::SetModifierComment, _r1, _1)]
// | eps [bind(&osmoh::RuleSequence::SetModifier, _val, Modifier::Open)]
;
rule_sequence =

6
3party/opening_hours/osm_parsers_terminals.hpp
View file

@ -5,9 +5,8 @@ namespace parsing
{
namespace qi = boost::spirit::qi;
class dash_ : public qi::symbols<wchar_t>
struct dash_ : public qi::symbols<wchar_t>
{
public:
dash_()
{
add
@ -18,9 +17,8 @@ class dash_ : public qi::symbols<wchar_t>
}
} dash;
class event_ : public qi::symbols<char, osmoh::Time::Event>
struct event_ : public qi::symbols<char, osmoh::Time::Event>
{
public:
event_()
{
add

163
3party/opening_hours/osm_time_range.cpp
View file

@ -113,9 +113,6 @@ Time::Time(TMinutes const minutes)
SetMinutes(minutes);
}
// Time::Time(THours const hours, TMinutes const minutes) { }
// Time::Time(Event const event, THours const hours = 0, TMinutes const minutes = 0) { }
Time::THours::rep Time::GetHoursCount() const
{
return GetHours().count();
@ -1388,163 +1385,3 @@ std::ostream & operator<<(std::ostream & ost, TRuleSequences const & s)
return ost;
}
} // namespace osmoh
// namespace
// {
// bool check_timespan(osmoh::TimeSpan const &ts, boost::gregorian::date const & d, boost::posix_time::ptime const & p)
// {
// using boost::gregorian::days;
// using boost::posix_time::ptime;
// using boost::posix_time::hours;
// using boost::posix_time::minutes;
// using boost::posix_time::time_period;
// time_period tp1 = osmoh::make_time_period(d-days(1), ts);
// time_period tp2 = osmoh::make_time_period(d, ts);
// /* very useful in debug */
// // std::cout << ts << "\t" << tp1 << "(" << p << ")" << (tp1.contains(p) ? " hit" : " miss") << std::endl;
// // std::cout << ts << "\t" << tp2 << "(" << p << ")" << (tp2.contains(p) ? " hit" : " miss") << std::endl;
// return tp1.contains(p) || tp2.contains(p);
// }
// bool check_weekday(osmoh::Weekday const & wd, boost::gregorian::date const & d)
// {
// using namespace boost::gregorian;
// bool hit = false;
// typedef nth_day_of_the_week_in_month nth_dow;
// if (wd.nth)
// {
// for (uint8_t i = 0; (wd.weekdays & (0xFF ^ ((1 << i) - 1))); ++i)
// {
// if (!(wd.weekdays & (1 << i)))
// continue;
// uint8_t a = wd.nth & 0xFF;
// for (size_t j = 0; (a & (0xFF ^ ((1 << j) - 1))); ++j)
// {
// if (a & (1 << j))
// {
// nth_dow ndm(nth_dow::week_num(j + 1), nth_dow::day_of_week_type((i + 1 == 7) ? 0 : (i + 1)), d.month());
// hit |= (d == ndm.get_date(d.year()));
// }
// }
// a = (wd.nth >> 8) & 0xFF;
// for (size_t j = 0; (a & (0xFF ^ ((1 << j) - 1))); ++j)
// {
// if (a & (1 << j))
// {
// last_day_of_the_week_in_month lwdm(nth_dow::day_of_week_type((i + 1 == 7) ? 0 : (i + 1)), d.month());
// hit |= (d == ((lwdm.get_date(d.year()) - weeks(j)) + days(wd.offset)));
// }
// }
// }
// }
// else
// {
// for (uint8_t i = 0; (wd.weekdays & (0xFF ^ ((1 << i) - 1))); ++i)
// {
// if (!(wd.weekdays & (1 << i)))
// continue;
// hit |= (d.day_of_week() == ((i + 1 == 7) ? 0 : (i + 1)));
// }
// }
// /* very useful in debug */
// // std::cout << d.day_of_week() << " " << d << " --> " << wd << (hit ? " hit" : " miss") << std::endl;
// return hit;
// }
// bool check_rule(osmoh::TimeRule const & r, std::tm const & stm,
// std::ostream * hitcontext = nullptr)
// {
// bool next = false;
// // check 24/7
// if (r.weekdays.empty() && r.timespan.empty() && r.state.state == osmoh::State::Open)
// return true;
// boost::gregorian::date date = boost::gregorian::date_from_tm(stm);
// boost::posix_time::ptime pt = boost::posix_time::ptime_from_tm(stm);
// next = r.weekdays.empty();
// for (auto const & wd : r.weekdays)
// {
// if (check_weekday(wd, date))
// {
// if (hitcontext)
// *hitcontext << wd << " ";
// next = true;
// }
// }
// if (!next)
// return next;
// next = r.timespan.empty();
// for (auto const & ts : r.timespan)
// {
// if (check_timespan(ts, date, pt))
// {
// if (hitcontext)
// *hitcontext << ts << " ";
// next = true;
// }
// }
// return next && !(r.timespan.empty() && r.weekdays.empty());
// }
// } // anonymouse namespace
// OSMTimeRange OSMTimeRange::FromString(std::string const & rules)
// {
// OSMTimeRange timeRange;
// std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter; // could not work on android
// std::wstring src = converter.from_bytes(rules); // rules should be wstring
// timeRange.m_valid = osmoh::parsing::parse_timerange(src.begin(), src.end(), timeRange.m_rules);
// return timeRange;
// }
// OSMTimeRange & OSMTimeRange::UpdateState(time_t timestamp)
// {
// std::tm stm = *localtime(&timestamp);
// osmoh::State::State true_state[3][3] = {
// {osmoh::State::Unknown, osmoh::State::Closed, osmoh::State::Open},
// {osmoh::State::Closed , osmoh::State::Closed, osmoh::State::Open},
// {osmoh::State::Open , osmoh::State::Closed, osmoh::State::Open}
// };
// osmoh::State::State false_state[3][3] = {
// {osmoh::State::Unknown, osmoh::State::Open , osmoh::State::Closed},
// {osmoh::State::Closed , osmoh::State::Closed, osmoh::State::Closed},
// {osmoh::State::Open , osmoh::State::Open , osmoh::State::Open}
// };
// m_state = osmoh::State::Unknown;
// m_comment = std::string();
// for (auto const & el : m_rules)
// {
// bool hit = false;
// if ((hit = check_rule(el, stm)))
// {
// m_state = true_state[m_state][el.state.state];
// m_comment = el.state.comment;
// }
// else
// {
// m_state = false_state[m_state][el.state.state];
// }
// /* very useful in debug */
// // char const * st[] = {"unknown", "closed", "open"};
// // std::cout << "-[" << hit << "]-------------------[" << el << "]: " << st[m_state] << "--------------------" << std::endl;
// }
// return *this;
// }
// OSMTimeRange & OSMTimeRange::UpdateState(std::string const & timestr, char const * timefmt)
// {
// std::tm when = {};
// std::stringstream ss(timestr);
// ss >> std::get_time(&when, timefmt);
// return UpdateState(std::mktime(&when));
// }

52
3party/opening_hours/osm_time_range.hpp
View file

@ -44,7 +44,7 @@ class Time
using TStateRep = std::underlying_type<State>::type;
public:
public:
enum class Event
{
NotEvent,
@ -62,8 +62,6 @@ class Time
Time(Time const &) = default;
Time(THours const hours);
Time(TMinutes const minutes);
Time(THours const hours, TMinutes const minutes);
Time(Event const event);
Time & operator=(Time const &) = default;
@ -90,7 +88,7 @@ class Time
Time operator-(Time const & t);
Time & operator-();
private:
private:
Time GetEventTime() const;
@ -114,7 +112,7 @@ std::ostream & operator<<(std::ostream & ost, Time const & time);
class Timespan
{
public:
public:
Timespan() = default;
Timespan(Timespan const &) = default;
Timespan(Time const & start, bool plus = false);
@ -139,7 +137,7 @@ class Timespan
bool IsValid() const;
private:
private:
Time m_start;
Time m_end;
Time m_period;
@ -153,7 +151,7 @@ std::ostream & operator<<(std::ostream & ost, osmoh::TTimespans const & timespan
class NthEntry
{
public:
public:
enum class Nth
{
None,
@ -175,7 +173,7 @@ class NthEntry
void SetStart(Nth const s);
void SetEnd(Nth const e);
private:
private:
Nth m_start{};
Nth m_end{};
};
@ -214,7 +212,7 @@ class WeekdayRange
{
using TNths = std::vector<NthEntry>;
public:
public:
bool HasWday(Weekday const & wday) const;
bool HasSunday() const;
@ -245,7 +243,7 @@ class WeekdayRange
void AddNth(NthEntry const & entry);
private:
private:
Weekday m_start{};
Weekday m_end{};
int32_t m_offset{};
@ -259,14 +257,14 @@ std::ostream & operator<<(std::ostream & ost, TWeekdayRanges const & ranges);
class Holiday
{
public:
public:
bool IsPlural() const;
void SetPlural(bool const plural);
int32_t GetOffset() const;
void SetOffset(int32_t const offset);
private:
private:
bool m_plural{false};
int32_t m_offset{};
};
@ -279,7 +277,7 @@ std::ostream & operator<<(std::ostream & ost, THolidays const & holidys);
/// Correspond to weekday_selector in osm opening hours
class Weekdays
{
public:
public:
bool IsEmpty() const;
bool HasWeekday() const;
bool HasHolidays() const;
@ -293,7 +291,7 @@ class Weekdays
void AddWeekdayRange(WeekdayRange const range);
void AddHoliday(Holiday const & holiday);
private:
private:
TWeekdayRanges m_weekdayRanges;
THolidays m_holidays;
};
@ -302,7 +300,7 @@ std::ostream & operator<<(std::ostream & ost, Weekdays const & weekday);
class DateOffset
{
public:
public:
bool IsEmpty() const;
bool HasWDayOffset() const;
bool HasOffset() const;
@ -316,7 +314,7 @@ class DateOffset
void SetOffset(int32_t const offset);
void SetWDayOffsetPositive(bool const on);
private:
private:
Weekday m_wday_offset{Weekday::None};
bool m_positive{true};
int32_t m_offset{};
@ -326,7 +324,7 @@ std::ostream & operator<<(std::ostream & ost, DateOffset const & offset);
class MonthDay
{
public:
public:
enum class Month
{
None,
@ -374,7 +372,7 @@ class MonthDay
void SetOffset(DateOffset const & offset);
void SetVariableDate(VariableDate const date);
private:
private:
TYear m_year{};
Month m_month{Month::None};
TDayNum m_daynum{};
@ -402,7 +400,7 @@ std::ostream & operator<<(std::ostream & ost, MonthDay const md);
class MonthdayRange
{
public:
public:
bool IsEmpty() const;
bool HasStart() const;
bool HasEnd() const;
@ -418,7 +416,7 @@ class MonthdayRange
void SetPeriod(uint32_t const period);
void SetPlus(bool const plus);
private:
private:
MonthDay m_start;
MonthDay m_end;
uint32_t m_period{};
@ -433,7 +431,7 @@ std::ostream & operator<<(std::ostream & ost, TMonthdayRanges const & ranges);
class YearRange
{
public:
public:
using TYear = uint16_t;
@ -453,7 +451,7 @@ class YearRange
void SetPlus(bool const plus);
void SetPeriod(uint32_t const period);
private:
private:
TYear m_start{};
TYear m_end{};
bool m_plus{false};
@ -467,7 +465,7 @@ std::ostream & operator<<(std::ostream & ost, TYearRanges const ranges);
class WeekRange
{
public:
public:
using TWeek = uint8_t;
@ -485,7 +483,7 @@ class WeekRange
void SetEnd(TWeek const end);
void SetPeriod(uint32_t const period);
private:
private:
TWeek m_start{};
TWeek m_end{};
uint32_t m_period{0};
@ -498,7 +496,7 @@ std::ostream & operator<<(std::ostream & ost, TWeekRanges const ranges);
class RuleSequence
{
public:
public:
enum class Modifier
{
DefaultOpen,
@ -547,10 +545,10 @@ class RuleSequence
void SetModifier(Modifier const modifier);
private:
private:
void dump() const;
private:
private:
bool m_24_per_7{false};
TYearRanges m_years;

4
3party/opening_hours/rules_evaluation.hpp
View file

@ -7,7 +7,7 @@ namespace osmoh
{
class RuleState
{
public:
public:
RuleState(RuleSequence::Modifier const & modifier):
m_modifier(modifier)
{
@ -35,7 +35,7 @@ class RuleState
return m_modifier == RuleSequence::Modifier::Unknown;
}
private:
private:
RuleSequence::Modifier m_modifier;
};