v8.10.10

wmundev · Apr 17, 2019 · 63dcda5 · 63dcda5
1 parent 8eb5a0e
commit 63dcda5
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 45 deletions.
diff --git a/csharp/PhoneNumbers.sln.DotSettings b/csharp/PhoneNumbers.sln.DotSettings
@@ -24,4 +24,5 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary> 
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Geocoder/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary> 
diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml
@@ -4638,6 +4638,7 @@
           )\d{6}
         </nationalNumberPattern>
       </generalDesc>
+      <!-- Number range 373 is been supported based on user report and online evidence. -->
       <fixedLine>
         <possibleLengths national="7"/>
         <exampleNumber>2401234</exampleNumber>
@@ -4652,7 +4653,7 @@
               1[0-35-9]|
               55|
               [69]\d|
-              7[01]
+              7[013]
             )|
             4(?:
               6[03]|
@@ -5650,7 +5651,7 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          1230\d{7}|
+          12300\d{6}|
           6\d{9,10}|
           [2-9]\d{8}
         </nationalNumberPattern>
@@ -5721,9 +5722,9 @@
         <exampleNumber>800123456</exampleNumber>
         <nationalNumberPattern>
           (?:
-            1230\d|
-            800
-          )\d{6}
+            123|
+            8
+          )00\d{6}
         </nationalNumberPattern>
       </tollFree>
       <!-- http://empresa.movistar.cl/nuestros_productos/soluciones_telefonia_ip/servicios/servicio_600.php -->
@@ -7509,13 +7510,8 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <!-- Short shared cost numbers. -->
-        <numberFormat pattern="(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>138</leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
-        <!-- Fixed line, 4 digit area codes. -->
-        <numberFormat pattern="(\d{4})(\d{3,11})" nationalPrefixFormattingRule="$NP$FG">
+        <!-- Fixed line, 4 digit area codes. Only area code 5361 has two digit subscriber numbers. -->
+        <numberFormat pattern="(\d{4})(\d{2,11})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
             [24-6]|
             3(?:
@@ -7607,6 +7603,11 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- Short shared cost numbers. -->
+        <numberFormat pattern="(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>138</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <!-- UAN (181) numbers. -->
         <numberFormat pattern="(\d{3})(\d{5,11})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>181</leadingDigits>
@@ -7731,7 +7732,8 @@
            lengths for number ranges. This would (if taken literally) result in 1 or 2 length
            subscriber numbers (e.g. 5-digit area code for 6 digit number).
            A contact of the German numbering authority confirmed that subscriber numbers
-           are never shorter than 3-digits, and we've adopted this in the range data. -->
+           are never shorter than 3-digits, and we've adopted this in the range data. Exception
+           to this rule is 5361 range, where two digit subscriber numbers are possible. -->
       <!-- Maximum lengths of German numbers are generally undefined, since any subscriber
            number can connect to a private exchange (PABX), which can consume additionally
            dialled digits (e.g. for calling individual rooms in a hotel directly). This means that in
@@ -7740,7 +7742,7 @@
            This needs to be shorter to avoid range lengths overlapping which would otherwise
            cause issues in parsing (since 49 is both an area code and the country calling code). -->
       <fixedLine>
-        <possibleLengths national="[5-15]" localOnly="3,4"/>
+        <possibleLengths national="[5-15]" localOnly="[2-4]"/>
         <exampleNumber>30123456</exampleNumber>
         <nationalNumberPattern>
           (?:
@@ -7821,7 +7823,11 @@
               3[14]|
               [4-9]1
             )|
-            [57][1-9]1|
+            5(?:
+              [124-9]1|
+              3[16]
+            )|
+            7[1-9]1|
             9(?:
               06|
               [1-9]1
@@ -8859,7 +8865,7 @@
           )\d{7}
         </nationalNumberPattern>
       </generalDesc>
-      <!-- Found valid fixed-line numbers online that starts with prefix 11 639 -->
+      <!-- Found valid fixed-line numbers online that starts with prefix 11 617 and 11 639. -->
       <fixedLine>
         <possibleLengths national="9" localOnly="7"/>
         <exampleNumber>111112345</exampleNumber>
@@ -8899,7 +8905,7 @@
                 5[0-4]
               )|
               6(?:
-                18|
+                1[78]|
                 2[69]|
                 39|
                 4[5-7]|
@@ -12950,8 +12956,7 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- 12-digit toll free numbers -->
-        <numberFormat pattern="(\d{2})(\d{3})(\d{4})(\d{3})" nationalPrefixFormattingRule="$NP$FG"
-                      nationalPrefixOptionalWhenFormatting="true">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{4})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>0</leadingDigits>
           <format>$1 $2 $3 $4</format>
           <intlFormat>NA</intlFormat>
