From f9a8d47886db3a20bb55750377f2e1115b8f7272 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Fri, 4 Aug 2023 06:08:41 +0100
Subject: [PATCH] Merge metadata changes from upstream 8.13.18

Includes changes in resources/ up to and including
upstream commit 54af863d780d:
  "[maven-release-plugin] prepare release v8.13.18"
---
 resources/PhoneNumberAlternateFormats.xml |   2 +-
 resources/PhoneNumberMetadata.xml         | 295 +++++++---------------
 resources/ShortNumberMetadata.xml         |  16 +-
 resources/carrier/en/221.txt              |   2 +-
 resources/carrier/en/41.txt               |   7 +
 resources/carrier/en/46.txt               |  20 +-
 resources/carrier/en/53.txt               |   1 +
 resources/carrier/en/64.txt               |   8 +
 resources/carrier/en/65.txt               |   5 +-
 resources/carrier/en/972.txt              |   1 +
 resources/carrier/en/973.txt              |   3 +
 resources/carrier/en/995.txt              |   7 +-
 resources/carrier/en/998.txt              |   1 +
 resources/geocoding/en/299.txt            |   1 +
 resources/timezones/map_data.txt          |   4 +-
 15 files changed, 144 insertions(+), 229 deletions(-)

diff --git a/resources/PhoneNumberAlternateFormats.xml b/resources/PhoneNumberAlternateFormats.xml
index 080fec429..fdd660cf9 100644
--- a/resources/PhoneNumberAlternateFormats.xml
+++ b/resources/PhoneNumberAlternateFormats.xml
@@ -3498,7 +3498,7 @@
       <availableFormats>
         <!-- Alternate mobile format -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
-          <leadingDigits>[69]</leadingDigits>
+          <leadingDigits>6</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- Alternate format for big cities. -->
diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index 51d98454d..69ddb7abb 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -3890,7 +3890,7 @@
         <numberFormat pattern="(\d{4})(\d{4})">
           <leadingDigits>
             [13679]|
-            8[047]
+            8[02-4679]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -3927,11 +3927,11 @@
               9[69][69]
             )|
             7(?:
+              [07]\d\d|
               1(?:
                 11|
                 78
-              )|
-              7\d\d
+              )
             )
           )\d{4}
         </nationalNumberPattern>
