update for lora spec RP002-1.0.3

update the list for lora spec RP002-1.0.3 https://lora-alliance.org/wp-content/uploads/2021/05/RP-2-1.0.3.pdf add as923 variants (as923_1, _2, _3 and _4) rename swaziland to eswatini Change-type: patch Signed-off-by: Aaron Shaw <[email protected]>
helium · May 24, 2021 · fb3462e · fb3462e
1 parent 8f90394
commit fb3462e
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 48 deletions.
diff --git a/config/sys.config b/config/sys.config
@@ -104,7 +104,10 @@
                       'CN470' => [486.3, 486.5, 486.7, 486.9, 487.1, 487.3, 487.5, 487.7 ],
                       'CN779' => [779.5, 779.7, 779.9],
                       'AU915' => [916.8, 917.0, 917.2, 917.4, 917.5, 917.6, 917.8, 918.0, 918.2],
-                      'AS923' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.5, 924.6, 924.8],
+                      'AS923_1' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
+                      'AS923_2' => [921.4, 921.6, 921.8, 922.0, 922.2, 922.4, 922.6, 922.8],
+                      'AS923_3' => [916.6, 916.8, 917.0, 917.2, 917.4, 917.6, 917.8, 918.0],
+                      'AS923_4' => [917.3, 917.5, 917.7, 917.9, 918.1, 918.3, 918.5, 918.7],
                       'KR920' => [922.1, 922.3, 922.5, 922.7, 922.9, 923.1, 923.3],
                       'IN865' => [865.0625, 865.4025, 865.985],
                       'RU864' => [864.1, 864.3, 864.5, 864.7, 864.9, 868.9, 869.1]}

diff --git a/priv/countries_reg_domains.csv b/priv/countries_reg_domains.csv
@@ -1,9 +1,9 @@
-AF,33.93911,67.709953,Afghanistan,,zone1
+AF,33.93911,67.709953,Afghanistan,,zone1
 AL,41.153332,20.168331,Albania,EU868,zone1
-DZ,28.033886,1.659626,Algeria,,zone1
+DZ,28.033886,1.659626,Algeria,AS923_3,zone1
 AS,-14.270972,-170.132217,American Samoa,US915,zone2
 AD,42.546245,1.601554,Andorra,EU868,zone1
-AO,-11.202692,17.873887,Angola,EU868,zone1
+AO,-11.202692,17.873887,Angola,,zone1
 AI,18.220554,-63.068615,Anguilla,AU915,zone2
 AQ,-75.250973,-0.071389,Antarctica,,zone1
 AG,17.060816,-61.796428,Antigua and Barbuda,,zone2
@@ -12,14 +12,14 @@ AM,40.069099,45.038189,Armenia,EU868,zone1
 AW,12.52111,-69.968338,Aruba,,zone2
 AU,-25.274398,133.775136,Australia,AU915,zone3
 AT,47.516231,14.550072,Austria,EU868,zone1
-AZ,40.143105,47.576927,Azerbaijan,,zone1
+AZ,40.143105,47.576927,Azerbaijan,EU433,zone1
 BS,25.03428,-77.39628,Bahamas,US915,zone2
 BH,25.930414,50.637772,Bahrain,EU868,zone1
-BD,23.684994,90.356331,Bangladesh,AS923,zone3
+BD,23.684994,90.356331,Bangladesh,AS923_1,zone3
 BB,13.193887,-59.543198,Barbados,AU915,zone2
 BY,53.709807,27.953389,Belarus,EU868,zone1
 BE,50.503887,4.469936,Belgium,EU868,zone1
-BZ,17.189877,-88.49765,Belize,US915,zone2
+BZ,17.189877,-88.49765,Belize,AU915,zone2
 BJ,9.30769,2.315834,Benin,EU868,zone1
 BM,32.321384,-64.75737,Bermuda,US915,zone2
 BT,27.514162,90.433601,Bhutan,EU868,zone3
@@ -30,11 +30,11 @@ BV,-54.423199,3.413194,Bouvet Island,EU868,zone1
 BR,-14.235004,-51.92528,Brazil,AU915,zone3
 IO,-6.343194,71.876519,British Indian Ocean Territory,,zone2
 VG,18.420695,-64.639968,British Virgin Islands,AU915,zone2
-BN,4.535277,114.727669,Brunei,AS923,zone3
+BN,4.535277,114.727669,Brunei,AS923_1,zone3
 BG,42.733883,25.48583,Bulgaria,EU868,zone1
 BF,12.238333,-1.561593,Burkina Faso,,zone1
 BI,-3.373056,29.918886,Burundi,EU868,zone1
