diff options
| -rw-r--r-- | resources/PhoneNumberMetadata.xml | 187 | ||||
| -rw-r--r-- | resources/PhoneNumberMetadataForTesting.xml | 100 | ||||
| -rw-r--r-- | resources/carrier/en/254.txt | 1 | ||||
| -rw-r--r-- | resources/carrier/en/508.txt | 18 | ||||
| -rw-r--r-- | resources/carrier/en/95.txt | 2 | ||||
| -rw-r--r-- | resources/carrier/en/972.txt | 1 | ||||
| -rw-r--r-- | resources/geocoding/en/95.txt | 8 | ||||
| -rw-r--r-- | resources/phonemetadata.proto | 18 | ||||
| -rw-r--r-- | resources/phonenumber.proto | 7 |
9 files changed, 169 insertions, 173 deletions
diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml index e43a36ab..e3a693d1 100644 --- a/resources/PhoneNumberMetadata.xml +++ b/resources/PhoneNumberMetadata.xml @@ -77,7 +77,6 @@ <!ATTLIST territory preferredExtnPrefix CDATA #IMPLIED> <!ATTLIST territory nationalPrefixFormattingRule CDATA #IMPLIED> <!ATTLIST territory nationalPrefixOptionalWhenFormatting (true) #IMPLIED> - <!ATTLIST territory leadingZeroPossible (true) #IMPLIED> <!ATTLIST territory carrierCodeFormattingRule CDATA #IMPLIED> <!ATTLIST territory mobileNumberPortableRegion (true) #IMPLIED> <!ATTLIST possibleLengths national CDATA #REQUIRED> @@ -1636,9 +1635,12 @@ </territory> <!-- Australia --> - <!-- Metadata shared with Cocos Islands (CC) and Christmas Islands (CX) --> + <!-- Metadata shared with Cocos Islands (CC) and Christmas Islands (CX). International prefix + based on the wikipedia page, either being a combination of the "Provider override codes" + with the default IDD (0011) following, or the default IDD, or the other IDD codes for + non-default carriers. --> <territory id="AU" countryCode="61" mainCountryForCode="true" - internationalPrefix="(?:14(?:1[14]|34|4[17]|[56]6|7[47]|88))?001[14-689]" + internationalPrefix="(?:14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011)|001[14-689]" preferredInternationalPrefix="0011" nationalPrefix="0" mobileNumberPortableRegion="true"> <references> @@ -3399,19 +3401,51 @@ (?: 2(?: 2\d{2}| - 5(?:11|[258]\d|9[67])| - 6(?:12|2\d|9[34])| - 8(?:2[34]|39|62) + 5(?: + 11| + [258]\d| + 9[67] + )| + 6(?: + 12| + 2\d| + 9[34] + )| + 8(?: + 2[34]| + 39| + 62 + ) )| 3(?: 3\d{2}| - 4(?:6\d|8[24])| - 8(?:25|42|5[257]|86|9[25])| - 9(?:2\d|3[234]|4[248]|5[24]|6[2-6]|7\d) + 4(?: + 6\d| + 8[24] + )| + 8(?: + 25| + 42| + 5[257]| + 86| + 9[25] + )| + 9(?: + 2\d| + 3[234]| + 4[248]| + 5[24]| + 6[2-6]| + 7\d + ) )| 4(?: 4\d{2}| - 6(?:11|[24689]\d|72) + 6(?: + 11| + [24689]\d| + 72 + ) ) )\d{4} </nationalNumberPattern> @@ -4161,7 +4195,7 @@ <!-- Belize --> <!-- The trunk prefix, formally 0, was dropped in the last reorganisation of the numbering plan. --> - <territory id="BZ" countryCode="501" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="BZ" countryCode="501" internationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T0202000016/en</sourceUrl> </references> @@ -4552,7 +4586,7 @@ </territory> <!-- Congo (Rep. of the) (Brazzaville) --> - <territory id="CG" countryCode="242" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="CG" countryCode="242" internationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T020200002E/en</sourceUrl> </references> @@ -4690,7 +4724,7 @@ </territory> <!-- Côte d'Ivoire --> - <territory id="CI" countryCode="225" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="CI" countryCode="225" internationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T0202000031/en</sourceUrl> <sourceUrl>http://fr.wikipedia.org/wiki/Liste_des_indicatifs_téléphoniques_en_Côte_d’Ivoire</sourceUrl> @@ -7702,7 +7736,7 @@ <!-- Fiji --> <territory id="FJ" countryCode="679" internationalPrefix="0(?:0|52)" - preferredInternationalPrefix="00" leadingZeroPossible="true"> + preferredInternationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T0202000048/en</sourceUrl> <sourceUrl>http://www.tfl.com.fj</sourceUrl> @@ -7962,7 +7996,7 @@ <!-- Gabon --> <!-- Note: We cannot set nationalPrefix="0" while fixed line numbers can start with a zero as this breaks parsing (it treats all leading zeros as national prefixes. --> - <territory id="GA" countryCode="241" internationalPrefix="00" leadingZeroPossible="true" > + <territory id="GA" countryCode="241" internationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T020200004E/en</sourceUrl> <sourceUrl>http://www.arcep.ga</sourceUrl> @@ -10735,9 +10769,14 @@ </numberFormat> <!-- The following is for voicemail access. --> <numberFormat pattern="(1599)(\d{6})"> - <leadingDigits>15</leadingDigits> + <leadingDigits>1599</leadingDigits> <format>$1-$2</format> </numberFormat> + <!-- Format is from http://everything.explained.today/Telephone_numbers_in_Israel/ --> + <numberFormat pattern="(151)(\d{1,2})(\d{3})(\d{4})"> + <leadingDigits>151</leadingDigits> + <format>$1-$2 $3-$4</format> + </numberFormat> <!-- These are 4-digit star numbers which are only accessible within Israel and must be dialed with a star in front of the number. --> <numberFormat pattern="(\d{4})"> @@ -10782,7 +10821,7 @@ ranges belong to Telzar carrier as per confirmation from them. --> <nationalNumberPattern> 5(?: - [02-47-9]\d{2}| + [0-47-9]\d{2}| 5(?: 01| 2[23]| @@ -10873,6 +10912,11 @@ <possibleLengths national="4,10"/> <exampleNumber>1599123456</exampleNumber> </uan> + <voicemail> + <nationalNumberPattern>151\d{8,9}</nationalNumberPattern> + <possibleLengths national="11,12"/> + <exampleNumber>15112340000</exampleNumber> + </voicemail> </territory> <!-- Isle of Man --> @@ -10901,19 +10945,21 @@ <exampleNumber>1624756789</exampleNumber> </fixedLine> <mobile> + <!-- 7624[2-4] numbers could be mobile or paging. --> <nationalNumberPattern> 7(?: 4576| - [59]24\d + [59]24\d| + 624[2-4] )\d{5} </nationalNumberPattern> <possibleLengths national="10"/> <exampleNumber>7924123456</exampleNumber> </mobile> <pager> - <nationalNumberPattern>7624[0-4689]\d{5}</nationalNumberPattern> + <nationalNumberPattern>7624[01689]\d{5}</nationalNumberPattern> <possibleLengths national="10"/> - <exampleNumber>7624212345</exampleNumber> + <exampleNumber>7624012345</exampleNumber> </pager> <tollFree> <!-- 808 162 with 10 digits. --> @@ -10981,8 +11027,8 @@ <!-- India --> <territory id="IN" countryCode="91" internationalPrefix="00" nationalPrefix="0" - leadingZeroPossible="true" nationalPrefixFormattingRule="$NP$FG" - nationalPrefixOptionalWhenFormatting="true" mobileNumberPortableRegion="true"> + nationalPrefixFormattingRule="$NP$FG" nationalPrefixOptionalWhenFormatting="true" + mobileNumberPortableRegion="true"> <references> <sourceUrl>http://www.itu.int/oth/T0202000063/en</sourceUrl> <sourceUrl>http://en.wikipedia.org/wiki/%2B91</sourceUrl> @@ -11017,7 +11063,7 @@ )| 3(?: [025-9]| - 1[07-9]| + 1[017-9]| [34][017-9] )| 4(?: @@ -11096,7 +11142,7 @@ 3(?: [05-8]| 1(?: - [089]| + [0189]| 7[5-9] )| 2(?: @@ -11679,6 +11725,7 @@ [05-8]\d{2}| 1(?: [089]\d| + 11| 7[5-8] )| 2(?: @@ -12296,10 +12343,11 @@ <!-- Italy --> <!-- Metadata shared with Vatican City (VA) --> - <territory id="IT" countryCode="39" internationalPrefix="00" leadingZeroPossible="true" - mobileNumberPortableRegion="true" mainCountryForCode="true"> + <territory id="IT" countryCode="39" internationalPrefix="00" mobileNumberPortableRegion="true" + mainCountryForCode="true"> <references> <sourceUrl>http://en.wikipedia.org/wiki/%2B39</sourceUrl> + <sourceUrl>https://www.agcom.it/piano-di-numerazione</sourceUrl> </references> <availableFormats> <!-- The leading zero for fixed numbers will be prepended before the matching of these @@ -13003,8 +13051,7 @@ <!-- Japan --> <territory id="JP" countryCode="81" internationalPrefix="010" nationalPrefix="0" - nationalPrefixFormattingRule="$NP$FG" leadingZeroPossible="true" - mobileNumberPortableRegion="true"> + nationalPrefixFormattingRule="$NP$FG" mobileNumberPortableRegion="true"> <references> <sourceUrl>http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/number_shitei.html</sourceUrl> <sourceUrl>http://www.numberingplans.com/?page=dialling&sub=areacodes&ac=JP</sourceUrl> @@ -13983,7 +14030,7 @@ nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG" mobileNumberPortableRegion="true" nationalPrefixForParsing="005|0"> <references> - <sourceUrl>http://www.ca.go.ke/images/downloads/NUMBERING/Telecommunication%20Numbering%20Plan%20For%20Kenya%20Feb%202016.Pdf</sourceUrl> + <sourceUrl>http://www.ca.go.ke/index.php/numbering</sourceUrl> <sourceUrl>https://www.itu.int/oth/T0202000070/en</sourceUrl> <sourceUrl>http://en.wikipedia.org/wiki/+254</sourceUrl> </references> @@ -14035,7 +14082,7 @@ <nationalNumberPattern> 7(?: [0-3679]\d| - 4[0-479]| + 4[0-4679]| 5[0-6]| 8[0-25-9] )\d{6} @@ -14535,7 +14582,7 @@ internationalPrefix="00(?:[124-68]|3\d{2}|7(?:[0-8]\d|9[0-79]))" nationalPrefix="0" nationalPrefixForParsing="0(8[1-46-8]|85\d{2})?" nationalPrefixFormattingRule="$NP$FG" carrierCodeFormattingRule="$NP$CC-$FG" - mobileNumberPortableRegion="true" leadingZeroPossible="true"> + mobileNumberPortableRegion="true"> <references> <sourceUrl>http://www.itu.int/oth/T0202000072/en</sourceUrl> <sourceUrl>http://en.wikipedia.org/wiki/%2B82</sourceUrl> @@ -16736,6 +16783,7 @@ </numberFormat> <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})"> <leadingDigits> + 432| 67| 81 </leadingDigits> @@ -16776,13 +16824,14 @@ </availableFormats> <generalDesc> <nationalNumberPattern> - [1478]\d{5,7}| - [256]\d{5,8}| + [178]\d{5,7}| + [24-6]\d{5,8}| 9(?: [279]\d{0,2}| - [58]| + 5| [34]\d{1,2}| - 6\d? + 6(?:\d{1,2})?| + 8(?:\d{2})? )\d{6} </nationalNumberPattern> </generalDesc> @@ -16790,7 +16839,12 @@ <nationalNumberPattern> 1(?: 2\d{1,2}| - [3-5]\d| + [35]\d| + 4(?: + \d| + 2[236]| + 39 + )| 6\d?| [89][0-6]\d )\d{4}| @@ -16802,6 +16856,8 @@ 3\d{4}| 4(?: 0\d{5}| + 26\d{4}| + 39\d{4}| \d{4} )| 5(?: @@ -16813,7 +16869,8 @@ 4(?: 2[245-8]| 3(?: - [2-46]| + 2(?:02)?| + [346]| 56? )| [46][2-6]| @@ -16854,7 +16911,10 @@ 6[2-8]| 7(?: [2367]| - 4\d| + 4(?: + \d| + 39 + )| 5\d?| 8[145]\d )| @@ -16920,12 +16980,19 @@ 88 )| 5[0-6]| - 61?\d| + 6(?: + 1\d| + 9\d{2}| + \d + )| 7(?: 3\d| [6-9]\d{2} )| - 8\d| + 8(?: + \d| + 9\d{2} + )| 9(?: 1\d| [5-7]\d{2}| @@ -17696,7 +17763,7 @@ nationalPrefixTransformRule="1$1" nationalPrefixFormattingRule="$NP $FG" nationalPrefixOptionalWhenFormatting="true" - leadingZeroPossible="true" mobileNumberPortableRegion="true"> + mobileNumberPortableRegion="true"> <references> <sourceUrl>http://www.itu.int/oth/T020200008A/en</sourceUrl> <sourceUrl>http://en.wikipedia.org/wiki/%2B52</sourceUrl> @@ -18280,7 +18347,7 @@ </territory> <!-- Niger --> - <territory id="NE" countryCode="227" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="NE" countryCode="227" internationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T020200009B/en</sourceUrl> </references> @@ -18773,7 +18840,7 @@ <!-- Norway --> <!-- Metadata (excluding fixed-line) shared with Svalbard. --> - <territory id="NO" countryCode="47" internationalPrefix="00" leadingZeroPossible="true" + <territory id="NO" countryCode="47" internationalPrefix="00" mainCountryForCode="true" mobileNumberPortableRegion="true"> <references> <sourceUrl>http://www.npt.no/npt/numsys/E.164.pdf</sourceUrl> @@ -20185,7 +20252,12 @@ <exampleNumber>411234</exampleNumber> </fixedLine> <mobile> - <nationalNumberPattern>55\d{4}</nationalNumberPattern> + <nationalNumberPattern> + (?: + 40| + 55 + )\d{4} + </nationalNumberPattern> <possibleLengths national="6"/> <exampleNumber>551234</exampleNumber> </mobile> @@ -21090,8 +21162,7 @@ <!-- According to ITU, there is no national prefix. However, this is still used. As of June 3rd 2011, this was confirmed by a Rwandan local. It is also shown in this format on pages such as http://www.tigo.co.rw "Choose Your Number" service. --> - <territory id="RW" countryCode="250" internationalPrefix="00" - nationalPrefix="0" leadingZeroPossible="true"> + <territory id="RW" countryCode="250" internationalPrefix="00" nationalPrefix="0"> <references> <sourceUrl>http://www.rura.gov.rw/docs/RWANDA_NATIONAL_NUMBERING_PLAN.pdf</sourceUrl> <sourceUrl>http://en.wikipedia.org/wiki/+250</sourceUrl> @@ -21881,7 +21952,7 @@ <!-- Svalbard --> <!-- Metadata shared with Norway. --> - <territory id="SJ" countryCode="47" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="SJ" countryCode="47" internationalPrefix="00"> <references> <sourceUrl>http://www.npt.no/pt_internet/numsys/E.164.pdf</sourceUrl> </references> @@ -22147,8 +22218,7 @@ and without this area code. The nationalPrefixForParsing and nationalPrefixTransformRule are used to ensure that if the 0549 is not present, it will be added. --> <territory id="SM" countryCode="378" internationalPrefix="00" - nationalPrefixForParsing="(?:0549)?([89]\d{5})" nationalPrefixTransformRule="0549$1" - leadingZeroPossible="true"> + nationalPrefixForParsing="(?:0549)?([89]\d{5})" nationalPrefixTransformRule="0549$1"> <references> <sourceUrl>http://www.itu.int/oth/T02020000B5/en</sourceUrl> <!-- Information about Italy. --> @@ -22706,7 +22776,7 @@ </territory> <!-- Swaziland --> - <territory id="SZ" countryCode="268" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="SZ" countryCode="268" internationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T02020000C6/en</sourceUrl> </references> @@ -23347,7 +23417,7 @@ </territory> <!-- Tonga --> - <territory id="TO" countryCode="676" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="TO" countryCode="676" internationalPrefix="00"> <references> <sourceUrl>http://www.itu.int/oth/T02020000D3/en</sourceUrl> <sourceUrl>http://www.wtng.info/wtng-676-to.html</sourceUrl> @@ -23992,13 +24062,13 @@ <exampleNumber>311234567</exampleNumber> </fixedLine> <mobile> - <!-- Added 71 prefix based on user report. --> + <!-- Added 71 prefix based on user report and 72 based on online numbers. --> <nationalNumberPattern> (?: 39| 50| 6[36-8]| - 7[13]| + 7[1-3]| 9[1-9] )\d{7} </nationalNumberPattern> @@ -24784,8 +24854,7 @@ the Italian telephone numbering plan. Telephone numbers in the Vatican City are similar to telephone numbers in Rome, with "698" following the "06" for Rome. A Vatican telephone number is in the form of 06 698x xxxx. --> - <territory id="VA" countryCode="39" internationalPrefix="00" leadingZeroPossible="true" - mobileNumberPortableRegion="true"> + <territory id="VA" countryCode="39" internationalPrefix="00" mobileNumberPortableRegion="true"> <references> <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_Vatican_City</sourceUrl> </references> @@ -26151,7 +26220,7 @@ </territory> <!-- Universal International Toll Free Number --> - <territory id="001" countryCode="800" leadingZeroPossible="true"> + <territory id="001" countryCode="800"> <references> <sourceUrl>http://www.itu.int/en/ITU-T/inr/unum/Pages/uifn.aspx</sourceUrl> </references> @@ -26171,7 +26240,7 @@ </territory> <!-- Universal International Shared Cost Number --> - <territory id="001" countryCode="808" leadingZeroPossible="true"> + <territory id="001" countryCode="808"> <references> <sourceUrl>http://www.itu.int/rec/T-REC-E.169-200205-I/en</sourceUrl> </references> @@ -26416,7 +26485,7 @@ <!-- Numbers here are classified as UAN, as they are non-geographical and universally accessible. In addition, the end-user tariff to reach these numbers is lower or similar to the tariff of a national call. --> - <territory id="001" countryCode="888" leadingZeroPossible="true"> + <territory id="001" countryCode="888"> <references> <sourceUrl>http://www.itu.int/oth/T02020000FA/en</sourceUrl> </references> @@ -26436,7 +26505,7 @@ </territory> <!-- Universal International Premium Rate Number --> - <territory id="001" countryCode="979" leadingZeroPossible="true"> + <territory id="001" countryCode="979"> <references> <sourceUrl>http://www.itu.int/rec/T-REC-E.169-200205-I/en</sourceUrl> </references> diff --git a/resources/PhoneNumberMetadataForTesting.xml b/resources/PhoneNumberMetadataForTesting.xml index 25b2b900..936fefa0 100644 --- a/resources/PhoneNumberMetadataForTesting.xml +++ b/resources/PhoneNumberMetadataForTesting.xml @@ -25,7 +25,6 @@ <territory id="AD" countryCode="376" internationalPrefix="00"> <generalDesc> <nationalNumberPattern>\d{6}</nationalNumberPattern> - <possibleNumberPattern>\d{6}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>\d{6}</nationalNumberPattern> @@ -40,7 +39,6 @@ <territory id="AE" countryCode="971" internationalPrefix="00"> <generalDesc> <nationalNumberPattern>[1-9]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <uan> <nationalNumberPattern>600\d{6}</nationalNumberPattern> @@ -55,17 +53,14 @@ nationalPrefix="0"> <generalDesc> <nationalNumberPattern>[1-9]\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{5,8}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[1-9]\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{5,8}</possibleNumberPattern> <possibleLengths national="8" localOnly="5,6"/> <exampleNumber>10123456</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>[1-9]\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{5,8}</possibleNumberPattern> <possibleLengths national="8" localOnly="5,6"/> <exampleNumber>10123456</exampleNumber> </mobile> @@ -82,7 +77,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[29]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>2\d(?:[26-9]\d|\d[26-9])\d{5}</nationalNumberPattern> @@ -132,29 +126,24 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[1-3689]\d{9,10}</nationalNumberPattern> - <possibleNumberPattern>\d{6,11}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[1-3]\d{5,9}</nationalNumberPattern> - <possibleNumberPattern>\d{6,10}</possibleNumberPattern> <possibleLengths national="[6-10]"/> <exampleNumber>1234567890</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>9\d{10}|[1-3]\d{9}</nationalNumberPattern> - <possibleNumberPattern>\d{10,11}</possibleNumberPattern> <possibleLengths national="10,11"/> <exampleNumber>9234567890</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>80\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8034567890</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>6(0\d|10)\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>6234567890</exampleNumber> </premiumRate> @@ -178,29 +167,24 @@ </availableFormats> <generalDesc > <nationalNumberPattern>[1-578]\d{4,14}</nationalNumberPattern> - <possibleNumberPattern>\d{5,15}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[2378]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> <possibleLengths national="9"/> <exampleNumber>212345678</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>4\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> <possibleLengths national="9"/> <exampleNumber>412345678</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>1800\d{6}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>1800123456</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>190[0126]\d{6}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>1900123456</exampleNumber> </premiumRate> @@ -210,7 +194,6 @@ <territory id="BB" countryCode="1" internationalPrefix="011"> <generalDesc> <nationalNumberPattern>246\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{7,10}</possibleNumberPattern> </generalDesc> <fixedLine> <possibleLengths national="10" localOnly="7"/> @@ -225,7 +208,6 @@ <territory id="BR" countryCode="55" internationalPrefix="00"> <generalDesc> <nationalNumberPattern>\d{8,10}</nationalNumberPattern> - <possibleNumberPattern>\d{8,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>\d{8,10}</nationalNumberPattern> @@ -239,7 +221,6 @@ nationalPrefix="1"> <generalDesc> <nationalNumberPattern>(242|8(00|66|77|88)|900)\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{7,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern> @@ -268,19 +249,16 @@ </fixedLine> <mobile> <nationalNumberPattern>242(357|359|457|557)\d{4}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>2423577890</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>8(00|66|77|88)\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8001234567</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>900\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>9001234567</exampleNumber> </premiumRate> @@ -313,7 +291,6 @@ <!-- This numbering plan is completely bogus, but is used to test the AYTF logic. For that reason, it is kept very simple. --> <nationalNumberPattern>[1-9]\d{5}</nationalNumberPattern> - <possibleNumberPattern>\d{6}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[1-9]\d{5}</nationalNumberPattern> @@ -326,7 +303,6 @@ <territory id="CA" countryCode="1" internationalPrefix="011"> <generalDesc> <nationalNumberPattern>226\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{7,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>226\d{7}</nationalNumberPattern> @@ -342,7 +318,6 @@ <territory id="CC" countryCode="61" internationalPrefix="00"> <generalDesc> <nationalNumberPattern>\d{6,10}</nationalNumberPattern> - <possibleNumberPattern>\d{6,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>\d{6,10}</nationalNumberPattern> @@ -380,11 +355,9 @@ 8[0-357-9]\d{6,9}| 9\d{7,10} </nationalNumberPattern> - <possibleNumberPattern>\d{4,12}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[2-9]\d{10}</nationalNumberPattern> - <possibleNumberPattern>\d{11}</possibleNumberPattern> <possibleLengths national="11"/> <exampleNumber>91234567</exampleNumber> </fixedLine> @@ -397,7 +370,6 @@ 7[0136-8] )\d{8} </nationalNumberPattern> - <possibleNumberPattern>\d{11}</possibleNumberPattern> <possibleLengths national="11"/> <exampleNumber>13123456789</exampleNumber> </mobile> @@ -410,7 +382,6 @@ <territory id="CX" countryCode="61" internationalPrefix="00"> <generalDesc> <nationalNumberPattern>\d{8,10}</nationalNumberPattern> - <possibleNumberPattern>\d{8,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>\d{8,10}</nationalNumberPattern> @@ -455,7 +426,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>\d{4,14}</nationalNumberPattern> - <possibleNumberPattern>\d{2,14}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern> @@ -469,24 +439,20 @@ )\d{1,8} </nationalNumberPattern> <possibleLengths national="[4-11]" localOnly="2,3"/> - <possibleNumberPattern>\d{2,14}</possibleNumberPattern> <exampleNumber>30123456</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>1(5\d{9}|7\d{8}|6[02]\d{8}|63\d{7})</nationalNumberPattern> - <possibleNumberPattern>\d{10,11}</possibleNumberPattern> <possibleLengths national="10,11"/> <exampleNumber>15123456789</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>800\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8001234567</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>900([135]\d{6}|9\d{7})</nationalNumberPattern> - <possibleNumberPattern>\d{10,11}</possibleNumberPattern> <possibleLengths national="10,11"/> <exampleNumber>9001234567</exampleNumber> </premiumRate> @@ -506,7 +472,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>3\d{6}</nationalNumberPattern> - <possibleNumberPattern>\d{7}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>3\d{6}</nationalNumberPattern> @@ -539,7 +504,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>\d{10}</nationalNumberPattern> - <possibleNumberPattern>\d{6,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[1-6]\d{9}</nationalNumberPattern> @@ -548,43 +512,36 @@ </fixedLine> <mobile> <nationalNumberPattern>7[1-57-9]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>7123456789</exampleNumber> </mobile> <pager> <nationalNumberPattern>76\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>7623456789</exampleNumber> </pager> <tollFree> <nationalNumberPattern>80\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8023456789</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>9[018]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>9023456789</exampleNumber> </premiumRate> <sharedCost> <nationalNumberPattern>8(?:4[3-5]|7[0-2])\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8433456789</exampleNumber> </sharedCost> <voip> <nationalNumberPattern>56\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>5633456789</exampleNumber> </voip> <personalNumber> <nationalNumberPattern>70\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>7033456789</exampleNumber> </personalNumber> @@ -596,7 +553,6 @@ <territory id="GG" countryCode="44" internationalPrefix="00"> <generalDesc> <nationalNumberPattern>\d{6,10}</nationalNumberPattern> - <possibleNumberPattern>\d{6,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>\d{6,10}</nationalNumberPattern> @@ -610,11 +566,9 @@ <territory id="HU" countryCode="36" internationalPrefix="00" nationalPrefix="06"> <generalDesc> <nationalNumberPattern>30\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <mobile> <nationalNumberPattern>30\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> <possibleLengths national="9"/> <exampleNumber>301234567</exampleNumber> </mobile> @@ -622,7 +576,7 @@ <!-- Italy --> <!-- http://en.wikipedia.org/wiki/%2B39 --> - <territory id="IT" countryCode="39" internationalPrefix="00" leadingZeroPossible="true"> + <territory id="IT" countryCode="39" internationalPrefix="00"> <availableFormats> <numberFormat pattern="(\d{2})(\d{4})(\d{4})"> <leadingDigits>0[26]</leadingDigits> @@ -643,29 +597,24 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[0389]\d{5,10}</nationalNumberPattern> - <possibleNumberPattern>\d{6,11}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>0\d{9,10}</nationalNumberPattern> - <possibleNumberPattern>\d{10,11}</possibleNumberPattern> <possibleLengths national="10,11"/> <exampleNumber>0123456789</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>3\d{8,9}</nationalNumberPattern> - <possibleNumberPattern>\d{9,10}</possibleNumberPattern> <possibleLengths national="9,10"/> <exampleNumber>3123456789</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>80(?:0\d{6}|3\d{3})</nationalNumberPattern> - <possibleNumberPattern>\d{6,9}</possibleNumberPattern> <possibleLengths national="6,9"/> <exampleNumber>800123456</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>89(?:2\d{3}|9\d{6})</nationalNumberPattern> - <possibleNumberPattern>\d{6,9}</possibleNumberPattern> <possibleLengths national="6,9"/> <exampleNumber>892123</exampleNumber> </premiumRate> @@ -676,7 +625,7 @@ patterns as digits beyond the third one are entered. As a result, only a few fake formatting rules are added. --> <territory id="JP" countryCode="81" internationalPrefix="010" - nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG" leadingZeroPossible="true"> + nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG"> <availableFormats> <numberFormat pattern="(\d{2})(\d{4})(\d{4})"> <leadingDigits>[57-9]0</leadingDigits> @@ -716,13 +665,11 @@ </availableFormats> <noInternationalDialling> <nationalNumberPattern>[23]\d{3}</nationalNumberPattern> - <possibleNumberPattern>\d{4}</possibleNumberPattern> <possibleLengths national="4"/> <exampleNumber>2123</exampleNumber> </noInternationalDialling> <generalDesc> <nationalNumberPattern>07\d{5}|[1-357-9]\d{3,10}</nationalNumberPattern> - <possibleNumberPattern>\d{4,11}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>07\d{5}|[1-357-9]\d{3,10}</nationalNumberPattern> @@ -731,7 +678,6 @@ </fixedLine> <tollFree> <nationalNumberPattern>0777[01]\d{2}</nationalNumberPattern> - <possibleNumberPattern>\d{7}</possibleNumberPattern> <possibleLengths national="7"/> <exampleNumber>0777012</exampleNumber> </tollFree> @@ -815,41 +761,34 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[1-7]\d{3,9}|8\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{4,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>(?:2|[34][1-3]|5[1-5]|6[1-4])(?:1\d{2,3}|[2-9]\d{6,7})</nationalNumberPattern> - <possibleNumberPattern>\d{4,10}</possibleNumberPattern> <possibleLengths national="[4-10]"/> <exampleNumber>22123456</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>1[0-25-9]\d{7,8}</nationalNumberPattern> - <possibleNumberPattern>\d{9,10}</possibleNumberPattern> <possibleLengths national="9,10"/> <exampleNumber>1023456789</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>80\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> <possibleLengths national="9"/> <exampleNumber>801234567</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>60[2-9]\d{6}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> <possibleLengths national="9"/> <exampleNumber>602345678</exampleNumber> </premiumRate> <personalNumber> <nationalNumberPattern>50\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>5012345678</exampleNumber> </personalNumber> <voip> <nationalNumberPattern>70\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>7012345678</exampleNumber> </voip> @@ -886,29 +825,24 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[1-9]\d{9,10}</nationalNumberPattern> - <possibleNumberPattern>\d{7,11}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[2-9]\d{9}</nationalNumberPattern> - <possibleNumberPattern>\d{7,10}</possibleNumberPattern> <possibleLengths national="10" localOnly="7"/> <exampleNumber>2123456789</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>1\d{10}</nationalNumberPattern> - <possibleNumberPattern>\d{11}</possibleNumberPattern> <possibleLengths national="11"/> <exampleNumber>11234567890</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>800\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8001234567</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>900\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>9001234567</exampleNumber> </premiumRate> @@ -936,29 +870,24 @@ [289]\d{7,9}| [3-7]\d{7} </nationalNumberPattern> - <possibleNumberPattern>\d{7,10}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>24099\d{3}|(?:3[2-79]|[479][2-689]|6[235-9])\d{6}</nationalNumberPattern> - <possibleNumberPattern>\d{7,8}</possibleNumberPattern> <possibleLengths national="7,8"/> <exampleNumber>24099123</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>2(?:[027]\d{7}|9\d{6,7}|1(?:0\d{5,7}|[12]\d{5,6}|[3-9]\d{5})|4[1-9]\d{6}|8\d{7,8})</nationalNumberPattern> - <possibleNumberPattern>\d{8,10}</possibleNumberPattern> <possibleLengths national="[8-10]"/> <exampleNumber>201234567</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>800\d{6,7}</nationalNumberPattern> - <possibleNumberPattern>\d{9,10}</possibleNumberPattern> <possibleLengths national="9,10"/> <exampleNumber>8001234567</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>900\d{6,7}</nationalNumberPattern> - <possibleNumberPattern>\d{9,10}</possibleNumberPattern> <possibleLengths national="9,10"/> <exampleNumber>9001234567</exampleNumber> </premiumRate> @@ -975,7 +904,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[1-9]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <mobile> <nationalNumberPattern>(?:5[01]|6[069]|7[289]|88)\d{7}</nationalNumberPattern> @@ -1007,7 +935,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[268]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <fixedLine> <!-- 0876 numbers are mentioned in the plan, but none in use can be @@ -1018,7 +945,6 @@ </fixedLine> <mobile> <nationalNumberPattern>6(?:9[23]|47)\d{6}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> <possibleLengths national="9"/> <exampleNumber>692123456</exampleNumber> </mobile> @@ -1039,7 +965,6 @@ <territory id="SE" countryCode="46" internationalPrefix="00"> <generalDesc> <nationalNumberPattern>\d{9}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <fixedLine> <possibleLengths national="9"/> @@ -1068,33 +993,24 @@ </availableFormats> <generalDesc> <nationalNumberPattern>[13689]\d{7,10}</nationalNumberPattern> - <!-- This specific pattern with the | is used to unit-test IsPossibleNumberWithReason. --> - <possibleNumberPattern> - \d{8}| - \d{10,11} - </possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[36]\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{8}</possibleNumberPattern> <possibleLengths national="8"/> <exampleNumber>31234567</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>[89]\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{8}</possibleNumberPattern> <possibleLengths national="8"/> <exampleNumber>81234567</exampleNumber> </mobile> <tollFree> <nationalNumberPattern>1?800\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10,11}</possibleNumberPattern> <possibleLengths national="10,11"/> <exampleNumber>8001234567</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>1900\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{11}</possibleNumberPattern> <possibleLengths national="11"/> <exampleNumber>19001234567</exampleNumber> </premiumRate> @@ -1145,36 +1061,30 @@ <generalDesc> <!-- Numbers beginning with 7 are excluded for testing purposes only. --> <nationalNumberPattern>[13-689]\d{9}|2[0-35-9]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>[13-689]\d{9}|2[0-35-9]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern> <possibleLengths national="10" localOnly="7"/> <exampleNumber>1234567890</exampleNumber> </fixedLine> <mobile> <nationalNumberPattern>[13-689]\d{9}|2[0-35-9]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern> <possibleLengths national="10" localOnly="7"/> <exampleNumber>1234567890</exampleNumber> </mobile> <noInternationalDialling> <!-- This range is added for testing purposes only. --> <nationalNumberPattern>800\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8004567890</exampleNumber> </noInternationalDialling> <tollFree> <nationalNumberPattern>8(?:00|66|77|88)\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>8004567890</exampleNumber> </tollFree> <premiumRate> <nationalNumberPattern>900\d{7}</nationalNumberPattern> - <possibleNumberPattern>\d{10}</possibleNumberPattern> <possibleLengths national="10"/> <exampleNumber>9004567890</exampleNumber> </premiumRate> @@ -1186,7 +1096,6 @@ <!-- Formatting as per La Réunion. --> <generalDesc> <nationalNumberPattern>[268]\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <fixedLine> <nationalNumberPattern>2696[0-4]\d{4}</nationalNumberPattern> @@ -1207,7 +1116,7 @@ </territory> <!-- International Toll Free numbers --> - <territory id="001" countryCode="800" leadingZeroPossible="true"> + <territory id="001" countryCode="800"> <availableFormats> <numberFormat pattern="(\d{4})(\d{4})"> <format>$1 $2</format> @@ -1215,7 +1124,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>\d{8}</nationalNumberPattern> - <possibleNumberPattern>\d{8}</possibleNumberPattern> </generalDesc> <tollFree> <nationalNumberPattern>\d{8}</nationalNumberPattern> @@ -1234,7 +1142,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>\d{9}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <mobile> <nationalNumberPattern>\d{9}</nationalNumberPattern> @@ -1252,7 +1159,6 @@ </availableFormats> <generalDesc> <nationalNumberPattern>\d{9}</nationalNumberPattern> - <possibleNumberPattern>\d{9}</possibleNumberPattern> </generalDesc> <premiumRate> <nationalNumberPattern>\d{9}</nationalNumberPattern> diff --git a/resources/carrier/en/254.txt b/resources/carrier/en/254.txt index f1324b20..2025690a 100644 --- a/resources/carrier/en/254.txt +++ b/resources/carrier/en/254.txt @@ -26,6 +26,7 @@ 254742|Safaricom 254743|Safaricom 254744|Homeland Media +254746|Safaricom 254747|JTL 254749|WiAfrica 254750|Airtel diff --git a/resources/carrier/en/508.txt b/resources/carrier/en/508.txt new file mode 100644 index 00000000..e16b2f57 --- /dev/null +++ b/resources/carrier/en/508.txt @@ -0,0 +1,18 @@ +# Copyright (C) 2017 The Libphonenumber Authors + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Source: www.arcep.fr + +50840|Globaltel +50855|SPM Telecom diff --git a/resources/carrier/en/95.txt b/resources/carrier/en/95.txt index 36bfd6eb..f8ca1b0a 100644 --- a/resources/carrier/en/95.txt +++ b/resources/carrier/en/95.txt @@ -42,10 +42,12 @@ 959427|ZTE 95951|ZTE 95955|ZTE +95969|MNTC 95976|Telenor 95977|Telenor 95978|Telenor 95979|Telenor +95989|MPT 95995|Ooredoo 95996|Ooredoo 95997|Ooredoo diff --git a/resources/carrier/en/972.txt b/resources/carrier/en/972.txt index 0ea55df7..698bc196 100644 --- a/resources/carrier/en/972.txt +++ b/resources/carrier/en/972.txt @@ -13,6 +13,7 @@ # limitations under the License. 97250|Pelephone +97251|Xphone 97252|Cellcom 97253|Hot Mobile 97254|Orange diff --git a/resources/geocoding/en/95.txt b/resources/geocoding/en/95.txt index aad0c08b..46492459 100644 --- a/resources/geocoding/en/95.txt +++ b/resources/geocoding/en/95.txt @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +951422|Yangon +951423|Yangon +951426|Yangon +951439|Yangon 951550|Bahan 951551|Bahan 951552|Bahan @@ -26,7 +30,10 @@ 951687|Bayintnaung 951688|Bayintnaung 9522000|Mingalar Mandalay +952426|Mandalay +952439|Mandalay 95256|Amarapura +9543202|Rakhine 954353|Buthidaung 9543565|Palatwa 95522221|Bago @@ -51,6 +58,7 @@ 956324|Magway 95642487|Shawpin 956525|Ngape +9567439|Naypyidaw 9567550|Naypyidaw 9569200|Aunglan 956940|Sinpaungwae diff --git a/resources/phonemetadata.proto b/resources/phonemetadata.proto index 1409bdad..102c6033 100644 --- a/resources/phonemetadata.proto +++ b/resources/phonemetadata.proto @@ -101,15 +101,6 @@ message PhoneNumberDesc { // total length and leading digits. optional string national_number_pattern = 2; - // The possible_number_pattern represents what a potentially valid phone - // number for this region may be written as. This is a superset of the - // national_number_pattern above and includes numbers that have the area code - // omitted. Typically the only restrictions here are in the number of digits. - // This could be used to highlight tokens in a text that may be a phone - // number, or to quickly prune numbers that could not possibly be a phone - // number for this locale. - optional string possible_number_pattern = 3; - // These represent the lengths a phone number from this region can be. They // will be sorted from smallest to biggest. Note that these lengths are for // the full number, without country calling code or national prefix. For @@ -291,13 +282,8 @@ message PhoneMetadata { // should not overlap. optional string leading_digits = 23; - // The leading zero in a phone number is meaningful in some countries (e.g. - // Italy). This means they cannot be dropped from the national number when - // converting into international format. If leading zeros are possible for - // valid international numbers for this region/country then set this to true. - // This only needs to be set for the region that is the main_country_for_code - // and all regions associated with that calling code will use the same - // setting. + // Deprecated: do not use. Will be deletd when there are no references to this + // later. optional bool leading_zero_possible = 26 [default=false]; // This field is set when this country has implemented mobile number diff --git a/resources/phonenumber.proto b/resources/phonenumber.proto index 1c168c75..823f2eaf 100644 --- a/resources/phonenumber.proto +++ b/resources/phonenumber.proto @@ -68,7 +68,7 @@ message PhoneNumber { // dialling internationally, set this flag to true, and also set the number of // leading zeros. // - // Clients who use the parsing or conversion functionality of the i18n phone + // Clients who use the parsing functionality of the i18n phone // number libraries will have these fields set if necessary automatically. optional bool italian_leading_zero = 4; optional int32 number_of_leading_zeros = 8 [ default = 1 ]; @@ -87,6 +87,11 @@ message PhoneNumber { // general parsing method, but in the method that parses and keeps raw_input. // New fields could be added upon request. enum CountryCodeSource { + // Default value returned if this is not set, because the phone number was + // created using parse, not parseAndKeepRawInput. hasCountryCodeSource will + // return false if this is the case. + UNSPECIFIED = 0; + // The country_code is derived based on a phone number with a leading "+", // e.g. the French number "+33 1 42 68 53 00". FROM_NUMBER_WITH_PLUS_SIGN = 1; |