Skip to content

Commit

Permalink
Merge 60f44b4 into 5a6e4e7
Browse files Browse the repository at this point in the history
  • Loading branch information
@giggsey
giggsey committed Aug 31, 2020
2 parents 5a6e4e7 + 60f44b4 commit 29cc006
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 19 deletions.
2 changes: 1 addition & 1 deletion METADATA-VERSION.txt
View file
Expand Up @@ -2,4 +2,4 @@
# It can be a commit, branch or tag of the https://github.com/google/libphonenumber project
#
# For more information, look at the phing tasks in build.xml
v8.12.8
v8.12.9
2 changes: 2 additions & 0 deletions src/carrier/data/en/65.php
View file
Expand Up @@ -12,6 +12,8 @@

return array (
65801 => 'TPG',
658018 => 'SingTel',
65802 => 'SingTel',
65803 => 'SingTel',
6581 => 'StarHub',
65810 => 'M1',
Expand Down
6 changes: 1 addition & 5 deletions src/carrier/data/en/972.php
View file
Expand Up @@ -19,13 +19,9 @@
972550 => 'Beezz',
9725517 => 'Cellact',
9725519 => 'Telzar',
972552 => 'Telzar',
9725522 => 'Home Cellular',
9725523 => 'Home Cellular',
9725524 => 'Telzar',
9725525 => 'Telzar',
9725526 => 'Telzar',
9725527 => 'Telzar',
9725528 => 'Telzar',
972553 => 'Free Telecom',
972554 => 'Cellran Cellular Communications',
9725550 => 'Annatel',
Expand Down
39 changes: 32 additions & 7 deletions src/data/PhoneNumberMetadata_CO.php
View file
Expand Up @@ -14,7 +14,7 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '(?:1\\d|3)\\d{9}|[124-8]\\d{7}',
'NationalNumberPattern' => '(?:1\\d|[36])\\d{9}|[124-8]\\d{7}',
'PossibleLength' =>
array (
0 => 8,
Expand All @@ -28,11 +28,12 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '[124-8][2-9]\\d{6}',
'ExampleNumber' => '12345678',
'NationalNumberPattern' => '60[124-8][2-9]\\d{6}|[124-8][2-9]\\d{6}',
'ExampleNumber' => '6012345678',
'PossibleLength' =>
array (
0 => 8,
1 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand Down Expand Up @@ -159,13 +160,25 @@
'format' => '$1 $2',
'leadingDigitsPatterns' =>
array (
0 => '[14][2-9]|[25-8]',
0 => '[146][2-9]|[2578]',
),
'nationalPrefixFormattingRule' => '($1)',
'domesticCarrierCodeFormattingRule' => '0$CC $1',
'nationalPrefixOptionalWhenFormatting' => false,
),
1 =>
array (
'pattern' => '(\\d{3})(\\d{7})',
'format' => '$1 $2',
'leadingDigitsPatterns' =>
array (
0 => '6',
),
'nationalPrefixFormattingRule' => '($1)',
'domesticCarrierCodeFormattingRule' => '0$CC $1',
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
array (
'pattern' => '(\\d{3})(\\d{7})',
'format' => '$1 $2',
Expand All @@ -177,7 +190,7 @@
'domesticCarrierCodeFormattingRule' => '0$CC $1',
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
3 =>
array (
'pattern' => '(\\d)(\\d{3})(\\d{7})',
'format' => '$1-$2-$3',
Expand All @@ -198,13 +211,25 @@
'format' => '$1 $2',
'leadingDigitsPatterns' =>
array (
0 => '[14][2-9]|[25-8]',
0 => '[146][2-9]|[2578]',
),
'nationalPrefixFormattingRule' => '($1)',
'domesticCarrierCodeFormattingRule' => '0$CC $1',
'nationalPrefixOptionalWhenFormatting' => false,
),
1 =>
array (
'pattern' => '(\\d{3})(\\d{7})',
'format' => '$1 $2',
'leadingDigitsPatterns' =>
array (
0 => '6',
),
'nationalPrefixFormattingRule' => '($1)',
'domesticCarrierCodeFormattingRule' => '0$CC $1',
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
array (
'pattern' => '(\\d{3})(\\d{7})',
'format' => '$1 $2',
Expand All @@ -216,7 +241,7 @@
'domesticCarrierCodeFormattingRule' => '0$CC $1',
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
3 =>
array (
'pattern' => '(\\d)(\\d{3})(\\d{7})',
'format' => '$1 $2 $3',
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_GB.php
View file
Expand Up @@ -31,7 +31,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[03])|(?:4[0-5]|5[0-26-9]|6[0-4]|[78][0-49])\\d\\d)|2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d\\d|1(?:[0-7]\\d\\d|8(?:0\\d|20)))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[03])|(?:4[0-5]|5[0-26-9]|6[0-4]|[78][0-49])\\d\\d)|2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d\\d|1(?:[0-7]\\d\\d|8(?:0\\d|2[0-35-9])))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
'ExampleNumber' => '1212345678',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_IL.php
View file
Expand Up @@ -45,7 +45,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '5(?:(?:[02368]\\d|[19][2-9]|4[1-9])\\d|5(?:01|1[79]|2[2-8]|3[23]|44|5[05689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}',
'NationalNumberPattern' => '5(?:(?:[02368]\\d|[19][2-9]|4[1-9])\\d|5(?:01|1[79]|2[2-9]|3[23]|44|5[05689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}',
'ExampleNumber' => '502345678',
'PossibleLength' =>
array (
Expand Down
6 changes: 3 additions & 3 deletions src/data/PhoneNumberMetadata_SG.php
View file
Expand Up @@ -39,7 +39,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '(?:8(?:0(?:1[0-7]|3[01])|[1-8]\\d\\d|9(?:[0-24]\\d|3[0-489]|5[0-2]))|9[0-8]\\d\\d)\\d{4}',
'NationalNumberPattern' => '(?:8(?:0(?:1[0-8]|2[7-9]|3[01])|[1-8]\\d\\d|9(?:[0-24]\\d|3[0-489]|5[0-2]))|9[0-8]\\d\\d)\\d{4}',
'ExampleNumber' => '81234567',
'PossibleLength' =>
array (
Expand Down Expand Up @@ -173,7 +173,7 @@
'format' => '$1 $2',
'leadingDigitsPatterns' =>
array (
0 => '[369]|8(?:0[13]|[1-9])',
0 => '[369]|8(?:0[1-3]|[1-9])',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
Expand Down Expand Up @@ -224,7 +224,7 @@
'format' => '$1 $2',
'leadingDigitsPatterns' =>
array (
0 => '[369]|8(?:0[13]|[1-9])',
0 => '[369]|8(?:0[1-3]|[1-9])',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
Expand Down
2 changes: 1 addition & 1 deletion src/data/ShortNumberMetadata_SA.php
View file
Expand Up @@ -63,7 +63,7 @@
),
'shortCode' =>
array (
'NationalNumberPattern' => '1(?:1(?:00|2|6111)|410|9(?:00|1[89]|9(?:099|22|91)))|9(?:0[24-79]|11|3[379]|40|66|8[5-9]|9[02-9])',
'NationalNumberPattern' => '1(?:1(?:00|2|6111)|410|9(?:00|1[89]|9(?:099|22|9[12])))|9(?:0[24-79]|11|3[379]|40|66|8[5-9]|9[02-9])',
'ExampleNumber' => '112',
'PossibleLength' =>
array (
Expand Down
149 changes: 149 additions & 0 deletions src/geocoding/data/en/57.php
View file
Expand Up @@ -157,6 +157,155 @@
57566 => 'Cartagena',
57567 => 'Cartagena',
57568 => 'Cartagena',
576012 => 'Bogotá',
576013 => 'Bogotá',
576014 => 'Bogotá',
576015 => 'Bogotá',
576016 => 'Bogotá',
576017 => 'Bogotá',
57601820 => 'Madrid',
57601821 => 'Funza',
57601822 => 'Funza',
576018230 => 'Subachoque',
576018232 => 'Funza',
576018240 => 'El Rosal',
576018241 => 'El Rosal',
576018242 => 'La Pradera/Subachoque/Subachique',
576018243 => 'Bojaca',
576018245 => 'Subachoque',
576018246 => 'Puente Piedra',
576018247 => 'La Punta',
576018249 => 'Zipacon',
576018250 => 'Madrid',
576018251 => 'Madrid',
576018252 => 'Madrid',
576018253 => 'Madrid',
576018254 => 'Madrid',
576018255 => 'Madrid',
576018256 => 'Madrid',
576018257 => 'Funza',
57601826 => 'Funza',
57601827 => 'Mosquera',
576018283 => 'Mosquera',
576018288 => 'Madrid',
576018289 => 'Madrid',
57601830 => 'Girardot',
57601831 => 'Girardot',
57601832 => 'Girardot',
57601833 => 'Girardot',
576018370 => 'Jerusalén',
576018371 => 'Guataqui',
576018373 => 'Beltrán',
576018375 => 'Nariño',
576018376 => 'Tocaima',
576018381 => 'Agua de Dios',
576018383 => 'Nilo',
576018384 => 'Viota',
576018385 => 'Nariño',
576018386 => 'Apulo',
576018392 => 'Nilo/La Esmeralda',
576018393 => 'Girardot',
576018397 => 'Apulo',
576018398 => 'Apulo',
576018402 => 'San Antonio de Tequendama',
576018403 => 'Choachi',
576018404 => 'Fomeque',
576018412 => 'Santa Inés',
576018416 => 'Guaduas',
576018417 => 'Guaduas',
576018419 => 'Pandi',
57601842 => 'Facatativa',
576018430 => 'Facatativa',
576018431 => 'Facatativa',
576018433 => 'Ninaima/Tobia',
576018434 => 'Cartagenita',
576018435 => 'Cartagenita',
576018436 => 'Facatativa',
576018437 => 'Facatativa',
576018438 => 'Facatativa',
576018439 => 'Facatativa',
576018440 => 'Facatativa',
576018441 => 'Viani',
576018442 => 'Cachipay',
576018443 => 'Cachipay',
576018444 => 'Villeta',
576018445 => 'Villeta',
576018446 => 'Villeta',
576018447 => 'Villeta',
576018449 => 'La Peña',
576018450 => 'San Antonio de Tequendama',
576018451 => 'Nocaima',
576018453 => 'La Florida',
576018480 => 'Quebradanegra',
576018481 => 'Quebradanegra',
576018482 => 'La Magdalena',
5760230 => 'Cali',
5760231 => 'Cali',
5760232 => 'Cali',
5760233 => 'Cali',
5760234 => 'Cali',
5760235 => 'Cali',
5760236 => 'Cali',
5760272 => 'Pasto',
5760273 => 'Pasto',
5760288 => 'Cali',
5760289 => 'Cali',
5760290 => 'Cali',
5760292 => 'Cali',
576042 => 'Medellín',
576043 => 'Medellín',
576044 => 'Medellín',
576045 => 'Medellín',
57604842 => 'Medellín',
576048510 => 'Medellín',
576048511 => 'Medellín',
576048720 => 'Medellín',
576048721 => 'Medellín',
576048722 => 'Medellín',
576048723 => 'Medellín',
576048724 => 'Medellín',
576048725 => 'Medellín',
576048726 => 'Medellín',
576049092 => 'Medellín',
57604911 => 'Medellín',
57604913 => 'Medellín',
57604917 => 'Medellín',
5760492 => 'Medellín',
5760532 => 'Barranquilla',
5760533 => 'Barranquilla',
5760534 => 'Barranquilla',
5760535 => 'Barranquilla',
5760536 => 'Barranquilla',
5760537 => 'Barranquilla',
5760538 => 'Barranquilla',
5760557 => 'Valledupar',
576056295 => 'Cartagena',
5760565 => 'Cartagena',
5760566 => 'Cartagena',
5760567 => 'Cartagena',
5760568 => 'Cartagena',
5760631 => 'Pereira',
5760632 => 'Pereira',
5760633 => 'Pereira',
5760634 => 'Pereira',
5760635 => 'Pereira',
5760687 => 'Manizales',
5760688 => 'Manizales',
5760689 => 'Manizales',
5760757 => 'Cucuta',
5760758 => 'Cucuta',
5760761 => 'Bucaramanga',
5760763 => 'Bucaramanga',
5760764 => 'Bucaramanga',
5760765 => 'Bucaramanga',
5760767 => 'Bucaramanga',
5760768 => 'Bucaramanga',
5760790 => 'Bucaramanga',
5760826 => 'Ibague',
5760827 => 'Ibague',
5760866 => 'Villavicencio',
5760886 => 'Neiva',
5760887 => 'Neiva',
57631 => 'Pereira',
57632 => 'Pereira',
57633 => 'Pereira',
Expand Down

0 comments on commit 29cc006

Please sign in to comment.