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

Do not edit unparsable opening hours.

Browse source
This commit is contained in:
Sergey Magidovich 2016-05-11 17:25:58 +03:00 • committed by Vladimir Byko-Ianko
parent af140f519d
commit 3913d4e8c6
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
View file

@ -924,6 +924,11 @@ BOOST_AUTO_TEST_CASE(OpeningHoursWeekRanges_TestParseUnparse)
BOOST_AUTO_TEST_CASE(OpeningHoursRuleSequence_TestParseUnparse)
{
{
auto const rule = "";
auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule);
BOOST_CHECK_EQUAL(parsedUnparsed, rule);
}
{
auto const rule = "24/7";
auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule);

22
indexer/osm_editor.cpp
View file

@ -40,6 +40,7 @@
#include "3party/Alohalytics/src/alohalytics.h"
#include "3party/pugixml/src/pugixml.hpp"
#include "3party/opening_hours/opening_hours.hpp"
using namespace pugi;
using feature::EGeomType;
@ -569,8 +570,27 @@ EditableProperties Editor::GetEditableProperties(FeatureType const & feature) co
// Disable editor for old data.
if (!version::IsSingleMwm(feature.GetID().m_mwmId.GetInfo()->m_version.GetVersion()))
return {};
// TODO(mgsergio): Check if feature is in the area where editing is disabled in the config.
return GetEditablePropertiesForTypes(feature::TypesHolder(feature));
auto editableProperties = GetEditablePropertiesForTypes(feature::TypesHolder(feature));
// Disable opening hours editing if opening hours cannot be parsed.
if (GetFeatureStatus(feature.GetID()) != FeatureStatus::Created)
{
auto const & originalFeature = m_getOriginalFeatureFn(feature.GetID());
auto const & metadata = originalFeature->GetMetadata();
auto const & featureOpeningHours = metadata.Get(feature::Metadata::FMD_OPEN_HOURS);
// Note: empty string is parsed as a valid opening hours rule.
if (!osmoh::OpeningHours(featureOpeningHours).IsValid())
{
auto & meta = editableProperties.m_metadata;
auto const toBeRemoved = remove(begin(meta), end(meta), feature::Metadata::FMD_OPEN_HOURS);
if (toBeRemoved != end(meta))
meta.erase(toBeRemoved);
}
}
return editableProperties;
}
// private
EditableProperties Editor::GetEditablePropertiesForTypes(feature::TypesHolder const & types) const