@@ -3945,8 +3945,8 @@
         <nationalNumberPattern>
           (?:
             3(?:
-              [1-79]\d|
-              8[0-47-9]
+              [0-79]\d|
+              8[0-57-9]
             )\d|
             6(?:
               3(?:
@@ -3954,6 +3954,7 @@
                 33|
                 6[16]
               )|
+              441|
               6(?:
                 3[03-9]|
                 [69]\d|
@@ -3966,7 +3967,7 @@
       <tollFree>
         <possibleLengths national="8"/>
         <exampleNumber>80123456</exampleNumber>
-        <nationalNumberPattern>80\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>8[02369]\d{6}</nationalNumberPattern>
       </tollFree>
       <!-- 87 numbers are "wholly paid by the caller", so they are slotted under premium-rate for
            now. -->
@@ -3976,7 +3977,7 @@
         <nationalNumberPattern>
           (?:
             87|
-            9[014578]
+            9[0-8]
           )\d{6}
         </nationalNumberPattern>
       </premiumRate>
@@ -7526,7 +7527,7 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d)(\d{7})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>5</leadingDigits>
+          <leadingDigits>[56]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{7})" nationalPrefixFormattingRule="$NP$FG">
@@ -7538,6 +7539,7 @@
         <nationalNumberPattern>
           [27]\d{6,7}|
           [34]\d{5,7}|
+          63\d{6}|
           (?:
             5|
             8\d\d
@@ -7572,7 +7574,12 @@
       <mobile>
         <possibleLengths national="8"/>
         <exampleNumber>51234567</exampleNumber>
-        <nationalNumberPattern>5\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            5\d|
+            63
+          )\d{6}
+        </nationalNumberPattern>
       </mobile>
       <tollFree>
         <possibleLengths national="10"/>
@@ -9255,9 +9262,13 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[189]</leadingDigits>
+          <leadingDigits>[89]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{8})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>1</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -11008,6 +11019,9 @@
             5(?:
               00(?:
                 0\d|
+                11|
+                22|
+                33|
                 44|
                 5[05]|
                 77|
@@ -11477,9 +11491,8 @@
           (?:
             19|
             3[1-7]|
-            6[14689]|
+            [68][1-9]|
             70|
-            8[14-79]|
             9\d
           )\d{4}
         </nationalNumberPattern>
@@ -13380,7 +13393,7 @@
               2[2-9]|
               3[0-3]|
               4[34]|
-              5[015689]|
+              5[0-25689]|
               6[6-8]|
               7[0-267]|
               8[7-9]|
@@ -15886,8 +15899,15 @@
     <!-- http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/number_shitei.html -->
     <!-- https://www.itu.int/oth/T020200006D/en -->
     <!-- http://www.numberingplans.com/?page=dialling&sub=areacodes&ac=JP -->
+    <!-- nationalPrefixTransformRule is used here for purpose of capturing 0005999999 kind of
+         short codes without dropping intial '0' as national prefix. As we are using this field, the
+         library is unable to capture domestic carrier codes used, example input:
+         003768-0XX-YYYY-ZZZZ. Due to historic reasons, the parts that we captured in
+         nationalPrefixTransform rule can either be used to transform or to capture in fields like
+         preferred_domestic_carrier_code; schema is designed this way. -->
     <territory id="JP" countryCode="81" internationalPrefix="010" nationalPrefix="0"
-               mobileNumberPortableRegion="true">
+               nationalPrefixForParsing="(000[259]\d{6})$|(?:(?:003768)0?)|0"
+               nationalPrefixTransformRule="$1" mobileNumberPortableRegion="true">
       <availableFormats>
         <!-- National-only toll-free numbers (0037, 0066, 0077 and 0088). -->
         <numberFormat pattern="(\d{4})(\d{4})">
@@ -16085,7 +16105,7 @@
             )|
             5(?:
               2|
-              3[045]|
+              3[0459]|
               4[0-369]|
               5[29]|
               8[02389]|
@@ -16101,7 +16121,7 @@
             )|
             8(?:
               2[124589]|
-              3[27-9]|
+              3[26-9]|
               49|
               51|
               6|
@@ -16166,12 +16186,17 @@
               [45]|
               6[248]|
               7[2-47]|
-              8[1-9]
+              8[1-9]|
+              9[29]
             )|
             5(?:
               2|
-              3[045]|
+              3(?:
+                [045]|
+                9[0-8]
+              )|
               4[0-369]|
+              5[29]|
               8[02389]|
               9[0-3]
             )|
@@ -16194,13 +16219,17 @@
                 4[0-39]|
                 9[0-2469]
               )|
+              3(?:
+                [29]|
+                60
+              )|
               49|
               51|
               6(?:
                 [0-24]|
                 36|
                 5[0-3589]|
-                72|
+                7[23]|
                 9[01459]
               )|
               7[0-468]|
@@ -16219,11 +16248,6 @@
                 4[0178]
               )
             )|
-            (?:
-              49|
-              55|
-              83
-            )[29]|
             (?:
               264|
               837
@@ -16300,7 +16324,14 @@
             )|
             5(?:
               2|
-              3[045]|
+              3(?:
+                [045]|
+                9(?:
+                  [0-58]|
+                  6[4-9]|
+                  7[0-35689]
+                )
+              )|
               4[0-369]|
               5[29]|
               8[02389]|
@@ -16327,6 +16358,7 @@
               )|
               3(?:
                 [29]|
+                60|
                 7(?:
                   [017-9]|
                   6[6-8]
@@ -16345,7 +16377,10 @@
                   [01]|
                   9[178]
                 )|
-                72|
+                7(?:
+                  2[2-468]|
+                  3[78]
+                )|
                 9[0145]
               )|
               7[0-468]|
@@ -16396,161 +16431,6 @@
               )
             )[019]
           </leadingDigits>