@@ -20335,7 +20340,7 @@
               0[2-9]|
               1[0-8]
             )|
-            90[235-9]
+            90[1-35-9]
           )\d{7}
         </nationalNumberPattern>
       </mobile>
@@ -21215,7 +21220,7 @@
         </nationalNumberPattern>
       </generalDesc>
       <!-- Looks like not all 1X numbers are land-line numbers in Lima, some of them are allotted
-           as IDDs. As it affects parsing of these numbers and no valid numbers found online, not
+           as IDDs. As it effects parsing of these numbers and no valid numbers found online, not
            supporting 8 digit 191[124], 1977 and 1990 ranges. -->
       <fixedLine>
         <possibleLengths national="8" localOnly="6,7"/>
@@ -21301,7 +21306,7 @@
       <mobile>
         <possibleLengths national="8"/>
         <exampleNumber>87123456</exampleNumber>
-        <nationalNumberPattern>8[79]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>8[7-9]\d{6}</nationalNumberPattern>
       </mobile>
     </territory>
 
@@ -25778,7 +25783,7 @@
             [25][2-8]|
             [346]|
             7[1-9]|
-            8[27-9]
+            8[237-9]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -25818,9 +25823,12 @@
         <exampleNumber>221234567</exampleNumber>
         <nationalNumberPattern>
           24\d{6,7}|
