{"action":"created","comment":{"url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/comments/47629281","id":47629281,"diff_hunk":"@@ -74,24 +80,39 @@ Layer:\n \n     {\n         \"name\": <name>,\n-        \"type\": \"internal WMS/external WMS/WMTS\",\n-        \"ui_metadata\": {\n+        \"type\": \"<map server type>/WMTS/null\",\n+        \"metadata\": {\n             <name>: <value>\n         }\n     }\n \n \n-Internal WMS Layer:\n+WMS Layer:\n \n .. code:: json\n \n     {\n-        \"layer\": <wms_layers>,\n-        \"image_type\": \"image/png\",\n-        \"style\": <style>,\n-        \"queryable\": 0/1,\n+\n+        \"layers\": <wms_layers>,\n+        \"name\": <name in tree>,\n         \"minResolutionHint\": <minResolutionHint>,\n         \"maxResolutionHint\": <maxResolutionHint>,\n+        \"url\": <wms server url>/null,\n+        \"url_wfs\": <wfs server url>/null,","path":"doc/developer/webservices.rst","position":51,"original_position":51,"commit_id":"4c29027ea7742b4ae0c5a799322a19ff76401795","original_commit_id":"4cfce70c63842b59c8c06b4dd8ee222b92c6e71a","user":{"login":"ochriste","id":138678,"avatar_url":"https://avatars.githubusercontent.com/u/138678?v=3","gravatar_id":"","url":"https://api.github.com/users/ochriste","html_url":"https://github.com/ochriste","followers_url":"https://api.github.com/users/ochriste/followers","following_url":"https://api.github.com/users/ochriste/following{/other_user}","gists_url":"https://api.github.com/users/ochriste/gists{/gist_id}","starred_url":"https://api.github.com/users/ochriste/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ochriste/subscriptions","organizations_url":"https://api.github.com/users/ochriste/orgs","repos_url":"https://api.github.com/users/ochriste/repos","events_url":"https://api.github.com/users/ochriste/events{/privacy}","received_events_url":"https://api.github.com/users/ochriste/received_events","type":"User","site_admin":false},"body":"null","created_at":"2015-12-15T12:23:50Z","updated_at":"2015-12-15T12:23:50Z","html_url":"https://github.com/camptocamp/c2cgeoportal/pull/1844#discussion_r47629281","pull_request_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844","_links":{"self":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/comments/47629281"},"html":{"href":"https://github.com/camptocamp/c2cgeoportal/pull/1844#discussion_r47629281"},"pull_request":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844"}}},"pull_request":{"url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844","id":52503896,"html_url":"https://github.com/camptocamp/c2cgeoportal/pull/1844","diff_url":"https://github.com/camptocamp/c2cgeoportal/pull/1844.diff","patch_url":"https://github.com/camptocamp/c2cgeoportal/pull/1844.patch","issue_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/1844","number":1844,"state":"open","locked":false,"title":"Refactored internal and external wms layers tables into one.","user":{"login":"ochriste","id":138678,"avatar_url":"https://avatars.githubusercontent.com/u/138678?v=3","gravatar_id":"","url":"https://api.github.com/users/ochriste","html_url":"https://github.com/ochriste","followers_url":"https://api.github.com/users/ochriste/followers","following_url":"https://api.github.com/users/ochriste/following{/other_user}","gists_url":"https://api.github.com/users/ochriste/gists{/gist_id}","starred_url":"https://api.github.com/users/ochriste/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ochriste/subscriptions","organizations_url":"https://api.github.com/users/ochriste/orgs","repos_url":"https://api.github.com/users/ochriste/repos","events_url":"https://api.github.com/users/ochriste/events{/privacy}","received_events_url":"https://api.github.com/users/ochriste/received_events","type":"User","site_admin":false},"body":"Merge LayerInternalWMS LayerExternalWMS into LayerWMS (+ ServerOGC), with Alembic migration script and FormAlchemy admin interface update.\r\n\r\nthemes json example visible here:\r\nhttp://geomapfish-demo.camptocamp.net/ochdev/wsgi/themes?version=2\r\n\r\nthis PR doesnt include cleaning of deprecated LayerInternalWMS and LayerExternalWMS,\r\nI would like to do that in a separate PR","created_at":"2015-12-03T08:21:35Z","updated_at":"2015-12-15T12:23:50Z","closed_at":null,"merged_at":null,"merge_commit_sha":"07bc586a1d8408f0289d0c9e2061422f1e610d11","assignee":null,"milestone":{"url":"https://api.github.com/repos/camptocamp/c2cgeoportal/milestones/31","html_url":"https://github.com/camptocamp/c2cgeoportal/milestones/2.0","labels_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/milestones/31/labels","id":1156553,"number":31,"title":"2.0","description":"","creator":{"login":"sbrunner","id":353872,"avatar_url":"https://avatars.githubusercontent.com/u/353872?v=3","gravatar_id":"","url":"https://api.github.com/users/sbrunner","html_url":"https://github.com/sbrunner","followers_url":"https://api.github.com/users/sbrunner/followers","following_url":"https://api.github.com/users/sbrunner/following{/other_user}","gists_url":"https://api.github.com/users/sbrunner/gists{/gist_id}","starred_url":"https://api.github.com/users/sbrunner/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sbrunner/subscriptions","organizations_url":"https://api.github.com/users/sbrunner/orgs","repos_url":"https://api.github.com/users/sbrunner/repos","events_url":"https://api.github.com/users/sbrunner/events{/privacy}","received_events_url":"https://api.github.com/users/sbrunner/received_events","type":"User","site_admin":false},"open_issues":39,"closed_issues":101,"state":"open","created_at":"2015-06-09T09:54:18Z","updated_at":"2015-12-15T11:52:46Z","due_on":"2016-02-11T23:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844/commits","review_comments_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844/comments","review_comment_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/comments{/number}","comments_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/1844/comments","statuses_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/statuses/4c29027ea7742b4ae0c5a799322a19ff76401795","head":{"label":"camptocamp:wms-layers-refactoring","ref":"wms-layers-refactoring","sha":"4c29027ea7742b4ae0c5a799322a19ff76401795","user":{"login":"camptocamp","id":28109,"avatar_url":"https://avatars.githubusercontent.com/u/28109?v=3","gravatar_id":"","url":"https://api.github.com/users/camptocamp","html_url":"https://github.com/camptocamp","followers_url":"https://api.github.com/users/camptocamp/followers","following_url":"https://api.github.com/users/camptocamp/following{/other_user}","gists_url":"https://api.github.com/users/camptocamp/gists{/gist_id}","starred_url":"https://api.github.com/users/camptocamp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/camptocamp/subscriptions","organizations_url":"https://api.github.com/users/camptocamp/orgs","repos_url":"https://api.github.com/users/camptocamp/repos","events_url":"https://api.github.com/users/camptocamp/events{/privacy}","received_events_url":"https://api.github.com/users/camptocamp/received_events","type":"Organization","site_admin":false},"repo":{"id":2932773,"name":"c2cgeoportal","full_name":"camptocamp/c2cgeoportal","owner":{"login":"camptocamp","id":28109,"avatar_url":"https://avatars.githubusercontent.com/u/28109?v=3","gravatar_id":"","url":"https://api.github.com/users/camptocamp","html_url":"https://github.com/camptocamp","followers_url":"https://api.github.com/users/camptocamp/followers","following_url":"https://api.github.com/users/camptocamp/following{/other_user}","gists_url":"https://api.github.com/users/camptocamp/gists{/gist_id}","starred_url":"https://api.github.com/users/camptocamp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/camptocamp/subscriptions","organizations_url":"https://api.github.com/users/camptocamp/orgs","repos_url":"https://api.github.com/users/camptocamp/repos","events_url":"https://api.github.com/users/camptocamp/events{/privacy}","received_events_url":"https://api.github.com/users/camptocamp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/camptocamp/c2cgeoportal","description":"c2cgeoportal application","fork":false,"url":"https://api.github.com/repos/camptocamp/c2cgeoportal","forks_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/forks","keys_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/keys{/key_id}","collaborators_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/teams","hooks_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/hooks","issue_events_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/events{/number}","events_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/events","assignees_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/assignees{/user}","branches_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/branches{/branch}","tags_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/tags","blobs_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/refs{/sha}","trees_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/trees{/sha}","statuses_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/statuses/{sha}","languages_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/languages","stargazers_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/stargazers","contributors_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/contributors","subscribers_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/subscribers","subscription_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/subscription","commits_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/commits{/sha}","git_commits_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/commits{/sha}","comments_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/comments{/number}","issue_comment_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/comments{/number}","contents_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/contents/{+path}","compare_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/compare/{base}...{head}","merges_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/merges","archive_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/downloads","issues_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues{/number}","pulls_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls{/number}","milestones_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/milestones{/number}","notifications_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/labels{/name}","releases_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/releases{/id}","created_at":"2011-12-07T13:42:59Z","updated_at":"2015-09-24T09:09:49Z","pushed_at":"2015-12-15T11:42:51Z","git_url":"git://github.com/camptocamp/c2cgeoportal.git","ssh_url":"git@github.com:camptocamp/c2cgeoportal.git","clone_url":"https://github.com/camptocamp/c2cgeoportal.git","svn_url":"https://github.com/camptocamp/c2cgeoportal","homepage":"","size":327237,"stargazers_count":17,"watchers_count":17,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":20,"mirror_url":null,"open_issues_count":92,"forks":20,"open_issues":92,"watchers":17,"default_branch":"master"}},"base":{"label":"camptocamp:master","ref":"master","sha":"707ca8e840ea6aa4e00e08e5487f64214b7ed683","user":{"login":"camptocamp","id":28109,"avatar_url":"https://avatars.githubusercontent.com/u/28109?v=3","gravatar_id":"","url":"https://api.github.com/users/camptocamp","html_url":"https://github.com/camptocamp","followers_url":"https://api.github.com/users/camptocamp/followers","following_url":"https://api.github.com/users/camptocamp/following{/other_user}","gists_url":"https://api.github.com/users/camptocamp/gists{/gist_id}","starred_url":"https://api.github.com/users/camptocamp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/camptocamp/subscriptions","organizations_url":"https://api.github.com/users/camptocamp/orgs","repos_url":"https://api.github.com/users/camptocamp/repos","events_url":"https://api.github.com/users/camptocamp/events{/privacy}","received_events_url":"https://api.github.com/users/camptocamp/received_events","type":"Organization","site_admin":false},"repo":{"id":2932773,"name":"c2cgeoportal","full_name":"camptocamp/c2cgeoportal","owner":{"login":"camptocamp","id":28109,"avatar_url":"https://avatars.githubusercontent.com/u/28109?v=3","gravatar_id":"","url":"https://api.github.com/users/camptocamp","html_url":"https://github.com/camptocamp","followers_url":"https://api.github.com/users/camptocamp/followers","following_url":"https://api.github.com/users/camptocamp/following{/other_user}","gists_url":"https://api.github.com/users/camptocamp/gists{/gist_id}","starred_url":"https://api.github.com/users/camptocamp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/camptocamp/subscriptions","organizations_url":"https://api.github.com/users/camptocamp/orgs","repos_url":"https://api.github.com/users/camptocamp/repos","events_url":"https://api.github.com/users/camptocamp/events{/privacy}","received_events_url":"https://api.github.com/users/camptocamp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/camptocamp/c2cgeoportal","description":"c2cgeoportal application","fork":false,"url":"https://api.github.com/repos/camptocamp/c2cgeoportal","forks_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/forks","keys_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/keys{/key_id}","collaborators_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/teams","hooks_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/hooks","issue_events_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/events{/number}","events_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/events","assignees_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/assignees{/user}","branches_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/branches{/branch}","tags_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/tags","blobs_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/refs{/sha}","trees_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/trees{/sha}","statuses_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/statuses/{sha}","languages_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/languages","stargazers_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/stargazers","contributors_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/contributors","subscribers_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/subscribers","subscription_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/subscription","commits_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/commits{/sha}","git_commits_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/git/commits{/sha}","comments_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/comments{/number}","issue_comment_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/comments{/number}","contents_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/contents/{+path}","compare_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/compare/{base}...{head}","merges_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/merges","archive_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/downloads","issues_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues{/number}","pulls_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls{/number}","milestones_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/milestones{/number}","notifications_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/labels{/name}","releases_url":"https://api.github.com/repos/camptocamp/c2cgeoportal/releases{/id}","created_at":"2011-12-07T13:42:59Z","updated_at":"2015-09-24T09:09:49Z","pushed_at":"2015-12-15T11:42:51Z","git_url":"git://github.com/camptocamp/c2cgeoportal.git","ssh_url":"git@github.com:camptocamp/c2cgeoportal.git","clone_url":"https://github.com/camptocamp/c2cgeoportal.git","svn_url":"https://github.com/camptocamp/c2cgeoportal","homepage":"","size":327237,"stargazers_count":17,"watchers_count":17,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":20,"mirror_url":null,"open_issues_count":92,"forks":20,"open_issues":92,"watchers":17,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844"},"html":{"href":"https://github.com/camptocamp/c2cgeoportal/pull/1844"},"issue":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/1844"},"comments":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/issues/1844/comments"},"review_comments":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844/comments"},"review_comment":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/pulls/1844/commits"},"statuses":{"href":"https://api.github.com/repos/camptocamp/c2cgeoportal/statuses/4c29027ea7742b4ae0c5a799322a19ff76401795"}}}}