Skip to content

Commit bc71bad

Browse files
committed
Merge metadata updates from upstream r532
1 parent 1e0c9bc commit bc71bad

4 files changed

Lines changed: 152 additions & 167 deletions

File tree

resources/PhoneNumberMetaData.xml

Lines changed: 55 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -679,56 +679,6 @@
679679
</emergency>
680680
</territory>
681681

682-
<!-- Netherlands Antilles -->
683-
<!-- Note this country no longer exists. This metadata exists only to validate old Sint Maarten
684-
numbers through their parallel running period (which ends Sep 2012). New number ranges
685-
added to Sint Maarten during this time will be added to the new territory only and not
686-
here. -->
687-
<!-- The link below no longer works, since ITU deleted this document since this country no
688-
longer exists. We keep it here as a record of the last place we found information on this
689-
country. -->
690-
<!-- http://www.itu.int/oth/T0202000097/en -->
691-
<territory id="AN" countryCode="599" internationalPrefix="00">
692-
<!-- Shares formatting patterns with "CW". -->
693-
<generalDesc>
694-
<nationalNumberPattern>5\d{6}</nationalNumberPattern>
695-
<possibleNumberPattern>\d{7}</possibleNumberPattern>
696-
</generalDesc>
697-
<fixedLine>
698-
<nationalNumberPattern>
699-
5(?:
700-
4[2-8]|
701-
8[239]
702-
)\d{4}
703-
</nationalNumberPattern>
704-
<exampleNumber>5451234</exampleNumber>
705-
</fixedLine>
706-
<mobile>
707-
<!-- The code 555 was NOT migrated when the new country calling code (+1 721) was assigned
708-
for Sint Maarten, so it is supported here but not there. The codes 55[12] also seem
709-
to not have been migrated: although they were not explicitly mentioned in the migration
710-
instructions, they are not in the new plan for SX. -->
711-
<nationalNumberPattern>
712-
5(?:
713-
1[02]|
714-
2\d|
715-
5[0-79]|
716-
8[016-8]
717-
)\d{4}
718-
</nationalNumberPattern>
719-
<exampleNumber>5101234</exampleNumber>
720-
</mobile>
721-
<emergency>
722-
<!-- http://www.rijksdienstcn.com/index.php?view=pagina&id=126&set_language=EN -->
723-
<nationalNumberPattern>
724-
112|
725-
911
726-
</nationalNumberPattern>
727-
<possibleNumberPattern>\d{3}</possibleNumberPattern>
728-
<exampleNumber>112</exampleNumber>
729-
</emergency>
730-
</territory>
731-
732682
<!-- Angola -->
733683
<!-- http://www.itu.int/oth/T0202000006/en -->
734684
<territory id="AO" countryCode="244" internationalPrefix="00">
@@ -5353,7 +5303,7 @@
53535303
40|
53545304
[68]9
53555305
</leadingDigits>
5356-
<format>$1/$2</format>
5306+
<format>$1 $2</format>
53575307
</numberFormat>
53585308
<!-- The order of the rules on 3-5 digits area code matter as fallback is used here. -->
53595309
<!-- 3 digit area codes. -->
@@ -5376,7 +5326,7 @@
53765326
[1-9]1
53775327
)
53785328
</leadingDigits>
5379-
<format>$1/$2</format>
5329+
<format>$1 $2</format>
53805330
</numberFormat>
53815331
<!-- 4 digit area codes. -->
53825332
<numberFormat pattern="(\d{4})(\d{2,11})">
@@ -5464,12 +5414,12 @@
54645414
)
54655415
)
54665416
</leadingDigits>
5467-
<format>$1/$2</format>
5417+
<format>$1 $2</format>
54685418
</numberFormat>
54695419
<!-- 5 digit area codes. -->
54705420
<numberFormat pattern="(\d{5})(\d{1,10})">
54715421
<leadingDigits>3</leadingDigits>
5472-
<format>$1/$2</format>
5422+
<format>$1 $2</format>
54735423
</numberFormat>
54745424
<numberFormat pattern="(1\d{2})(\d{7,8})">
54755425
<leadingDigits>1[5-7]</leadingDigits>
@@ -8699,7 +8649,7 @@
86998649
)|
87008650
3(?:
87018651
1\d|
8702-
2[1-5]|
8652+
2[1-57]|
87038653
3[1-4]|
87048654
[45][1-3]|
87058655
7[1-7]|
@@ -9301,8 +9251,12 @@
93019251
<leadingDigits>1</leadingDigits>
93029252
<format>$1 $2 $3</format>
93039253
</numberFormat>
9304-
<numberFormat pattern="(6[029])(\d{4})(\d{3})">
9305-
<leadingDigits>6[029]</leadingDigits>
9254+
<numberFormat pattern="(6[09])(\d{4})(\d{3})">
9255+
<leadingDigits>6[09]</leadingDigits>
9256+
<format>$1 $2 $3</format>
9257+
</numberFormat>
9258+
<numberFormat pattern="(62)(\d{3})(\d{3,4})">
9259+
<leadingDigits>62</leadingDigits>
93069260
<format>$1 $2 $3</format>
93079261
</numberFormat>
93089262
<numberFormat pattern="([2-5]\d)(\d{3})(\d{3})">
@@ -9352,23 +9306,25 @@
93529306
<possibleNumberPattern>\d{6,12}</possibleNumberPattern>
93539307
</generalDesc>
93549308
<fixedLine>
9355-
<!-- Supporting 060 (general service), 062 (universal access), 069 (children service)
9356-
numbers here too. -->
93579309
<nationalNumberPattern>
9358-
(?:
9359-
1|
9360-
6[029]
9361-
)\d{7}|
9310+
1\d{7}|
93629311
(?:
93639312
2[0-3]|
93649313
3[1-5]|
93659314
4[02-47-9]|
93669315
5[1-3]
93679316
)\d{6}
93689317
</nationalNumberPattern>
9369-
<possibleNumberPattern>\d{6,9}</possibleNumberPattern>
9318+
<possibleNumberPattern>\d{6,8}</possibleNumberPattern>
93709319
<exampleNumber>12345678</exampleNumber>
93719320
</fixedLine>
9321+
<uan>
9322+
<!-- ITU numbering plan doesn't specify the length of the numbers with prefix 62, but there
9323+
are numbers on the internet with 6 or 7 digits after the prefix. -->
9324+
<nationalNumberPattern>62\d{6,7}</nationalNumberPattern>
9325+
<possibleNumberPattern>\d{8,9}</possibleNumberPattern>
9326+
<exampleNumber>62123456</exampleNumber>
9327+
</uan>
93729328
<mobile>
93739329
<nationalNumberPattern>9[1257-9]\d{6,10}</nationalNumberPattern>
93749330
<possibleNumberPattern>\d{8,12}</possibleNumberPattern>
@@ -9380,9 +9336,15 @@
93809336
<exampleNumber>8001234567</exampleNumber>
93819337
</tollFree>
93829338
<premiumRate>
9383-
<!-- 061 is for TeleVoting numbers - but these are charged at similar rates to premium rate
9384-
so we include them here. -->
9385-
<nationalNumberPattern>6[145]\d{4,7}</nationalNumberPattern>
9339+
<!-- The prefixes 060, 061, 064, 065 and 069 are named as premium rate numbers by
9340+
http://www.vipnet.hr/en/poslovni-korisnici/telefon-internet/vip-adsl-usluga#panel_4.
9341+
-->
9342+
<nationalNumberPattern>
9343+
6(?:
9344+
[09]\d{7}|
9345+
[145]\d{4,7}
9346+
)
9347+
</nationalNumberPattern>
93869348
<possibleNumberPattern>\d{6,9}</possibleNumberPattern>
93879349
<exampleNumber>611234</exampleNumber>
93889350
</premiumRate>
@@ -18212,21 +18174,21 @@
1821218174
<generalDesc>
1821318175
<nationalNumberPattern>
1821418176
(?:
18215-
2[3-6]|
18177+
2[2-6]|
1821618178
5|
18217-
9[2-9]
18179+
9[1-9]
1821818180
)\d{6}|
1821918181
800\d{5,6}
1822018182
</nationalNumberPattern>
1822118183
<possibleNumberPattern>\d{7,9}</possibleNumberPattern>
1822218184
</generalDesc>
1822318185
<fixedLine>
18224-
<nationalNumberPattern>2[3-6]\d{6}</nationalNumberPattern>
18186+
<nationalNumberPattern>2[2-6]\d{6}</nationalNumberPattern>
1822518187
<possibleNumberPattern>\d{8}</possibleNumberPattern>
1822618188
<exampleNumber>23123456</exampleNumber>
1822718189
</fixedLine>
1822818190
<mobile>
18229-
<nationalNumberPattern>9[2-9]\d{6}</nationalNumberPattern>
18191+
<nationalNumberPattern>9[1-9]\d{6}</nationalNumberPattern>
1823018192
<possibleNumberPattern>\d{8}</possibleNumberPattern>
1823118193
<exampleNumber>92123456</exampleNumber>
1823218194
</mobile>
@@ -20281,12 +20243,12 @@
2028120243
<!-- A single group is used to format 5-digit numbers. -->
2028220244
<availableFormats>
2028320245
<numberFormat pattern="(\d{3})(\d{4})">
20284-
<leadingDigits>[78]</leadingDigits>
20246+
<leadingDigits>[7-9]</leadingDigits>
2028520247
<format>$1 $2</format>
2028620248
</numberFormat>
2028720249
</availableFormats>
2028820250
<generalDesc>
20289-
<nationalNumberPattern>[1-8]\d{4,6}</nationalNumberPattern>
20251+
<nationalNumberPattern>[1-9]\d{4,6}</nationalNumberPattern>
2029020252
<possibleNumberPattern>\d{5,7}</possibleNumberPattern>
2029120253
</generalDesc>
2029220254
<fixedLine>
@@ -20308,11 +20270,18 @@
2030820270
<nationalNumberPattern>
2030920271
48\d{3}|
2031020272
7(?:
20311-
4\d|
20312-
5[025-8]|
20313-
6[0-6]
20273+
[46-8]\d|
20274+
5[025-9]|
20275+
90
2031420276
)\d{4}|
20315-
8[4-8]\d{5}
20277+
8[4-8]\d{5}|
20278+
9(?:
20279+
[46]\d|
20280+
5[0-46-9]|
20281+
7[0-689]|
20282+
8[0-79]|
20283+
9[0-8]
20284+
)\d{4}
2031620285
</nationalNumberPattern>
2031720286
<exampleNumber>7421234</exampleNumber>
2031820287
</mobile>
@@ -24645,9 +24614,9 @@
2464524614
<exampleNumber>801234567</exampleNumber>
2464624615
</tollFree>
2464724616
<premiumRate>
24648-
<nationalNumberPattern>86[1-9]\d{6}</nationalNumberPattern>
24617+
<nationalNumberPattern>86[2-9]\d{6}</nationalNumberPattern>
2464924618
<possibleNumberPattern>\d{9}</possibleNumberPattern>
24650-
<exampleNumber>861234567</exampleNumber>
24619+
<exampleNumber>862345678</exampleNumber>
2465124620
</premiumRate>
2465224621
<sharedCost>
2465324622
<nationalNumberPattern>860\d{6}</nationalNumberPattern>
@@ -24659,6 +24628,13 @@
2465924628
<possibleNumberPattern>\d{9}</possibleNumberPattern>
2466024629
<exampleNumber>871234567</exampleNumber>
2466124630
</voip>
24631+
<uan>
24632+
<!-- MaxiCall numbers cost as much as national long distance, so they are classified as UAN
24633+
numbers. -->
24634+
<nationalNumberPattern>861\d{6}</nationalNumberPattern>
24635+
<possibleNumberPattern>\d{9}</possibleNumberPattern>
24636+
<exampleNumber>861123456</exampleNumber>
24637+
</uan>
2466224638
<emergency>
2466324639
<nationalNumberPattern>
2466424640
1(?:

resources/PhoneNumberMetaDataForTesting.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@
800800
</territory>
801801

802802
<!-- International Toll Free numbers -->
803-
<territory id="001" countryCode="800">
803+
<territory id="001" countryCode="800" leadingZeroPossible="true">
804804
<availableFormats>
805805
<numberFormat pattern="(\d{4})(\d{4})">
806806
<format>$1 $2</format>

resources/geocoding/el/30.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
# Generated from:
1616
# http://el.wikipedia.org/wiki/Τηλεφωνικοί_κωδικοί_της_Ελλάδας [2667046]
17+
# Prefixes 302736 and 302893 were translated from the English equivalent
18+
# wikipedia page.
1719

1820
3021|Αθήνα/Πειραιάς/Σαλαμίνα
1921
302221|Χαλκίδα
@@ -79,8 +81,8 @@
7981
302322|Νιγρίτα
8082
302323|Σιδηρόκαστρο
8183
302324|Νέα Ζίχνη
82-
3023250|Ηράκλεια
83-
302327|Ροδόπολη Σερρών
84+
302325|Ηράκλεια, Σερρών
85+
302327|Ροδόπολη, Σερρών
8486
302331|Βέροια
8587
302332|Νάουσα
8688
302333|Αλεξάνδρεια
@@ -132,7 +134,7 @@
132134
302465|Σιάτιστα
133135
302467|Καστοριά
134136
302468|Νεάπολη
135-
3024910|Φάρσαλα
137+
302491|Φάρσαλα
136138
302492|Τύρναβος
137139
302493|Ελασσόνα
138140
302494|Αγιά
@@ -214,6 +216,7 @@
214216
302733|Γύθειο
215217
302734|Νεάπολη
216218
302735|Σκάλα
219+
302736|Κύθηρα
217220
302741|Κόρινθος
218221
302742|Κιάτο
219222
302743|Ξυλόκαστρο
@@ -250,7 +253,7 @@
250253
302844|Τζερμιάδο
251254
302891|Αρκαλοχώρι
252255
302892|Μοίρες, Ηράκλειο
253-
302893|Πύργος, Μονοφάτσι
256+
302893|Πύργος, Κρήτη
254257
302894|Αγία Βαρβάρα, Ηράκλειο Κρήτης
255258
302895|Άνω Βιάννος
256259
302897|Λιμένας Χερσονήσου

0 commit comments

Comments
 (0)