summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1431_enbin0 -> 33 bytes
-rw-r--r--java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_enbin0 -> 35 bytes
-rw-r--r--java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1873_enbin0 -> 31 bytes
-rw-r--r--java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/configbin4907 -> 4943 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java8
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870bin0 -> 310 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CAbin726 -> 736 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CIbin436 -> 438 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EGbin763 -> 746 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HKbin540 -> 649 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_INbin4035 -> 3999 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IRbin1122 -> 1123 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LBbin546 -> 564 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MAbin775 -> 778 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MEbin695 -> 692 bytes
-rw-r--r--java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MMbin696 -> 788 bytes
-rw-r--r--java/release_notes.txt6
-rw-r--r--resources/PhoneNumberMetaData.xml235
-rw-r--r--resources/geocoding/en/1.txt3
19 files changed, 167 insertions, 85 deletions
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1431_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1431_en
new file mode 100644
index 0000000..412c009
--- /dev/null
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1431_en
Binary files differ
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_en
new file mode 100644
index 0000000..b3bf8a0
--- /dev/null
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_en
Binary files differ
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1873_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1873_en
new file mode 100644
index 0000000..78e7da1
--- /dev/null
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1873_en
Binary files differ
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index 1f71c41..97f51e9 100644
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
index 922ab6d..7c8cf06 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
@@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMap {
// countries sharing a calling code, such as the NANPA countries, the one
// indicated with "isMainCountryForCode" in the metadata should be first.
static Map<Integer, List<String>> getCountryCodeToRegionCodeMap() {
- // The capacity is set to 281 as there are 211 different country codes,
+ // The capacity is set to 282 as there are 212 different country codes,
// and this offers a load factor of roughly 0.75.
Map<Integer, List<String>> countryCodeToRegionCodeMap =
- new HashMap<Integer, List<String>>(281);
+ new HashMap<Integer, List<String>>(282);
ArrayList<String> listWithRegionCode;
@@ -808,6 +808,10 @@ public class CountryCodeToRegionCodeMap {
countryCodeToRegionCodeMap.put(856, listWithRegionCode);
listWithRegionCode = new ArrayList<String>(1);
+ listWithRegionCode.add("001");
+ countryCodeToRegionCodeMap.put(870, listWithRegionCode);
+
+ listWithRegionCode = new ArrayList<String>(1);
listWithRegionCode.add("BD");
countryCodeToRegionCodeMap.put(880, listWithRegionCode);
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
new file mode 100644
index 0000000..2e8834e
--- /dev/null
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index ca99fc0..1960498 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index 5598d7f..857e66b 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index 16582aa..89b83de 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 0b3561a..cab9953 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 15576b0..529d469 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 5383277..5af5d86 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 6b2dba9..e8b1b4b 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index bf444b7..9de2932 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index 14dbe77..949f450 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
Binary files differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
index 6074b5a..e0eb9f8 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
Binary files differ
diff --git a/java/release_notes.txt b/java/release_notes.txt
index 87b6c09..8a61a9d 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,3 +1,9 @@
+May 8th, 2012: libphonenumber-4.8.1
+* Metadata update only:
+ - CA, CI, EG, HK, IN, IR, LB, MA, ME, MM
+ - Non-geographical entity with calling code 870 (Inmarsat)
+ - Geocoding updates for country calling codes 1 for new area codes
+
April 24th, 2012: libphonenumber-4.8
* Functionality changes
- RFC format now outputs a number starting with "tel:"
diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml
index 1e7c9c1..845d061 100644
--- a/resources/PhoneNumberMetaData.xml
+++ b/resources/PhoneNumberMetaData.xml
@@ -17,8 +17,9 @@
MetaData on Phone Number Plan and formatting rules
Note: Territories are in alphabetical order by their IDs, which are based on ISO 3166-1
- two-letter country codes. The country names in the comments are the official short names
- in English according to ISO 3166-1.
+ two-letter country codes (or are set to "001" for non-geographical entities, which
+ represents "World" in the UN M.49 standard). The country names in the comments are the
+ official short names in English according to ISO 3166-1.
For more information on what each element represents, see
java/com/google/i18n/phonenumbers/phonemetadata.proto
@@ -29,6 +30,9 @@
hence only basic validation rules (numbers should be between 3 and 15 digits long) will be
applied.
+ If adding an element for a non-geographical entity, please add an example number element to the
+ general description.
+
Country code, international and national prefix information main source:
http://www.itu.int/pub/T-SP-E.164C-2011
@@ -3610,7 +3614,7 @@
4(?:
03|
1[68]|
- 38|
+ 3[18]|
5[06]
)|
5(?:
@@ -3632,6 +3636,7 @@
8(?:
[06]7|
19|
+ 73
)|
90[25]
)[2-9]\d{6}|
@@ -3655,7 +3660,7 @@
4(?:
03|
1[68]|
- 38|
+ 3[18]|
5[06]
)|
5(?:
@@ -3677,6 +3682,7 @@
8(?:
[06]7|
19|
+ 73
)|
90[25]
)[2-9]\d{6}
@@ -4032,12 +4038,12 @@
<exampleNumber>21234567</exampleNumber>
</fixedLine>
<mobile>
- <!-- Added the prefixes 40, 5[57-9] & 65 because SMS messages have been successfully
- delivered. Supported by numbers found on the internet. -->
+ <!-- Added the prefixes 4[0-2] (Moov), 5[57-9] & 65 because SMS messages have been
+ successfully delivered. Supported by numbers found on the internet. -->
<nationalNumberPattern>
(?:
0[1-9]|
- 4[04-9]|
+ 4[0-24-9]|
5[057-9]|
6[05679]
)\d{6}
@@ -6132,9 +6138,7 @@
<numberFormat pattern="(\d{3})(\d{3})(\d{4})">
<leadingDigits>
1(?:
- 0[0169]|
- 1[124]|
- 2[0-278]|
+ [012]|
5[0-2]
)|
[89]00
@@ -6207,11 +6211,11 @@
<exampleNumber>234567890</exampleNumber>
</fixedLine>
<mobile>
- <!-- Adding the extra prefix 121 from user reports that Mobinil has started allocating
- numbers beginning with this prefix. -->
+ <!-- Adding the extra prefixes 102 and 121 from user reports that Vodafone and Mobinil have
+ started allocating numbers beginning with these prefixes. -->
<nationalNumberPattern>
1(?:
- 0[0169]|
+ 0[01269]|
1[124]|
2[0-278]
)\d{7}
@@ -8142,7 +8146,6 @@
<exampleNumber>302345678</exampleNumber>
</fixedLine>
<mobile>
- <!-- Added 20[0-79] from online numbers found with these prefixes. -->
<nationalNumberPattern>
(?:
2[034678]|
@@ -8991,7 +8994,7 @@
</territory>
<!-- Hong Kong -->
- <!-- http://www.ofta.gov.hk/numbering/main.html -->
+ <!-- http://www.ofca.gov.hk/en/industry_focus/telecommunications/portability/index.html -->
<territory id="HK" countryCode="852" internationalPrefix="00">
<availableFormats>
<numberFormat pattern="(\d{4})(\d{4})">
@@ -9012,6 +9015,10 @@
<leadingDigits>900</leadingDigits>
<format>$1 $2 $3 $4</format>
</numberFormat>
+ <numberFormat pattern="(900)(\d{2,5})">
+ <leadingDigits>900</leadingDigits>
+ <format>$1 $2</format>
+ </numberFormat>
</availableFormats>
<generalDesc>
<!-- Slightly more complex pattern to allow the country code to be stripped off if
@@ -9019,17 +9026,31 @@
<nationalNumberPattern>
[235-7]\d{7}|
8\d{7,8}|
- 9\d{7,10}
+ 9\d{4,10}
</nationalNumberPattern>
- <possibleNumberPattern>\d{8,11}</possibleNumberPattern>
+ <possibleNumberPattern>\d{5,11}</possibleNumberPattern>
</generalDesc>
<fixedLine>
- <nationalNumberPattern>[23]\d{7}</nationalNumberPattern>
+ <nationalNumberPattern>
+ (?:
+ [23]\d|
+ 5[78]
+ )\d{6}
+ </nationalNumberPattern>
<possibleNumberPattern>\d{8}</possibleNumberPattern>
<exampleNumber>21234567</exampleNumber>
</fixedLine>
<mobile>
- <nationalNumberPattern>[569]\d{7}</nationalNumberPattern>
+ <nationalNumberPattern>
+ (?:
+ 5[1-69]\d|
+ 6\d{2}|
+ 9(?:
+ 0[1-9]|
+ [1-8]\d
+ )
+ )\d{5}
+ </nationalNumberPattern>
<possibleNumberPattern>\d{8}</possibleNumberPattern>
<exampleNumber>51234567</exampleNumber>
</mobile>
@@ -9044,8 +9065,13 @@
<exampleNumber>800123456</exampleNumber>
</tollFree>
<premiumRate>
- <nationalNumberPattern>900\d{8}</nationalNumberPattern>
- <possibleNumberPattern>\d{11}</possibleNumberPattern>
+ <nationalNumberPattern>
+ 900(?:
+ [0-24-9]\d{7}|
+ 3\d{1,4}
+ )
+ </nationalNumberPattern>
+ <possibleNumberPattern>\d{5,11}</possibleNumberPattern>
<exampleNumber>90012345678</exampleNumber>
</premiumRate>
<personalNumber>
@@ -10115,21 +10141,20 @@
9[389]
)|
3(?:
- 0[13-9]|
- 5[0-4789]|
+ 0[1-9]|
+ [58]|
7[3679]|
- 8[1-9]|
9[689]
)|
4(?:
- 0[1-5789]|
+ 0[1-9]|
1[15-9]|
[29][89]|
39|
8[389]
)|
5(?:
- 0[0-5789]|
+ 0|
[47]9|
[25]0|
6[6-9]|
@@ -10173,8 +10198,8 @@
)|
2(?:
[2369]|
- 7[01357]|
- 8[567]
+ 7[0135789]|
+ 8[01567]
)|
3(?:
0[0235-8]|
@@ -10189,14 +10214,14 @@
)|
5(?:
0[07-9]|
- 11|
+ 1[01]|
[26]|
30|
4[47]|
5[39]|
- 85|
+ 8[56]|
7[45]|
- 9[015]
+ 9[0157]
)|
6(?:
[0589]|
@@ -10211,18 +10236,17 @@
)|
8(?:
[07-9]|
- 17|
+ 1[057]|
2[024-8]|
44|
5[3589]|
6[0167]
)|
9(?:
- [057-9]|
+ [05-9]|
2[35-9]|
3[019]|
- 4[03678]|
- 6[0-46-9]
+ 4[03678]
)
)|
9
@@ -10600,14 +10624,14 @@
<!-- A couple of additional prefixes not found on the wikipedia page, are added because SMS
messages have been successfully sent to these numbers. It seems almost impossible to
know for some of these numbers whether they are land-line or mobile, since the ranges
- overlap. Extra prefixes added: 7277, 730[124-689], 735[0-2478], 738[1-57], 740[3479],
- 750[79], 7796, 787[34], 7896, 810[1-358], 811[56], 812[02569], 814[01], 8171, 8179,
- 822[1-689], 823[0-24-9], 826[0-35-7], 827[0137], 829[0-2479], the ranges in 83X
- excepting 830[037], 834[14] and 8390, 840[02-57-9], 842[24-689], 843[0-59], 844[0-489],
- 845[0-24-689], 846[09], 847[0135], 848[0-8], 850[7-9], 852[02-589], 8530, 854[47],
- 8559, 856[0-5], 8595, 860[1259], 8649, 865[03-79], 867[0-59], 868[349], 869[0-46],
- 872[013-9], 8749, 875[1-35-9], 876[0-47], 879[4589], 8824, 8859, 892[67], 894[6-8],
- 896[346]. -->
+ overlap. Extra prefixes added: 7277, 730[124-689], 735[0-24-8], 738[0-57], 740[34679],
+ 750[679], 7796, 787[34], 7896, 810[1-358], 811[56], 812[02569], 814[01], 8171, 8179,
+ 822[1-689], 823[0-24-9], 826[0-35-7], 827[0137-9], 828[01], 829[0-2479], the ranges in
+ 83X excepting 830[037], 834[14] and 8390, 840[02-57-9], 842[24-689], 843[0-59],
+ 844[0-489], 845[0-24-689], 846[09], 847[0135], 848[0-8], 850[7-9], 8510, 852[02-589],
+ 8530, 854[47], 8559, 856[0-5], 8586, 859[57], 860[1259], 8649, 865[03-79], 867[0-59],
+ 868[349], 869[0-46], 872[013-9], 8749, 875[1-35-9], 876[0-47], 879[4589], 881[05],
+ 8824, 8859, 892[67], 894[6-8], 896[3-6]. -->
<nationalNumberPattern>
(?:
7(?:
@@ -10618,21 +10642,20 @@
9[389]
)|
3(?:
- 0[13-9]|
- 5[0-4789]|
+ 0[1-9]|
+ [58]\d|
7[3679]|
- 8[1-9]|
9[689]
)|
4(?:
- 0[1-5789]|
+ 0[1-9]|
1[15-9]|
[29][89]|
39|
8[389]
)|
5(?:
- 0[0-5789]|
+ 0\d|
[47]9|
[25]0|
6[6-9]|
@@ -10679,8 +10702,8 @@
2(?:
[2369]\d|
52|
- 7[01357]|
- 8[567]
+ 7[0135789]|
+ 8[01567]
)|
3(?:
0[0235-8]|
@@ -10695,14 +10718,14 @@
)|
5(?:
0[07-9]|
- 11|
+ 1[01]|
[26]\d|
30|
4[47]|
5[39]|
7[45]|
- 85|
- 9[015]
+ 8[56]|
+ 9[0157]
)|
6(?:
[0589]\d|
@@ -10717,18 +10740,17 @@
)|
8(?:
[07-9]\d|
- 17|
+ 1[057]|
2[024-8]|
44|
5[3589]|
6[0167]
)|
9(?:
- [057-9]\d|
+ [05-9]\d|
2[35-9]|
3[019]|
- 4[036-8]|
- 6[0-46-9]
+ 4[036-8]
)
)|
9\d{3}
@@ -10880,7 +10902,7 @@
<nationalNumberPattern>
[2-6]\d{4,9}|
9(?:
- [134]\d{8}|
+ [1-4]\d{8}|
9\d{2,8}
)|
[178]\d{9}
@@ -10921,9 +10943,10 @@
)|
2(?:
2[189]|
- [3689][12]|
+ [389][12]|
42|
5[256]|
+ 6[1-59]|
7[34]
)|
3(?:
@@ -10976,19 +10999,18 @@
9(?:
1(?:
[039]\d|
- 1[1-36-9]|
+ [16][1-35-9]|
2[1-8]|
- 4[01346-9]|
- 5[13-9]|
- 6[1-35-9]|
- 7[1-9]|
- 8[1346-9]
+ 4[013-9]|
+ [57][1-9]|
+ 8[13-9]
)|
+ 2[01]\d|
3(?:
+ [035-9]\d|
13|
2[1-579]|
- 47|
- [5-9]\d
+ 47
)
)\d{6}
</nationalNumberPattern>
@@ -13943,8 +13965,9 @@
<leadingDigits>
[13-6]|
7(?:
- [2-57-9]|
- 62)|
+ [2-579]|
+ 62|
+ 8[0-7])|
[89][2-9]
</leadingDigits>
<format>$1 $2 $3</format>
@@ -13954,7 +13977,8 @@
[89][01]|
7(?:
[01]|
- 6[013-9])
+ 6[013-9]|
+ 88)
</leadingDigits>
<format>$1 $2 $3</format>
</numberFormat>
@@ -13968,8 +13992,9 @@
(?:
[14-6]\d{2}|
7(?:
- [2-57-9]\d|
- 62)|
+ [2-579]\d|
+ 62|
+ 8[0-7])|
[89][2-9]\d
)\d{4}
</nationalNumberPattern>
@@ -13982,7 +14007,8 @@
3\d|
7(?:
[01]\d|
- 6[013-9]
+ 6[013-9]|
+ 88
)
)\d{5}
</nationalNumberPattern>
@@ -14909,15 +14935,15 @@
<exampleNumber>520123456</exampleNumber>
</fixedLine>
<mobile>
- <!-- Prefixes 60[1-5], 62[79], 63[0458] and 680 are from numbers found online, bug-reports,
- and information provided directly by the carriers. -->
+ <!-- Prefixes 60[1-5], 62[79], 63[0458] and 68[01] are from numbers found online,
+ bug-reports, and information provided directly by the carriers. -->
<nationalNumberPattern>
6(?:
0[0-6]|
[14-7]\d|
2[23679]|
3[03458]|
- 80|
+ 8[01]|
99
)\d{6}
</nationalNumberPattern>
@@ -15237,7 +15263,7 @@
</premiumRate>
<voip>
<!-- VOIP are prefixed with 78. -->
- <nationalNumberPattern>78[134579]\d{5}</nationalNumberPattern>
+ <nationalNumberPattern>78[1-9]\d{5}</nationalNumberPattern>
<possibleNumberPattern>\d{8}</possibleNumberPattern>
<exampleNumber>78108780</exampleNumber>
</voip>
@@ -15589,7 +15615,16 @@
<format>$1 $2 $3</format>
</numberFormat>
<numberFormat pattern="(9)(\d{3})(\d{4,5})">
- <leadingDigits>9[24-9]</leadingDigits>
+ <leadingDigits>
+ 9(?:
+ [25-9]|
+ 4[1349]
+ )
+ </leadingDigits>
+ <format>$1 $2 $3</format>
+ </numberFormat>
+ <numberFormat pattern="(9)(4\d{4})(\d{4})">
+ <leadingDigits>94[0256]</leadingDigits>
<format>$1 $2 $3</format>
</numberFormat>
</availableFormats>
@@ -15598,10 +15633,11 @@
[124-8]\d{5,7}|
9(?:
[25689]|
- [47]\d
+ 4\d{1,2}|
+ 7\d
)\d{6}
</nationalNumberPattern>
- <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
+ <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
</generalDesc>
<fixedLine>
<!-- Fixed satellite network numbers (1 3 33X XXX) are also included here. It seems as well
@@ -15629,15 +15665,19 @@
<exampleNumber>1234567</exampleNumber>
</fixedLine>
<mobile>
- <!-- Mobile numbers starting with 09 7XX and 09 4XX have been found online, despite not
+ <!-- Mobile numbers starting with 09 7XX and 09 4[139]X have been found online, despite not
being in the plan, so we support these here.-->
<nationalNumberPattern>
9(?:
[25689]|
- [47]\d
+ 4(?:
+ [0256]\d|
+ [1349]
+ )|
+ 7\d
)\d{6}
</nationalNumberPattern>
- <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
+ <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
<exampleNumber>92123456</exampleNumber>
</mobile>
<!-- No information on other types of phone numbers for Myanmar has been found. -->
@@ -24596,6 +24636,35 @@
</sharedCost>
</territory>
+ <!-- Inmarsat Global Limited -->
+ <!-- http://www.itu.int/oth/T0202000065/en -->
+ <!-- www.inmarsat.com -->
+ <territory id="001" countryCode="870">
+ <availableFormats>
+ <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
+ <format>$1 $2 $3</format>
+ </numberFormat>
+ </availableFormats>
+ <generalDesc>
+ <nationalNumberPattern>[35-7]\d{8}</nationalNumberPattern>
+ <possibleNumberPattern>\d{9}</possibleNumberPattern>
+ <exampleNumber>301234567</exampleNumber>
+ </generalDesc>
+ <fixedLine>
+ <nationalNumberPattern>NA</nationalNumberPattern>
+ <possibleNumberPattern>NA</possibleNumberPattern>
+ </fixedLine>
+ <mobile>
+ <!-- Assigning these to mobile since Inmarsat considers them to be mobile numbers. -->
+ <nationalNumberPattern>
+ (?:
+ [356]\d|
+ 7[6-8]
+ )\d{7}
+ </nationalNumberPattern>
+ </mobile>
+ </territory>
+
<!-- http://www.itu.int/oth/T02020000F3/en -->
<!-- http://www.republicwireless.com/world-wi-fi-number -->
<territory id="001" countryCode="883">
diff --git a/resources/geocoding/en/1.txt b/resources/geocoding/en/1.txt
index aef3b8e..5ebef41 100644
--- a/resources/geocoding/en/1.txt
+++ b/resources/geocoding/en/1.txt
@@ -10651,6 +10651,7 @@
1425957|Bellevue, WA
1425990|Bellevue, WA
1430|Texas
+1431|Manitoba
1432|Texas
1432218|Midland, TX
1432229|Presidio, TX
@@ -18966,6 +18967,7 @@
1662983|Bruce, MS
1662993|Ripley, MS
1667|Maryland
+1669|California
1678|Georgia
1678289|Stockbridge, GA
1678297|Alpharetta, GA
@@ -27336,6 +27338,7 @@
1870974|Jonesboro, AR
1870994|Ash Flat, AR
1872|Chicago, IL
+1873|Quebec
1878|Pennsylvania
1888988|Anaheim, CA
1901|Tennessee