diff options
| author | mpimenov <mpimenov@users.noreply.github.com> | 2016-06-03 17:22:26 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2016-06-03 17:22:26 +0300 |
| commit | f01fc1454c2389317aa7de3265eb75a12205188c (patch) | |
| tree | 9682b8f21cc05d7f64f2858ea4594c7dde574d9e /iphone/Maps/Classes/Editor | |
| parent | 4a5eec95a9f5eb00cb58b5a66e4d520934cb5210 (diff) | |
| parent | 2b03a4e015f0c0c9f6dbe09d77696209ad7edda3 (diff) | |
Merge pull request #3439 from mgsergio/release-62
[cherry-pick] Release 62
Diffstat (limited to 'iphone/Maps/Classes/Editor')
| -rw-r--r-- | iphone/Maps/Classes/Editor/MWMEditorViewController.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm index b38e4873c7..91dc9d06c9 100644 --- a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm @@ -309,7 +309,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab noteInfo[kStatLat] = @(latLon.lat); noteInfo[kStatLon] = @(latLon.lon); [Statistics logEvent:kStatEditorProblemReport withParameters:noteInfo]; - osm::Editor::Instance().CreateNote(latLon, featureID, osm::Editor::NoteProblemType::General ,self.note.UTF8String); + f.CreateNote(latLon, featureID, osm::Editor::NoteProblemType::General, self.note.UTF8String); } switch (f.SaveEditedMapObject(m_mapObject)) @@ -676,6 +676,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab case osm::Editor::FeatureStatus::Untouched: return L(@"editor_place_doesnt_exist"); case osm::Editor::FeatureStatus::Deleted: + case osm::Editor::FeatureStatus::Obsolete: // TODO(Vlad): Either make a valid button or disable it. NSAssert(false, @"Incorrect feature status!"); return L(@"editor_place_doesnt_exist"); case osm::Editor::FeatureStatus::Modified: @@ -899,7 +900,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab - (void)tryToChangeInvalidStateForCell:(MWMEditorTextTableViewCell *)cell { [self.tableView beginUpdates]; - + NSIndexPath * indexPath = [self.tableView indexPathForCell:cell]; [self.invalidCells removeObject:indexPath]; @@ -1015,7 +1016,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab kStatEditorMWMVersion : @(fid.GetMwmVersion()), kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage), kStatLat : @(latLon.lat), kStatLon : @(latLon.lon)}]; - osm::Editor::Instance().CreateNote(latLon, fid, osm::Editor::NoteProblemType::PlaceDoesNotExist, additional); + GetFramework().CreateNote(latLon, fid, osm::Editor::NoteProblemType::PlaceDoesNotExist, additional); [self backTap]; [self showDropDown]; }]; |