data/PhoneNumberMetaData.xml in phonelib-0.2.4 vs data/PhoneNumberMetaData.xml in phonelib-0.2.5
- old
+ new
@@ -936,10 +936,15 @@
911
</leadingDigits>
<format>$1</format>
<intlFormat>NA</intlFormat>
</numberFormat>
+ <numberFormat pattern="(\d{2})" nationalPrefixFormattingRule="$NP$FG">
+ <leadingDigits>0</leadingDigits>
+ <format>$1</format>
+ <intlFormat>NA</intlFormat>
+ </numberFormat>
</availableFormats>
<generalDesc>
<nationalNumberPattern>
[1-368]\d{9}|
9\d{10}
@@ -2036,11 +2041,11 @@
2(?:
2\d{2}|
3|
4\d
)
- )
+ )|
)\d{3}|
4(?:
0(?:
2(?:
[09]\d|
@@ -2296,11 +2301,11 @@
<format>$1 $2 $3 $4</format>
</numberFormat>
<numberFormat pattern="([15-8]\d)(\d{2})(\d{2})(\d{2})">
<leadingDigits>
[156]|
- 7[018]|
+ 7[0178]|
8(?:
0[1-9]|
[1-79]
)
</leadingDigits>
@@ -2319,21 +2324,25 @@
<generalDesc>
<nationalNumberPattern>[1-9]\d{7,8}</nationalNumberPattern>
<possibleNumberPattern>\d{8,9}</possibleNumberPattern>
</generalDesc>
<fixedLine>
- <!-- According to the published Excel document the third digit must be 1-9. -->
+ <!-- Note that 80 is a valid area code, so we explicitly check for this case that the third
+ digit begins with 1-9 -->
<nationalNumberPattern>
(?:
1[0-69]|
+ [23][2-8]|
[49][23]|
5\d|
6[013-57-9]|
- 71|
- 8[0-79]
- )[1-9]\d{5}|
- [23][2-8]\d{6}
+ 71
+ )\d{6}|
+ 8(?:
+ 0[1-9]|
+ [1-79]\d
+ )\d{5}
</nationalNumberPattern>
<possibleNumberPattern>\d{8}</possibleNumberPattern>
<exampleNumber>12345678</exampleNumber>
</fixedLine>
<mobile>
@@ -2354,13 +2363,13 @@
<exampleNumber>80012345</exampleNumber>
</tollFree>
<premiumRate>
<nationalNumberPattern>
(?:
- 70[2-7]|
- 90\d
- )\d{5}
+ 90|
+ 7[07]
+ )\d{6}
</nationalNumberPattern>
<possibleNumberPattern>\d{8}</possibleNumberPattern>
<exampleNumber>90123456</exampleNumber>
</premiumRate>
<uan>
@@ -2413,12 +2422,12 @@
</fixedLine>
<mobile>
<nationalNumberPattern>
6(?:
[0-24-6]\d|
- 8[0-8]|
- 3[0-3]
+ 8[0-5]|
+ 3[0-3]|
)\d{5}|
7\d{7}
</nationalNumberPattern>
<exampleNumber>70123456</exampleNumber>
</mobile>
@@ -3075,11 +3084,11 @@
<mobile>
<nationalNumberPattern>
1(?:
1(?:
5[347]|
- [6-9]\d
+ [6-9]\d|
)|
[2-9][6-9]\d
)\d{6}|
(?:
2[12478]|
@@ -4634,13 +4643,11 @@
</territory>
<!-- Colombia -->
<!-- http://www.itu.int/oth/T020200002C/en -->
<!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Colombia -->
- <!-- Extra international dialling prefixes from www.claro.com.co and www.tigo.com.co. -->
- <!-- 05 and 005 are for Orbitel: co.orbitel.com -->
- <territory id="CO" countryCode="57" internationalPrefix="00(?:4(?:[14]4|56)|[579])"
+ <territory id="CO" countryCode="57" internationalPrefix="00[579]|#555|#999"
nationalPrefix="0" nationalPrefixForParsing="0([3579]|4(?:44|56))?"
mobileNumberPortableRegion="true">
<availableFormats>
<numberFormat pattern="(\d)(\d{7})" carrierCodeFormattingRule="$NP$CC $FG"
nationalPrefixFormattingRule="($FG)">
@@ -4733,11 +4740,11 @@
</territory>
<!-- Costa Rica -->
<!-- http://www.itu.int/oth/T0202000030/en -->
<territory id="CR" countryCode="506" internationalPrefix="00"
- nationalPrefixForParsing="(19(?:0[01468]|19|20|66|77))"
+ nationalPrefixForParsing="(19(?:0[0-2468]|19|20|66|77))"
carrierCodeFormattingRule="$CC $FG">
<availableFormats>
<numberFormat pattern="(\d{4})(\d{4})">
<leadingDigits>
[24-7]|
@@ -4788,11 +4795,14 @@
210[0-6]\d{4}|
4(?:
0(?:
[04]0\d{4}|
10[0-3]\d{3}|
- 2900\d{2}|
+ 2(?:
+ 00\d|
+ 900
+ )\d{2}|
3[01]\d{4}|
5\d{5}|
70[01]\d{3}|
8[0-2]\d{4}
)|
@@ -6507,12 +6517,12 @@
</leadingDigits>
<format>$1 $2</format>
</numberFormat>
<numberFormat pattern="(\d{2})(\d{4,10})">
<leadingDigits>
- [14]|
2[09]|
+ [14]|
50|
7[135]
</leadingDigits>
<format>$1 $2</format>
</numberFormat>
@@ -7876,44 +7886,31 @@
</tollFree>
<!-- No premiumRate information can be found. -->
</territory>
<!-- Gibraltar -->
- <!-- http://www.gra.gi/index.php?topic=numbering+plan§ion=legislation&site=communications -->
<territory id="GI" countryCode="350" internationalPrefix="00">
- <availableFormats>
- <!-- Most numbers are formatted as a block -->
- <numberFormat pattern="(\d{3})(\d{5})">
- <leadingDigits>2</leadingDigits>
- <format>$1 $2</format>
- </numberFormat>
- </availableFormats>
+ <!-- No formatting rules - numbers are always formatted as a block. -->
<generalDesc>
<nationalNumberPattern>[2568]\d{7}</nationalNumberPattern>
<possibleNumberPattern>\d{8}</possibleNumberPattern>
</generalDesc>
<fixedLine>
<nationalNumberPattern>
2(?:
00\d|
- 1(?:
- 6[24-7]|
- 9\d
- )|
- 2(?:
- 00|
- 2[2457]
- )
+ 16[0-7]|
+ 22[2457]
)\d{4}
</nationalNumberPattern>
<exampleNumber>20012345</exampleNumber>
</fixedLine>
<mobile>
<nationalNumberPattern>
(?:
- 5[46-8]|
- 62
+ 5[4-8]|
+ 60
)\d{6}
</nationalNumberPattern>
<exampleNumber>57123456</exampleNumber>
</mobile>
<tollFree>
@@ -8009,11 +8006,11 @@
<exampleNumber>5661234</exampleNumber>
</fixedLine>
<mobile>
<nationalNumberPattern>
(?:
- 2[0-6]|
+ 2[0-2]|
[3679]\d
)\d{5}
</nationalNumberPattern>
<exampleNumber>3012345</exampleNumber>
</mobile>
@@ -10560,11 +10557,11 @@
<exampleNumber>4101234</exampleNumber>
</fixedLine>
<mobile>
<!-- TETRA = TErrestrial Trunked RAdio is included under mobile. -->
<nationalNumberPattern>
- 38[589]\d{6}|
+ 38[59]\d{6}|
(?:
6(?:
1[0-8]|
3[0-27-9]|
4[0-27]|
@@ -10585,13 +10582,10 @@
)\d{4}
</nationalNumberPattern>
<exampleNumber>6101234</exampleNumber>
</mobile>
<tollFree>
- <!-- The UIFN numbers mentioned in the Excel document are not yet included since no real
- numbers can be found online, and it is not clear what these are; the standard
- definition would have them under the +800 country code instead of Iceland. -->
<nationalNumberPattern>800\d{4}</nationalNumberPattern>
<possibleNumberPattern>\d{7}</possibleNumberPattern>
<exampleNumber>8001234</exampleNumber>
</tollFree>
<premiumRate>
@@ -10604,10 +10598,11 @@
<possibleNumberPattern>\d{7}</possibleNumberPattern>
<exampleNumber>4921234</exampleNumber>
</voip>
<voicemail>
<nationalNumberPattern>
+ 388\d{6}|
(?:
6(?:
2[0-8]|
49|
8\d
@@ -10619,12 +10614,11 @@
7[014-9]
)|
95[48]
)\d{4}
</nationalNumberPattern>
- <possibleNumberPattern>\d{7}</possibleNumberPattern>
- <exampleNumber>6201234</exampleNumber>
+ <exampleNumber>388123456</exampleNumber>
</voicemail>
</territory>
<!-- Italy -->
<!-- http://en.wikipedia.org/wiki/%2B39 -->
@@ -15556,10 +15550,10 @@
7[1-9]|
9\d
)|
7\d{2}|
8(?:
- [256]\d|
+ [26]\d|
7[15-8]
)|
9[0-8]\d
)\d{4}
</nationalNumberPattern>