-KH,12.565679,104.990963,Cambodia,AS923,zone3
+KH,12.565679,104.990963,Cambodia,AS923_1,zone3
 CM,7.369722,12.354722,Cameroon,EU433,zone1
 CA,56.130366,-106.346771,Canada,US915,zone1
 CV,16.002082,-24.013197,Cape Verde,,zone1
@@ -48,12 +48,12 @@ CC,-12.164165,96.870956,Cocos [Keeling] Islands,AU915,zone3
 CO,4.570868,-74.297333,Colombia,AU915,zone2
 KM,-11.875001,43.872219,Comoros,EU868,zone1
 CD,-4.038333,21.758664,Congo [DRC],,zone1
-CG,-0.228021,15.827659,Congo [Republic],EU868,zone1
+CG,-0.228021,15.827659,Congo [Republic],,zone1
 CK,-21.236736,-159.777671,Cook Islands,AU915,zone3
-CR,9.748917,-83.753428,Costa Rica,AS923,zone2
+CR,9.748917,-83.753428,Costa Rica,AS923_1,zone2
 CI,7.539989,-5.54708,Côte d'Ivoire,EU868,zone1
 HR,45.1,15.2,Croatia,EU868,zone1
-CU,21.521757,-77.781167,Cuba,,zone2
+CU,21.521757,-77.781167,Cuba,AS923_3,zone2
 CY,35.126413,33.429859,Cyprus,EU868,zone1
 CZ,49.817492,15.472962,Czech Republic,EU868,zone1
 DK,56.26392,9.501785,Denmark,EU868,zone1
@@ -66,6 +66,7 @@ SV,13.794185,-88.89653,El Salvador,AU915,zone2
 GQ,1.650801,10.267895,Equatorial Guinea,EU868,zone3
 ER,15.179384,39.782334,Eritrea,,zone1
 EE,58.595272,25.013607,Estonia,EU868,zone1
+SZ,-26.522503,31.465866,Eswatini [Swaziland],,zone1
 ET,9.145,40.489673,Ethiopia,,zone1
 FK,-51.796253,-59.523613,Falkland Islands [Islas Malvinas],EU868,zone2
 FO,61.892635,-6.911806,Faroe Islands,EU868,zone1
@@ -89,65 +90,65 @@ GP,16.995971,-62.067641,Guadeloupe,EU868,zone2
 GU,13.444304,144.793731,Guam,US915,zone2
 GT,15.783471,-90.230759,Guatemala,AU915,zone2
 GG,49.465691,-2.585278,Guernsey,EU868,zone1
-GN,9.945587,-9.696645,Guinea,,zone1
+GN,9.945587,-9.696645,Guinea,EU433,zone1
 GW,11.803749,-15.180413,Guinea-Bissau,,zone1
 GY,4.860416,-58.93018,Guyana,US915,zone2
 HT,18.971187,-72.285215,Haiti,,zone2
 HM,-53.08181,73.504158,Heard Island and McDonald Islands,AU915,zone3
 HN,15.199999,-86.241905,Honduras,AU915,zone2
-HK,22.396428,114.109497,Hong Kong,AS923,zone3
+HK,22.396428,114.109497,Hong Kong,AS923_1,zone3
 HU,47.162494,19.503304,Hungary,EU868,zone1
 IS,64.963051,-19.020835,Iceland,EU868,zone1
 IN,20.593684,78.96288,India,IN865,zone3
-ID,-0.789275,113.921327,Indonesia,,zone3
+ID,-0.789275,113.921327,Indonesia,AS923_2,zone3
 IR,32.427908,53.688046,Iran,EU868,zone1
-IQ,33.223191,43.679291,Iraq,EU868,zone1
+IQ,33.223191,43.679291,Iraq,,zone1
 IE,53.41291,-8.24389,Ireland,EU868,zone1
 IM,54.236107,-4.548056,Isle of Man,EU868,zone1
-IL,31.046051,34.851612,Israel,,zone1
+IL,31.046051,34.851612,Israel,AS923_4,zone1
 IT,41.87194,12.56738,Italy,EU868,zone1
 JM,18.109581,-77.297508,Jamaica,AU915,zone2
-JP,36.204824,138.252924,Japan,AS923,zone3
+JP,36.204824,138.252924,Japan,AS923_1,zone3
 JE,49.214439,-2.13125,Jersey,EU868,zone1
-JO,30.585164,36.238414,Jordan,,zone1
+JO,30.585164,36.238414,Jordan,IN865,zone1
 KZ,48.019573,66.923684,Kazakhstan,EU433,zone1
 KE,-0.023559,37.906193,Kenya,EU868,zone1
 KI,-3.370417,-168.734039,Kiribati,,zone1
