Fix timezone lookup for some cities

move tz-hint from weather stations up to cities
for cities that have no timezone info

https://bugzilla.gnome.org/show_bug.cgi?id=699311

2 files changed, 57 insertions, 59 deletions

diff --git a/data/Locations.xml.in b/data/Locations.xml.in
index c98e6f7..33d7717 100644
--- a/data/Locations.xml.in
+++ b/data/Locations.xml.in
@@ -780,10 +780,10 @@
         <!-- The capital of the Democratic Republic of the Congo -->
         <_name>Kinshasa</_name>
         <coordinates>-4.329722 15.315000</coordinates>
+        <tz-hint>Africa/Kinshasa</tz-hint>
         <location>
           <name>N'Djili Airport</name>
           <code>FZAA</code>
-          <tz-hint>Africa/Kinshasa</tz-hint>
           <coordinates>-4.383333 15.433333</coordinates>
         </location>
       </city>
@@ -7433,10 +7433,10 @@
         <!-- The capital of the Federated States of Micronesia -->
         <_name>Palikir</_name>
         <coordinates>6.916667 158.150000</coordinates>
+        <tz-hint>Pacific/Pohnpei</tz-hint>
         <location>
           <name>Pohnpei</name>
           <code>PTTP</code>
-          <tz-hint>Pacific/Pohnpei</tz-hint>
           <coordinates>6.966667 158.216667</coordinates>
         </location>
       </city>
@@ -18081,10 +18081,10 @@
           -->
         <_name>Abakan</_name>
         <coordinates>53.715556 91.429167</coordinates>
+        <tz-hint>Asia/Krasnoyarsk</tz-hint>
         <location>
           <name>Abakan</name>
           <code>UNAA</code>
-          <tz-hint>Asia/Krasnoyarsk</tz-hint>
           <coordinates>53.750000 91.400000</coordinates>
         </location>
       </city>
@@ -18094,10 +18094,10 @@
           -->
         <_name>Adler</_name>
         <coordinates>43.431111 39.923611</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Adler</name>
           <code>URSS</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>43.433333 39.900000</coordinates>
         </location>
       </city>
@@ -18107,10 +18107,10 @@
           -->
         <_name>Anadyr'</_name>
         <coordinates>64.750000 177.483333</coordinates>
+        <tz-hint>Asia/Kamchatka</tz-hint>
         <location>
           <name>Anadyr'</name>
           <code>UHMA</code>
-          <tz-hint>Asia/Kamchatka</tz-hint>
           <coordinates>64.783333 177.566667</coordinates>
         </location>
       </city>
@@ -18120,10 +18120,10 @@
           -->
         <_name>Anapa</_name>
         <coordinates>44.894444 37.321667</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Anapa / Vitiazevo</name>
           <code>URKA</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>44.900000 37.316667</coordinates>
         </location>
       </city>
@@ -18133,10 +18133,10 @@
           -->
         <_name>Arkhangel'sk</_name>
         <coordinates>64.547222 40.548611</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Arhangel'sk</name>
           <code>ULAA</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>64.500000 40.733333</coordinates>
         </location>
       </city>
@@ -18146,10 +18146,10 @@
           -->
         <_name>Astrakhan'</_name>
         <coordinates>46.349444 48.049167</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Astrakhan'</name>
           <code>URWA</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>46.283333 48.006389</coordinates>
         </location>
       </city>
@@ -18159,10 +18159,10 @@
           -->
         <_name>Barnaul</_name>
         <coordinates>53.360556 83.763611</coordinates>
+        <tz-hint>Asia/Omsk</tz-hint>
         <location>
           <name>Barnaul</name>
           <code>UNBB</code>
-          <tz-hint>Asia/Omsk</tz-hint>
           <coordinates>53.433333 83.516667</coordinates>
         </location>
       </city>
@@ -18172,10 +18172,10 @@
           -->
         <_name>Bratsk</_name>
         <coordinates>56.350000 101.916667</coordinates>
+        <tz-hint>Asia/Irkutsk</tz-hint>
         <location>
           <name>Bratsk / Irkutsk</name>
           <code>UIBB</code>
-          <tz-hint>Asia/Irkutsk</tz-hint>
           <coordinates>56.370833 101.698611</coordinates>
         </location>
       </city>
