libgweather r522 - in trunk: . data
- From: danw svn gnome org
- To: svn-commits-list gnome org
- Subject: libgweather r522 - in trunk: . data
- Date: Tue, 25 Nov 2008 22:02:24 +0000 (UTC)
Author: danw
Date: Tue Nov 25 22:02:24 2008
New Revision: 522
URL: http://svn.gnome.org/viewvc/libgweather?rev=522&view=rev
Log:
* data/update-locations.py: when given a location name like
"Covington / Cincinnati", only create an entry for one of the two
cities (the larger one if we can tell, the one closer to the
weather station if we can't) rather than creating a separate entry
for each.
* data/Locations.xml.in: regen
Modified:
trunk/ChangeLog
trunk/data/Locations.xml.in
trunk/data/update-locations.py
Modified: trunk/data/Locations.xml.in
==============================================================================
--- trunk/data/Locations.xml.in (original)
+++ trunk/data/Locations.xml.in Tue Nov 25 22:02:24 2008
@@ -862,16 +862,6 @@
</timezones>
<tz-hint>Africa/Djibouti</tz-hint>
<city>
- <!-- A city in Djibouti -->
- <_name>Ambouli</_name>
- <coordinates>11.569444 43.136667</coordinates>
- <location>
- <name>Djibouti / Ambouli</name>
- <code>HDAM</code>
- <coordinates>11.550000 43.166667</coordinates>
- </location>
- </city>
- <city>
<!-- The capital of Djibouti -->
<_name msgctxt="City in Djibouti">Djibouti</_name>
<coordinates>11.595000 43.148056</coordinates>
@@ -1145,16 +1135,6 @@
<coordinates>13.350000 -16.800000</coordinates>
</location>
</city>
- <city>
- <!-- A city in Gambia -->
- <_name>Old Yundum</_name>
- <coordinates>13.362500 -16.686111</coordinates>
- <location>
- <name>Banjul / Old Yundum</name>
- <code>GBYD</code>
- <coordinates>13.350000 -16.800000</coordinates>
- </location>
- </city>
</country>
<country>
<!-- GH - Ghana -->
@@ -1918,16 +1898,6 @@
</city>
<city>
<!-- A city in Nigeria -->
- <_name>Lagos</_name>
- <coordinates>6.453056 3.395833</coordinates>
- <location>
- <name>Lagos / Ikeja</name>
- <code>DNMM</code>
- <coordinates>6.583333 3.333333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Nigeria -->
<_name>Port Harcourt</_name>
<coordinates>4.789167 6.998611</coordinates>
<location>
@@ -1963,16 +1933,6 @@
</timezones>
<tz-hint>Indian/Reunion</tz-hint>
<city>
- <!-- A city in RÃunion -->
- <_name>Gillot</_name>
- <coordinates>-20.883333 55.516667</coordinates>
- <location>
- <name>Saint-Denis / Gillot</name>
- <code>FMEE</code>
- <coordinates>-20.883333 55.516667</coordinates>
- </location>
- </city>
- <city>
<!-- The capital of RÃunion -->
<_name>Saint-Denis</_name>
<coordinates>-20.866667 55.466667</coordinates>
@@ -2435,16 +2395,6 @@
</city>
<city>
<!-- A city in Tanzania -->
- <_name>Kisauni</_name>
- <coordinates>-6.216667 39.216667</coordinates>
- <location>
- <name>Zanzibar / Kisauni</name>
- <code>HTZA</code>
- <coordinates>-6.216667 39.216667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Tanzania -->
<_name>Mbeya</_name>
<coordinates>-8.900000 33.450000</coordinates>
<location>
@@ -3131,16 +3081,6 @@
</city>
<city>
<!-- A city in Cambodia -->
- <_name>Pouthichentong</_name>
- <coordinates>11.566667 104.850000</coordinates>
- <location>
- <name>Phnom Penh / Pouthichentong</name>
- <code>VDPP</code>
- <coordinates>11.550000 104.850000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Cambodia -->
<_name>Siemreab</_name>
<coordinates>13.366667 103.850000</coordinates>
<location>
@@ -3782,16 +3722,6 @@
</city>
<city>
<!-- A city in India -->
- <_name>Dam Dam</_name>
- <coordinates>22.622222 88.416944</coordinates>
- <location>
- <name>Calcutta / Dam Dam</name>
- <code>VECC</code>
- <coordinates>22.650000 88.450000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in India -->
<_name>Hyderabad</_name>
<coordinates>17.375278 78.474444</coordinates>
<location>
@@ -3861,16 +3791,6 @@
</city>
<city>
<!-- A city in India -->
- <_name>Palam</_name>
- <coordinates>28.566667 77.100000</coordinates>
- <location>
- <name>New Delhi / Palam</name>
- <code>VIDP</code>
- <coordinates>28.566667 77.116667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in India -->
<_name>Patna</_name>
<coordinates>25.600000 85.116667</coordinates>
<location>
@@ -3880,26 +3800,6 @@
</location>
</city>
<city>
- <!-- A city in India -->
- <_name>Sanganer</_name>
- <coordinates>26.816667 75.783333</coordinates>
- <location>
- <name>Jaipur / Sanganer</name>
- <code>VIJP</code>
- <coordinates>26.816667 75.800000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in India -->
- <_name msgctxt="City in India">Santa Cruz</_name>
- <coordinates>19.083333 72.833333</coordinates>
- <location>
- <name>Bombay / Santa Cruz</name>
- <code>VABB</code>
- <coordinates>19.116667 72.850000</coordinates>
- </location>
- </city>
- <city>
<!-- A city in India.
The local name in Malayalam is "ààààààààààààà".
-->
@@ -5717,18 +5617,6 @@
</location>
</city>
<city>
- <!-- A city in Taiwan.
- The name is also written "æå".
- -->
- <_name>Sung-shan</_name>
- <coordinates>25.043056 121.579673</coordinates>
- <location>
- <name>Sung-shan / T'ai-pei Shih</name>
- <code>RCSS</code>
- <coordinates>25.066667 121.550000</coordinates>
- </location>
- </city>
- <city>
<!-- The capital of Taiwan.
The name is also written "èåå".
-->
@@ -6481,16 +6369,6 @@
</city>
<city>
<!-- A city in Saint Kitts and Nevis -->
- <_name>Charlestown</_name>
- <coordinates>17.133333 -62.616667</coordinates>
- <location>
- <name>Charlestown / Newcastle</name>
- <code>TKPN</code>
- <coordinates>17.200000 -62.583333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Saint Kitts and Nevis -->
<_name>Golden Rock</_name>
<coordinates>17.316667 -62.716667</coordinates>
<location>
@@ -7687,16 +7565,6 @@
<coordinates>-13.816667 -172.000000</coordinates>
</location>
</city>
- <city>
- <!-- A city in Samoa -->
- <_name>Faleolo</_name>
- <coordinates>-13.816667 -171.983333</coordinates>
- <location>
- <name>Faleolo International / Apia</name>
- <code>NSFA</code>
- <coordinates>-13.816667 -172.000000</coordinates>
- </location>
- </city>
</country>
<country>
<!-- SB - Solomon Islands -->
@@ -8415,7 +8283,7 @@
</city>
<city>
<!-- A city in Bolivia -->
- <_name msgctxt="City in Bolivia">Santa Cruz</_name>
+ <_name>Santa Cruz</_name>
<coordinates>-17.800000 -63.166667</coordinates>
<location>
<name>El Trompillo Airport</name>
@@ -10147,16 +10015,6 @@
</city>
<city>
<!-- A city in Cuba -->
- <_name>Rancho Boyeros</_name>
- <coordinates>23.000000 -82.385833</coordinates>
- <location>
- <name>Jose Marti Airport, Rancho Boyeros, Havana</name>
- <code>MUHA</code>
- <coordinates>22.983333 -82.400000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Cuba -->
<_name>Santiago de Cuba</_name>
<coordinates>20.024722 -75.821944</coordinates>
<location>
@@ -10165,16 +10023,6 @@
<coordinates>19.966667 -75.850000</coordinates>
</location>
</city>
- <city>
- <!-- A city in Cuba -->
- <_name>Varadero</_name>
- <coordinates>23.153611 -81.251389</coordinates>
- <location>
- <name>Varadero, Matanzas</name>
- <code>MUVR</code>
- <coordinates>23.133333 -81.283333</coordinates>
- </location>
- </city>
</country>
<country>
<!-- DO - Dominican Republic -->
@@ -12045,16 +11893,6 @@
</location>
</city>
<city>
- <!-- A city in Belarus -->
- <_name>Loshitsa</_name>
- <coordinates>53.850000 27.533333</coordinates>
- <location>
- <name>Loshitsa / Minsk International</name>
- <code>UMMM</code>
- <coordinates>53.865000 27.541667</coordinates>
- </location>
- </city>
- <city>
<!-- The capital of Belarus -->
<_name>Minsk</_name>
<coordinates>53.900000 27.566667</coordinates>
@@ -12114,16 +11952,6 @@
<coordinates>51.200000 4.466667</coordinates>
</location>
</city>
- <city>
- <!-- A city in Antwerp in Belgium -->
- <_name>Deurne</_name>
- <coordinates>51.216667 4.466667</coordinates>
- <location>
- <name>Antwerp / Deurne</name>
- <code>EBAW</code>
- <coordinates>51.200000 4.466667</coordinates>
- </location>
- </city>
</state>
<state>
<!-- A state in Belgium. local name (nl): Brussel, Vlaams- en
@@ -12189,16 +12017,6 @@
<fips-code>BE03</fips-code>
<city>
<!-- A city in Hainaut in Belgium -->
- <_name>Charleroi</_name>
- <coordinates>50.416667 4.433333</coordinates>
- <location>
- <name>Charleroi / Gosselies</name>
- <code>EBCI</code>
- <coordinates>50.466667 4.450000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Hainaut in Belgium -->
<_name>ChiÃvres</_name>
<coordinates>50.583333 3.800000</coordinates>
<location>
@@ -12446,16 +12264,6 @@
</city>
<city>
<!-- A city in Croatia -->
- <_name>Donji Zemunik</_name>
- <coordinates>44.106667 15.380556</coordinates>
- <location>
- <name>Zadar / Donji Zemunik</name>
- <code>LDZD</code>
- <coordinates>44.100000 15.350000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Croatia -->
<_name>Dubrovnik</_name>
<coordinates>42.650556 18.091389</coordinates>
<location>
@@ -12486,16 +12294,6 @@
</city>
<city>
<!-- A city in Croatia -->
- <_name>OmiÅalj</_name>
- <coordinates>45.208889 14.556389</coordinates>
- <location>
- <name>Rijeka / OmiÅalj</name>
- <code>LDRI</code>
- <coordinates>45.216667 14.583333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Croatia -->
<_name>Osijek</_name>
<coordinates>45.551111 18.693889</coordinates>
<location>
@@ -12506,16 +12304,6 @@
</city>
<city>
<!-- A city in Croatia -->
- <_name>Pleso</_name>
- <coordinates>45.733333 16.083333</coordinates>
- <location>
- <name>Zagreb / Pleso</name>
- <code>LDZA</code>
- <coordinates>45.733333 16.066667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Croatia -->
<_name>Rijeka</_name>
<coordinates>45.343056 14.409167</coordinates>
<location>
@@ -12554,26 +12342,6 @@
<coordinates>45.733333 16.066667</coordinates>
</location>
</city>
- <city>
- <!-- A city in Croatia -->
- <_name>Äepin</_name>
- <coordinates>45.523611 18.563333</coordinates>
- <location>
- <name>Osijek / Äepin</name>
- <code>LDOS</code>
- <coordinates>45.450000 18.800000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Croatia -->
- <_name>Äilipi</_name>
- <coordinates>42.553056 18.276111</coordinates>
- <location>
- <name>Dubrovnik / Äilipi</name>
- <code>LDDU</code>
- <coordinates>42.566667 18.266667</coordinates>
- </location>
- </city>
</country>
<country>
<!-- CY - Cyprus -->
@@ -12723,16 +12491,6 @@
<tz-hint>Europe/Copenhagen</tz-hint>
<city>
<!-- A city in Denmark -->
- <_name>Beldringe</_name>
- <coordinates>55.466667 10.333333</coordinates>
- <location>
- <name>Odense / Beldringe</name>
- <code>EKOD</code>
- <coordinates>55.483333 10.333333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Denmark -->
<_name>Billund</_name>
<coordinates>55.733333 9.116667</coordinates>
<location>
@@ -12934,16 +12692,6 @@
<coordinates>58.300000 26.733333</coordinates>
</location>
</city>
- <city>
- <!-- A city in Estonia -->
- <_name>Ãlenurme</_name>
- <coordinates>58.315833 26.724167</coordinates>
- <location>
- <name>Tartu / Ãlenurme</name>
- <code>EETU</code>
- <coordinates>58.300000 26.733333</coordinates>
- </location>
- </city>
</country>
<country>
<!-- FO - Faroe Islands, an autonomous province of Denmark in the
@@ -13162,16 +12910,6 @@
</city>
<city>
<!-- A city in Finland -->
- <_name>Pirkkala</_name>
- <coordinates>61.466667 23.566667</coordinates>
- <location>
- <name>Tampere / Pirkkala</name>
- <code>EFTP</code>
- <coordinates>61.416667 23.583333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Finland -->
<_name>Pori</_name>
<coordinates>61.483333 21.783333</coordinates>
<location>
@@ -14267,16 +14005,6 @@
<fips-code>GM01</fips-code>
<city>
<!-- A city in Baden-WÃrttemberg in Germany -->
- <_name>Baden-Baden</_name>
- <coordinates>48.750000 8.250000</coordinates>
- <location>
- <name>Karlsruhe, Baden Wurttemberg</name>
- <code>EDSB</code>
- <coordinates>48.778611 8.079722</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Baden-WÃrttemberg in Germany -->
<_name>Donaueschingen</_name>
<coordinates>47.950000 8.500000</coordinates>
<location>
@@ -14375,16 +14103,6 @@
<fips-code>GM02</fips-code>
<city>
<!-- A city in Bavaria in Germany -->
- <_name>Ansbach</_name>
- <coordinates>49.300000 10.583333</coordinates>
- <location>
- <name>Ansbach / Katterbach</name>
- <code>ETEB</code>
- <coordinates>49.316667 10.633333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Bavaria in Germany -->
<_name>Augsburg</_name>
<coordinates>48.366667 10.883333</coordinates>
<location>
@@ -14596,16 +14314,6 @@
<fips-code>GM05</fips-code>
<city>
<!-- A city in Hesse in Germany -->
- <_name>Calden</_name>
- <coordinates>51.416667 9.400000</coordinates>
- <location>
- <name>Kassel / Calden</name>
- <code>EDVK</code>
- <coordinates>51.400000 9.383333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Hesse in Germany -->
<_name>Frankfurt</_name>
<coordinates>50.116667 8.683333</coordinates>
<location>
@@ -14819,19 +14527,6 @@
</location>
</city>
<city>
- <!-- A city in North Rhine-Westphalia in Germany.
- "Cologne" is the traditional English name.
- The local name in German is "KÃln".
- -->
- <_name>Cologne</_name>
- <coordinates>50.933333 6.950000</coordinates>
- <location>
- <name>Cologne / Bonn</name>
- <code>EDDK</code>
- <coordinates>50.866667 7.166667</coordinates>
- </location>
- </city>
- <city>
<!-- A city in North Rhine-Westphalia in Germany -->
<_name>Dortmund</_name>
<coordinates>51.516667 7.450000</coordinates>
@@ -14883,16 +14578,6 @@
</city>
<city>
<!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Lippstadt</_name>
- <coordinates>51.666667 8.350000</coordinates>
- <location>
- <name>Paderborn / Lippstadt</name>
- <code>EDLP</code>
- <coordinates>51.616667 8.616667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in North Rhine-Westphalia in Germany -->
<_name>MÃnchengladbach</_name>
<coordinates>51.200000 6.433333</coordinates>
<location>
@@ -14931,16 +14616,6 @@
<coordinates>52.300000 7.383333</coordinates>
</location>
</city>
- <city>
- <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Wickede</_name>
- <coordinates>51.533333 7.616667</coordinates>
- <location>
- <name>Dortmund / Wickede</name>
- <code>EDLW</code>
- <coordinates>51.516667 7.616667</coordinates>
- </location>
- </city>
</state>
<state>
<!-- A state in Germany. The local name is "Rheinland-Pfalz".
@@ -17754,17 +17429,6 @@
</city>
<city>
<!-- A city in Portugal -->
- <_name>Horta</_name>
- <coordinates>38.533333 -28.633333</coordinates>
- <location>
- <name>Horta / Castelo Branco Acores</name>
- <code>LPHR</code>
- <tz-hint>Atlantic/Azores</tz-hint>
- <coordinates>38.516667 -28.716667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Portugal -->
<_name>Lajes</_name>
<coordinates>38.766667 -27.100000</coordinates>
<location>
@@ -17819,16 +17483,6 @@
</city>
<city>
<!-- A city in Portugal -->
- <_name>Pedras Rubras</_name>
- <coordinates>41.233333 -8.666667</coordinates>
- <location>
- <name>Porto / Pedras Rubras</name>
- <code>LPPR</code>
- <coordinates>41.233333 -8.683333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Portugal -->
<_name>Ponta Delgada</_name>
<coordinates>37.733333 -25.666667</coordinates>
<location>
@@ -17840,16 +17494,6 @@
</city>
<city>
<!-- A city in Portugal -->
- <_name>Portela</_name>
- <coordinates>38.716667 -9.216667</coordinates>
- <location>
- <name>Lisbon / Portela</name>
- <code>LPPT</code>
- <coordinates>38.766667 -9.133333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Portugal -->
<_name>Porto</_name>
<coordinates>41.150000 -8.616667</coordinates>
<location>
@@ -18012,16 +17656,6 @@
</city>
<city>
<!-- A city in Romania -->
- <_name>Salcea</_name>
- <coordinates>47.650000 26.366667</coordinates>
- <location>
- <name>Suceava / Salcea</name>
- <code>LRSV</code>
- <coordinates>47.650000 26.250000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Romania -->
<_name>Satu Mare</_name>
<coordinates>47.800000 22.883333</coordinates>
<location>
@@ -18466,19 +18100,6 @@
</city>
<city>
<!-- A city in Russia.
- The local name in Russian is "ÐÐÑÐÐÐÐÐÑÐ".
- -->
- <_name>Mikhaylovsk</_name>
- <coordinates>45.128333 42.025556</coordinates>
- <location>
- <name>Stavropol' / Mikhaylovsk</name>
- <code>URMT</code>
- <tz-hint>Europe/Moscow</tz-hint>
- <coordinates>45.333333 42.000000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Russia.
The local name in Russian is "ÐÐÐÐÑÐÐÑÐÑÐ ÐÐÐÑ".
-->
<_name>Mineral'nyye Vody</_name>
@@ -18951,16 +18572,6 @@
</city>
<city>
<!-- A city in Serbia -->
- <_name>SurÄin</_name>
- <coordinates>44.793056 20.280278</coordinates>
- <location>
- <name>Belgrade / SurÄin</name>
- <code>LYBE</code>
- <coordinates>44.816667 20.283333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Serbia -->
<_name>VrÅac</_name>
<coordinates>45.116667 21.303611</coordinates>
<location>
@@ -18990,16 +18601,6 @@
</timezones>
<tz-hint>Europe/Bratislava</tz-hint>
<city>
- <!-- A city in Slovakia -->
- <_name>Barca</_name>
- <coordinates>48.683333 21.266667</coordinates>
- <location>
- <name>KoÅice</name>
- <code>LZKZ</code>
- <coordinates>48.663056 21.241111</coordinates>
- </location>
- </city>
- <city>
<!-- The capital of Slovakia -->
<_name>Bratislava</_name>
<coordinates>48.150000 17.116667</coordinates>
@@ -21263,17 +20864,6 @@
</city>
<city>
<!-- A city in Scotland in the United Kingdom -->
- <_name>Dalcross</_name>
- <coordinates>57.533333 -4.050000</coordinates>
- <location>
- <name>Inverness / Dalcross</name>
- <code>EGPE</code>
- <zone>:nescotland</zone>
- <coordinates>57.533333 -4.050000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Scotland in the United Kingdom -->
<_name>Dundee</_name>
<coordinates>56.500000 -2.966667</coordinates>
<location>
@@ -21285,17 +20875,6 @@
</city>
<city>
<!-- A city in Scotland in the United Kingdom -->
- <_name>Dyce</_name>
- <coordinates>57.200000 -2.183333</coordinates>
- <location>
- <name>Aberdeen / Dyce</name>
- <code>EGPD</code>
- <zone>:nescotland</zone>
- <coordinates>57.200000 -2.216667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Scotland in the United Kingdom -->
<_name>Edinburgh</_name>
<coordinates>55.950000 -3.200000</coordinates>
<location>
@@ -21492,7 +21071,7 @@
<!-- A city in South and South West England in the United
Kingdom
-->
- <_name msgctxt="City in South and South West England, United Kingdom">Bristol</_name>
+ <_name>Bristol</_name>
<coordinates>51.450000 -2.583333</coordinates>
<location>
<name>Bristol / Lulsgate</name>
@@ -28246,16 +27825,6 @@
<tz-hint>America/Mexico_City</tz-hint>
<city>
<!-- A city in Veracruz in Mexico -->
- <_name>Las Bajadas</_name>
- <coordinates>19.166667 -96.166667</coordinates>
- <location>
- <name>Veracruz / Las Bajadas, General Heriberto Jara Airport</name>
- <code>MMVR</code>
- <coordinates>19.150000 -96.183333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Veracruz in Mexico -->
<_name>MinatitlÃn</_name>
<coordinates>17.983333 -94.516667</coordinates>
<location>
@@ -30552,13 +30121,6 @@
<radar>okc</radar>
<coordinates>36.010278 -94.167778</coordinates>
</location>
- <location>
- <name>Fayetteville / Springdale, Northwest Arkansas Regional Airport</name>
- <code>KXNA</code>
- <zone>ARZ010</zone>
- <radar>okc</radar>
- <coordinates>36.281944 -94.306944</coordinates>
- </location>
</city>
<city>
<!-- A city in Arkansas in the United States -->
@@ -30585,16 +30147,6 @@
</city>
<city>
<!-- A city in Arkansas in the United States -->
- <_name>Harrell</_name>
- <coordinates>33.510114 -92.398762</coordinates>
- <location>
- <name>Camden / Harrell Field</name>
- <code>KCDH</code>
- <coordinates>33.616667 -92.766667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Arkansas in the United States -->
<_name>Harrison</_name>
<coordinates>36.229794 -93.107676</coordinates>
<location>
@@ -31113,18 +30665,6 @@
</city>
<city>
<!-- A city in California in the United States -->
- <_name>El Cajon</_name>
- <coordinates>32.794773 -116.962527</coordinates>
- <location>
- <name>San Diego / El Cajon, Gillespie Field Airport</name>
- <code>KSEE</code>
- <zone>CAZ050</zone>
- <radar>lax</radar>
- <coordinates>32.826111 -116.972222</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in California in the United States -->
<_name>El Centro</_name>
<coordinates>32.792000 -115.563051</coordinates>
<location>
@@ -31172,18 +30712,6 @@
</city>
<city>
<!-- A city in California in the United States -->
- <_name msgctxt="City in California, United States">Eureka</_name>
- <coordinates>40.802071 -124.163673</coordinates>
- <location>
- <name>Arcata / Eureka, Arcata Airport</name>
- <code>KACV</code>
- <zone>CAZ001</zone>
- <radar>rbl</radar>
- <coordinates>40.978056 -124.108611</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in California in the United States -->
<_name msgctxt="City in California, United States">Fairfield</_name>
<coordinates>38.249358 -122.039966</coordinates>
<location>
@@ -31533,18 +31061,6 @@
</city>
<city>
<!-- A city in California in the United States -->
- <_name>Miramar</_name>
- <coordinates>32.893658 -117.118366</coordinates>
- <location>
- <name>San Diego, Miramar MCAS / Mitscher Field Airport</name>
- <code>KNKX</code>
- <zone>CAZ043</zone>
- <radar>lax</radar>
- <coordinates>32.868333 -117.142500</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in California in the United States -->
<_name>Modesto</_name>
<coordinates>37.639097 -120.996878</coordinates>
<location>
@@ -32444,16 +31960,6 @@
</city>
<city>
<!-- A city in Colorado in the United States -->
- <_name>Copper Mountain</_name>
- <coordinates>39.506653 -106.142244</coordinates>
- <location>
- <name>Copper Mountain, Red Cliff Pass</name>
- <code>KCCU</code>
- <coordinates>39.467222 -106.150278</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Colorado in the United States -->
<_name>Cortez</_name>
<coordinates>37.348883 -108.585926</coordinates>
<location>
@@ -32628,16 +32134,6 @@
</city>
<city>
<!-- A city in Colorado in the United States -->
- <_name>La Veta Pass</_name>
- <coordinates>37.593063 -105.203336</coordinates>
- <location>
- <name>La Veta Mountain</name>
- <code>KVTP</code>
- <coordinates>37.501111 -105.166944</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Colorado in the United States -->
<_name>Lakewood</_name>
<coordinates>39.704709 -105.081373</coordinates>
<location>
@@ -32684,18 +32180,6 @@
</city>
<city>
<!-- A city in Colorado in the United States -->
- <_name>Loveland</_name>
- <coordinates>40.397761 -105.074980</coordinates>
- <location>
- <name>Fort Collins / Loveland, Fort Collins-Loveland Municipal Airport</name>
- <code>KFNL</code>
- <zone>COZ038</zone>
- <radar>den</radar>
- <coordinates>40.450000 -105.016667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Colorado in the United States -->
<_name>Meeker</_name>
<coordinates>40.037473 -107.913130</coordinates>
<location>
@@ -32718,16 +32202,6 @@
</city>
<city>
<!-- A city in Colorado in the United States -->
- <_name>Monument</_name>
- <coordinates>39.091659 -104.872758</coordinates>
- <location>
- <name>Elbert Mountain, Monument Pass</name>
- <code>KMNH</code>
- <coordinates>39.216667 -104.633889</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Colorado in the United States -->
<_name>Pagosa Springs</_name>
<coordinates>37.269450 -107.009762</coordinates>
<location>
@@ -32930,18 +32404,6 @@
</city>
<city>
<!-- A city in Connecticut in the United States -->
- <_name>New London</_name>
- <coordinates>41.355654 -72.099521</coordinates>
- <location>
- <name>Groton / New London, Groton / New London Airport</name>
- <code>KGON</code>
- <zone>CTZ012</zone>
- <radar>nyc</radar>
- <coordinates>41.327500 -72.049444</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Connecticut in the United States -->
<_name msgctxt="City in Connecticut, United States">Oxford</_name>
<coordinates>41.433985 -73.116777</coordinates>
<location>
@@ -33102,18 +32564,6 @@
</city>
<city>
<!-- A city in Florida in the United States -->
- <_name>Bradenton</_name>
- <coordinates>27.498928 -82.574819</coordinates>
- <location>
- <name>Sarasota / Bradenton, Sarasota-Bradenton International Airport</name>
- <code>KSRQ</code>
- <zone>FLZ060</zone>
- <radar>tpa</radar>
- <coordinates>27.401389 -82.558611</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Florida in the United States -->
<_name>Brooksville</_name>
<coordinates>28.555272 -82.387871</coordinates>
<location>
@@ -33172,16 +32622,6 @@
</city>
<city>
<!-- A city in Florida in the United States -->
- <_name>Cocoa Beach</_name>
- <coordinates>28.320007 -80.607551</coordinates>
- <location>
- <name>Cocoa Beach, Cape Canaveral Air Force Station Skid Strip</name>
- <code>KXMR</code>
- <coordinates>28.466667 -80.566667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Florida in the United States -->
<_name>Crestview</_name>
<coordinates>30.762133 -86.570508</coordinates>
<location>
@@ -34056,16 +33496,6 @@
</city>
<city>
<!-- A city in Georgia in the United States -->
- <_name>Glynco</_name>
- <coordinates>31.222451 -81.510102</coordinates>
- <location>
- <name>Brunswick / Glynco</name>
- <code>KBQK</code>
- <coordinates>31.250000 -81.466667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Georgia in the United States -->
<_name msgctxt="City in Georgia, United States">Greensboro</_name>
<coordinates>33.575683 -83.182379</coordinates>
<location>
@@ -34168,18 +33598,6 @@
</city>
<city>
<!-- A city in Georgia in the United States -->
- <_name>Peachtree City</_name>
- <coordinates>33.396783 -84.595763</coordinates>
- <location>
- <name>Atlanta, Peachtree City-Falcon Field</name>
- <code>KFFC</code>
- <zone>GAZ033</zone>
- <radar>atl</radar>
- <coordinates>33.355278 -84.566944</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Georgia in the United States -->
<_name msgctxt="City in Georgia, United States">Rome</_name>
<coordinates>34.257038 -85.164673</coordinates>
<location>
@@ -34838,19 +34256,7 @@
</city>
<city>
<!-- A city in Illinois in the United States -->
- <_name msgctxt="City in Illinois, United States">Charleston</_name>
- <coordinates>39.496146 -88.176152</coordinates>
- <location>
- <name>Mattoon / Charleston, Coles County Memorial Airport</name>
- <code>KMTO</code>
- <zone>ILZ056</zone>
- <radar>stl</radar>
- <coordinates>39.478056 -88.279167</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Illinois in the United States -->
- <_name msgctxt="City in Illinois, United States">Chicago</_name>
+ <_name>Chicago</_name>
<coordinates>41.850033 -87.650052</coordinates>
<location>
<name>Chicago Midway Airport</name>
@@ -35143,7 +34549,7 @@
</city>
<city>
<!-- A city in Illinois in the United States -->
- <_name msgctxt="City in Illinois, United States">Mount Vernon</_name>
+ <_name>Mount Vernon</_name>
<coordinates>38.317271 -88.903120</coordinates>
<location>
<name>Mount Vernon Airport</name>
@@ -35155,18 +34561,6 @@
</city>
<city>
<!-- A city in Illinois in the United States -->
- <_name>Murphysboro</_name>
- <coordinates>37.764495 -89.335089</coordinates>
- <location>
- <name>Carbondale / Murphysboro, Southern Illinois Airport</name>
- <code>KMDH</code>
- <zone>ILZ084</zone>
- <radar>stl</radar>
- <coordinates>37.783056 -89.245000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Illinois in the United States -->
<_name>Naperville</_name>
<coordinates>41.785863 -88.147289</coordinates>
<location>
@@ -35179,18 +34573,6 @@
</city>
<city>
<!-- A city in Illinois in the United States -->
- <_name>Normal</_name>
- <coordinates>40.514203 -88.990631</coordinates>
- <location>
- <name>Bloomington / Normal, Central Illinois Regional Airport at Bloomington-Normal</name>
- <code>KBMI</code>
- <zone>ILZ038</zone>
- <radar>ind</radar>
- <coordinates>40.476944 -88.915833</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Illinois in the United States -->
<_name>Olney</_name>
<coordinates>38.730881 -88.085315</coordinates>
<location>
@@ -35307,18 +34689,6 @@
</city>
<city>
<!-- A city in Illinois in the United States -->
- <_name>Romeoville</_name>
- <coordinates>41.647531 -88.089506</coordinates>
- <location>
- <name>Chicago / Romeoville, Lewis University Airport</name>
- <code>KLOT</code>
- <zone>ILZ014</zone>
- <radar>ord</radar>
- <coordinates>41.608333 -88.094167</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Illinois in the United States -->
<_name msgctxt="City in Illinois, United States">Salem</_name>
<coordinates>38.626993 -88.945616</coordinates>
<location>
@@ -35383,18 +34753,6 @@
</city>
<city>
<!-- A city in Illinois in the United States -->
- <_name>Urbana</_name>
- <coordinates>40.110588 -88.207270</coordinates>
- <location>
- <name>Champaign / Urbana, University of Illinois-Willard Airport</name>
- <code>KCMI</code>
- <zone>ILZ045</zone>
- <radar>ind</radar>
- <coordinates>40.032222 -88.273333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Illinois in the United States -->
<_name>Waukegan</_name>
<coordinates>42.363633 -87.844794</coordinates>
<location>
@@ -35417,18 +34775,6 @@
<coordinates>41.896389 -88.251111</coordinates>
</location>
</city>
- <city>
- <!-- A city in Illinois in the United States -->
- <_name msgctxt="City in Illinois, United States">Wheeling</_name>
- <coordinates>42.139193 -87.928959</coordinates>
- <location>
- <name>Chicago / Wheeling, Pal-Waukee Airport</name>
- <code>KPWK</code>
- <zone>ILZ006</zone>
- <radar>ord</radar>
- <coordinates>42.120833 -87.904722</coordinates>
- </location>
- </city>
</state>
<state>
<!-- A state/province/territory in United States -->
@@ -35863,7 +35209,7 @@
</city>
<city>
<!-- A city in Iowa in the United States -->
- <_name msgctxt="City in Iowa, United States">Denison</_name>
+ <_name>Denison</_name>
<coordinates>42.017766 -95.355276</coordinates>
<location>
<name>Denison</name>
@@ -36150,7 +35496,7 @@
</city>
<city>
<!-- A city in Iowa in the United States -->
- <_name msgctxt="City in Iowa, United States">Shenandoah</_name>
+ <_name>Shenandoah</_name>
<coordinates>40.765553 -95.372210</coordinates>
<location>
<name>Shenandoah Municipal</name>
@@ -36249,16 +35595,6 @@
<tz-hint>America/Chicago</tz-hint>
<city>
<!-- A city in Kansas in the United States -->
- <_name>Arkansas City</_name>
- <coordinates>37.061974 -97.038371</coordinates>
- <location>
- <name>Winfield / Arkansas City, Strother Field</name>
- <code>KWLD</code>
- <coordinates>37.168056 -97.036944</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Kansas in the United States -->
<_name>Chanute</_name>
<coordinates>37.679214 -95.457203</coordinates>
<location>
@@ -36642,18 +35978,6 @@
</city>
<city>
<!-- A city in Kentucky in the United States -->
- <_name>Covington</_name>
- <coordinates>39.083671 -84.508554</coordinates>
- <location>
- <name>Covington / Cincinnati, Cincinnati / Northern Kentucky International Airport</name>
- <code>KCVG</code>
- <zone>KYZ092</zone>
- <radar>ind</radar>
- <coordinates>39.043056 -84.671667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Kentucky in the United States -->
<_name msgctxt="City in Kentucky, United States">Frankfort</_name>
<coordinates>38.200905 -84.873284</coordinates>
<location>
@@ -38053,16 +37377,6 @@
</city>
<city>
<!-- A city in Michigan in the United States -->
- <_name>Grosse Ile</_name>
- <coordinates>42.129208 -83.144368</coordinates>
- <location>
- <name>Detroit / Grosse Ile, Grosse Ile Airport</name>
- <code>KONZ</code>
- <coordinates>42.098611 -83.161111</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Michigan in the United States -->
<_name>Hancock</_name>
<coordinates>47.126871 -88.580956</coordinates>
<location>
@@ -38176,18 +37490,6 @@
</city>
<city>
<!-- A city in Michigan in the United States -->
- <_name>Kingsford</_name>
- <coordinates>45.794956 -88.072071</coordinates>
- <location>
- <name>Iron Mountain / Kingsford, Ford Airport</name>
- <code>KIMT</code>
- <zone>MIZ011</zone>
- <radar>htl</radar>
- <coordinates>45.814167 -88.108889</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Michigan in the United States -->
<_name>Kinross</_name>
<coordinates>46.275019 -84.514768</coordinates>
<location>
@@ -38666,18 +37968,6 @@
</city>
<city>
<!-- A city in Minnesota in the United States -->
- <_name>Blaine</_name>
- <coordinates>45.160799 -93.234949</coordinates>
- <location>
- <name>Minneapolis / Blaine</name>
- <code>KANE</code>
- <zone>MNZ060</zone>
- <radar>msp</radar>
- <coordinates>45.150000 -93.216667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Minnesota in the United States -->
<_name>Brainerd</_name>
<coordinates>46.358022 -94.200829</coordinates>
<location>
@@ -39621,18 +38911,6 @@
</city>
<city>
<!-- A city in Mississippi in the United States -->
- <_name>Laurel</_name>
- <coordinates>31.694051 -89.130612</coordinates>
- <location>
- <name>Hattiesburg / Laurel, Hattiesburg-Laurel Regional Airport</name>
- <code>KPIB</code>
- <zone>MSZ066</zone>
- <radar>jan</radar>
- <coordinates>31.466667 -89.333333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Mississippi in the United States -->
<_name>McComb</_name>
<coordinates>31.243787 -90.453154</coordinates>
<location>
@@ -39706,18 +38984,6 @@
</city>
<city>
<!-- A city in Mississippi in the United States -->
- <_name>Starkville</_name>
- <coordinates>33.450400 -88.818387</coordinates>
- <location>
- <name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</name>
- <code>KGTR</code>
- <zone>MSZ031</zone>
- <radar>bhm</radar>
- <coordinates>33.450000 -88.583333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Mississippi in the United States -->
<_name>Tunica</_name>
<coordinates>34.684545 -90.382877</coordinates>
<location>
@@ -39750,18 +39016,6 @@
<coordinates>32.348056 -91.030000</coordinates>
</location>
</city>
- <city>
- <!-- A city in Mississippi in the United States -->
- <_name msgctxt="City in Mississippi, United States">West Point</_name>
- <coordinates>33.607619 -88.650325</coordinates>
- <location>
- <name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</name>
- <code>KGTR</code>
- <zone>MSZ031</zone>
- <radar>bhm</radar>
- <coordinates>33.450000 -88.583333</coordinates>
- </location>
- </city>
</state>
<state>
<!-- A state/province/territory in United States -->
@@ -39932,18 +39186,6 @@
</city>
<city>
<!-- A city in Missouri in the United States -->
- <_name>Rolla</_name>
- <coordinates>37.951430 -91.771269</coordinates>
- <location>
- <name>Rolla / Vichy, Rolla National Airport</name>
- <code>KVIH</code>
- <zone>MOZ058</zone>
- <radar>stl</radar>
- <coordinates>38.131944 -91.765278</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Missouri in the United States -->
<_name>Sedalia</_name>
<coordinates>38.704461 -93.228261</coordinates>
<location>
@@ -40795,16 +40037,6 @@
</city>
<city>
<!-- A city in Nevada in the United States -->
- <_name>Laughlin</_name>
- <coordinates>35.167777 -114.573021</coordinates>
- <location>
- <name>Bullhead City, Laughlin / Bullhead International Airport</name>
- <code>KIFP</code>
- <coordinates>35.157500 -114.559444</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Nevada in the United States -->
<_name>Lovelock</_name>
<coordinates>40.179354 -118.473481</coordinates>
<location>
@@ -42443,18 +41675,6 @@
</city>
<city>
<!-- A city in North Carolina in the United States -->
- <_name msgctxt="City in North Carolina, United States">New River</_name>
- <coordinates>34.757385 -77.409685</coordinates>
- <location>
- <name>Jacksonville, New River, Marine Corps Air Station</name>
- <code>KNCA</code>
- <zone>NCZ098</zone>
- <radar>clt</radar>
- <coordinates>34.705833 -77.440833</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in North Carolina in the United States -->
<_name>North Wilkesboro</_name>
<coordinates>36.158465 -81.147584</coordinates>
<location>
@@ -42589,16 +41809,6 @@
</city>
<city>
<!-- A city in North Carolina in the United States -->
- <_name>Southern Pines</_name>
- <coordinates>35.174047 -79.392254</coordinates>
- <location>
- <name>Pinehurst / Southern Pines, Moore County Airport</name>
- <code>KSOP</code>
- <coordinates>35.233333 -79.400000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in North Carolina in the United States -->
<_name>Statesville</_name>
<coordinates>35.782636 -80.887296</coordinates>
<location>
@@ -42609,16 +41819,6 @@
</city>
<city>
<!-- A city in North Carolina in the United States -->
- <_name>Swansboro</_name>
- <coordinates>34.687662 -77.119117</coordinates>
- <location>
- <name>Bogue Field, Marine Corps Auxiliary Landing Field</name>
- <code>KNJM</code>
- <coordinates>34.692778 -77.029444</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in North Carolina in the United States -->
<_name>Wadesboro</_name>
<coordinates>34.968210 -80.076727</coordinates>
<location>
@@ -43046,16 +42246,6 @@
</city>
<city>
<!-- A city in Ohio in the United States -->
- <_name>Lorain</_name>
- <coordinates>41.452819 -82.182375</coordinates>
- <location>
- <name>Lorain / Elyria, Lorain County Regional Airport</name>
- <code>KLPR</code>
- <coordinates>41.346111 -82.179444</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Ohio in the United States -->
<_name>Mansfield</_name>
<coordinates>40.758390 -82.515447</coordinates>
<location>
@@ -44185,18 +43375,6 @@
</city>
<city>
<!-- A city in Pennsylvania in the United States -->
- <_name>Muir</_name>
- <coordinates>40.592310 -76.518572</coordinates>
- <location>
- <name>Muir Army Air Field / Indiantown</name>
- <code>KMUI</code>
- <zone>PAZ058</zone>
- <radar>har</radar>
- <coordinates>40.433333 -76.566667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Pennsylvania in the United States -->
<_name>New Castle</_name>
<coordinates>41.003672 -80.347009</coordinates>
<location>
@@ -44854,19 +44032,6 @@
<tz-hint>America/Chicago</tz-hint>
<city>
<!-- A city in Tennessee in the United States -->
- <_name msgctxt="City in Tennessee, United States">Bristol</_name>
- <coordinates>36.595106 -82.188744</coordinates>
- <location>
- <name>Bristol / Johnson / Kingsport, Tri-City Regional Airport</name>
- <code>KTRI</code>
- <tz-hint>America/New_York</tz-hint>
- <zone>TNZ017</zone>
- <radar>avl</radar>
- <coordinates>36.479722 -82.398889</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Tennessee in the United States -->
<_name>Chattanooga</_name>
<coordinates>35.045630 -85.309680</coordinates>
<location>
@@ -45414,16 +44579,6 @@
</city>
<city>
<!-- A city in Texas in the United States -->
- <_name msgctxt="City in Texas, United States">Denison</_name>
- <coordinates>33.755659 -96.536658</coordinates>
- <location>
- <name>Sherman / Denison, Grayson County Airport</name>
- <code>KGYI</code>
- <coordinates>33.716667 -96.666667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Texas in the United States -->
<_name>Denton</_name>
<coordinates>33.214841 -97.133068</coordinates>
<location>
@@ -45530,13 +44685,6 @@
<radar>dfw</radar>
<coordinates>32.973333 -97.318056</coordinates>
</location>
- <location>
- <name>Dallas / Fort Worth, Dallas / Fort Worth International Airport</name>
- <code>KDFW</code>
- <zone>TXZ119</zone>
- <radar>dfw</radar>
- <coordinates>32.896944 -97.021944</coordinates>
- </location>
</city>
<city>
<!-- A city in Texas in the United States -->
@@ -45879,17 +45027,6 @@
</city>
<city>
<!-- A city in Texas in the United States -->
- <_name>Lake Jackson</_name>
- <coordinates>29.033857 -95.434386</coordinates>
- <location>
- <name>Angleton / Lake Jackson, Brazoria County Airport</name>
- <code>KLBX</code>
- <radar>vct</radar>
- <coordinates>29.115278 -95.463056</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Texas in the United States -->
<_name msgctxt="City in Texas, United States">Lancaster</_name>
<coordinates>32.592080 -96.756108</coordinates>
<location>
@@ -46211,18 +45348,6 @@
</city>
<city>
<!-- A city in Texas in the United States -->
- <_name>Port Arthur</_name>
- <coordinates>29.898826 -93.928781</coordinates>
- <location>
- <name>Beaumont / Port Arthur, Southeast Texas Regional Airport</name>
- <code>KBPT</code>
- <zone>TXZ215</zone>
- <radar>gls</radar>
- <coordinates>29.950833 -94.020833</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Texas in the United States -->
<_name>Port Isabel</_name>
<coordinates>26.073412 -97.208584</coordinates>
<location>
@@ -46385,18 +45510,6 @@
</city>
<city>
<!-- A city in Texas in the United States -->
- <_name>Sugar Land</_name>
- <coordinates>29.619679 -95.634946</coordinates>
- <location>
- <name>Houston, Sugar Land Municipal / Hull Field Airport</name>
- <code>KSGR</code>
- <zone>TXZ213</zone>
- <radar>gls</radar>
- <coordinates>29.622222 -95.656667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Texas in the United States -->
<_name>Sulphur Springs</_name>
<coordinates>33.138448 -95.601067</coordinates>
<location>
@@ -46513,16 +45626,6 @@
</city>
<city>
<!-- A city in Texas in the United States -->
- <_name>Waxahachie</_name>
- <coordinates>32.386531 -96.848331</coordinates>
- <location>
- <name>Midlothian / Waxahachie, Mid-Way Regional Airport</name>
- <code>KJWY</code>
- <coordinates>32.455833 -96.912222</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Texas in the United States -->
<_name>Weslaco</_name>
<coordinates>26.159519 -97.990837</coordinates>
<location>
@@ -46818,18 +45921,6 @@
</city>
<city>
<!-- A city in Vermont in the United States -->
- <_name>Montpelier</_name>
- <coordinates>44.260059 -72.575387</coordinates>
- <location>
- <name>Barre / Montpelier, Knapp State Airport</name>
- <code>KMPV</code>
- <zone>VTZ008</zone>
- <radar>btv</radar>
- <coordinates>44.204722 -72.566111</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Vermont in the United States -->
<_name>Morrisville</_name>
<coordinates>44.561719 -72.598449</coordinates>
<location>
@@ -47149,18 +46240,6 @@
</city>
<city>
<!-- A city in Virginia in the United States -->
- <_name msgctxt="City in Virginia, United States">New River</_name>
- <coordinates>37.133459 -80.591449</coordinates>
- <location>
- <name>Dublin / New River Valley</name>
- <code>KPSK</code>
- <zone>VAZ013</zone>
- <radar>crw</radar>
- <coordinates>37.133333 -80.683333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Virginia in the United States -->
<_name>Newport News</_name>
<coordinates>36.978759 -76.428003</coordinates>
<location>
@@ -47198,18 +46277,6 @@
</city>
<city>
<!-- A city in Virginia in the United States -->
- <_name>Oceana</_name>
- <coordinates>36.842093 -76.012986</coordinates>
- <location>
- <name>Virginia Beach, Oceana, Naval Air Station</name>
- <code>KNTU</code>
- <zone>VAZ098</zone>
- <radar>ric</radar>
- <coordinates>36.821111 -76.028333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Virginia in the United States -->
<_name msgctxt="City in Virginia, United States">Orange</_name>
<coordinates>38.245411 -78.110834</coordinates>
<location>
@@ -47302,18 +46369,6 @@
</city>
<city>
<!-- A city in Virginia in the United States -->
- <_name msgctxt="City in Virginia, United States">Shenandoah</_name>
- <coordinates>38.485124 -78.625016</coordinates>
- <location>
- <name>Staunton / Shenandoah</name>
- <code>KSHD</code>
- <zone>VAZ025</zone>
- <radar>crw</radar>
- <coordinates>38.266667 -78.900000</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Virginia in the United States -->
<_name>South Hill</_name>
<coordinates>36.726532 -78.128886</coordinates>
<location>
@@ -47380,7 +46435,7 @@
</city>
<city>
<!-- A city in Virginia in the United States -->
- <_name msgctxt="City in Virginia, United States">West Point</_name>
+ <_name>West Point</_name>
<coordinates>37.531534 -76.796350</coordinates>
<location>
<name>Middle Peninsula Regional Airport</name>
@@ -47422,18 +46477,6 @@
<coordinates>36.983333 -82.533333</coordinates>
</location>
</city>
- <city>
- <!-- A city in Virginia in the United States -->
- <_name>Wytheville</_name>
- <coordinates>36.948453 -81.084811</coordinates>
- <location>
- <name>Marion / Wytheville</name>
- <code>KMKJ</code>
- <zone>VAZ009</zone>
- <radar>avl</radar>
- <coordinates>36.900000 -81.350000</coordinates>
- </location>
- </city>
</state>
<state>
<!-- A state/province/territory in United States -->
@@ -47619,18 +46662,6 @@
</city>
<city>
<!-- A city in Washington in the United States -->
- <_name msgctxt="City in Washington, United States">Mount Vernon</_name>
- <coordinates>48.421216 -122.334047</coordinates>
- <location>
- <name>Burlington / Mount Vernon, Skagit Regional Airport</name>
- <code>KBVS</code>
- <zone>WAZ005</zone>
- <radar>sea</radar>
- <coordinates>48.470833 -122.420833</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Washington in the United States -->
<_name>Oak Harbor</_name>
<coordinates>48.293156 -122.643225</coordinates>
<location>
@@ -47689,18 +46720,6 @@
</city>
<city>
<!-- A city in Washington in the United States -->
- <_name>Pullman</_name>
- <coordinates>46.731274 -117.179616</coordinates>
- <location>
- <name>Pullman / Moscow, Pullman / Moscow Regional Airport</name>
- <code>KPUW</code>
- <zone>WAZ032</zone>
- <radar>sea</radar>
- <coordinates>46.743889 -117.109722</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Washington in the United States -->
<_name>Quillayute</_name>
<coordinates>47.943130 -124.542435</coordinates>
<location>
@@ -48030,7 +47049,7 @@
</city>
<city>
<!-- A city in West Virginia in the United States -->
- <_name msgctxt="City in West Virginia, United States">Wheeling</_name>
+ <_name>Wheeling</_name>
<coordinates>40.063962 -80.720915</coordinates>
<location>
<name>Wheeling Ohio County Airport</name>
@@ -48126,18 +47145,6 @@
</city>
<city>
<!-- A city in Wisconsin in the United States -->
- <_name msgctxt="City in Wisconsin, United States">Chicago</_name>
- <coordinates>42.586131 -87.824797</coordinates>
- <location>
- <name>Chicago / Waukegan, Waukegan Regional Airport</name>
- <code>KUGN</code>
- <zone>ILZ014</zone>
- <radar>ord</radar>
- <coordinates>42.416667 -87.866667</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Wisconsin in the United States -->
<_name>Clintonville</_name>
<coordinates>44.620535 -88.762323</coordinates>
<location>
@@ -48377,18 +47384,6 @@
</city>
<city>
<!-- A city in Wisconsin in the United States -->
- <_name>Minocqua</_name>
- <coordinates>45.871342 -89.710981</coordinates>
- <location>
- <name>Minocqua / Woodruff, Lakeland Airport / Noble F. Lee Memorial Field</name>
- <code>KARV</code>
- <zone>WIZ010</zone>
- <radar>htl</radar>
- <coordinates>45.933333 -89.733333</coordinates>
- </location>
- </city>
- <city>
- <!-- A city in Wisconsin in the United States -->
<_name msgctxt="City in Wisconsin, United States">Monroe</_name>
<coordinates>42.601119 -89.638453</coordinates>
<location>
Modified: trunk/data/update-locations.py
==============================================================================
--- trunk/data/update-locations.py (original)
+++ trunk/data/update-locations.py Tue Nov 25 22:02:24 2008
@@ -327,9 +327,9 @@
self.name_comment = []
if isinstance(arg, tuple):
- (self.id, self.latitude, self.longitude, elevation, importance, self.country_code, self.state_code, self.county_code, name_type, self.name_lang, short_name, long_name, flat_name) = arg
+ (self.id, self.latitude, self.longitude, elevation, self.importance, self.country_code, self.state_code, self.county_code, name_type, self.name_lang, short_name, long_name, flat_name) = arg
self.coordinates = "%f %f" % (self.latitude, self.longitude)
- self.is_capital = importance == 3
+ self.is_capital = self.importance == 3
self.name = short_name or long_name
self.has_conventional_name = name_type == 'C'
elif isinstance(arg, LocBase):
@@ -644,13 +644,23 @@
return None
city = get_city(best_loc[0], station.country_code)
- add_city(city, station)
if not shortened:
station.name = station.name.replace(city_name, city.name)
return city
+def dist_from_station(city, station, cmpcity):
+ if city.importance != cmpcity.importance:
+ return -cmp(city.importance, cmpcity.importance)
+ dist = distance(station.latitude, station.longitude,
+ city.latitude, city.longitude)
+ if city.importance > 0:
+ dist = dist / 5.0
+ elif city.importance < 0: # and trivial ones are farther
+ dist = dist * 2.0
+ return dist
+
observations_url = os.getenv('OBSERVATIONS_URL') or 'http://gnome.org/~danw/observations.txt'
observations = urllib.urlopen(observations_url)
recent = [obs.rstrip() for obs in observations.readlines()]
@@ -677,21 +687,25 @@
# Find a match
location = station.name.replace(", ", " / ")
if location.find(" / ") != -1:
- matched_any = False
+ matched_cities = []
na_parts = [part for part in location.split(" / ")
if not part.endswith('Airport') and
part.find('County') == -1]
for part in na_parts:
city = find_city(c, part, station, False)
if city is not None:
- matched_any = True
- if matched_any:
+ matched_cities.append(city)
+ if len(matched_cities):
+ matched_cities.sort(lambda c1, c2: cmp(dist_from_station(c1, station, c2), dist_from_station(c2, station, c1)))
+ add_city(matched_cities[0], station)
continue
if city is None:
airport = re.search(r"([^/ ][^/]*?) (International |Municipal )?Airport", location)
if airport is not None:
city = find_city(c, airport.group(1), station, False)
+ if city is not None:
+ add_city(city, station)
if city is None:
city = find_city(c, location, station, True)
@@ -699,6 +713,9 @@
country = fips_codes[station.country_code]
country.missing_stations.append(station)
continue
+ else:
+ add_city(city, station)
+
# Now do missing major cities
c.execute("SELECT id FROM cities WHERE importance > 1");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