-XK,42.602636,20.902977,Kosovo,EU868,zone1
+XK,42.602636,20.902977,Kosovo,,zone1
 KW,29.31166,47.481766,Kuwait,EU868,zone1
 KG,41.20438,74.766098,Kyrgyzstan,,zone1
-LA,19.85627,102.495496,Laos,AS923,zone3
+LA,19.85627,102.495496,Laos,AS923_1,zone3
 LV,56.879635,24.603189,Latvia,EU868,zone1
 LB,33.854721,35.862285,Lebanon,EU868,zone1
-LS,-29.609988,28.233608,Lesotho,EU868,zone1
+LS,-29.609988,28.233608,Lesotho,EU433,zone1
 LR,6.428055,-9.429499,Liberia,,zone1
 LY,26.3351,17.228331,Libya,,zone1
 LI,47.166,9.555373,Liechtenstein,EU868,zone1
 LT,55.169438,23.881275,Lithuania,EU868,zone1
 LU,49.815273,6.129583,Luxembourg,EU868,zone1
-MO,22.198745,113.543873,Macau,AS923,zone3
+MO,22.198745,113.543873,Macau,AS923_1,zone3
 MK,41.608635,21.745275,North Macedonia,EU868,zone1
 MG,-18.766947,46.869107,Madagascar,EU868,zone1
-MW,-13.254308,34.301525,Malawi,EU868,zone1
-MY,4.210484,101.975766,Malaysia,AS923,zone3
+MW,-13.254308,34.301525,Malawi,,zone1
+MY,4.210484,101.975766,Malaysia,AS923_1,zone3
 MV,3.202778,73.22068,Maldives,,zone3
-ML,17.570692,-3.996166,Mali,,zone3
+ML,17.570692,-3.996166,Mali,EU433,zone3
 MT,35.937496,14.375416,Malta,EU868,zone1
 MH,7.131474,171.184478,Marshall Islands,,zone3
 MQ,14.641528,-61.024174,Martinique,EU868,zone2
 MR,21.00789,-10.940835,Mauritania,EU868,zone1
-MU,-20.348404,57.552152,Mauritius,EU868,zone1
+MU,-20.348404,57.552152,Mauritius,EU433,zone1
 YT,-12.8275,45.166244,Mayotte,EU868,zone1
 MX,23.634501,-102.552784,Mexico,US915,zone2
 FM,7.425554,150.550812,Micronesia,,zone3
 MD,47.411631,28.369885,Moldova,EU868,zone1
 MC,43.750298,7.412841,Monaco,EU868,zone1
 MN,46.862496,103.846656,Mongolia,,zone1
 ME,42.708678,19.37439,Montenegro,EU868,zone1
-MS,16.742498,-62.187366,Montserrat,,zone1
-MA,31.791702,-7.09262,Morocco,EU868,zone1
-MZ,-18.665695,35.529562,Mozambique,EU868,zone1
-MM,21.913965,95.956223,Myanmar [Burma],AS923,zone1
+MS,16.742498,-62.187366,Montserrat,AU915,zone1
+MA,31.791702,-7.09262,Morocco,EU433,zone1
+MZ,-18.665695,35.529562,Mozambique,,zone1
+MM,21.913965,95.956223,Myanmar [Burma],AS923_1,zone1
 NA,-22.95764,18.49041,Namibia,EU868,zone1
 NR,-0.522778,166.931503,Nauru,,zone3
 NP,28.394857,84.124008,Nepal,,zone3
@@ -160,18 +161,18 @@ NE,17.607789,8.081666,Niger,IN865,zone1
 NG,9.081999,8.675277,Nigeria,EU868,zone1
 NU,-19.054445,-169.867233,Niue,AU915,zone1
 NF,-29.040835,167.954712,Norfolk Island,AU915,zone3
-KP,40.339852,127.510093,North Korea,KR920,zone1
+KP,40.339852,127.510093,North Korea,,zone1
 MP,17.33083,145.38469,Northern Mariana Islands,US915,zone3
 NO,60.472024,8.468946,Norway,EU868,zone1
 OM,21.512583,55.923255,Oman,EU868,zone1
 PK,30.375321,69.345116,Pakistan,IN865,zone3
 PW,7.51498,134.58252,Palau,,zone3
 PS,31.952162,35.233154,Palestinian Territories,,zone1
-PA,8.537981,-80.782127,Panama,US915,zone2
+PA,8.537981,-80.782127,Panama,AU915,zone2
 PG,-6.314993,143.95555,Papua New Guinea,AU915,zone3
 PY,-23.442503,-58.443832,Paraguay,AU915,zone2
 PE,-9.189967,-75.015152,Peru,AU915,zone2
