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

Fixed assertions in the editor core.

Browse source
This commit is contained in:
Alex Zolotarev 2015-12-25 14:08:07 +03:00 • committed by Sergey Yershov
parent 0cd90b5022
commit be45f80027
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
editor/xml_feature.hpp
View file

@ -74,6 +74,7 @@ public:
uint32_t GetOffset() const;
void SetOffset(uint32_t featureOffset);
/// @returns my::INVALID_TIME_STAMP if there were no any upload attempt.
time_t GetUploadTime() const;
void SetUploadTime(time_t const time);

4
indexer/osm_editor.cpp
View file

@ -239,6 +239,7 @@ void Editor::LoadMapEdits()
fti.m_feature = FeatureType::FromXML(xml);
fti.m_feature.SetID(fid);
fti.m_modificationTimestamp = xml.GetModificationTime();
ASSERT_NOT_EQUAL(my::INVALID_TIME_STAMP, fti.m_modificationTimestamp, ());
fti.m_uploadAttemptTimestamp = xml.GetUploadTime();
fti.m_uploadStatus = xml.GetUploadStatus();
fti.m_uploadError = xml.GetUploadError();
@ -280,8 +281,9 @@ void Editor::Save(string const & fullFilePath) const
FeatureTypeInfo const & fti = offset.second;
XMLFeature xf = fti.m_feature.ToXML();
xf.SetOffset(offset.first);
ASSERT_NOT_EQUAL(0, fti.m_modificationTimestamp, ());
xf.SetModificationTime(fti.m_modificationTimestamp);
if (fti.m_uploadAttemptTimestamp)
if (fti.m_uploadAttemptTimestamp != my::INVALID_TIME_STAMP)
{
xf.SetUploadTime(fti.m_uploadAttemptTimestamp);
ASSERT(!fti.m_uploadStatus.empty(), ("Upload status updates with upload timestamp."));

6
indexer/osm_editor.hpp
View file

@ -7,6 +7,8 @@
#include "editor/xml_feature.hpp"
#include "base/timer.hpp"
#include "std/ctime.hpp"
#include "std/function.hpp"
#include "std/map.hpp"
@ -85,8 +87,8 @@ private:
{
FeatureStatus m_status;
FeatureType m_feature;
time_t m_modificationTimestamp = 0;
time_t m_uploadAttemptTimestamp = 0;
time_t m_modificationTimestamp = my::INVALID_TIME_STAMP;
time_t m_uploadAttemptTimestamp = my::INVALID_TIME_STAMP;
/// "" | "ok" | "repeat" | "failed"
string m_uploadStatus;
string m_uploadError;