{"action":"created","comment":{"url":"https://api.github.com/repos/openscope/openscope/pulls/comments/140960124","pull_request_review_id":65100302,"id":140960124,"diff_hunk":"@@ -686,55 +888,53 @@ export default class CanvasController {\n \n                 cc.stroke();\n \n-                if (exit_name) {\n+                if (exitName) {\n                     // Initialize count for this transition\n-                    if (isNaN(text_at_point[exit_name])) {\n-                        text_at_point[exit_name] = 0;\n+                    if (isNaN(textAtPoint[exitName])) {\n+                        textAtPoint[exitName] = 0;\n                     }\n \n                     // Move the y point for drawing depending on how many sids we have drawn text for\n                     // at this point already\n-                    const y_point = fixY + (15 * text_at_point[exit_name]);\n-                    cc.fillText(`${sid.identifier}.${exit_name}`, fixX + 10, y_point);\n+                    const y_point = fixY + (15 * textAtPoint[exitName]);\n+                    cc.fillText(`${sid.identifier}.${exitName}`, fixX + 10, y_point);\n \n-                    text_at_point[exit_name] += 1;  // Increment the count for this transition\n+                    textAtPoint[exitName] += 1;  // Increment the count for this transition\n                 }\n-            });\n+            }\n \n-            if (write_sid_name) {\n-                cc.fillText(sid.identifier, fixX + 10, fixY);\n+            if (shouldDrawProcedureName) {\n+                const labelOffsetX = fixX + 10;\n+                cc.fillText(sid.identifier, labelOffsetX, fixY);\n             }\n-        });\n+        }\n     }\n \n     /**\n      * Draw a trailing indicator 2.5 NM (4.6km) behind landing aircraft to help with traffic spacing\n      *\n      * @for CanvasController\n      * @method canvas_draw_separation_indicator\n-     * @param cc\n-     * @param aircraft\n+     * @param cc {HTMLCanvasContext}\n+     * @param aircraft {AircraftModel}\n      */\n     canvas_draw_separation_indicator(cc, aircraft) {\n-        if (!GameController.shouldUseTrailingSeparationIndicator(aircraft)) {\n+        if (!GameController.shouldUseTrailingSeparationIndicator(aircraft) || !this.theme.RADAR_TARGET.TRAILING_SEPARATION_INDICATOR_ENABLED) {","path":"src/assets/scripts/client/canvas/CanvasController.js","position":953,"original_position":953,"commit_id":"f7d08ebcb8c8dc1aa4a9b4761ada979ed7e56fb6","original_commit_id":"f7d08ebcb8c8dc1aa4a9b4761ada979ed7e56fb6","user":{"login":"erikquinn","id":5103735,"avatar_url":"https://avatars0.githubusercontent.com/u/5103735?v=4","gravatar_id":"","url":"https://api.github.com/users/erikquinn","html_url":"https://github.com/erikquinn","followers_url":"https://api.github.com/users/erikquinn/followers","following_url":"https://api.github.com/users/erikquinn/following{/other_user}","gists_url":"https://api.github.com/users/erikquinn/gists{/gist_id}","starred_url":"https://api.github.com/users/erikquinn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/erikquinn/subscriptions","organizations_url":"https://api.github.com/users/erikquinn/orgs","repos_url":"https://api.github.com/users/erikquinn/repos","events_url":"https://api.github.com/users/erikquinn/events{/privacy}","received_events_url":"https://api.github.com/users/erikquinn/received_events","type":"User","site_admin":false},"body":"This is already be included in the `.shouldUseTrailingSeparationIndicator()` method, so there's no need for the addition here.","created_at":"2017-09-26T05:28:42Z","updated_at":"2017-09-26T05:39:37Z","html_url":"https://github.com/openscope/openscope/pull/708#discussion_r140960124","pull_request_url":"https://api.github.com/repos/openscope/openscope/pulls/708","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/openscope/openscope/pulls/comments/140960124"},"html":{"href":"https://github.com/openscope/openscope/pull/708#discussion_r140960124"},"pull_request":{"href":"https://api.github.com/repos/openscope/openscope/pulls/708"}}},"pull_request":{"url":"https://api.github.com/repos/openscope/openscope/pulls/708","id":141744018,"html_url":"https://github.com/openscope/openscope/pull/708","diff_url":"https://github.com/openscope/openscope/pull/708.diff","patch_url":"https://github.com/openscope/openscope/pull/708.patch","issue_url":"https://api.github.com/repos/openscope/openscope/issues/708","number":708,"state":"open","locked":false,"title":"enhancement/707","user":{"login":"n8rzz","id":3325985,"avatar_url":"https://avatars1.githubusercontent.com/u/3325985?v=4","gravatar_id":"","url":"https://api.github.com/users/n8rzz","html_url":"https://github.com/n8rzz","followers_url":"https://api.github.com/users/n8rzz/followers","following_url":"https://api.github.com/users/n8rzz/following{/other_user}","gists_url":"https://api.github.com/users/n8rzz/gists{/gist_id}","starred_url":"https://api.github.com/users/n8rzz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/n8rzz/subscriptions","organizations_url":"https://api.github.com/users/n8rzz/orgs","repos_url":"https://api.github.com/users/n8rzz/repos","events_url":"https://api.github.com/users/n8rzz/events{/privacy}","received_events_url":"https://api.github.com/users/n8rzz/received_events","type":"User","site_admin":false},"body":"Resolves #707 \r\n\r\nInitial canvas controller refactor\r\n\r\n_depends on #706 (#296)_","created_at":"2017-09-19T02:23:31Z","updated_at":"2017-09-26T05:39:37Z","closed_at":null,"merged_at":null,"merge_commit_sha":"769afb331aecb026c1bd2314c7615ba09234fa7b","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":{"url":"https://api.github.com/repos/openscope/openscope/milestones/8","html_url":"https://github.com/openscope/openscope/milestone/8","labels_url":"https://api.github.com/repos/openscope/openscope/milestones/8/labels","id":2621966,"number":8,"title":"v5.5.0","description":"","creator":{"login":"erikquinn","id":5103735,"avatar_url":"https://avatars0.githubusercontent.com/u/5103735?v=4","gravatar_id":"","url":"https://api.github.com/users/erikquinn","html_url":"https://github.com/erikquinn","followers_url":"https://api.github.com/users/erikquinn/followers","following_url":"https://api.github.com/users/erikquinn/following{/other_user}","gists_url":"https://api.github.com/users/erikquinn/gists{/gist_id}","starred_url":"https://api.github.com/users/erikquinn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/erikquinn/subscriptions","organizations_url":"https://api.github.com/users/erikquinn/orgs","repos_url":"https://api.github.com/users/erikquinn/repos","events_url":"https://api.github.com/users/erikquinn/events{/privacy}","received_events_url":"https://api.github.com/users/erikquinn/received_events","type":"User","site_admin":false},"open_issues":9,"closed_issues":18,"state":"open","created_at":"2017-07-05T01:35:27Z","updated_at":"2017-09-26T04:45:41Z","due_on":"2017-09-29T07:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/openscope/openscope/pulls/708/commits","review_comments_url":"https://api.github.com/repos/openscope/openscope/pulls/708/comments","review_comment_url":"https://api.github.com/repos/openscope/openscope/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openscope/openscope/issues/708/comments","statuses_url":"https://api.github.com/repos/openscope/openscope/statuses/f7d08ebcb8c8dc1aa4a9b4761ada979ed7e56fb6","head":{"label":"openscope:enhancement/707","ref":"enhancement/707","sha":"f7d08ebcb8c8dc1aa4a9b4761ada979ed7e56fb6","user":{"login":"openscope","id":19348939,"avatar_url":"https://avatars0.githubusercontent.com/u/19348939?v=4","gravatar_id":"","url":"https://api.github.com/users/openscope","html_url":"https://github.com/openscope","followers_url":"https://api.github.com/users/openscope/followers","following_url":"https://api.github.com/users/openscope/following{/other_user}","gists_url":"https://api.github.com/users/openscope/gists{/gist_id}","starred_url":"https://api.github.com/users/openscope/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openscope/subscriptions","organizations_url":"https://api.github.com/users/openscope/orgs","repos_url":"https://api.github.com/users/openscope/repos","events_url":"https://api.github.com/users/openscope/events{/privacy}","received_events_url":"https://api.github.com/users/openscope/received_events","type":"Organization","site_admin":false},"repo":{"id":77648370,"name":"openscope","full_name":"openscope/openscope","owner":{"login":"openscope","id":19348939,"avatar_url":"https://avatars0.githubusercontent.com/u/19348939?v=4","gravatar_id":"","url":"https://api.github.com/users/openscope","html_url":"https://github.com/openscope","followers_url":"https://api.github.com/users/openscope/followers","following_url":"https://api.github.com/users/openscope/following{/other_user}","gists_url":"https://api.github.com/users/openscope/gists{/gist_id}","starred_url":"https://api.github.com/users/openscope/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openscope/subscriptions","organizations_url":"https://api.github.com/users/openscope/orgs","repos_url":"https://api.github.com/users/openscope/repos","events_url":"https://api.github.com/users/openscope/events{/privacy}","received_events_url":"https://api.github.com/users/openscope/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/openscope/openscope","description":"openScope Air Traffic Control Simulator","fork":false,"url":"https://api.github.com/repos/openscope/openscope","forks_url":"https://api.github.com/repos/openscope/openscope/forks","keys_url":"https://api.github.com/repos/openscope/openscope/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openscope/openscope/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openscope/openscope/teams","hooks_url":"https://api.github.com/repos/openscope/openscope/hooks","issue_events_url":"https://api.github.com/repos/openscope/openscope/issues/events{/number}","events_url":"https://api.github.com/repos/openscope/openscope/events","assignees_url":"https://api.github.com/repos/openscope/openscope/assignees{/user}","branches_url":"https://api.github.com/repos/openscope/openscope/branches{/branch}","tags_url":"https://api.github.com/repos/openscope/openscope/tags","blobs_url":"https://api.github.com/repos/openscope/openscope/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openscope/openscope/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openscope/openscope/git/refs{/sha}","trees_url":"https://api.github.com/repos/openscope/openscope/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openscope/openscope/statuses/{sha}","languages_url":"https://api.github.com/repos/openscope/openscope/languages","stargazers_url":"https://api.github.com/repos/openscope/openscope/stargazers","contributors_url":"https://api.github.com/repos/openscope/openscope/contributors","subscribers_url":"https://api.github.com/repos/openscope/openscope/subscribers","subscription_url":"https://api.github.com/repos/openscope/openscope/subscription","commits_url":"https://api.github.com/repos/openscope/openscope/commits{/sha}","git_commits_url":"https://api.github.com/repos/openscope/openscope/git/commits{/sha}","comments_url":"https://api.github.com/repos/openscope/openscope/comments{/number}","issue_comment_url":"https://api.github.com/repos/openscope/openscope/issues/comments{/number}","contents_url":"https://api.github.com/repos/openscope/openscope/contents/{+path}","compare_url":"https://api.github.com/repos/openscope/openscope/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openscope/openscope/merges","archive_url":"https://api.github.com/repos/openscope/openscope/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openscope/openscope/downloads","issues_url":"https://api.github.com/repos/openscope/openscope/issues{/number}","pulls_url":"https://api.github.com/repos/openscope/openscope/pulls{/number}","milestones_url":"https://api.github.com/repos/openscope/openscope/milestones{/number}","notifications_url":"https://api.github.com/repos/openscope/openscope/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openscope/openscope/labels{/name}","releases_url":"https://api.github.com/repos/openscope/openscope/releases{/id}","deployments_url":"https://api.github.com/repos/openscope/openscope/deployments","created_at":"2016-12-30T00:32:13Z","updated_at":"2017-09-18T18:42:05Z","pushed_at":"2017-09-26T04:45:44Z","git_url":"git://github.com/openscope/openscope.git","ssh_url":"git@github.com:openscope/openscope.git","clone_url":"https://github.com/openscope/openscope.git","svn_url":"https://github.com/openscope/openscope","homepage":"http://www.openscope.co","size":20395,"stargazers_count":77,"watchers_count":77,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":38,"mirror_url":null,"open_issues_count":251,"forks":38,"open_issues":251,"watchers":77,"default_branch":"develop"}},"base":{"label":"openscope:develop","ref":"develop","sha":"542b12321a80398fe461d679d21beb05a3d45721","user":{"login":"openscope","id":19348939,"avatar_url":"https://avatars0.githubusercontent.com/u/19348939?v=4","gravatar_id":"","url":"https://api.github.com/users/openscope","html_url":"https://github.com/openscope","followers_url":"https://api.github.com/users/openscope/followers","following_url":"https://api.github.com/users/openscope/following{/other_user}","gists_url":"https://api.github.com/users/openscope/gists{/gist_id}","starred_url":"https://api.github.com/users/openscope/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openscope/subscriptions","organizations_url":"https://api.github.com/users/openscope/orgs","repos_url":"https://api.github.com/users/openscope/repos","events_url":"https://api.github.com/users/openscope/events{/privacy}","received_events_url":"https://api.github.com/users/openscope/received_events","type":"Organization","site_admin":false},"repo":{"id":77648370,"name":"openscope","full_name":"openscope/openscope","owner":{"login":"openscope","id":19348939,"avatar_url":"https://avatars0.githubusercontent.com/u/19348939?v=4","gravatar_id":"","url":"https://api.github.com/users/openscope","html_url":"https://github.com/openscope","followers_url":"https://api.github.com/users/openscope/followers","following_url":"https://api.github.com/users/openscope/following{/other_user}","gists_url":"https://api.github.com/users/openscope/gists{/gist_id}","starred_url":"https://api.github.com/users/openscope/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openscope/subscriptions","organizations_url":"https://api.github.com/users/openscope/orgs","repos_url":"https://api.github.com/users/openscope/repos","events_url":"https://api.github.com/users/openscope/events{/privacy}","received_events_url":"https://api.github.com/users/openscope/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/openscope/openscope","description":"openScope Air Traffic Control Simulator","fork":false,"url":"https://api.github.com/repos/openscope/openscope","forks_url":"https://api.github.com/repos/openscope/openscope/forks","keys_url":"https://api.github.com/repos/openscope/openscope/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openscope/openscope/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openscope/openscope/teams","hooks_url":"https://api.github.com/repos/openscope/openscope/hooks","issue_events_url":"https://api.github.com/repos/openscope/openscope/issues/events{/number}","events_url":"https://api.github.com/repos/openscope/openscope/events","assignees_url":"https://api.github.com/repos/openscope/openscope/assignees{/user}","branches_url":"https://api.github.com/repos/openscope/openscope/branches{/branch}","tags_url":"https://api.github.com/repos/openscope/openscope/tags","blobs_url":"https://api.github.com/repos/openscope/openscope/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openscope/openscope/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openscope/openscope/git/refs{/sha}","trees_url":"https://api.github.com/repos/openscope/openscope/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openscope/openscope/statuses/{sha}","languages_url":"https://api.github.com/repos/openscope/openscope/languages","stargazers_url":"https://api.github.com/repos/openscope/openscope/stargazers","contributors_url":"https://api.github.com/repos/openscope/openscope/contributors","subscribers_url":"https://api.github.com/repos/openscope/openscope/subscribers","subscription_url":"https://api.github.com/repos/openscope/openscope/subscription","commits_url":"https://api.github.com/repos/openscope/openscope/commits{/sha}","git_commits_url":"https://api.github.com/repos/openscope/openscope/git/commits{/sha}","comments_url":"https://api.github.com/repos/openscope/openscope/comments{/number}","issue_comment_url":"https://api.github.com/repos/openscope/openscope/issues/comments{/number}","contents_url":"https://api.github.com/repos/openscope/openscope/contents/{+path}","compare_url":"https://api.github.com/repos/openscope/openscope/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openscope/openscope/merges","archive_url":"https://api.github.com/repos/openscope/openscope/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openscope/openscope/downloads","issues_url":"https://api.github.com/repos/openscope/openscope/issues{/number}","pulls_url":"https://api.github.com/repos/openscope/openscope/pulls{/number}","milestones_url":"https://api.github.com/repos/openscope/openscope/milestones{/number}","notifications_url":"https://api.github.com/repos/openscope/openscope/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openscope/openscope/labels{/name}","releases_url":"https://api.github.com/repos/openscope/openscope/releases{/id}","deployments_url":"https://api.github.com/repos/openscope/openscope/deployments","created_at":"2016-12-30T00:32:13Z","updated_at":"2017-09-18T18:42:05Z","pushed_at":"2017-09-26T04:45:44Z","git_url":"git://github.com/openscope/openscope.git","ssh_url":"git@github.com:openscope/openscope.git","clone_url":"https://github.com/openscope/openscope.git","svn_url":"https://github.com/openscope/openscope","homepage":"http://www.openscope.co","size":20395,"stargazers_count":77,"watchers_count":77,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":38,"mirror_url":null,"open_issues_count":251,"forks":38,"open_issues":251,"watchers":77,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/openscope/openscope/pulls/708"},"html":{"href":"https://github.com/openscope/openscope/pull/708"},"issue":{"href":"https://api.github.com/repos/openscope/openscope/issues/708"},"comments":{"href":"https://api.github.com/repos/openscope/openscope/issues/708/comments"},"review_comments":{"href":"https://api.github.com/repos/openscope/openscope/pulls/708/comments"},"review_comment":{"href":"https://api.github.com/repos/openscope/openscope/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openscope/openscope/pulls/708/commits"},"statuses":{"href":"https://api.github.com/repos/openscope/openscope/statuses/f7d08ebcb8c8dc1aa4a9b4761ada979ed7e56fb6"}},"author_association":"MEMBER"}}
{"actor":{"display_login":"erikquinn"}}