{"action":"created","comment":{"url":"https://api.github.com/repos/tilezen/vector-datasource/pulls/comments/192892350","pull_request_review_id":125756868,"id":192892350,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDE5Mjg5MjM1MA==","diff_hunk":"@@ -0,0 +1,135 @@\n+# -*- encoding: utf-8 -*-\n+from . import FixtureTest\n+\n+\n+class NorwegianShieldTest(FixtureTest):\n+    def test_no_oslo_ring(self):\n+        # there's a different sign for the Store Ringvei (Oslo Ring-road). also\n+        # looks like in Norway they actually sign the E-roads.\n+        #\n+        # https://en.wikipedia.org/wiki/Ring_3_(Oslo)\n+        # https://en.wikipedia.org/wiki/Norwegian_national_road\n+\n+        import dsl\n+\n+        z, x, y = (16, 34736, 19062)\n+\n+        self.generate_fixtures(\n+            dsl.is_in('NO', z, x, y),\n+            # https://www.openstreetmap.org/way/71218142\n+            dsl.way(71218142, dsl.tile_diagonal(z, x, y), {\n+                'highway': u'trunk',\n+                'int_ref': u'E 06',\n+                'lanes': u'2',\n+                'maxspeed': u'70',\n+                'maxspeed:conditional': u'60 @ (Nov 01 - Apr 8)',\n+                'name': u'Adolf Hedins vei',\n+                'oneway': u'yes',\n+                'ref': u'E 6;Ring 3',\n+                'source': u'openstreetmap.org',\n+            }),\n+            dsl.relation(1, {\n+                'nat_ref': u'E 6',\n+                'network': u'e-road',\n+                'ref': u'E 06',\n+                'route': u'road',\n+                'section': u'Norway (south-south)',\n+                'source': u'openstreetmap.org',\n+                'type': u'route',\n+                'wikidata': u'Q921422',\n+                'wikipedia': u'de:Europastraße 6',\n+            }, ways=[71218142]),\n+            dsl.relation(2, {\n+                'name': u'Store ringvei',\n+                'ref': u'Ring 3',\n+                'route': u'road',\n+                'source': u'openstreetmap.org',\n+                'type': u'route',\n+            }, ways=[71218142]),\n+        )\n+\n+        self.assert_has_feature(\n+            z, x, y, 'roads', {\n+                'id': 71218142,\n+                'network': u'NO:oslo:ring',\n+                'shield_text': 'Ring 3',\n+                'all_networks': ['NO:oslo:ring', 'e-road'],\n+                'all_shield_texts': ['Ring 3', 'E 6'],\n+            })\n+\n+    def test_51_nofylkesvei(self):\n+        # interesting set of networks... but we should be able to normalise\n+        # them, or recover the network from the ref=Fv##\n+        import dsl\n+\n+        z, x, y = (16, 34420, 18373)\n+\n+        self.generate_fixtures(\n+            dsl.is_in('NO', z, x, y),\n+            # https://www.openstreetmap.org/way/26119489\n+            dsl.way(26119489, dsl.tile_diagonal(z, x, y), {\n+                'highway': u'primary',\n+                'maxspeed': u'80',\n+                'name': u'Fjellvegen',\n+                'ref': u'51',\n+                'source': u'openstreetmap.org',\n+            }),\n+            dsl.relation(1, {\n+                'name': u'Fylkesvei 51',\n+                'network': u'no:Fylkesvei (Oppland);no:Fylkesvei (Buskerud)',\n+                'operator': u'Statens vegvesen',\n+                'ref': u'Fv51',\n+                'route': u'road',\n+                'source': u'openstreetmap.org',\n+                'type': u'route',\n+                'wikidata': u'Q1770921',\n+                'wikipedia': u'no:Fylkesvei 51',\n+            }, ways=[26119489]),\n+        )\n+\n+        self.assert_has_feature(\n+            z, x, y, 'roads', {\n+                'id': 26119489,\n+                'network': u'NO:Fylkesvei',","path":"integration-test/1491-norwegian-shields.py","position":93,"original_position":93,"commit_id":"28c06004411a57c4fabc29241d7315d81e182fc6","original_commit_id":"28c06004411a57c4fabc29241d7315d81e182fc6","user":{"login":"nvkelso","id":853051,"node_id":"MDQ6VXNlcjg1MzA1MQ==","avatar_url":"https://avatars0.githubusercontent.com/u/853051?v=4","gravatar_id":"","url":"https://api.github.com/users/nvkelso","html_url":"https://github.com/nvkelso","followers_url":"https://api.github.com/users/nvkelso/followers","following_url":"https://api.github.com/users/nvkelso/following{/other_user}","gists_url":"https://api.github.com/users/nvkelso/gists{/gist_id}","starred_url":"https://api.github.com/users/nvkelso/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nvkelso/subscriptions","organizations_url":"https://api.github.com/users/nvkelso/orgs","repos_url":"https://api.github.com/users/nvkelso/repos","events_url":"https://api.github.com/users/nvkelso/events{/privacy}","received_events_url":"https://api.github.com/users/nvkelso/received_events","type":"User","site_admin":false},"body":"`Fylkesvei` here means \"county level road\". Per comments elsewhere, should this be lowercase?","created_at":"2018-06-04T21:55:16Z","updated_at":"2018-06-04T21:55:17Z","html_url":"https://github.com/tilezen/vector-datasource/pull/1515#discussion_r192892350","pull_request_url":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/tilezen/vector-datasource/pulls/comments/192892350"},"html":{"href":"https://github.com/tilezen/vector-datasource/pull/1515#discussion_r192892350"},"pull_request":{"href":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515"}},"in_reply_to_id":192892184},"pull_request":{"url":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515","id":192371122,"node_id":"MDExOlB1bGxSZXF1ZXN0MTkyMzcxMTIy","html_url":"https://github.com/tilezen/vector-datasource/pull/1515","diff_url":"https://github.com/tilezen/vector-datasource/pull/1515.diff","patch_url":"https://github.com/tilezen/vector-datasource/pull/1515.patch","issue_url":"https://api.github.com/repos/tilezen/vector-datasource/issues/1515","number":1515,"state":"open","locked":false,"title":"Various mostly generic network fixes","user":{"login":"zerebubuth","id":271360,"node_id":"MDQ6VXNlcjI3MTM2MA==","avatar_url":"https://avatars1.githubusercontent.com/u/271360?v=4","gravatar_id":"","url":"https://api.github.com/users/zerebubuth","html_url":"https://github.com/zerebubuth","followers_url":"https://api.github.com/users/zerebubuth/followers","following_url":"https://api.github.com/users/zerebubuth/following{/other_user}","gists_url":"https://api.github.com/users/zerebubuth/gists{/gist_id}","starred_url":"https://api.github.com/users/zerebubuth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zerebubuth/subscriptions","organizations_url":"https://api.github.com/users/zerebubuth/orgs","repos_url":"https://api.github.com/users/zerebubuth/repos","events_url":"https://api.github.com/users/zerebubuth/events{/privacy}","received_events_url":"https://api.github.com/users/zerebubuth/received_events","type":"User","site_admin":false},"body":"The main things attempted in this are:\r\n\r\n1. Upper case the country code where the network is `xx:yyy`, i.e: `XX:yyy`, and\r\n2. Replace dash with colon where the network is `XX-yyy`, i.e: `XX:yyy`.\r\n\r\nAdditional things that were covered along the way:\r\n\r\n* Many networks seem to be of the form `XX-roads` or `XX:Roads`, but generally we prefer the lower case and singular `XX:road`.\r\n* Special handling for roads in Riksvei, Fylkesvei and Ring-roads in Norway\r\n* Handling regional roads in Peru\r\n* Handling expressways and motorways in Poland.\r\n\r\nConnects to #1491.","created_at":"2018-06-04T10:59:15Z","updated_at":"2018-06-04T21:55:17Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c647f038f45563e8e33be1af78128b32b3c9666d","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515/commits","review_comments_url":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515/comments","review_comment_url":"https://api.github.com/repos/tilezen/vector-datasource/pulls/comments{/number}","comments_url":"https://api.github.com/repos/tilezen/vector-datasource/issues/1515/comments","statuses_url":"https://api.github.com/repos/tilezen/vector-datasource/statuses/28c06004411a57c4fabc29241d7315d81e182fc6","head":{"label":"tilezen:zerebubuth/1491-generic-network-fixes","ref":"zerebubuth/1491-generic-network-fixes","sha":"28c06004411a57c4fabc29241d7315d81e182fc6","user":{"login":"tilezen","id":19462720,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE5NDYyNzIw","avatar_url":"https://avatars2.githubusercontent.com/u/19462720?v=4","gravatar_id":"","url":"https://api.github.com/users/tilezen","html_url":"https://github.com/tilezen","followers_url":"https://api.github.com/users/tilezen/followers","following_url":"https://api.github.com/users/tilezen/following{/other_user}","gists_url":"https://api.github.com/users/tilezen/gists{/gist_id}","starred_url":"https://api.github.com/users/tilezen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tilezen/subscriptions","organizations_url":"https://api.github.com/users/tilezen/orgs","repos_url":"https://api.github.com/users/tilezen/repos","events_url":"https://api.github.com/users/tilezen/events{/privacy}","received_events_url":"https://api.github.com/users/tilezen/received_events","type":"Organization","site_admin":false},"repo":{"id":13446739,"node_id":"MDEwOlJlcG9zaXRvcnkxMzQ0NjczOQ==","name":"vector-datasource","full_name":"tilezen/vector-datasource","owner":{"login":"tilezen","id":19462720,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE5NDYyNzIw","avatar_url":"https://avatars2.githubusercontent.com/u/19462720?v=4","gravatar_id":"","url":"https://api.github.com/users/tilezen","html_url":"https://github.com/tilezen","followers_url":"https://api.github.com/users/tilezen/followers","following_url":"https://api.github.com/users/tilezen/following{/other_user}","gists_url":"https://api.github.com/users/tilezen/gists{/gist_id}","starred_url":"https://api.github.com/users/tilezen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tilezen/subscriptions","organizations_url":"https://api.github.com/users/tilezen/orgs","repos_url":"https://api.github.com/users/tilezen/repos","events_url":"https://api.github.com/users/tilezen/events{/privacy}","received_events_url":"https://api.github.com/users/tilezen/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/tilezen/vector-datasource","description":"Mapzen vector tile service - OpenStreetMap data in several formats","fork":false,"url":"https://api.github.com/repos/tilezen/vector-datasource","forks_url":"https://api.github.com/repos/tilezen/vector-datasource/forks","keys_url":"https://api.github.com/repos/tilezen/vector-datasource/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tilezen/vector-datasource/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tilezen/vector-datasource/teams","hooks_url":"https://api.github.com/repos/tilezen/vector-datasource/hooks","issue_events_url":"https://api.github.com/repos/tilezen/vector-datasource/issues/events{/number}","events_url":"https://api.github.com/repos/tilezen/vector-datasource/events","assignees_url":"https://api.github.com/repos/tilezen/vector-datasource/assignees{/user}","branches_url":"https://api.github.com/repos/tilezen/vector-datasource/branches{/branch}","tags_url":"https://api.github.com/repos/tilezen/vector-datasource/tags","blobs_url":"https://api.github.com/repos/tilezen/vector-datasource/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tilezen/vector-datasource/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tilezen/vector-datasource/git/refs{/sha}","trees_url":"https://api.github.com/repos/tilezen/vector-datasource/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tilezen/vector-datasource/statuses/{sha}","languages_url":"https://api.github.com/repos/tilezen/vector-datasource/languages","stargazers_url":"https://api.github.com/repos/tilezen/vector-datasource/stargazers","contributors_url":"https://api.github.com/repos/tilezen/vector-datasource/contributors","subscribers_url":"https://api.github.com/repos/tilezen/vector-datasource/subscribers","subscription_url":"https://api.github.com/repos/tilezen/vector-datasource/subscription","commits_url":"https://api.github.com/repos/tilezen/vector-datasource/commits{/sha}","git_commits_url":"https://api.github.com/repos/tilezen/vector-datasource/git/commits{/sha}","comments_url":"https://api.github.com/repos/tilezen/vector-datasource/comments{/number}","issue_comment_url":"https://api.github.com/repos/tilezen/vector-datasource/issues/comments{/number}","contents_url":"https://api.github.com/repos/tilezen/vector-datasource/contents/{+path}","compare_url":"https://api.github.com/repos/tilezen/vector-datasource/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tilezen/vector-datasource/merges","archive_url":"https://api.github.com/repos/tilezen/vector-datasource/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tilezen/vector-datasource/downloads","issues_url":"https://api.github.com/repos/tilezen/vector-datasource/issues{/number}","pulls_url":"https://api.github.com/repos/tilezen/vector-datasource/pulls{/number}","milestones_url":"https://api.github.com/repos/tilezen/vector-datasource/milestones{/number}","notifications_url":"https://api.github.com/repos/tilezen/vector-datasource/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tilezen/vector-datasource/labels{/name}","releases_url":"https://api.github.com/repos/tilezen/vector-datasource/releases{/id}","deployments_url":"https://api.github.com/repos/tilezen/vector-datasource/deployments","created_at":"2013-10-09T15:54:45Z","updated_at":"2018-06-04T08:01:26Z","pushed_at":"2018-06-04T18:42:20Z","git_url":"git://github.com/tilezen/vector-datasource.git","ssh_url":"git@github.com:tilezen/vector-datasource.git","clone_url":"https://github.com/tilezen/vector-datasource.git","svn_url":"https://github.com/tilezen/vector-datasource","homepage":"https://mapzen.com/projects/vector-tiles/","size":66245,"stargazers_count":342,"watchers_count":342,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":96,"mirror_url":null,"archived":false,"open_issues_count":236,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":96,"open_issues":236,"watchers":342,"default_branch":"master"}},"base":{"label":"tilezen:master","ref":"master","sha":"c6ace1195c9225d2318239e9496b3bc55581baa6","user":{"login":"tilezen","id":19462720,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE5NDYyNzIw","avatar_url":"https://avatars2.githubusercontent.com/u/19462720?v=4","gravatar_id":"","url":"https://api.github.com/users/tilezen","html_url":"https://github.com/tilezen","followers_url":"https://api.github.com/users/tilezen/followers","following_url":"https://api.github.com/users/tilezen/following{/other_user}","gists_url":"https://api.github.com/users/tilezen/gists{/gist_id}","starred_url":"https://api.github.com/users/tilezen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tilezen/subscriptions","organizations_url":"https://api.github.com/users/tilezen/orgs","repos_url":"https://api.github.com/users/tilezen/repos","events_url":"https://api.github.com/users/tilezen/events{/privacy}","received_events_url":"https://api.github.com/users/tilezen/received_events","type":"Organization","site_admin":false},"repo":{"id":13446739,"node_id":"MDEwOlJlcG9zaXRvcnkxMzQ0NjczOQ==","name":"vector-datasource","full_name":"tilezen/vector-datasource","owner":{"login":"tilezen","id":19462720,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE5NDYyNzIw","avatar_url":"https://avatars2.githubusercontent.com/u/19462720?v=4","gravatar_id":"","url":"https://api.github.com/users/tilezen","html_url":"https://github.com/tilezen","followers_url":"https://api.github.com/users/tilezen/followers","following_url":"https://api.github.com/users/tilezen/following{/other_user}","gists_url":"https://api.github.com/users/tilezen/gists{/gist_id}","starred_url":"https://api.github.com/users/tilezen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tilezen/subscriptions","organizations_url":"https://api.github.com/users/tilezen/orgs","repos_url":"https://api.github.com/users/tilezen/repos","events_url":"https://api.github.com/users/tilezen/events{/privacy}","received_events_url":"https://api.github.com/users/tilezen/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/tilezen/vector-datasource","description":"Mapzen vector tile service - OpenStreetMap data in several formats","fork":false,"url":"https://api.github.com/repos/tilezen/vector-datasource","forks_url":"https://api.github.com/repos/tilezen/vector-datasource/forks","keys_url":"https://api.github.com/repos/tilezen/vector-datasource/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tilezen/vector-datasource/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tilezen/vector-datasource/teams","hooks_url":"https://api.github.com/repos/tilezen/vector-datasource/hooks","issue_events_url":"https://api.github.com/repos/tilezen/vector-datasource/issues/events{/number}","events_url":"https://api.github.com/repos/tilezen/vector-datasource/events","assignees_url":"https://api.github.com/repos/tilezen/vector-datasource/assignees{/user}","branches_url":"https://api.github.com/repos/tilezen/vector-datasource/branches{/branch}","tags_url":"https://api.github.com/repos/tilezen/vector-datasource/tags","blobs_url":"https://api.github.com/repos/tilezen/vector-datasource/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tilezen/vector-datasource/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tilezen/vector-datasource/git/refs{/sha}","trees_url":"https://api.github.com/repos/tilezen/vector-datasource/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tilezen/vector-datasource/statuses/{sha}","languages_url":"https://api.github.com/repos/tilezen/vector-datasource/languages","stargazers_url":"https://api.github.com/repos/tilezen/vector-datasource/stargazers","contributors_url":"https://api.github.com/repos/tilezen/vector-datasource/contributors","subscribers_url":"https://api.github.com/repos/tilezen/vector-datasource/subscribers","subscription_url":"https://api.github.com/repos/tilezen/vector-datasource/subscription","commits_url":"https://api.github.com/repos/tilezen/vector-datasource/commits{/sha}","git_commits_url":"https://api.github.com/repos/tilezen/vector-datasource/git/commits{/sha}","comments_url":"https://api.github.com/repos/tilezen/vector-datasource/comments{/number}","issue_comment_url":"https://api.github.com/repos/tilezen/vector-datasource/issues/comments{/number}","contents_url":"https://api.github.com/repos/tilezen/vector-datasource/contents/{+path}","compare_url":"https://api.github.com/repos/tilezen/vector-datasource/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tilezen/vector-datasource/merges","archive_url":"https://api.github.com/repos/tilezen/vector-datasource/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tilezen/vector-datasource/downloads","issues_url":"https://api.github.com/repos/tilezen/vector-datasource/issues{/number}","pulls_url":"https://api.github.com/repos/tilezen/vector-datasource/pulls{/number}","milestones_url":"https://api.github.com/repos/tilezen/vector-datasource/milestones{/number}","notifications_url":"https://api.github.com/repos/tilezen/vector-datasource/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tilezen/vector-datasource/labels{/name}","releases_url":"https://api.github.com/repos/tilezen/vector-datasource/releases{/id}","deployments_url":"https://api.github.com/repos/tilezen/vector-datasource/deployments","created_at":"2013-10-09T15:54:45Z","updated_at":"2018-06-04T08:01:26Z","pushed_at":"2018-06-04T18:42:20Z","git_url":"git://github.com/tilezen/vector-datasource.git","ssh_url":"git@github.com:tilezen/vector-datasource.git","clone_url":"https://github.com/tilezen/vector-datasource.git","svn_url":"https://github.com/tilezen/vector-datasource","homepage":"https://mapzen.com/projects/vector-tiles/","size":66245,"stargazers_count":342,"watchers_count":342,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":96,"mirror_url":null,"archived":false,"open_issues_count":236,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":96,"open_issues":236,"watchers":342,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515"},"html":{"href":"https://github.com/tilezen/vector-datasource/pull/1515"},"issue":{"href":"https://api.github.com/repos/tilezen/vector-datasource/issues/1515"},"comments":{"href":"https://api.github.com/repos/tilezen/vector-datasource/issues/1515/comments"},"review_comments":{"href":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515/comments"},"review_comment":{"href":"https://api.github.com/repos/tilezen/vector-datasource/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/tilezen/vector-datasource/pulls/1515/commits"},"statuses":{"href":"https://api.github.com/repos/tilezen/vector-datasource/statuses/28c06004411a57c4fabc29241d7315d81e182fc6"}},"author_association":"MEMBER"}}
{"actor":{"display_login":"nvkelso"}}