phonelib 0.5.6 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (92) hide show
  1. checksums.yaml +4 -4
  2. data/data/extended_data.dat +0 -0
  3. data/data/libphonenumber/FALSEHOODS.md +221 -0
  4. data/data/libphonenumber/FAQ.md +8 -0
  5. data/data/libphonenumber/README.md +4 -4
  6. data/data/libphonenumber/cpp/CMakeLists.txt +2 -1
  7. data/data/libphonenumber/cpp/README +62 -2
  8. data/data/libphonenumber/cpp/src/phonenumbers/lite_metadata.cc +9480 -9440
  9. data/data/libphonenumber/cpp/src/phonenumbers/metadata.cc +10349 -10308
  10. data/data/libphonenumber/cpp/src/phonenumbers/phonenumbermatcher.cc +1 -1
  11. data/data/libphonenumber/cpp/src/phonenumbers/phonenumberutil.cc +108 -5
  12. data/data/libphonenumber/cpp/src/phonenumbers/phonenumberutil.h +37 -4
  13. data/data/libphonenumber/cpp/src/phonenumbers/short_metadata.cc +544 -514
  14. data/data/libphonenumber/cpp/test/phonenumbers/phonenumbermatcher_test.cc +9 -1
  15. data/data/libphonenumber/cpp/test/phonenumbers/phonenumberutil_test.cc +61 -1
  16. data/data/libphonenumber/debian/control +1 -1
  17. data/data/libphonenumber/java/carrier/pom.xml +4 -4
  18. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en +0 -0
  19. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en +0 -0
  20. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en +0 -0
  21. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en +0 -0
  22. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en +0 -0
  23. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en +0 -0
  24. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en +0 -0
  25. data/data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en +0 -0
  26. data/data/libphonenumber/java/demo/pom.xml +5 -5
  27. data/data/libphonenumber/java/geocoder/pom.xml +4 -4
  28. data/data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en +0 -0
  29. data/data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en +0 -0
  30. data/data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en +0 -0
  31. data/data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en +0 -0
  32. data/data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh +0 -0
  33. data/data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data +0 -0
  34. data/data/libphonenumber/java/internal/prefixmapper/pom.xml +3 -3
  35. data/data/libphonenumber/java/libphonenumber/pom.xml +2 -2
  36. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +120 -12
  37. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ +0 -0
  38. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ +0 -0
  39. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI +0 -0
  40. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL +0 -0
  41. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN +0 -0
  42. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET +0 -0
  43. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO +0 -0
  44. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ +0 -0
  45. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN +0 -0
  46. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE +0 -0
  47. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW +0 -0
  48. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML +0 -0
  49. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO +0 -0
  50. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO +0 -0
  51. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM +0 -0
  52. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE +0 -0
  53. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO +0 -0
  54. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK +0 -0
  55. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN +0 -0
  56. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO +0 -0
  57. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR +0 -0
  58. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE +0 -0
  59. data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto +0 -0
  60. data/data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java +22 -4
  61. data/data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +22 -1
  62. data/data/libphonenumber/java/pending_code_changes.txt +1 -0
  63. data/data/libphonenumber/java/pom.xml +1 -1
  64. data/data/libphonenumber/java/release_notes.txt +33 -1
  65. data/data/libphonenumber/javascript/README.md +2 -2
  66. data/data/libphonenumber/javascript/i18n/phonenumbers/demo-compiled.js +157 -155
  67. data/data/libphonenumber/javascript/i18n/phonenumbers/metadata.js +49 -41
  68. data/data/libphonenumber/javascript/i18n/phonenumbers/metadatalite.js +49 -41
  69. data/data/libphonenumber/javascript/i18n/phonenumbers/phonenumberutil.js +39 -10
  70. data/data/libphonenumber/javascript/i18n/phonenumbers/phonenumberutil_test.js +8 -0
  71. data/data/libphonenumber/resources/PhoneNumberMetadata.xml +176 -125
  72. data/data/libphonenumber/resources/ShortNumberMetadata.xml +158 -24
  73. data/data/libphonenumber/resources/carrier/en/225.txt +1 -0
  74. data/data/libphonenumber/resources/carrier/en/229.txt +3 -0
  75. data/data/libphonenumber/resources/carrier/en/252.txt +1 -0
  76. data/data/libphonenumber/resources/carrier/en/254.txt +24 -8
  77. data/data/libphonenumber/resources/carrier/en/84.txt +3 -0
  78. data/data/libphonenumber/resources/carrier/en/853.txt +10 -0
  79. data/data/libphonenumber/resources/carrier/en/86.txt +9 -0
  80. data/data/libphonenumber/resources/carrier/en/968.txt +11 -1
  81. data/data/libphonenumber/resources/geocoding/en/251.txt +1 -0
  82. data/data/libphonenumber/resources/geocoding/en/254.txt +5 -5
  83. data/data/libphonenumber/resources/geocoding/en/84.txt +9 -1
  84. data/data/libphonenumber/resources/geocoding/en/86.txt +18 -14
  85. data/data/libphonenumber/resources/geocoding/zh/86.txt +17 -15
  86. data/data/libphonenumber/resources/phonenumber.proto +7 -6
  87. data/data/libphonenumber/resources/timezones/map_data.txt +63 -19
  88. data/data/phone_data.dat +0 -0
  89. data/lib/phonelib/phone_analyzer.rb +11 -7
  90. data/lib/phonelib/phone_analyzer_helper.rb +4 -3
  91. data/lib/phonelib/version.rb +1 -1
  92. metadata +4 -2
