Upgrade to location-conflation 0.6 / country-coder 4.0

Replace some more custom geojson with country-coder subcountries

dist/features.json

@@ -19,7 +19,6 @@
     {"type": "Feature", "id": "de-mecklenburg-vorpommern.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[10.94238, 54.01745], [12.09045, 54.46365], [13.83179, 54.95239], [14.34814, 53.42263], [13.74939, 53.48805], [12.89246, 53.18958], [12.09045, 53.35055], [11.48621, 53.11711], [10.61829, 53.38005], [10.94238, 53.68695], [10.75562, 53.77469], [10.94238, 54.01745]]]}},
     {"type": "Feature", "id": "de-ostwestfalen-lippe.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[8.04337, 52.05756], [8.42583, 52.19919], [8.43846, 52.35394], [8.30866, 52.39929], [8.28438, 52.4581], [8.67096, 52.56967], [9.22028, 52.49616], [9.06097, 52.28328], [9.47365, 51.86716], [9.46266, 51.64103], [9.26285, 51.46641], [9.15648, 51.43569], [8.80348, 51.43218], [8.54444, 51.46003], [8.42239, 51.55658], [8.31076, 51.72252], [8.12645, 51.86844], [8.04337, 52.05756]]]}},
     {"type": "Feature", "id": "de-stuttgart-meetup.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[8.8742, 49.05092], [9.51209, 49.08061], [9.68238, 48.98652], [9.76615, 48.83308], [9.49973, 48.72766], [9.59655, 48.61066], [9.58282, 48.5357], [9.46746, 48.51114], [9.14131, 48.60612], [8.77189, 48.49476], [8.74854, 48.60294], [8.80004, 48.59523], [8.80073, 48.77746], [8.92776, 48.87058], [8.8742, 49.05092]]]}},
-    {"type": "Feature", "id": "ireland.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[-5, 54.4], [-5.372, 53.633], [-5.79, 52.05], [-9.19, 50.9], [-11.15, 51.23], [-11, 54.14], [-7.88, 55.94], [-6.1, 55.5], [-5, 54.4]]]}},
     {"type": "Feature", "id": "bi-vc-cvl.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[7.36633, 45.32125], [7.89917, 45.57752], [8.91541, 45.58521], [9.01154, 45.24202], [7.65472, 45.07352], [7.36633, 45.32125]]]}},
     {"type": "Feature", "id": "cuneo.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[7.66022, 45.06382], [7.90741, 44.93953], [8.04474, 44.35921], [7.14661, 44.2865], [7.1521, 44.91036], [7.66022, 45.06382]]]}},
     {"type": "Feature", "id": "lazio.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[13.23814, 42.1301], [13.19363, 42.15923], [13.17062, 42.15169], [13.12434, 42.17797], [13.08798, 42.17886], [13.08575, 42.14318], [13.0317, 42.12309], [13.01946, 42.07634], [13.05545, 42.01736], [13.10194, 42.00898], [13.10589, 42.02698], [13.36437, 41.92475], [13.384, 41.90419], [13.35751, 41.8694], [13.38052, 41.81709], [13.4169, 41.83467], [13.50508, 41.8016], [13.52044, 41.77297], [13.57182, 41.7543], [13.66214, 41.81144], [13.70555, 41.78747], [13.72956, 41.7989], [13.7629, 41.7488], [13.81162, 41.75426], [13.85645, 41.73124], [13.89541, 41.73405], [13.98311, 41.66238], [14.01182, 41.60835], [13.99895, 41.57448], [14.02596, 41.55567], [14.00526, 41.53875], [14.0275, 41.52321], [13.97291, 41.49404], [13.99278, 41.48208], [13.9779, 41.46249], [13.90257, 41.42273], [13.86123, 41.41763], [13.8886, 41.40081], [13.8688, 41.36272], [13.88974, 41.29748], [13.82898, 41.28154], [13.83083, 41.2502], [13.77126, 41.24136], [13.45667, 40.77769], [11.52381, 41.03693], [11.44922, 42.37798], [11.48889, 42.43937], [11.61771, 42.43604], [11.61626, 42.48862], [11.56011, 42.51595], [11.58852, 42.54226], [11.57917, 42.56803], [11.61401, 42.55723], [11.64337, 42.56635], [11.71111, 42.61091], [11.73597, 42.60666], [11.74975, 42.63965], [11.80478, 42.644], [11.77554, 42.70951], [11.80156, 42.70719], [11.81949, 42.74543], [11.74602, 42.78576], [11.77424, 42.82107], [11.80685, 42.79485], [11.8137, 42.82267], [11.84851, 42.84008], [11.90558, 42.8325], [11.92743, 42.78092], [11.97948, 42.76459], [11.96293, 42.72669], [11.9301, 42.71295], [11.94133, 42.6833], [12.03, 42.64324], [12.10666, 42.66464], [12.12406, 42.64929], [12.16101, 42.67691], [12.20434, 42.66046], [12.24292, 42.62906], [12.22819, 42.61077], [12.24626, 42.60256], [12.23866, 42.57218], [12.27504, 42.55991], [12.26676, 42.53347], [12.29027, 42.51904], [12.27477, 42.50921], [12.30735, 42.4973], [12.29041, 42.49164], [12.32537, 42.49476], [12.35123, 42.47365], [12.39017, 42.49819], [12.41905, 42.49765], [12.41244, 42.46756], [12.43038, 42.45802], [12.41368, 42.45517], [12.41365, 42.4256], [12.4636, 42.42909], [12.44469, 42.39882], [12.51169, 42.40311], [12.52874, 42.36445], [12.60642, 42.40245], [12.61481, 42.46511], [12.64109, 42.4678], [12.6495, 42.44331], [12.67465, 42.44242], [12.74156, 42.47053], [12.71114, 42.50079], [12.89273, 42.5635], [12.88052, 42.60935], [13.00524, 42.61622], [13.02522, 42.64], [13.06423, 42.62427], [13.13, 42.66053], [13.14645, 42.64714], [13.17506, 42.66707], [13.19025, 42.73363], [13.25415, 42.72145], [13.2645, 42.74019], [13.28589, 42.74049], [13.35851, 42.69533], [13.35059, 42.66968], [13.37022, 42.6507], [13.4092, 42.64383], [13.39493, 42.59223], [13.29421, 42.5705], [13.28454, 42.58349], [13.24686, 42.57367], [13.19228, 42.58849], [13.15673, 42.54102], [13.17934, 42.48031], [13.11708, 42.44489], [13.19508, 42.39017], [13.15427, 42.35797], [13.22737, 42.32031], [13.23563, 42.27871], [13.28229, 42.23874], [13.33653, 42.22338], [13.34238, 42.19939], [13.3808, 42.18142], [13.34871, 42.17689], [13.35488, 42.16769], [13.32819, 42.16483], [13.30621, 42.13923], [13.23814, 42.1301]]]}},
@@ -33,7 +32,6 @@
     {"type": "Feature", "id": "east_midlands.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[-0.37, 53.85], [0.2, 53.5], [0.55, 53.1], [-1.1222, 52.36367], [-1.95817, 53.27605], [-1.88, 53.86], [-0.96, 54.06], [-0.37, 53.85]]]}},
     {"type": "Feature", "id": "england-west-midlands.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[-3.28493, 52.44175], [-3.12706, 52.96995], [-1.95817, 53.27605], [-1.1222, 52.36367], [-1.59859, 51.90733], [-2.65611, 51.7761], [-3.10848, 51.95414], [-3.28493, 52.44175]]]}},
     {"type": "Feature", "id": "london.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[0.23926, 51.43251], [0.23923, 51.43329], [0.23926, 51.43251], [0.23717, 51.4241], [0.205, 51.39919], [0.18385, 51.37628], [0.16188, 51.36621], [0.15614, 51.3539], [0.1603, 51.31026], [0.14958, 51.30173], [0.14213, 51.29098], [0.06692, 51.27361], [-0.01594, 51.26864], [-0.05766, 51.2586], [-0.10949, 51.25943], [-0.16628, 51.26848], [-0.19872, 51.25854], [-0.22666, 51.2587], [-0.27352, 51.28757], [-0.31813, 51.30077], [-0.33644, 51.31532], [-0.40313, 51.30581], [-0.44436, 51.31987], [-0.47985, 51.3302], [-0.50762, 51.37142], [-0.53414, 51.39494], [-0.54109, 51.42774], [-0.53264, 51.43923], [-0.5152, 51.46248], [-0.49617, 51.48894], [-0.50203, 51.53945], [-0.5278, 51.55474], [-0.53166, 51.5611], [-0.53569, 51.57289], [-0.53596, 51.5778], [-0.53455, 51.58275], [-0.53376, 51.58792], [-0.51516, 51.6337], [-0.49776, 51.65205], [-0.4901, 51.66912], [-0.45924, 51.67692], [-0.44684, 51.69442], [-0.42579, 51.71213], [-0.39306, 51.715], [-0.38079, 51.71654], [-0.34459, 51.70948], [-0.2838, 51.71515], [-0.26707, 51.71395], [-0.23509, 51.69056], [-0.22093, 51.68445], [-0.17729, 51.68441], [-0.10644, 51.69165], [-0.05899, 51.68257], [0.02324, 51.678], [0.0691, 51.68854], [0.10856, 51.68336], [0.19863, 51.65015], [0.25714, 51.61353], [0.28187, 51.57813], [0.29039, 51.55903], [0.26811, 51.50265], [0.26882, 51.49783], [0.26782, 51.49042], [0.2659, 51.47443], [0.25509, 51.46053], [0.23586, 51.44791], [0.23926, 51.43251]]]}},
-    {"type": "Feature", "id": "scotland.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[-3.05969, 54.98352], [-3.12904, 54.95199], [-3.21625, 54.96579], [-5, 54.4], [-6.1, 55.5], [-14.78497, 57.60709], [-0.3751, 61.32236], [0, 56.6], [-2.08637, 55.79086], [-2.08569, 55.7619], [-2.10251, 55.76132], [-2.24258, 55.64505], [-2.32979, 55.64079], [-2.16019, 55.46095], [-2.56805, 55.31274], [-2.70401, 55.1773], [-2.96082, 55.05084], [-3.04939, 55.05517], [-3.03017, 55.03314], [-3.05969, 54.98352]]]}},
     {"type": "Feature", "id": "ottawa_gatineau.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[-76.23413, 45.50827], [-76.12839, 45.55829], [-75.26184, 45.58041], [-75.13412, 45.39652], [-75.42938, 45.32512], [-75.35385, 45.17816], [-75.82489, 44.93564], [-76.34537, 45.36855], [-76.23413, 45.50827]]]}},
     {"type": "Feature", "id": "vancouver_metro.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[-123.32, 49], [-123.45, 49.38], [-123.26, 49.47], [-122.24, 49.27], [-122.2, 49], [-123.32, 49]]]}},
     {"type": "Feature", "id": "boston_metro.geojson", "properties": {}, "geometry": {"type": "Polygon", "coordinates": [[[-70.5, 41.91], [-71, 41.91], [-71.42, 42.05], [-71.57, 42.18], [-71.64, 42.4], [-71.57, 42.52], [-71.35, 42.64], [-71.1, 42.7], [-70.5, 42.7], [-70.5, 41.91]]]}},

dist/resources.json

@@ -216,12 +216,12 @@
     "hu-matrix": {"id": "hu-matrix", "type": "matrix", "locationSet": {"include": ["hu"]}, "languageCodes": ["en", "hu"], "name": "OpenStreetMap HU matrix room", "description": "OpenStreetMap Hungary matrix chat", "extendedDescription": "OpenStreetMap chat on map topics. One of the OSM community support forums.", "url": "https://matrix.to/#/#osm:grin.hu", "contacts": [{"name": "Peter 'grin' Gervai", "email": "[email protected]"}]},
     "hu-meetup": {"id": "hu-meetup", "type": "meetup", "locationSet": {"include": ["hu"]}, "languageCodes": ["hu"], "name": "OpenStreetMap Hungary Meetup", "description": "The platform for organizing meetups in Hungary", "url": "https://www.meetup.com/OpenStreetMap-Hungary", "contacts": [{"name": "Ferenc Veres", "email": "[email protected]"}], "order": 5},
     "il-telegram": {"id": "il-telegram", "type": "telegram", "locationSet": {"include": ["il"]}, "name": "OSM Israel on Telegram", "description": "A Telegram group for the OpenStreetMap community in Israel: {url}", "url": "https://t.me/OSM_Israel", "order": 5},
-    "ireland-chapter": {"id": "ireland-chapter", "type": "osm-lc", "locationSet": {"include": ["ireland.geojson"]}, "languageCodes": ["en"], "name": "OpenStreetMap Ireland Local Chapter", "description": "We help grow and improve OpenStreetMap in Ireland.", "extendedDescription": "OpenStreetMap Ireland provides an advocate voice for the OpenStreetMap project on the island of Ireland, in addition to interacting with other open initiatives.", "url": "https://www.openstreetmap.ie/", "order": 1},
-    "ireland-facebook": {"id": "ireland-facebook", "type": "facebook", "locationSet": {"include": ["ireland.geojson"]}, "languageCodes": ["en"], "name": "OpenStreetMap Ireland Facebook group", "description": "OpenStreetMap Ireland Facebook page", "url": "https://www.facebook.com/groups/OpenStreetMapIreland", "order": 3},
-    "ireland-irc": {"id": "ireland-irc", "type": "irc", "locationSet": {"include": ["ireland.geojson"]}, "languageCodes": ["en"], "name": "OpenStreetMap Ireland IRC", "description": "Join #osm-ie on irc.oftc.net (port 6667)", "extendedDescription": "Join #osm-ie on irc.oftc.net (port 6667), please be patient and wait for a few minutes if you ask a question", "url": "https://webchat.oftc.net/?channels=osm-ie", "order": -1},
-    "ireland-mailinglist": {"id": "ireland-mailinglist", "type": "mailinglist", "locationSet": {"include": ["ireland.geojson"]}, "languageCodes": ["en"], "name": "Talk-ie Mailing List", "description": "Talk-ie is the mailing list for the Irish OSM community", "url": "https://lists.openstreetmap.org/listinfo/talk-ie", "order": 4},
-    "ireland-telegram": {"id": "ireland-telegram", "type": "telegram", "locationSet": {"include": ["ireland.geojson"]}, "languageCodes": ["en"], "name": "OSM Ireland on Telegram", "description": "OpenStreetMap Ireland Telegram chat", "url": "https://t.me/joinchat/BDLI7w9jCWm7Bwm2T06jwQ?fbclid=IwAR1ltY85Y7_4_CZhhwLOsLLppzis1MOVRRy897epT99JuZ9ZHZF8wpDRIfk", "order": 5},
-    "ireland-twitter": {"id": "ireland-twitter", "type": "twitter", "locationSet": {"include": ["ireland.geojson"]}, "languageCodes": ["en"], "name": "OpenStreetMap IE on Twitter", "description": "OpenStreetMap IE on Twitter: {url}", "url": "https://twitter.com/osm_ie", "order": 2},
+    "ireland-chapter": {"id": "ireland-chapter", "type": "osm-lc", "locationSet": {"include": ["gb-nir", "ie"]}, "languageCodes": ["en"], "name": "OpenStreetMap Ireland Local Chapter", "description": "We help grow and improve OpenStreetMap in Ireland.", "extendedDescription": "OpenStreetMap Ireland provides an advocate voice for the OpenStreetMap project on the island of Ireland, in addition to interacting with other open initiatives.", "url": "https://www.openstreetmap.ie/", "order": 1},
+    "ireland-facebook": {"id": "ireland-facebook", "type": "facebook", "locationSet": {"include": ["gb-nir", "ie"]}, "languageCodes": ["en"], "name": "OpenStreetMap Ireland Facebook group", "description": "OpenStreetMap Ireland Facebook page", "url": "https://www.facebook.com/groups/OpenStreetMapIreland", "order": 3},
+    "ireland-irc": {"id": "ireland-irc", "type": "irc", "locationSet": {"include": ["gb-nir", "ie"]}, "languageCodes": ["en"], "name": "OpenStreetMap Ireland IRC", "description": "Join #osm-ie on irc.oftc.net (port 6667)", "extendedDescription": "Join #osm-ie on irc.oftc.net (port 6667), please be patient and wait for a few minutes if you ask a question", "url": "https://webchat.oftc.net/?channels=osm-ie", "order": -1},
+    "ireland-mailinglist": {"id": "ireland-mailinglist", "type": "mailinglist", "locationSet": {"include": ["gb-nir", "ie"]}, "languageCodes": ["en"], "name": "Talk-ie Mailing List", "description": "Talk-ie is the mailing list for the Irish OSM community", "url": "https://lists.openstreetmap.org/listinfo/talk-ie", "order": 4},
+    "ireland-telegram": {"id": "ireland-telegram", "type": "telegram", "locationSet": {"include": ["gb-nir", "ie"]}, "languageCodes": ["en"], "name": "OSM Ireland on Telegram", "description": "OpenStreetMap Ireland Telegram chat", "url": "https://t.me/joinchat/BDLI7w9jCWm7Bwm2T06jwQ?fbclid=IwAR1ltY85Y7_4_CZhhwLOsLLppzis1MOVRRy897epT99JuZ9ZHZF8wpDRIfk", "order": 5},
+    "ireland-twitter": {"id": "ireland-twitter", "type": "twitter", "locationSet": {"include": ["gb-nir", "ie"]}, "languageCodes": ["en"], "name": "OpenStreetMap IE on Twitter", "description": "OpenStreetMap IE on Twitter: {url}", "url": "https://twitter.com/osm_ie", "order": 2},
     "is-chapter": {"id": "is-chapter", "type": "osm-lc", "locationSet": {"include": ["is"]}, "languageCodes": ["en", "is"], "name": "OpenStreetMap Iceland Local Chapter", "description": "We help grow and improve OpenStreetMap in Iceland.", "url": "https://www.hlidskjalf.is/", "contacts": [{"name": "Talk-is-owner", "email": "[email protected]"}], "order": 1},
     "is-facebook": {"id": "is-facebook", "type": "facebook", "locationSet": {"include": ["is"]}, "languageCodes": ["en", "is"], "name": "OSM Iceland on Facebook", "description": "Page of OpenStreetMap in Iceland", "url": "https://www.facebook.com/osmiceland/", "contacts": [{"name": "Talk-is-owner", "email": "[email protected]"}], "order": 3},
     "is-mailinglist": {"id": "is-mailinglist", "type": "mailinglist", "locationSet": {"include": ["is"]}, "languageCodes": ["en", "is"], "name": "Talk-is Mailing List", "description": "Talk-is is the official mailing list for the Icelandic OSM community", "url": "https://lists.openstreetmap.org/listinfo/talk-is", "contacts": [{"name": "Talk-is-owner", "email": "[email protected]"}], "order": -3},
@@ -299,7 +299,7 @@
     "romania-facebook": {"id": "romania-facebook", "type": "facebook", "locationSet": {"include": ["ro"]}, "name": "OpenStreetMap Romania Facebook group", "description": "Group for mappers and users of OpenStreetMap in Romania", "url": "https://www.facebook.com/groups/1487443198159793/", "order": 1},
     "romania-telegram": {"id": "romania-telegram", "type": "telegram", "locationSet": {"include": ["ro"]}, "name": "@OSMRomania on Telegram", "description": "OpenStreetMap Romania Telegram chat", "url": "https://t.me/OSMRomania", "order": 2},
     "sa-telegram": {"id": "sa-telegram", "type": "telegram", "locationSet": {"include": ["sa"]}, "name": "OSM Saudi Arabia on Telegram", "description": "A Telegram group for the OpenStreetMap community in Saudi Arabia: {url}", "url": "https://t.me/OSMSaudi", "order": 5},
-    "scotland-twitter": {"id": "scotland-twitter", "type": "twitter", "locationSet": {"include": ["scotland.geojson"]}, "languageCodes": ["en"], "name": "OpenStreetMap Alba on Twitter", "description": "OpenStreetMap Alba on Twitter: {url}", "url": "https://twitter.com/OSMScotland", "order": 4},
+    "scotland-twitter": {"id": "scotland-twitter", "type": "twitter", "locationSet": {"include": ["gb-sct"]}, "languageCodes": ["en"], "name": "OpenStreetMap Alba on Twitter", "description": "OpenStreetMap Alba on Twitter: {url}", "url": "https://twitter.com/OSMScotland", "order": 4},
     "se-facebook": {"id": "se-facebook", "type": "facebook", "locationSet": {"include": ["se"]}, "languageCodes": ["sv"], "name": "OpenStreetMap Sweden Facebook", "description": "OpenStreetMap Sweden on Facebook", "url": "https://www.facebook.com/groups/osmsweden/", "order": 3},
     "se-forum": {"id": "se-forum", "type": "forum", "locationSet": {"include": ["se"]}, "languageCodes": ["sv"], "name": "OpenStreetMap Sweden Web Forum", "description": "OpenStreetMap Sweden web forum", "url": "https://forum.openstreetmap.org/viewforum.php?id=4", "order": -2},
     "se-irc": {"id": "se-irc", "type": "irc", "locationSet": {"include": ["se"]}, "languageCodes": ["sv"], "name": "OpenStreetMap Sweden IRC", "description": "Join #osm.se on irc.oftc.net (port 6667)", "url": "https://webchat.oftc.net/?channels=osm.se", "order": -4},

package.json

@@ -30,7 +30,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
     "@fortawesome/free-brands-svg-icons": "^5.15.1",
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
-    "@ideditor/location-conflation": "0.5.0",
+    "@ideditor/location-conflation": "0.6.0",
     "@mapbox/geojson-area": "^0.2.2",
     "@rollup/plugin-commonjs": "^15.1.0",
     "@rollup/plugin-json": "^4.1.0",

resources/europe/ireland/ireland-chapter.json

@@ -1,7 +1,7 @@
 {
   "id": "ireland-chapter",
   "type": "osm-lc",
-  "locationSet": {"include": ["ireland.geojson"]},
+  "locationSet": {"include": ["gb-nir", "ie"]},
   "languageCodes": ["en"],
   "name": "OpenStreetMap Ireland Local Chapter",
   "description": "We help grow and improve OpenStreetMap in Ireland.",

resources/europe/ireland/ireland-facebook.json

@@ -1,7 +1,7 @@
 {
   "id": "ireland-facebook",
   "type": "facebook",
-  "locationSet": {"include": ["ireland.geojson"]},
+  "locationSet": {"include": ["gb-nir", "ie"]},
   "languageCodes": ["en"],
   "name": "OpenStreetMap Ireland Facebook group",
   "description": "OpenStreetMap Ireland Facebook page",

resources/europe/ireland/ireland-irc.json

@@ -1,7 +1,7 @@
 {
   "id": "ireland-irc",
   "type": "irc",
-  "locationSet": {"include": ["ireland.geojson"]},
+  "locationSet": {"include": ["gb-nir", "ie"]},
   "languageCodes": ["en"],
   "name": "OpenStreetMap Ireland IRC",
   "description": "Join #osm-ie on irc.oftc.net (port 6667)",