@@ -18185,10 +18185,10 @@
           -->
         <_name>Bryansk</_name>
         <coordinates>53.287500 34.380556</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Bryansk</name>
           <code>UUBP</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>53.250000 34.316667</coordinates>
         </location>
       </city>
@@ -18198,10 +18198,10 @@
           -->
         <_name>Chelyabinsk</_name>
         <coordinates>55.154444 61.429722</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Chelyabinsk-Balandino</name>
           <code>USCC</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>55.166667 61.400000</coordinates>
         </location>
       </city>
@@ -18211,10 +18211,10 @@
           -->
         <_name>Chita</_name>
         <coordinates>52.031712 113.500867</coordinates>
+        <tz-hint>Asia/Yakutsk</tz-hint>
         <location>
           <name>Chita</name>
           <code>UIAA</code>
-          <tz-hint>Asia/Yakutsk</tz-hint>
           <coordinates>52.083333 113.483333</coordinates>
         </location>
       </city>
@@ -18224,10 +18224,10 @@
           -->
         <_name>Chul'man</_name>
         <coordinates>56.846944 124.906111</coordinates>
+        <tz-hint>Asia/Yakutsk</tz-hint>
         <location>
           <name>Cul'man</name>
           <code>UELL</code>
-          <tz-hint>Asia/Yakutsk</tz-hint>
           <coordinates>56.833333 124.866667</coordinates>
         </location>
       </city>
@@ -18237,10 +18237,10 @@
           -->
         <_name>Engel's</_name>
         <coordinates>51.483889 46.105278</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Saratov, Tsentralny Airport</name>
           <code>UWSS</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>51.570000 46.070000</coordinates>
         </location>
       </city>
@@ -18250,10 +18250,10 @@
           -->
         <_name>Irkutsk</_name>
         <coordinates>52.297778 104.296389</coordinates>
+        <tz-hint>Asia/Irkutsk</tz-hint>
         <location>
           <name>Irkutsk</name>
           <code>UIII</code>
-          <tz-hint>Asia/Irkutsk</tz-hint>
           <coordinates>52.266667 104.316667</coordinates>
         </location>
       </city>
@@ -18263,10 +18263,10 @@
           -->
         <_name>Kaliningrad</_name>
         <coordinates>54.710000 20.500000</coordinates>
+        <tz-hint>Europe/Kaliningrad</tz-hint>
         <location>
           <name>Khrabrovo Airport</name>
           <code>UMKK</code>
-          <tz-hint>Europe/Kaliningrad</tz-hint>
           <coordinates>54.720000 20.500000</coordinates>
         </location>
       </city>
@@ -18276,10 +18276,10 @@
           -->
         <_name>Kazan'</_name>
         <coordinates>55.750000 49.133333</coordinates>
+        <tz-hint>Europe/Samara</tz-hint>
         <location>
           <name>Kazan'</name>
           <code>UWKD</code>
-          <tz-hint>Europe/Samara</tz-hint>
           <coordinates>55.783333 49.200000</coordinates>
         </location>
       </city>
@@ -18289,10 +18289,10 @@
           -->
         <_name>Kemerovo</_name>
         <coordinates>55.333333 86.083333</coordinates>
+        <tz-hint>Asia/Krasnoyarsk</tz-hint>
         <location>
           <name>Kemerovo</name>
           <code>UNEE</code>
-          <tz-hint>Asia/Krasnoyarsk</tz-hint>
           <coordinates>55.330000 86.080000</coordinates>
         </location>
       </city>
@@ -18302,10 +18302,10 @@
           -->
         <_name>Khabarovsk</_name>
         <coordinates>48.480833 135.092778</coordinates>
+        <tz-hint>Asia/Vladivostok</tz-hint>
         <location>
           <name>Habarovsk</name>
           <code>UHHH</code>
-          <tz-hint>Asia/Vladivostok</tz-hint>
           <coordinates>48.516667 135.166667</coordinates>
         </location>
       </city>
@@ -18328,10 +18328,10 @@
           -->
         <_name>Krasnodar</_name>
         <coordinates>45.032778 38.976944</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Krasnodar</name>
           <code>URKK</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>45.033333 39.150000</coordinates>
         </location>
       </city>
@@ -18341,10 +18341,10 @@
 	 -->
         <_name>Krasnoyarsk</_name>
         <coordinates>56.016667 93.066667</coordinates>
+        <tz-hint>Asia/Krasnoyarsk</tz-hint>
         <location>
           <name>Krasnoyarsk</name>
           <code>UNKL</code>