-          82(?:
-            3\d|
-            66
+          8(?:
+            2(?:
+              3\d|
+              66
+            )|
+            36[24-9]
           )\d{4}|
           (?:
             2[235-8]\d|
@@ -27523,10 +27531,18 @@
           )\d{6}
         </nationalNumberPattern>
       </mobile>
+      <!-- As per the user and update from carrier it seems that numbers starting with 1800 are
+           renumbered to 1228. Because we don't have complete update,supporting both the ranges
+           at present. -->
       <tollFree>
         <possibleLengths national="[8-10]"/>
         <exampleNumber>1800123456</exampleNumber>
-        <nationalNumberPattern>1800\d{4,6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          1(?:
+            228\d{4}|
+            800\d{4,6}
+          )
+        </nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="[8-10]"/>

diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
@@ -7559,7 +7559,7 @@
     <!-- http://tskl.net.ki/services has others. -->
     <territory id="KI">
       <generalDesc>
-        <nationalNumberPattern>[179]\d{2,3}</nationalNumberPattern>
+        <nationalNumberPattern>[17]\d{2,3}</nationalNumberPattern>
       </generalDesc>
       <!-- http://tskl.net.ki/services/3g-4g-rates-offpeaks/quick-dial-credit-checking-codes/
            lists 777 as voicemail access. -->
@@ -7573,36 +7573,24 @@
             9[2-5]
           )|
           777|
-          99[2-49]|
           10[0-8]
         </nationalNumberPattern>
       </shortCode>
       <tollFree>
         <possibleLengths national="3"/>
         <exampleNumber>192</exampleNumber>
-        <nationalNumberPattern>
-          19[2-5]|
-          99[2-49]
-        </nationalNumberPattern>
+        <nationalNumberPattern>19[2-5]</nationalNumberPattern>
       </tollFree>
       <!-- http://www.tskl.net.ki/910_operator.php - charged at $0.20 per call. -->
       <standardRate>
         <possibleLengths national="3"/>
         <exampleNumber>103</exampleNumber>
         <nationalNumberPattern>103</nationalNumberPattern>
       </standardRate>
-      <!-- ITU 30.VIII.2013 still listed 9XX emergency numbers (not yet 1XX).
-           Newer ITU updates (2016) no longer mention 9XX but list 1XX.
-           9XX might no longer be in use, but some websites (Wikipedia) still
-           list them.
-           TODO(b/33193822): Remove after confirming with government. -->
       <emergency>
         <possibleLengths national="3"/>
         <exampleNumber>192</exampleNumber>
-        <nationalNumberPattern>
-          19[2-5]|
-          99[2-49]
-        </nationalNumberPattern>
+        <nationalNumberPattern>19[2-5]</nationalNumberPattern>
       </emergency>
       <!-- See comment for emergency section. -->
       <expandedEmergency>

diff --git a/resources/carrier/en/234.txt b/resources/carrier/en/234.txt
@@ -247,6 +247,7 @@
 2348885|Starcomms
 2348886|Starcomms
 2348887|Starcomms
+234901|Airtel
 234902|Airtel
 234903|MTN
 234905|Glo

diff --git a/resources/carrier/en/689.txt b/resources/carrier/en/689.txt
@@ -13,4 +13,5 @@
 # limitations under the License.
 
 68987|Vini
+68988|Viti
 68989|Vodafone
diff --git a/resources/geocoding/en/251.txt b/resources/geocoding/en/251.txt
@@ -91,7 +91,7 @@
 25111552|Filwha VI, Addis Ababa
 25111553|Filwha V, Addis Ababa
 25111554|Filwha VII, Addis Ababa
-2511161|Bole I, Addis Ababa
+25111618|Bole I, Addis Ababa
 25111626|Bole Michael, Addis Ababa
 25111629|Gerji, Addis Ababa
 25111645|Yeka I, Addis Ababa

diff --git a/resources/geocoding/en/267.txt b/resources/geocoding/en/267.txt
@@ -25,7 +25,8 @@
 267319|Gaborone
 26735|Gaborone
 26736|Gaborone
-26737|Gaborone
+267370|Gaborone
+267371|Gaborone
 267390|Gaborone
 267391|Gaborone
 267392|Gaborone

diff --git a/resources/geocoding/en/886.txt b/resources/geocoding/en/886.txt
@@ -29,6 +29,7 @@
 88680|Pingtung
 886823|Kinmen
 886826|Wuqiu
+88683|Matsu
 88687|Pingtung
 88688|Pingtung
 88689|Taitung
diff --git a/resources/geocoding/zh/886.txt b/resources/geocoding/zh/886.txt
@@ -29,6 +29,7 @@
 88680|屏东
 886823|金门
 886826|乌丘
+88683|马祖
 88687|屏东
 88688|屏东
 88689|台东
diff --git a/resources/geocoding/zh_Hant/886.txt b/resources/geocoding/zh_Hant/886.txt
@@ -29,6 +29,7 @@
 88680|屏東
 886823|金門
 886826|烏坵
+88683|馬祖
 88687|屏東
 88688|屏東
 88689|臺東
diff --git a/resources/timezones/map_data.txt b/resources/timezones/map_data.txt
@@ -3220,6 +3220,7 @@
 689|Pacific/Gambier&Pacific/Marquesas&Pacific/Tahiti
 6894|Pacific/Tahiti
 68987|Pacific/Gambier&Pacific/Marquesas&Pacific/Tahiti
+68988|Pacific/Tahiti
 68989|Pacific/Tahiti
 690|Pacific/Fakaofo
 691|Pacific/Kosrae&Pacific/Ponape&Pacific/Truk
-Original file line number
+Diff line change
@@ Expand Up / @@ -247,6 +247,7 @@ @@
     2348885|Starcomms
     2348886|Starcomms
     2348887|Starcomms
+|Airtel
 |Airtel
 |MTN
 |Glo
@@ Expand Down @@