{"action":"created","comment":{"url":"https://api.github.com/repos/mapsme/omim/pulls/comments/55663393","id":55663393,"diff_hunk":"@@ -342,31 +358,37 @@ void Editor::DeleteFeature(FeatureType const & feature)\n   Invalidate();\n }\n \n-Editor::SaveResult Editor::SaveEditedFeature(FeatureType & editedFeature, string const & editedStreet,\n-                                             string const & editedHouseNumber)\n+namespace\n {\n-  // Check house number for validity.\n-  if (editedHouseNumber.empty() || feature::IsHouseNumber(editedHouseNumber))\n-    editedFeature.SetHouseNumber(editedHouseNumber);\n-  // TODO(AlexZ): Store edited house number as house name if feature::IsHouseNumber() returned false.\n+constexpr uint32_t kStartIndexForCreatedFeatures = numeric_limits<uint32_t>::max() - 0xfffff;\n+bool IsCreatedFeature(FeatureID const & fid) { return fid.m_index >= kStartIndexForCreatedFeatures; }\n+}  // namespace\n \n-  FeatureID const fid = editedFeature.GetID();\n-  if (AreFeaturesEqualButStreet(editedFeature, *m_getOriginalFeatureFn(fid)) &&\n-      m_getOriginalFeatureStreetFn(editedFeature) == editedStreet)\n+Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)\n+{\n+  FeatureID const & fid = emo.GetID();\n+  FeatureTypeInfo fti;\n+  fti.m_feature.ReplaceBy(emo);\n+  if (IsCreatedFeature(fid))\n   {\n-    RemoveFeatureFromStorageIfExists(fid.m_mwmId, fid.m_index);\n-    // TODO(AlexZ): Synchronize Save call/make it on a separate thread.\n-    Save(GetEditorFilePath());\n-    Invalidate();\n-    return NothingWasChanged;\n+    fti.m_status = FeatureStatus::Created;\n+  }\n+  else\n+  {\n+    if (AreFeaturesEqualButStreet(fti.m_feature, *m_getOriginalFeatureFn(fid)) &&\n+        m_getOriginalFeatureStreetFn(fti.m_feature) == emo.GetStreet())","path":"indexer/osm_editor.cpp","position":106,"original_position":106,"commit_id":"ac96af80e59ee85f264b1b00a1f3b4cb8e9d1d27","original_commit_id":"ac96af80e59ee85f264b1b00a1f3b4cb8e9d1d27","user":{"login":"deathbaba","id":170263,"avatar_url":"https://avatars.githubusercontent.com/u/170263?v=3","gravatar_id":"","url":"https://api.github.com/users/deathbaba","html_url":"https://github.com/deathbaba","followers_url":"https://api.github.com/users/deathbaba/followers","following_url":"https://api.github.com/users/deathbaba/following{/other_user}","gists_url":"https://api.github.com/users/deathbaba/gists{/gist_id}","starred_url":"https://api.github.com/users/deathbaba/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deathbaba/subscriptions","organizations_url":"https://api.github.com/users/deathbaba/orgs","repos_url":"https://api.github.com/users/deathbaba/repos","events_url":"https://api.github.com/users/deathbaba/events{/privacy}","received_events_url":"https://api.github.com/users/deathbaba/received_events","type":"User","site_admin":false},"body":"Технически, если правки пользователя совпадают один в один с тем, что уже есть в mwm, то это даже не нужно хранить. И т.к. у нас нет явного способа откатить одну фичу, то пользователь может сейчас отредактировать ее \"как было раньше\", и она сама откатится.\r\nНа этапе заливки в осм мы отдельно проверяем, были ли на самом деле правки.","created_at":"2016-03-10T10:58:53Z","updated_at":"2016-03-10T10:58:53Z","html_url":"https://github.com/mapsme/omim/pull/2106#discussion_r55663393","pull_request_url":"https://api.github.com/repos/mapsme/omim/pulls/2106","_links":{"self":{"href":"https://api.github.com/repos/mapsme/omim/pulls/comments/55663393"},"html":{"href":"https://github.com/mapsme/omim/pull/2106#discussion_r55663393"},"pull_request":{"href":"https://api.github.com/repos/mapsme/omim/pulls/2106"}}},"pull_request":{"url":"https://api.github.com/repos/mapsme/omim/pulls/2106","id":61679542,"html_url":"https://github.com/mapsme/omim/pull/2106","diff_url":"https://github.com/mapsme/omim/pull/2106.diff","patch_url":"https://github.com/mapsme/omim/pull/2106.patch","issue_url":"https://api.github.com/repos/mapsme/omim/issues/2106","number":2106,"state":"open","locked":false,"title":"[editor] Create features support in the core.","user":{"login":"deathbaba","id":170263,"avatar_url":"https://avatars.githubusercontent.com/u/170263?v=3","gravatar_id":"","url":"https://api.github.com/users/deathbaba","html_url":"https://github.com/deathbaba","followers_url":"https://api.github.com/users/deathbaba/followers","following_url":"https://api.github.com/users/deathbaba/following{/other_user}","gists_url":"https://api.github.com/users/deathbaba/gists{/gist_id}","starred_url":"https://api.github.com/users/deathbaba/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deathbaba/subscriptions","organizations_url":"https://api.github.com/users/deathbaba/orgs","repos_url":"https://api.github.com/users/deathbaba/repos","events_url":"https://api.github.com/users/deathbaba/events{/privacy}","received_events_url":"https://api.github.com/users/deathbaba/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-03-04T08:12:05Z","updated_at":"2016-03-10T10:58:53Z","closed_at":null,"merged_at":null,"merge_commit_sha":"7523ec5bb0bdba5b1df9717a9491e954d1b34ea6","assignee":{"login":"mgsergio","id":6658987,"avatar_url":"https://avatars.githubusercontent.com/u/6658987?v=3","gravatar_id":"","url":"https://api.github.com/users/mgsergio","html_url":"https://github.com/mgsergio","followers_url":"https://api.github.com/users/mgsergio/followers","following_url":"https://api.github.com/users/mgsergio/following{/other_user}","gists_url":"https://api.github.com/users/mgsergio/gists{/gist_id}","starred_url":"https://api.github.com/users/mgsergio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mgsergio/subscriptions","organizations_url":"https://api.github.com/users/mgsergio/orgs","repos_url":"https://api.github.com/users/mgsergio/repos","events_url":"https://api.github.com/users/mgsergio/events{/privacy}","received_events_url":"https://api.github.com/users/mgsergio/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/mapsme/omim/pulls/2106/commits","review_comments_url":"https://api.github.com/repos/mapsme/omim/pulls/2106/comments","review_comment_url":"https://api.github.com/repos/mapsme/omim/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mapsme/omim/issues/2106/comments","statuses_url":"https://api.github.com/repos/mapsme/omim/statuses/ac96af80e59ee85f264b1b00a1f3b4cb8e9d1d27","head":{"label":"deathbaba:editor-create-features","ref":"editor-create-features","sha":"ac96af80e59ee85f264b1b00a1f3b4cb8e9d1d27","user":{"login":"deathbaba","id":170263,"avatar_url":"https://avatars.githubusercontent.com/u/170263?v=3","gravatar_id":"","url":"https://api.github.com/users/deathbaba","html_url":"https://github.com/deathbaba","followers_url":"https://api.github.com/users/deathbaba/followers","following_url":"https://api.github.com/users/deathbaba/following{/other_user}","gists_url":"https://api.github.com/users/deathbaba/gists{/gist_id}","starred_url":"https://api.github.com/users/deathbaba/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deathbaba/subscriptions","organizations_url":"https://api.github.com/users/deathbaba/orgs","repos_url":"https://api.github.com/users/deathbaba/repos","events_url":"https://api.github.com/users/deathbaba/events{/privacy}","received_events_url":"https://api.github.com/users/deathbaba/received_events","type":"User","site_admin":false},"repo":{"id":43427531,"name":"omim","full_name":"deathbaba/omim","owner":{"login":"deathbaba","id":170263,"avatar_url":"https://avatars.githubusercontent.com/u/170263?v=3","gravatar_id":"","url":"https://api.github.com/users/deathbaba","html_url":"https://github.com/deathbaba","followers_url":"https://api.github.com/users/deathbaba/followers","following_url":"https://api.github.com/users/deathbaba/following{/other_user}","gists_url":"https://api.github.com/users/deathbaba/gists{/gist_id}","starred_url":"https://api.github.com/users/deathbaba/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deathbaba/subscriptions","organizations_url":"https://api.github.com/users/deathbaba/orgs","repos_url":"https://api.github.com/users/deathbaba/repos","events_url":"https://api.github.com/users/deathbaba/events{/privacy}","received_events_url":"https://api.github.com/users/deathbaba/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/deathbaba/omim","description":"MAPS.ME - Offline OpenStreetMap maps for iOS/Android/Mac/Linux/Windows","fork":true,"url":"https://api.github.com/repos/deathbaba/omim","forks_url":"https://api.github.com/repos/deathbaba/omim/forks","keys_url":"https://api.github.com/repos/deathbaba/omim/keys{/key_id}","collaborators_url":"https://api.github.com/repos/deathbaba/omim/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/deathbaba/omim/teams","hooks_url":"https://api.github.com/repos/deathbaba/omim/hooks","issue_events_url":"https://api.github.com/repos/deathbaba/omim/issues/events{/number}","events_url":"https://api.github.com/repos/deathbaba/omim/events","assignees_url":"https://api.github.com/repos/deathbaba/omim/assignees{/user}","branches_url":"https://api.github.com/repos/deathbaba/omim/branches{/branch}","tags_url":"https://api.github.com/repos/deathbaba/omim/tags","blobs_url":"https://api.github.com/repos/deathbaba/omim/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/deathbaba/omim/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/deathbaba/omim/git/refs{/sha}","trees_url":"https://api.github.com/repos/deathbaba/omim/git/trees{/sha}","statuses_url":"https://api.github.com/repos/deathbaba/omim/statuses/{sha}","languages_url":"https://api.github.com/repos/deathbaba/omim/languages","stargazers_url":"https://api.github.com/repos/deathbaba/omim/stargazers","contributors_url":"https://api.github.com/repos/deathbaba/omim/contributors","subscribers_url":"https://api.github.com/repos/deathbaba/omim/subscribers","subscription_url":"https://api.github.com/repos/deathbaba/omim/subscription","commits_url":"https://api.github.com/repos/deathbaba/omim/commits{/sha}","git_commits_url":"https://api.github.com/repos/deathbaba/omim/git/commits{/sha}","comments_url":"https://api.github.com/repos/deathbaba/omim/comments{/number}","issue_comment_url":"https://api.github.com/repos/deathbaba/omim/issues/comments{/number}","contents_url":"https://api.github.com/repos/deathbaba/omim/contents/{+path}","compare_url":"https://api.github.com/repos/deathbaba/omim/compare/{base}...{head}","merges_url":"https://api.github.com/repos/deathbaba/omim/merges","archive_url":"https://api.github.com/repos/deathbaba/omim/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/deathbaba/omim/downloads","issues_url":"https://api.github.com/repos/deathbaba/omim/issues{/number}","pulls_url":"https://api.github.com/repos/deathbaba/omim/pulls{/number}","milestones_url":"https://api.github.com/repos/deathbaba/omim/milestones{/number}","notifications_url":"https://api.github.com/repos/deathbaba/omim/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/deathbaba/omim/labels{/name}","releases_url":"https://api.github.com/repos/deathbaba/omim/releases{/id}","deployments_url":"https://api.github.com/repos/deathbaba/omim/deployments","created_at":"2015-09-30T10:45:37Z","updated_at":"2015-09-30T10:48:10Z","pushed_at":"2016-03-09T20:37:16Z","git_url":"git://github.com/deathbaba/omim.git","ssh_url":"git@github.com:deathbaba/omim.git","clone_url":"https://github.com/deathbaba/omim.git","svn_url":"https://github.com/deathbaba/omim","homepage":null,"size":2208729,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"mapsme:new-search","ref":"new-search","sha":"11ab14c9cbcde19b6d5ab1fabbc1ec67d4036948","user":{"login":"mapsme","id":14185141,"avatar_url":"https://avatars.githubusercontent.com/u/14185141?v=3","gravatar_id":"","url":"https://api.github.com/users/mapsme","html_url":"https://github.com/mapsme","followers_url":"https://api.github.com/users/mapsme/followers","following_url":"https://api.github.com/users/mapsme/following{/other_user}","gists_url":"https://api.github.com/users/mapsme/gists{/gist_id}","starred_url":"https://api.github.com/users/mapsme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mapsme/subscriptions","organizations_url":"https://api.github.com/users/mapsme/orgs","repos_url":"https://api.github.com/users/mapsme/repos","events_url":"https://api.github.com/users/mapsme/events{/privacy}","received_events_url":"https://api.github.com/users/mapsme/received_events","type":"Organization","site_admin":false},"repo":{"id":42798033,"name":"omim","full_name":"mapsme/omim","owner":{"login":"mapsme","id":14185141,"avatar_url":"https://avatars.githubusercontent.com/u/14185141?v=3","gravatar_id":"","url":"https://api.github.com/users/mapsme","html_url":"https://github.com/mapsme","followers_url":"https://api.github.com/users/mapsme/followers","following_url":"https://api.github.com/users/mapsme/following{/other_user}","gists_url":"https://api.github.com/users/mapsme/gists{/gist_id}","starred_url":"https://api.github.com/users/mapsme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mapsme/subscriptions","organizations_url":"https://api.github.com/users/mapsme/orgs","repos_url":"https://api.github.com/users/mapsme/repos","events_url":"https://api.github.com/users/mapsme/events{/privacy}","received_events_url":"https://api.github.com/users/mapsme/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mapsme/omim","description":"MAPS.ME - Offline OpenStreetMap maps for iOS/Android/Mac/Linux/Windows","fork":false,"url":"https://api.github.com/repos/mapsme/omim","forks_url":"https://api.github.com/repos/mapsme/omim/forks","keys_url":"https://api.github.com/repos/mapsme/omim/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mapsme/omim/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mapsme/omim/teams","hooks_url":"https://api.github.com/repos/mapsme/omim/hooks","issue_events_url":"https://api.github.com/repos/mapsme/omim/issues/events{/number}","events_url":"https://api.github.com/repos/mapsme/omim/events","assignees_url":"https://api.github.com/repos/mapsme/omim/assignees{/user}","branches_url":"https://api.github.com/repos/mapsme/omim/branches{/branch}","tags_url":"https://api.github.com/repos/mapsme/omim/tags","blobs_url":"https://api.github.com/repos/mapsme/omim/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mapsme/omim/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mapsme/omim/git/refs{/sha}","trees_url":"https://api.github.com/repos/mapsme/omim/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mapsme/omim/statuses/{sha}","languages_url":"https://api.github.com/repos/mapsme/omim/languages","stargazers_url":"https://api.github.com/repos/mapsme/omim/stargazers","contributors_url":"https://api.github.com/repos/mapsme/omim/contributors","subscribers_url":"https://api.github.com/repos/mapsme/omim/subscribers","subscription_url":"https://api.github.com/repos/mapsme/omim/subscription","commits_url":"https://api.github.com/repos/mapsme/omim/commits{/sha}","git_commits_url":"https://api.github.com/repos/mapsme/omim/git/commits{/sha}","comments_url":"https://api.github.com/repos/mapsme/omim/comments{/number}","issue_comment_url":"https://api.github.com/repos/mapsme/omim/issues/comments{/number}","contents_url":"https://api.github.com/repos/mapsme/omim/contents/{+path}","compare_url":"https://api.github.com/repos/mapsme/omim/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mapsme/omim/merges","archive_url":"https://api.github.com/repos/mapsme/omim/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mapsme/omim/downloads","issues_url":"https://api.github.com/repos/mapsme/omim/issues{/number}","pulls_url":"https://api.github.com/repos/mapsme/omim/pulls{/number}","milestones_url":"https://api.github.com/repos/mapsme/omim/milestones{/number}","notifications_url":"https://api.github.com/repos/mapsme/omim/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mapsme/omim/labels{/name}","releases_url":"https://api.github.com/repos/mapsme/omim/releases{/id}","deployments_url":"https://api.github.com/repos/mapsme/omim/deployments","created_at":"2015-09-20T02:57:13Z","updated_at":"2016-03-08T08:01:42Z","pushed_at":"2016-03-10T10:45:34Z","git_url":"git://github.com/mapsme/omim.git","ssh_url":"git@github.com:mapsme/omim.git","clone_url":"https://github.com/mapsme/omim.git","svn_url":"https://github.com/mapsme/omim","homepage":null,"size":2275150,"stargazers_count":1642,"watchers_count":1642,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":232,"mirror_url":null,"open_issues_count":118,"forks":232,"open_issues":118,"watchers":1642,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mapsme/omim/pulls/2106"},"html":{"href":"https://github.com/mapsme/omim/pull/2106"},"issue":{"href":"https://api.github.com/repos/mapsme/omim/issues/2106"},"comments":{"href":"https://api.github.com/repos/mapsme/omim/issues/2106/comments"},"review_comments":{"href":"https://api.github.com/repos/mapsme/omim/pulls/2106/comments"},"review_comment":{"href":"https://api.github.com/repos/mapsme/omim/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mapsme/omim/pulls/2106/commits"},"statuses":{"href":"https://api.github.com/repos/mapsme/omim/statuses/ac96af80e59ee85f264b1b00a1f3b4cb8e9d1d27"}}}}