-          <tz-hint>Asia/Krasnoyarsk</tz-hint>
           <coordinates>56.016667 93.066667</coordinates>
         </location>
       </city>
@@ -18354,10 +18354,10 @@
           -->
         <_name>Magadan</_name>
         <coordinates>59.566667 150.800000</coordinates>
+        <tz-hint>Asia/Magadan</tz-hint>
         <location>
           <name>Magadan</name>
           <code>UHMM</code>
-          <tz-hint>Asia/Magadan</tz-hint>
           <coordinates>59.550000 150.783333</coordinates>
         </location>
       </city>
@@ -18367,10 +18367,10 @@
           -->
         <_name>Mineral'nyye Vody</_name>
         <coordinates>44.210278 43.135278</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Mineral'nye Vody</name>
           <code>URMM</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>44.233333 43.066667</coordinates>
         </location>
       </city>
@@ -18380,10 +18380,10 @@
           -->
         <_name>Mirnyy</_name>
         <coordinates>62.535278 113.961111</coordinates>
+        <tz-hint>Asia/Yakutsk</tz-hint>
         <location>
           <name>Mirny</name>
           <code>UERR</code>
-          <tz-hint>Asia/Yakutsk</tz-hint>
           <coordinates>62.530000 114.030000</coordinates>
         </location>
       </city>
@@ -18394,22 +18394,20 @@
           -->
         <_name msgctxt="City in Russia">Moscow</_name>
         <coordinates>55.752222 37.615556</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Vnukovo Airport</name>
           <code>UUWW</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>55.650000 37.266667</coordinates>
         </location>
         <location>
           <name>Sheremet'ye Airport</name>
           <code>UUEE</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>55.983333 37.500000</coordinates>
         </location>
         <location>
           <name>Domodedovo Airport</name>
           <code>UUDD</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>55.400000 37.900000</coordinates>
         </location>
       </city>
@@ -18419,10 +18417,10 @@
           -->
         <_name>Murmansk</_name>
         <coordinates>68.971667 33.081944</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Murmansk</name>
           <code>ULMM</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>68.966667 33.050000</coordinates>
         </location>
       </city>
@@ -18432,10 +18430,10 @@
           -->
         <_name>Nal'chik</_name>
         <coordinates>43.498056 43.618889</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Nal'chik</name>
           <code>URMN</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>43.512778 43.636667</coordinates>
         </location>
       </city>
@@ -18445,10 +18443,10 @@
           -->
         <_name>Nizhnevartovsk</_name>
         <coordinates>60.933333 76.566667</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Nizhnevartovsk</name>
           <code>USNN</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>60.933333 76.483333</coordinates>
         </location>
       </city>
@@ -18458,10 +18456,10 @@
           -->
         <_name>Novokuznetsk</_name>
         <coordinates>53.750000 87.100000</coordinates>
+        <tz-hint>Asia/Krasnoyarsk</tz-hint>
         <location>
           <name>Novokuznetsk</name>
           <code>UNWW</code>
-          <tz-hint>Asia/Krasnoyarsk</tz-hint>
           <coordinates>53.733333 87.183333</coordinates>
         </location>
       </city>
@@ -18471,10 +18469,10 @@
           -->
         <_name>Novosibirsk</_name>
         <coordinates>55.041111 82.934444</coordinates>
+        <tz-hint>Asia/Omsk</tz-hint>
         <location>
           <name>Novosibirsk</name>
           <code>UNNT</code>
-          <tz-hint>Asia/Omsk</tz-hint>
           <coordinates>55.083333 82.900000</coordinates>
         </location>
       </city>
@@ -18484,10 +18482,10 @@
           -->
         <_name>Omsk</_name>
         <coordinates>55.000000 73.400000</coordinates>
+        <tz-hint>Asia/Omsk</tz-hint>
         <location>
           <name>Omsk</name>
           <code>UNOO</code>
-          <tz-hint>Asia/Omsk</tz-hint>
           <coordinates>54.966667 73.300000</coordinates>
         </location>
       </city>
@@ -18497,10 +18495,10 @@
           -->
         <_name>Orenburg</_name>
         <coordinates>51.784722 55.098611</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Tsentralny Airport</name>
           <code>UWOO</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>51.780000 55.120000</coordinates>
         </location>
       </city>