@@ -3510,8 +3510,13 @@
3510
3510
  </nationalNumberPattern>
3511
3511
  <exampleNumber>114</exampleNumber>
3512
3512
  </shortCode>
3513
+ <directoryServices>
3514
+ <nationalNumberPattern>118</nationalNumberPattern>
3515
+ <possibleNumberPattern>\d{3}</possibleNumberPattern>
3516
+ <exampleNumber>118</exampleNumber>
3517
+ </directoryServices>
3513
3518
  <emergency>
3514
- <nationalNumberPattern>112</nationalNumberPattern>
3519
+ <nationalNumberPattern>11[24]</nationalNumberPattern>
3515
3520
  <possibleNumberPattern>\d{3}</possibleNumberPattern>
3516
3521
  <exampleNumber>112</exampleNumber>
3517
3522
  </emergency>
@@ -3544,6 +3549,7 @@
3544
3549
  )|
3545
3550
  8\d{3}
3546
3551
  )|
3552
+ 9[167]|
3547
3553
  [578]
3548
3554
  )|
3549
3555
  2(?:
@@ -3584,7 +3590,8 @@
3584
3590
  [0459]|
3585
3591
  6\d{3}|
3586
3592
  871[03]
3587
- )
3593
+ )|
3594
+ 9[167]
3588
3595
  )|
3589
3596
  224|