-          <leadingDigits>
-            1(?:
-              1|
-              5(?:
-                4[018]|
-                5[017]
-              )|
-              77|
-              88|
-              9[69]
-            )|
-            2(?:
-              2[127]|
-              3[0-269]|
-              4[59]|
-              5(?:
-                [1-3]|
-                5[0-69]|
-                7[015-9]|
-                9(?:
-                  17|
-                  99
-                )
-              )|
-              6(?:
-                2|
-                4[016-9]
-              )|
-              7(?:
-                [1-35]|
-                8[0189]
-              )|
-              8(?:
-                [16]|
-                3[0134]|
-                9[0-5]
-              )|
-              9(?:
-                [028]|
-                17|
-                3[015-9]
-              )
-            )|
-            4(?:
-              2(?:
-                [13-79]|
-                8[014-6]
-              )|
-              3[0-57]|
-              [45]|
-              6[248]|
-              7[2-47]|
-              9[29]
-            )|
-            5(?:
-              2|
-              3[045]|
-              4[0-369]|
-              5[29]|
-              8[02389]|
-              9[0-3]
-            )|
-            7(?:
-              2[02-46-9]|
-              34|
-              [58]|
-              6[0249]|
-              7[57]|
-              9(?:
-                [23]|
-                4[0-59]|
-                5[01569]|
-                6[0167]
-              )
-            )|
-            8(?:
-              2(?:
-                [1258]|
-                4[0-39]|
-                9(?:
-                  [019]|
-                  4[1-3]|
-                  6(?:
-                    [0-47-9]|
-                    5[01346-9]
-                  )
-                )
-              )|
-              3(?:
-                [29]|
-                7(?:
-                  [017-9]|
-                  6[6-8]
-                )
-              )|
-              49|
-              51|
-              6(?:
-                [0-24]|
-                36[23]|
-                5(?:
-                  [0-389]|
-                  5[23]
-                )|
-                6(?:
-                  [01]|
-                  9[178]
-                )|
-                72|
-                9[0145]
-              )|
-              7[0-468]|
-              8[68]
-            )|
-            9(?:
-              4[15]|
-              5[138]|
-              6[1-3]|
-              7[156]|
-              8[189]|
-              9(?:
-                [1289]|
-                3(?:
-                  31|
-                  4[357]
-                )|
-                4[0178]
-              )
-            )|
-            (?:
-              223|
-              8699
-            )[014-9]|
-            (?:
-              25[0468]|
-              422|
-              838
-            )[01]|
-            (?:
-              48|
-              829(?:
-                2|
-                66
-              )|
-              9[23]
-            )[1-9]|
-            (?:
-              47[59]|
-              59[89]|
-              8(?:
-                68|
-                9
-              )
-            )[019]
-          </leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{2})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
@@ -22945,7 +22825,10 @@
         <possibleLengths national="[8-10]"/>
         <exampleNumber>211234567</exampleNumber>
         <nationalNumberPattern>