@@ -18510,10 +18508,10 @@
           -->
         <_name>Penza</_name>
         <coordinates>53.195833 45.000000</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Penza</name>
           <code>UWPP</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>53.116667 45.016667</coordinates>
         </location>
       </city>
@@ -18523,10 +18521,10 @@
           -->
         <_name>Perm'</_name>
         <coordinates>58.000000 56.250000</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Bolshoe Savino Airport</name>
           <code>USPP</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>58.000000 56.250000</coordinates>
         </location>
       </city>
@@ -18536,10 +18534,10 @@
           -->
         <_name>Petropavlovsk</_name>
         <coordinates>53.016667 158.650000</coordinates>
+        <tz-hint>Asia/Kamchatka</tz-hint>
         <location>
           <name>Petropavlovsk-Kamchatskij</name>
           <code>UHPP</code>
-          <tz-hint>Asia/Kamchatka</tz-hint>
           <coordinates>53.083333 158.583333</coordinates>
         </location>
       </city>
@@ -18549,10 +18547,10 @@
           -->
         <_name>Rostov</_name>
         <coordinates>47.236389 39.713889</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Rostov</name>
           <code>URRR</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>47.266667 39.816667</coordinates>
         </location>
       </city>
@@ -18564,10 +18562,10 @@
           -->
         <_name>Saint Petersburg</_name>
         <coordinates>59.894444 30.264167</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>St. Peterburg</name>
           <code>ULLI</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>59.966667 30.300000</coordinates>
         </location>
       </city>
@@ -18577,10 +18575,10 @@
           -->
         <_name>Samara</_name>
         <coordinates>53.200000 50.150000</coordinates>
+        <tz-hint>Europe/Samara</tz-hint>
         <location>
           <name>Samara</name>
           <code>UWWW</code>
-          <tz-hint>Europe/Samara</tz-hint>
           <coordinates>53.200000 50.150000</coordinates>
         </location>
       </city>
@@ -18588,10 +18586,10 @@
         <!-- A city in Russia -->
         <_name>Saratov</_name>
         <coordinates>51.540556 46.008611</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Tsentralny Airport</name>
           <code>UWSS</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>51.570000 46.070000</coordinates>
         </location>
       </city>
@@ -18601,10 +18599,10 @@
           -->
         <_name>Stavropol'</_name>
         <coordinates>45.042778 41.973333</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Stavropol' / Mikhaylovsk</name>
           <code>URMT</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>45.333333 42.000000</coordinates>
         </location>
       </city>
@@ -18614,10 +18612,10 @@
           -->
         <_name>Strigino</_name>
         <coordinates>56.202778 43.798611</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Nizhny Novgorod, Strigino Airport</name>
           <code>UWGG</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>56.330000 44.000000</coordinates>
         </location>
       </city>
@@ -18627,10 +18625,10 @@
           -->
         <_name>Surgut</_name>
         <coordinates>61.250000 73.416667</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Surgut</name>
           <code>USRR</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>61.250000 73.500000</coordinates>
         </location>
       </city>
@@ -18638,10 +18636,10 @@
         <!-- A city in Russia -->
         <_name>Syktyvkar</_name>
         <coordinates>61.666667 50.812222</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Syktyvkar</name>
           <code>UUYY</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>61.716667 50.833333</coordinates>
         </location>
       </city>
@@ -18649,10 +18647,10 @@
         <!-- A city in Russia -->
         <_name>Tiksi</_name>
         <coordinates>71.687222 128.869444</coordinates>
+        <tz-hint>Asia/Yakutsk</tz-hint>
         <location>
           <name>Tiksi</name>
           <code>UEST</code>
-          <tz-hint>Asia/Yakutsk</tz-hint>
           <coordinates>71.700000 128.900000</coordinates>
         </location>
       </city>
@@ -18660,10 +18658,10 @@
         <!-- A city in Russia -->
         <_name>Tyumen</_name>
         <coordinates>57.15 65.533333</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Tyumen</name>
           <code>USTR</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>57.181828 65.35024</coordinates>
         </location>
       </city>
@@ -18671,10 +18669,10 @@
         <!-- A city in Russia -->
         <_name>Udachnyy</_name>
         <coordinates>66.416667 112.400000</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Polyarny</name>
           <code>UERP</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>66.400556 112.030278</coordinates>
         </location>
       </city>