3590
3597
  3(?:
@@ -3689,19 +3696,30 @@
3689
3696
  </emergency>
3690
3697
  <expandedEmergency>
3691
3698
  <nationalNumberPattern>
3692
- 116(?:
3693
- 000|
3694
- 111
3699
+ 1(?:
3700
+ 1(?:
3701
+ [459]|
3702
+ 6(?:
3703
+ 000|
3704
+ 111
3705
+ )
3706
+ )|
3707
+ 9[167]
3695
3708
  )
3696
3709
  </nationalNumberPattern>
3697
- <possibleNumberPattern>\d{6}</possibleNumberPattern>
3710
+ <possibleNumberPattern>\d{3,6}</possibleNumberPattern>
3698
3711
  <exampleNumber>116111</exampleNumber>
3699
3712
  </expandedEmergency>
3700
3713
  <!-- https://clients.txtnation.com/entries/22523777-France-Premium-SMS-Short-Code-Regulations
3701
3714
  -->
3702
3715
  <smsServices>
3703
- <nationalNumberPattern>[3-8]\d{4}</nationalNumberPattern>
3704
- <possibleNumberPattern>\d{5}</possibleNumberPattern>
3716
+ <nationalNumberPattern>
3717
+ (?:
3718
+ 114|
3719
+ [3-8]\d{4}
3720
+ )
3721
+ </nationalNumberPattern>
3722
+ <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
3705
3723
  <exampleNumber>33700</exampleNumber>
3706
3724
  </smsServices>
3707
3725
  <carrierSelectionCodes>
@@ -5390,48 +5408,147 @@
5390
5408
  </territory>
5391
5409
 
5392
5410
  <!-- Kenya -->
5393
- <!-- http://www.cck.go.ke/licensing/numbering/plan.html -->
5411
+ <!-- http://www.ca.go.ke/images/downloads/NUMBERING/Telecommunication%20Numbering%20Plan%20For%20Kenya%20Feb%202016.Pdf -->
5394
5412
  <!-- http://en.wikipedia.org/wiki/+254 -->
5395
5413
  <territory id="KE">
5396
5414
  <generalDesc>
5397
- <nationalNumberPattern>[1489]\d{2,4}</nationalNumberPattern>
5415
+ <nationalNumberPattern>[1-9]\d{2,4}</nationalNumberPattern>
5398
5416
  <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
5399
5417
  </generalDesc>
5400
5418
  <shortCode>
5401
- <!-- Excluding SMS-only premium-rate short codes for now. -->
5402
5419
  <nationalNumberPattern>
5403
5420
  1(?:
5404
5421
  0(?:
5405
5422
  [079]|
5423
+ 1[12]|
5406
5424
  400
5407
5425
  )|
5408
5426
  1(?:
5409
- [26]|
5410
- 9[0-259]
5427
+ [2456]|
5428
+ 9[0-2459]
5411
5429
  )|
5412
- 2[13]|
5413
- 3[01]
5430
+ 2[123]|
5431
+ 3[01]|
5432
+ 5(?:
5433
+ 01|
5434
+ 1[01]|
5435
+ 2[0-2457]|
5436
+ 33|
5437
+ 55|
5438
+ 6(?:
5439
+ 29|
5440
+ 6[67]
5441
+ )
5442
+ )|
5443
+ 65\d{2}|
5444
+ [78]\d|
5445
+ 9(?:
5446
+ [02-9]\d{2}|
5447
+ 19
5448
+ )
5414
5449
  )|
5415
- 40404|
5416
- 8988|
5417
- 999
5450
+ (?:
5451
+ 2[0-79]|
5452
+ 3[0-29]|
5453
+ 4[0-4]
5454
+ )\d{3}|
5455
+ 5(?:
5456
+ [0-2]\d|
5457
+ 99
5458
+ )\d{2}|
5459
+ (?:
5460
+ 6[2357]|
5461
+ 7[0-29]
5462
+ )\d{3}|
5463
+ 8(?:
5464
+ [0-9]\d{3}|
5465
+ 988
5466
+ )|
5467
+ 9(?:
5468
+ 09\d{2}|
5469
+ 99
5470
+ )
5418
5471
  </nationalNumberPattern>
5419
5472
  <exampleNumber>116</exampleNumber>
5420
5473
  </shortCode>
5474
+ <tollFree>
5475
+ <nationalNumberPattern>
5476
+ 15(?:
5477
+ 01|
5478
+ 2[127]|
5479
+ 6(?:
5480
+ 29|
5481
+ 6[67]
5482
+ )
5483
+ )
5484
+ </nationalNumberPattern>
5485
+ <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
5486
+ <exampleNumber>1501</exampleNumber>
5487
+ </tollFree>
5488
+ <premiumRate>
5489
+ <nationalNumberPattern>909\d{2}</nationalNumberPattern>
5490
+ <possibleNumberPattern>\d{5}</possibleNumberPattern>
5491
+ </premiumRate>
5421
5492
  <carrierSpecific>
5422
5493
  <!-- https://support.google.com/plus/answer/1304917 -->
5423
5494
  <!-- https://support.twitter.com/articles/20170024 -->
5424
5495
  <nationalNumberPattern>
5425
- 10400|
5426
- 40404|
5427
- 8988
5496
+ 1(?:
5497
+ 0400|
5498
+ 3[01]|
5499
+ 5(?:
5500
+ 1[01]|
5501
+ 2[25]
5502
+ )|
5503
+ 65\d{2}
5504
+ )|
5505
+ (?:
5506
+ 2[0-79]|
5507
+ 3[0-29]|
5508
+ 4[0-4]
5509
+ )\d{3}|
5510
+ 5(?:
5511
+ [0-2]\d|
5512
+ 99
5513
+ )\d{2}|
5514
+ (?:
5515
+ 6[2357]|
5516
+ 7[0-29]
5517
+ )\d{3}|
5518
+ 8(?:
5519
+ 988|
5520
+ [0-9]\d{3}
5521
+ )|
5522
+ 909\d{2}
5428
5523
  </nationalNumberPattern>
5429
- <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
5524
+ <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
5430
5525
  </carrierSpecific>
5526
+ <carrierServices>
5527
+ <nationalNumberPattern>
5528
+ 1(?:
5529
+ 00|
5530
+ 2[13]|
5531
+ 3[01]
5532
+ )
5533
+ </nationalNumberPattern>
5534
+ <possibleNumberPattern>\d{3}</possibleNumberPattern>
5535
+ <exampleNumber>121</exampleNumber>
5536
+ </carrierServices>
5537
+ <directoryServices>
5538
+ <nationalNumberPattern>
5539
+ 1(?:
5540
+ 01[12]|
5541
+ 9[02-9]\d{2}
5542
+ )
5543
+ </nationalNumberPattern>
5544
+ <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
5545
+ <exampleNumber>1012</exampleNumber>
5546
+ </directoryServices>
5431
5547
  <emergency>
5432
5548
  <!-- http://www.kenyapolice.go.ke/report_a_crime.asp -->
5433
5549
  <nationalNumberPattern>
5434
5550
  112|
5551
+ 114|
5435
5552
  999
5436
5553
  </nationalNumberPattern>
5437
5554
  <possibleNumberPattern>\d{3}</possibleNumberPattern>
@@ -5440,12 +5557,29 @@
5440
5557
  <smsServices>
5441
5558
  <!-- https://support.twitter.com/articles/20170024 -->
5442
5559
  <nationalNumberPattern>
5443
- 10400|
5560
+ 1(?:
5561
+ 0400|
5562
+ 5(?:
5563
+ 01|
5564
+ 55|
5565
+ 6(?:
5566
+ 29|
5567
+ 6[67]
5568
+ )
5569
+ )|
5570
+ 65\d{2}
5571
+ )|
5444
5572
  40404|
5445
- 8988
5573
+ 8988|
5574
+ 909\d{2}
5446
5575
  </nationalNumberPattern>
5447
5576
  <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
5448
5577
  </smsServices>
5578
+ <carrierSelectionCodes>
5579
+ <nationalNumberPattern>1[78]\d</nationalNumberPattern>
5580
+ <possibleNumberPattern>\d{3}</possibleNumberPattern>
5581
+ <exampleNumber>171</exampleNumber>
5582
+ </carrierSelectionCodes>
5449
5583
  </territory>
5450
5584
 
5451
5585
  <!-- Kyrgyzstan -->
@@ -37,6 +37,7 @@
37
37
  22547|Orange
38
38
  22548|Orange
39
39
  22549|Orange
40
+ 22551|Moov
40
41
  22554|MTN
41
42
  22555|MTN
42
43
  22556|MTN
@@ -13,7 +13,10 @@
13
13
  # limitations under the License.
14
14
 
15
15
  22961|MTN
16
+ 22962|MTN
17
+ 22963|Moov
16
18
  22964|Moov
19
+ 22965|Moov
17
20
  22966|MTN
18
21
  22967|MTN
19
22
  22968|Glo
@@ -22,6 +22,7 @@
22
22
  25268|Nationlink
23
23
  25269|Nationlink
24
24
  25279|Somtel
25
+ 252906|Golis Telecom
25
26
  252907|Golis Telecom
26
27
  25292|STG
27
28
  25293|STG
@@ -20,20 +20,31 @@
20
20
  25471|Safaricom
21
21
  25472|Safaricom
22
22
  25473|Airtel
23
- 25476|Airtel
24
- 254750|Essar
25
- 254751|Essar
26
- 254752|Essar
27
- 254753|Essar
28
- 254754|Essar
29
- 254755|Essar
30
- 254756|Essar
23
+ 254750|Airtel
24
+ 254751|Airtel
25
+ 254752|Airtel
26
+ 254753|Airtel
27
+ 254754|Airtel
28
+ 254755|Airtel
29
+ 254756|Airtel
30
+ 254760|Mobile Pay
31
+ 254761|Airtel
32
+ 254762|Airtel
33
+ 254763|Finserve
34
+ 254764|Finserve
35
+ 254765|Airtel
36
+ 254766|Airtel
37
+ 254767|Zioncell
38
+ 254768|Airtel
39
+ 254769|Airtel
31
40
  254770|Telkom
32
41
  254771|Telkom
33
42
  254772|Telkom
34
43
  254773|Telkom
35
44
  254774|Telkom
36
45
  254775|Telkom
46
+ 254776|Telkom
47
+ 254777|Telkom
37
48
  254780|Airtel
38
49
  254781|Airtel
39
50
  254782|Airtel
@@ -45,3 +56,8 @@
45
56
  254790|Safaricom
46
57
  254791|Safaricom
47
58
  254792|Safaricom
59
+ 254793|Safaricom
60
+ 254794|Safaricom
61
+ 254795|Safaricom
62
+ 254796|Safaricom
63
+ 254797|Safaricom
@@ -19,6 +19,9 @@
19
19
  84129|Vinaphone
20
20
  84162|Viettel Mobile
21
21
  84199|G-Mobile
22
+ 84868|Viettel Mobile
23
+ 84888|Vinaphone
24
+ 84898|MobiFone
22
25
  8490|MobiFone
23
26
  8491|Vinaphone
24
27
  8494|Vinaphone
@@ -309,6 +309,16 @@
309
309
  8536812|CTM
310
310
  8536813|CTM
311
311
  8536814|CTM
312
+ 8536815|SmarTone
313
+ 8536816|SmarTone
314
+ 8536817|SmarTone
315
+ 8536818|SmarTone
316
+ 8536819|SmarTone
317
+ 8536850|3
318
+ 8536851|3
319
+ 8536852|3
320
+ 8536853|3
321
+ 8536854|3
312
322
  8536880|CTM
313
323
  8536881|CTM
314
324
  8536882|CTM
@@ -25,17 +25,26 @@
25
25
  86137|China Mobile
26
26
  86138|China Mobile
27
27
  86139|China Mobile
28
+ 86145|China Unicom
29
+ 86147|China Mobile
28
30
  86150|China Mobile
29
31
  86151|China Mobile
32
+ 86152|China Mobile
30
33
  86153|China Telecom
34
+ 86155|China Unicom
31
35
  86156|China Unicom
32
36
  86157|China Mobile
33
37
  86158|China Mobile
34
38
  86159|China Mobile
39
+ 86173|China Telecom
35
40
  86176|China Unicom
36
41
  86177|China Telecom
37
42
  86178|China Mobile
38
43
  86180|China Telecom
44
+ 86181|China Telecom
45
+ 86182|China Mobile
46
+ 86183|China Mobile
47
+ 86184|China Mobile
39
48
  86185|China Unicom
40
49
  86186|China Unicom
41
50
  86187|China Mobile
@@ -12,7 +12,17 @@
12
12
  # See the License for the specific language governing permissions and
13
13
  # limitations under the License.
14
14
 
15
- 96890|Omantel/Ooredoo
15
+ 96871|Omantel
16
+ 96879|Ooredoo
17
+ 968901|Omantel
18
+ 968902|Omantel
19
+ 968903|Omantel
20
+ 968904|Omantel
21
+ 968905|Omantel
22
+ 968906|Omantel
23
+ 968907|Omantel
24
+ 968908|Omantel
25
+ 968909|Omantel
16
26
  96891|Omantel
17
27
  96892|Omantel
18
28
  96893|Omantel
@@ -84,6 +84,7 @@
84
84
  25111468|Keria V, Addis Ababa
85
85
  25111515|Filwoha II, Addis Ababa
86
86
  25111517|Sheraton/DID, Addis Ababa
87
+ 25111518|Addis Ababa Region
87
88
  25111544|ECA, Addis Ababa
88
89
  25111550|Filwoha IV, Addis Ababa
89
90
  25111551|Filwoha III, Addis Ababa
@@ -18,25 +18,25 @@
18
18
  # best names based on online research.
19
19
 
20
20
  25420|Nairobi
21
- 25440|Kwale
21
+ 25440|Kwale/Ukunda/Msambweni/Lungalunga
22
22
  25441|Mombasa/Mariakani/Kilifi
23
23
  25442|Malindi/Lamu/Garsen
24
24
  25443|Voi/Wundanyi/Mwatate/Taveta
25
25
  25444|Machakos/Makueni/Mwingi/Kitui
26
26
  25445|Kajiado/Ngong/Loitokitok/Athi River
27
27
  25446|Garissa/Hola/Wajir/Mandera
28
- 25450|Naivasha/Narok
29
- 25451|Nakuru
28
+ 25450|Naivasha/Narok/Gilgil
29
+ 25451|Nakuru/Njoro/Molo
30
30
  25452|Kericho/Bomet
31
31
  25453|Eldoret/Turbo/Kapsabet/Iten/Kabarnet
32
32
  25454|Kitale/Moi's Bridge/Kapenguria/Lodwar
33
33
  25455|Bungoma/Busia
34
34
  25456|Kakamega/Mbale/Butere/Mumias
35
- 25457|Kisumu/Siaya
35
+ 25457|Kisumu/Siaya/Maseno
36
36
  25458|Kisii/Kilgoris/Oyugis/Nyamira
37
37
  25459|Homabay/Migori
38
38
  25460|Muranga/Kerugoya
39
- 25461|Nyeri
39
+ 25461|Nyeri/Karatina
40
40
  25462|Nanyuki
41
41
  25464|Meru/Maua/Chuka
42
42
  25465|Nyahururu/Maralal