-          2[0-27-9]\d{7,8}|
+          2(?:
+            [0-27-9]\d|
+            6
+          )\d{6,7}|
           2(?:
             1\d|
             75
@@ -22954,8 +22837,8 @@
       </mobile>
       <pager>
         <possibleLengths national="8,9"/>
-        <exampleNumber>26123456</exampleNumber>
-        <nationalNumberPattern>[28]6\d{6,7}</nationalNumberPattern>
+        <exampleNumber>86123456</exampleNumber>
+        <nationalNumberPattern>86\d{6,7}</nationalNumberPattern>
       </pager>
       <!-- These are the toll free patterns used, by Telecom and Telstra/Clear, but they are
            referred to as 'Value-added service' in the phone plan for some reason. 85 numbers are
@@ -24924,8 +24807,7 @@
             479[0-5]|
             76(?:
               2[27]|
-              3[0-37]|
-              9\d
+              3[0-37]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -26008,7 +25890,7 @@
           <leadingDigits>
             [369]|
             8(?:
-              0[1-7]|
+              0[1-8]|
               [1-9]
             )
           </leadingDigits>
@@ -26057,12 +25939,12 @@
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            07[01]|
+            08[01]|
             95[0-2]
           )\d{4}|
           (?:
             8(?:
-              0[1-6]|
+              0[1-7]|
               [1-8]\d|
               9[0-4]
             )|
@@ -28855,7 +28737,8 @@
             [01578]\d|
             20|
             36|
-            [46][0-4]|
+            4[0-4]|
+            6[0-5]|
             9[89]
           )\d{6}
         </nationalNumberPattern>
@@ -29283,12 +29166,13 @@
                internationalPrefix="810" nationalPrefix="8">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP $FG">
-          <leadingDigits>[35-9]</leadingDigits>
+          <leadingDigits>[235-9]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          200\d{6}|
           (?:
             33|
             [5-79]\d|
@@ -29389,11 +29273,14 @@
         <nationalNumberPattern>
           (?:
             (?:
-              33|
-              50|
-              88|
-              9[0-57-9]
-            )\d{3}|
+              200[01]|
+              (?:
+                33|
+                50|
+                88|
+                9[0-57-9]
+              )\d\d
+            )\d|
             6(?:
               1(?:
                 2(?:
@@ -30293,12 +30180,12 @@
         <!-- Format for old mobile ranges and VOIP. -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG"
                       nationalPrefixOptionalWhenFormatting="true">
-          <leadingDigits>[69]</leadingDigits>
+          <leadingDigits>6</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG"
                       nationalPrefixOptionalWhenFormatting="true">
-          <leadingDigits>[3578]</leadingDigits>
+          <leadingDigits>[357-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- 2-digit area codes (big cities) -->
@@ -30728,8 +30615,7 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_France -->
     <!-- http://www.comores-online.com/mwezinet/internet/262 -->
     <!-- http://www.arcep.fr/index.php?id=2137&bloc=0596&CMD=RESULTS_NUMEROTATION -->
-    <territory id="YT" countryCode="262" leadingDigits="269|63|9(?:39|47)8" internationalPrefix="00"
-               nationalPrefix="0">
+    <territory id="YT" countryCode="262" internationalPrefix="00" nationalPrefix="0">
       <generalDesc>
         <nationalNumberPattern>
           (?:
@@ -30780,9 +30666,12 @@
         <exampleNumber>939801234</exampleNumber>
         <nationalNumberPattern>
           9(?:
-            39|
-            47
-          )8[01]\d{4}
+            (?:
+              39|
+              47
+            )8[01]|
+            769\d
+          )\d{4}
         </nationalNumberPattern>
       </voip>
     </territory>
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
index f10e425b2..6858d2233 100644
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@@ -7704,12 +7704,17 @@
     <!-- http://www.numberingplans.com/?page=dialling&sub=areacodes&ac=JP -->
     <territory id="JP">
       <generalDesc>
-        <nationalNumberPattern>1\d\d</nationalNumberPattern>
+        <nationalNumberPattern>
+          [01]\d\d(?:
+            \d{7}
+          )?
+        </nationalNumberPattern>
       </generalDesc>
       <shortCode>
-        <possibleLengths national="3"/>
+        <possibleLengths national="3,10"/>
         <exampleNumber>102</exampleNumber>
         <nationalNumberPattern>
+          000[259]\d{6}|
           1(?:
             0[24]|
             1[089]|
@@ -7728,6 +7733,13 @@
         <exampleNumber>110</exampleNumber>
         <nationalNumberPattern>11[09]</nationalNumberPattern>
       </emergency>
+      <!-- As per confirmations from the carrier (NTTDocomo), these are SMS only short codes,
+           which are used to interact with respective companies i.e. after scanning the code. -->
+      <smsServices>
+        <possibleLengths national="10"/>
+        <exampleNumber>0005000000</exampleNumber>
+        <nationalNumberPattern>000\d{7}</nationalNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Kenya (KE) -->
diff --git a/resources/carrier/en/221.txt b/resources/carrier/en/221.txt
index 3d4a301ec..85e4e3e87 100644
--- a/resources/carrier/en/221.txt
+++ b/resources/carrier/en/221.txt
@@ -19,7 +19,7 @@
 22172|HAYO
 22175|Promobile
 221757|Origines
-22176|Tigo
+22176|Free
 22177|Orange
 22178|Orange
 22179|ADIE
diff --git a/resources/carrier/en/41.txt b/resources/carrier/en/41.txt
index 7f9af0cd4..5ded8540e 100644
--- a/resources/carrier/en/41.txt
+++ b/resources/carrier/en/41.txt
@@ -66,6 +66,13 @@
 417840|UPC Switzerland
 417841|UPC Switzerland
 417842|UPC Switzerland
+4178470|MTEL
+4178471|MTEL
+4178472|MTEL
+4178473|MTEL
+4178474|MTEL
+4178475|MTEL
+4178476|MTEL
 4178480|Nexphone
 4178490|Telecom26 AG
 41785|Salt
diff --git a/resources/carrier/en/46.txt b/resources/carrier/en/46.txt
index e834cbf66..605dc8834 100644
--- a/resources/carrier/en/46.txt
+++ b/resources/carrier/en/46.txt
@@ -1,17 +1,3 @@
-# Copyright (C) 2019 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.
-
 46700|Tele2 Sverige
 467010|SPINBOX AB
 467011|Telenor Sverige
@@ -166,6 +152,7 @@
 46720894|TeliaSonera
 46720895|TeliaSonera
 46720896|TeliaSonera
+46720898|Xplora
 46720902|Telavox AB
 46720908|Telavox AB
 4672092|Telavox AB
@@ -213,6 +200,11 @@
 4672342|Telenor Sverige
 4672343|MESSAGEBIRD B.V.
 46723440|Beepsend
+46723442|Xplora
+46723443|Xplora
+46723445|Xplora
+46723446|Xplora
+46723447|Xplora
 46723449|Beepsend
 4672345|42 Telecom AB
 46723460|Beepsend
diff --git a/resources/carrier/en/53.txt b/resources/carrier/en/53.txt
index 4a3083f52..b947710c4 100644
--- a/resources/carrier/en/53.txt
+++ b/resources/carrier/en/53.txt
@@ -13,3 +13,4 @@
 # limitations under the License.
 
 535|etecsa
+536|etecsa
diff --git a/resources/carrier/en/64.txt b/resources/carrier/en/64.txt
index 4f2af4af6..50a17df43 100644
--- a/resources/carrier/en/64.txt
+++ b/resources/carrier/en/64.txt
@@ -20,6 +20,14 @@
 64206|Voyager Internet Limted
 6421|Vodafone
 6422|2degrees
+64260|2degrees
+64261|Spark
+64262|Spark
+64263|Spark
+64264|Spark
+64266|2degrees
+64268|Spark
+64269|Spark
 6427|Spark
 64280|Vodafone
 64281|Sure (Guernsey) New Zealand Limited
diff --git a/resources/carrier/en/65.txt b/resources/carrier/en/65.txt
index 31184caf4..d2f23a284 100644
--- a/resources/carrier/en/65.txt
+++ b/resources/carrier/en/65.txt
@@ -51,7 +51,10 @@
 658059|M1
 65806|Simba
 658067|SingTel
-65807|SingTel
+65807|Simba
+658070|SingTel
+658071|SingTel
+65808|Simba
 6581|StarHub
 65810|M1
 65812|SingTel
diff --git a/resources/carrier/en/972.txt b/resources/carrier/en/972.txt
index 1f35d14ab..19a2d8aaa 100644
--- a/resources/carrier/en/972.txt
+++ b/resources/carrier/en/972.txt
@@ -33,6 +33,7 @@
 97255440|Merkaziya
 9725550|Annatel
 9725551|Annatel
+9725552|Annatel
 9725555|Rami Levy
 972556|Rami Levy
 9725570|Cellact
diff --git a/resources/carrier/en/973.txt b/resources/carrier/en/973.txt
index 21e599ff1..33209b7b7 100644
--- a/resources/carrier/en/973.txt
+++ b/resources/carrier/en/973.txt
@@ -15,6 +15,7 @@
 # Prefixes obtained here:
 # http://www.tra.org.bh/en/marketNumbering.aspx
 
+97330|Telecommunications Regulatory Authority
 97331|Royal Court
 97332|Batelco
 97333|VIVA
@@ -23,8 +24,10 @@
 97336|zain BH
 97337|zain BH
 97338|Batelco
+973385|Telecommunications Regulatory Authority
 97339|Batelco
 97363|VIVA
+97364|Batelco
 9736630|zain BH
 9736633|zain BH
 9736634|zain BH
diff --git a/resources/carrier/en/995.txt b/resources/carrier/en/995.txt
index 5a604a637..befb50616 100644
--- a/resources/carrier/en/995.txt
+++ b/resources/carrier/en/995.txt
@@ -14,14 +14,9 @@
 
 # Veon was formerly known as Beeline/VimpelCom.
 
-9955000|Silknet
-9955004|Silknet
+995500|Silknet
 99550050|MagtiCom
-99550055|Silknet
 99550070|MyPhone
-99550077|Silknet
-9955008|Silknet
-9955009|Silknet
 9955050|Silknet
 9955055|MagtiCom
 995510|Silknet
diff --git a/resources/carrier/en/998.txt b/resources/carrier/en/998.txt
index a1c556866..c870835cc 100644
--- a/resources/carrier/en/998.txt
+++ b/resources/carrier/en/998.txt
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+9982|Beeline
 9983|HUMANS
 99850|Ucell
 99861220|MobiUZ
diff --git a/resources/geocoding/en/299.txt b/resources/geocoding/en/299.txt
index db57c904c..6cf2edd06 100644
--- a/resources/geocoding/en/299.txt
+++ b/resources/geocoding/en/299.txt
@@ -22,6 +22,7 @@
 29934|Nuuk
 29935|Nuuk
 29936|Nuuk
+29937|Nuuk
 29961|Nanortalik
 29964|Qaqortoq
 29966|Narsaq
diff --git a/resources/timezones/map_data.txt b/resources/timezones/map_data.txt
index d036d8c68..a7c9f2298 100644
--- a/resources/timezones/map_data.txt
+++ b/resources/timezones/map_data.txt
@@ -2094,7 +2094,9 @@
 2629399|Indian/Reunion
 2629478|Indian/Mayotte
 2629479|Indian/Reunion
-26297|Indian/Reunion
+2629762|Indian/Reunion
+2629763|Indian/Reunion
+2629769|Indian/Mayotte
 263|Africa/Harare
 264|Africa/Windhoek
 265|Africa/Blantyre