-PH,12.879721,121.774017,Philippines,,zone1
+PH,12.879721,121.774017,Philippines,AS923_3,zone1
 PN,-24.703615,-127.439308,Pitcairn Islands,,zone2
 PL,51.919438,19.145136,Poland,EU868,zone1
 PT,39.399872,-8.224454,Portugal,EU868,zone1
@@ -190,31 +191,30 @@ WS,-13.759029,-172.104629,Samoa,EU868,zone2
 SM,43.94236,12.457777,San Marino,EU868,zone1
 ST,0.18636,6.613081,São Tomé and Príncipe,,zone1
 SA,23.885942,45.079162,Saudi Arabia,EU868,zone1
-SN,14.497401,-14.452362,Senegal,,zone1
+SN,14.497401,-14.452362,Senegal,EU868,zone1
 RS,44.016521,21.005859,Serbia,EU868,zone1
-SC,-4.679574,55.491977,Seychelles,EU868,zone1
+SC,-4.679574,55.491977,Seychelles,EU433,zone1
 SL,8.460555,-11.779889,Sierra Leone,,zone1
-SG,1.352083,103.819836,Singapore,AS923,zone3
+SG,1.352083,103.819836,Singapore,AS923_1,zone3
 SK,48.669026,19.699024,Slovakia,EU868,zone1
 SI,46.151241,14.995463,Slovenia,EU868,zone1
-SB,-9.64571,160.156194,Solomon Islands,AS923,zone1
+SB,-9.64571,160.156194,Solomon Islands,AS923_1,zone1
 SO,5.152149,46.199616,Somalia,EU868,zone1
 ZA,-30.559482,22.937506,South Africa,EU868,zone1
 GS,-54.429579,-36.587909,South Georgia and the South Sandwich Islands,EU868,zone2
 KR,35.907757,127.766922,South Korea,KR920,zone3
 ES,40.463667,-3.74922,Spain,EU868,zone3
-LK,7.873054,80.771797,Sri Lanka,AS923,zone3
+LK,7.873054,80.771797,Sri Lanka,AS923_1,zone3
 SD,12.862807,30.217636,Sudan,,zone1
 SR,3.919305,-56.027783,Suriname,AU915,zone2
 SJ,77.553604,23.670272,Svalbard and Jan Mayen,EU868,zone1
-SZ,-26.522503,31.465866,Swaziland,,zone1
 SE,60.128161,18.643501,Sweden,EU868,zone1
 CH,46.818188,8.227512,Switzerland,EU868,zone1
-SY,34.802075,38.996815,Syria,,zone1
-TW,23.69781,120.960515,Taiwan,AS923,zone3
+SY,34.802075,38.996815,Syria,EU868,zone1
+TW,23.69781,120.960515,Taiwan,AS923_1,zone3
 TJ,38.861034,71.276093,Tajikistan,,zone1
-TZ,-6.369028,34.888822,Tanzania,EU868,zone1
-TH,15.870032,100.992541,Thailand,AS923,zone3
+TZ,-6.369028,34.888822,Tanzania,AS923_1,zone1
+TH,15.870032,100.992541,Thailand,AS923_1,zone3
 TL,-8.874217,125.727539,Timor-Leste,,zone3
 TG,8.619543,0.824782,Togo,EU433,zone1
 TK,-8.967363,-171.855881,Tokelau,AU915,zone3
@@ -234,12 +234,12 @@ GB,55.378051,-3.435973,United Kingdom,EU868,zone1
 US,37.09024,-95.712891,United States,US915,zone2
 UY,-32.522779,-55.765835,Uruguay,AU915,zone2
 UZ,41.377491,64.585262,Uzbekistan,EU433,zone1
-VU,-15.376706,166.959158,Vanuatu,EU868,zone3
+VU,-15.376706,166.959158,Vanuatu,AS923_3,zone3
 VA,41.902916,12.453389,Vatican City,EU868,zone1
-VE,6.42375,-66.58973,Venezuela,AS923,zone2
-VN,14.058324,108.277199,Vietnam,,zone3
+VE,6.42375,-66.58973,Venezuela,AS923_1,zone2
+VN,14.058324,108.277199,Vietnam,AS923_2,zone3
 WF,-13.768752,-177.156097,Wallis and Futuna,EU868,zone2
 EH,24.215527,-12.885834,Western Sahara,,zone1
 YE,15.552727,48.516388,Yemen,,zone1
 ZM,-13.133897,27.849332,Zambia,EU868,zone1
-ZW,-19.015438,29.154857,Zimbabwe,EU868,zone1
+ZW,-19.015438,29.154857,Zimbabwe,EU433,zone1