@@ -18682,10 +18680,10 @@
         <!-- A city in Russia -->
         <_name>Ufa</_name>
         <coordinates>54.775000 56.037500</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Ufa</name>
           <code>UWUU</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>54.730000 55.930000</coordinates>
         </location>
       </city>
@@ -18704,10 +18702,10 @@
         <!-- A city in Russia -->
         <_name>Ulan-Ude</_name>
         <coordinates>51.826053 107.609794</coordinates>
+        <tz-hint>Asia/Irkutsk</tz-hint>
         <location>
           <name>Ulan-Ude</name>
           <code>UIUU</code>
-          <tz-hint>Asia/Irkutsk</tz-hint>
           <coordinates>51.833333 107.600000</coordinates>
         </location>
       </city>
@@ -18715,10 +18713,10 @@
         <!-- A city in Russia -->
         <_name>Velikiye Luki</_name>
         <coordinates>56.340000 30.534722</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Velikiye Luki</name>
           <code>ULOL</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>56.350000 30.616667</coordinates>
         </location>
       </city>
@@ -18726,10 +18724,10 @@
         <!-- A city in Russia -->
         <_name>Vladivostok</_name>
         <coordinates>43.128056 131.901111</coordinates>
+        <tz-hint>Asia/Vladivostok</tz-hint>
         <location>
           <name>Vladivostok</name>
           <code>UHWW</code>
-          <tz-hint>Asia/Vladivostok</tz-hint>
           <coordinates>43.116667 131.933333</coordinates>
         </location>
       </city>
@@ -18737,10 +18735,10 @@
         <!-- A city in Russia -->
         <_name>Volgograd</_name>
         <coordinates>48.804722 44.585833</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Volgograd</name>
           <code>URWW</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>48.783333 44.366667</coordinates>
         </location>
       </city>
@@ -18748,10 +18746,10 @@
         <!-- A city in Russia -->
         <_name>Voronezh</_name>
         <coordinates>51.669905 39.192267</coordinates>
+        <tz-hint>Europe/Moscow</tz-hint>
         <location>
           <name>Voronez</name>
           <code>UUOO</code>
-          <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>51.650000 39.250000</coordinates>
         </location>
       </city>
@@ -18759,10 +18757,10 @@
         <!-- A city in Russia -->
         <_name>Yakutsk</_name>
         <coordinates>62.033889 129.733056</coordinates>
+        <tz-hint>Asia/Yakutsk</tz-hint>
         <location>
           <name>Jakutsk</name>
           <code>UEEE</code>
-          <tz-hint>Asia/Yakutsk</tz-hint>
           <coordinates>62.016667 129.716667</coordinates>
         </location>
       </city>
@@ -18770,10 +18768,10 @@
         <!-- A city in Russia -->
         <_name>Yekaterinburg</_name>
         <coordinates>56.857500 60.612500</coordinates>
+        <tz-hint>Asia/Yekaterinburg</tz-hint>
         <location>
           <name>Yekaterinburg</name>
           <code>USSS</code>
-          <tz-hint>Asia/Yekaterinburg</tz-hint>
           <coordinates>56.833333 60.633333</coordinates>
         </location>
       </city>
@@ -18781,10 +18779,10 @@
         <!-- A city in Russia -->
         <_name>Yuzhno-Sakhalinsk</_name>
         <coordinates>46.958116 142.733665</coordinates>
+        <tz-hint>Asia/Vladivostok</tz-hint>
         <location>
           <name>Yuzhno-Sakhalinsk</name>
           <code>UHSS</code>
-          <tz-hint>Asia/Vladivostok</tz-hint>
           <coordinates>46.950000 142.716667</coordinates>
         </location>
       </city>
diff --git a/data/locations.dtd b/data/locations.dtd
index f0facaa..5451e71 100644
--- a/data/locations.dtd
+++ b/data/locations.dtd
@@ -8,7 +8,7 @@
 <!ELEMENT country (%name;, iso-code, fips-code+, pref-lang?, timezones, tz-hint?, (location|state|province|city)*) >
 <!ELEMENT state (%name;, fips-code+, tz-hint?, (location|city)*) >
 <!ELEMENT province (%name;, (location|city)*) >
-<!ELEMENT city (%name;, coordinates?, location+) >
+<!ELEMENT city (%name;, coordinates?, tz-hint?, location+) >
 <!ELEMENT location (%name;, code, tz-hint?, zone?, yahoo-woeid?, radar?, coordinates?) >
 
 <!ELEMENT timezones (timezone+) >