From 3913d4e8c69e665147fe82c402259aaee46a2c02 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Wed, 11 May 2016 17:25:58 +0300 Subject: [PATCH] Do not edit unparsable opening hours. --- .../opening_hours_tests.cpp | 5 +++++ indexer/osm_editor.cpp | 22 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp index 3bef1f5c31..833462d77c 100644 --- a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp +++ b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp @@ -924,6 +924,11 @@ BOOST_AUTO_TEST_CASE(OpeningHoursWeekRanges_TestParseUnparse) BOOST_AUTO_TEST_CASE(OpeningHoursRuleSequence_TestParseUnparse) { + { + auto const rule = ""; + auto const parsedUnparsed = ParseAndUnparse(rule); + BOOST_CHECK_EQUAL(parsedUnparsed, rule); + } { auto const rule = "24/7"; auto const parsedUnparsed = ParseAndUnparse(rule); diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 976024ab82..9d7a9ee6f0 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -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