libgweather r518 - in trunk: . data data/sources libgweather



Author: danw
Date: Tue Nov 25 18:39:18 2008
New Revision: 518
URL: http://svn.gnome.org/viewvc/libgweather?rev=518&view=rev

Log:
	Don't worry about sub-city locations; people generally aren't
	going to know which of the locations is closest to them, and the
	weather reports from all of them should be basically the same
	anyway.

	* data/update-locations.py (Location.print_xml): never use <_name>
	for location-level names; always just use <name> so they don't get
	localized
	(observations_url): add a hack to let you override the
	recent-observations file, so you can regenerate Locations.xml.in
	without changing the set of active stations
	(Country.__init__): add "Bahamas" to the list of countries whose
	name we put "the" before in comments

	* data/Locations.xml.in: regen, dropping localization for
	<location> nodes

	* libgweather/gweather-xml.c (gweather_xml_parse_node): Remove the
	cities-with-multiple-locations code, and just make all cities use
	their first child location. Also, ignore <location>s that aren't
	children of <city>s (which should be impossible now anyway).

	* libgweather/location-entry.c (fill_location_entry_model):
	likewise


Modified:
   trunk/ChangeLog
   trunk/data/   (props changed)
   trunk/data/Locations.xml.in
   trunk/data/sources/   (props changed)
   trunk/data/update-locations.py
   trunk/libgweather/gweather-xml.c
   trunk/libgweather/location-entry.c

Modified: trunk/data/Locations.xml.in
==============================================================================
--- trunk/data/Locations.xml.in	(original)
+++ trunk/data/Locations.xml.in	Tue Nov 25 18:39:18 2008
@@ -244,12 +244,12 @@
         <_name>Oran</_name>
         <coordinates>35.691111 -0.641667</coordinates>
         <location>
-          <_name>Es Senia Airport</_name>
+          <name>Es Senia Airport</name>
           <code>DAOO</code>
           <coordinates>35.633333 -0.600000</coordinates>
         </location>
         <location>
-          <_name>Tafaraoui Airport</_name>
+          <name>Tafaraoui Airport</name>
           <code>DAOL</code>
           <coordinates>35.542500 -0.532222</coordinates>
         </location>
@@ -941,12 +941,12 @@
         <_name>Alexandria</_name>
         <coordinates>31.198056 29.919167</coordinates>
         <location>
-          <_name>Nouzha Airport</_name>
+          <name>Nouzha Airport</name>
           <code>HEAX</code>
           <coordinates>31.200000 29.950000</coordinates>
         </location>
         <location>
-          <_name>Alexandria Borg El Arab</_name>
+          <name>Alexandria Borg El Arab</name>
           <code>HEBA</code>
           <coordinates>31.516667 30.166667</coordinates>
         </location>
@@ -2200,12 +2200,12 @@
         <_name>Johannesburg</_name>
         <coordinates>-26.200000 28.083333</coordinates>
         <location>
-          <_name>O. R. Tambo International Airport</_name>
+          <name>O. R. Tambo International Airport</name>
           <code>FAJS</code>
           <coordinates>-26.133333 28.233333</coordinates>
         </location>
         <location>
-          <_name>Lanseria</_name>
+          <name>Lanseria</name>
           <code>FALA</code>
           <coordinates>-25.933333 27.933333</coordinates>
         </location>
@@ -3548,12 +3548,12 @@
           <_name>Shanghai</_name>
           <coordinates>31.222222 121.458056</coordinates>
           <location>
-            <_name>Hongqiao Airport</_name>
+            <name>Hongqiao Airport</name>
             <code>ZSSS</code>
             <coordinates>31.166667 121.433333</coordinates>
           </location>
           <location>
-            <_name>Pudong Airport</_name>
+            <name>Pudong Airport</name>
             <code>ZSPD</code>
             <coordinates>31.116667 121.766667</coordinates>
           </location>
@@ -4002,12 +4002,12 @@
         <_name>Chitose</_name>
         <coordinates>42.819444 141.652222</coordinates>
         <location>
-          <_name>Chitose Air Base</_name>
+          <name>Chitose Air Base</name>
           <code>RJCC</code>
           <coordinates>42.800000 141.666667</coordinates>
         </location>
         <location>
-          <_name>Chitose Japanese Air Self Defense Force</_name>
+          <name>Chitose Japanese Air Self Defense Force</name>
           <code>RJCJ</code>
           <coordinates>42.816667 141.683333</coordinates>
         </location>
@@ -4117,12 +4117,12 @@
         <_name>Hiroshima</_name>
         <coordinates>34.400000 132.450000</coordinates>
         <location>
-          <_name>Hiroshimanishi</_name>
+          <name>Hiroshimanishi</name>
           <code>RJBH</code>
           <coordinates>34.366667 132.433333</coordinates>
         </location>
         <location>
-          <_name>Hiroshima Airport</_name>
+          <name>Hiroshima Airport</name>
           <code>RJOA</code>
           <coordinates>34.433333 132.916667</coordinates>
         </location>
@@ -4462,12 +4462,12 @@
         <_name>Obihiro</_name>
         <coordinates>42.917222 143.204444</coordinates>
         <location>
-          <_name>Tokachi Japanese Ground Self Defense Force</_name>
+          <name>Tokachi Japanese Ground Self Defense Force</name>
           <code>RJCT</code>
           <coordinates>42.900000 143.166667</coordinates>
         </location>
         <location>
-          <_name>Obihiro Airport</_name>
+          <name>Obihiro Airport</name>
           <code>RJCB</code>
           <coordinates>42.733333 143.216667</coordinates>
         </location>
@@ -4617,12 +4617,12 @@
         <_name>Sendai</_name>
         <coordinates>38.254722 140.884722</coordinates>
         <location>
-          <_name>Kasuminome Air Base</_name>
+          <name>Kasuminome Air Base</name>
           <code>RJSU</code>
           <coordinates>38.233333 140.916667</coordinates>
         </location>
         <location>
-          <_name>Sendai Airport</_name>
+          <name>Sendai Airport</name>
           <code>RJSS</code>
           <coordinates>38.133333 140.916667</coordinates>
         </location>
@@ -4672,12 +4672,12 @@
         <_name>Tokyo</_name>
         <coordinates>35.685000 139.751389</coordinates>
         <location>
-          <_name>Tokyo Heliport</_name>
+          <name>Tokyo Heliport</name>
           <code>RJTI</code>
           <coordinates>35.633333 139.850000</coordinates>
         </location>
         <location>
-          <_name>Tokyo International Airport</_name>
+          <name>Tokyo International Airport</name>
           <code>RJTT</code>
           <coordinates>35.550000 139.783333</coordinates>
         </location>
@@ -5516,12 +5516,12 @@
         <_name>Singapore</_name>
         <coordinates>1.293056 103.855833</coordinates>
         <location>
-          <_name>Paya Lebar Airport</_name>
+          <name>Paya Lebar Airport</name>
           <code>WSAP</code>
           <coordinates>1.366667 103.916667</coordinates>
         </location>
         <location>
-          <_name>Changi Airport</_name>
+          <name>Changi Airport</name>
           <code>WSSS</code>
           <coordinates>1.366667 103.983333</coordinates>
         </location>
@@ -5797,7 +5797,7 @@
         <_name>Bangkok</_name>
         <coordinates>13.750000 100.516667</coordinates>
         <location>
-          <name>Don Muang</name>
+          <name>Bangkok</name>
           <code>VTBD</code>
           <coordinates>13.916667 100.600000</coordinates>
         </location>
@@ -7449,12 +7449,12 @@
         <_name>Majuro</_name>
         <coordinates>7.100000 171.383333</coordinates>
         <location>
-          <_name>Majuro Atoll, Marshall Islands International Airport</_name>
+          <name>Majuro Atoll, Marshall Islands International Airport</name>
           <code>PKMJ</code>
           <coordinates>7.066667 171.283333</coordinates>
         </location>
         <location>
-          <_name>Majuro Atoll</_name>
+          <name>Majuro Atoll</name>
           <code>PKMR</code>
           <coordinates>7.083333 171.200000</coordinates>
         </location>
@@ -7658,12 +7658,12 @@
         <_name>Chalan Kanoa</_name>
         <coordinates>15.145556 145.699167</coordinates>
         <location>
-          <_name>Saipan Island, Saipan International Airport</_name>
+          <name>Saipan Island, Saipan International Airport</name>
           <code>PGSN</code>
           <coordinates>15.116667 145.733333</coordinates>
         </location>
         <location>
-          <_name>Tinian Island, N. Mariana Is, West Tinian Airport</_name>
+          <name>Tinian Island, N. Mariana Is, West Tinian Airport</name>
           <code>PGWT</code>
           <coordinates>14.983333 145.616667</coordinates>
         </location>
@@ -7683,12 +7683,12 @@
         <_name>Koror</_name>
         <coordinates>7.333333 134.483333</coordinates>
         <location>
-          <_name>Koror, Palau</_name>
+          <name>Koror, Palau</name>
           <code>PTKR</code>
           <coordinates>7.333333 134.483333</coordinates>
         </location>
         <location>
-          <_name>Babelthuap Island, Babelthuap / Koror Airport</_name>
+          <name>Babelthuap Island, Babelthuap / Koror Airport</name>
           <code>PTRO</code>
           <coordinates>7.366667 134.533333</coordinates>
         </location>
@@ -8256,7 +8256,7 @@
       </timezones>
       <tz-hint>America/Nassau</tz-hint>
       <city>
-        <!-- Translators: this is a city in Bahamas -->
+        <!-- Translators: this is a city in the Bahamas -->
         <_name>Freeport</_name>
         <coordinates>26.533333 -78.700000</coordinates>
         <location>
@@ -8266,7 +8266,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bahamas -->
+        <!-- Translators: this is a city in the Bahamas -->
         <_name>Georgetown</_name>
         <coordinates>23.500000 -75.766667</coordinates>
         <location>
@@ -8276,7 +8276,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Bahamas -->
+        <!-- Translators: this is the capital of the Bahamas -->
         <_name>Nassau</_name>
         <coordinates>25.083333 -77.350000</coordinates>
         <location>
@@ -8808,12 +8808,12 @@
           <_name>Manaus</_name>
           <coordinates>-3.113333 -60.025278</coordinates>
           <location>
-            <_name>Manaus Airport</_name>
+            <name>Manaus Airport</name>
             <code>SBMN</code>
             <coordinates>-3.150000 -59.983333</coordinates>
           </location>
           <location>
-            <_name>Eduardo Gomes International Airport</_name>
+            <name>Eduardo Gomes International Airport</name>
             <code>SBEG</code>
             <tz-hint>America/Manaus</tz-hint>
             <coordinates>-3.033333 -60.050000</coordinates>
@@ -9127,13 +9127,13 @@
           <_name>Belo Horizonte</_name>
           <coordinates>-19.916667 -43.933333</coordinates>
           <location>
-            <_name>Belo Horizonte</_name>
+            <name>Belo Horizonte</name>
             <code>SBCF</code>
             <tz-hint>America/Sao_Paulo</tz-hint>
             <coordinates>-19.933333 -43.933333</coordinates>
           </location>
           <location>
-            <_name>Belo Horizonte Airport</_name>
+            <name>Belo Horizonte Airport</name>
             <code>SBBH</code>
             <coordinates>-19.850000 -43.950000</coordinates>
           </location>
@@ -9198,12 +9198,12 @@
           <_name>Curitiba</_name>
           <coordinates>-25.416667 -49.250000</coordinates>
           <location>
-            <_name>Curitiba</_name>
+            <name>Curitiba</name>
             <code>SBBI</code>
             <coordinates>-25.433333 -49.266667</coordinates>
           </location>
           <location>
-            <_name>Curitiba Airport</_name>
+            <name>Curitiba Airport</name>
             <code>SBCT</code>
             <tz-hint>America/Sao_Paulo</tz-hint>
             <coordinates>-25.516667 -49.166667</coordinates>
@@ -9494,12 +9494,12 @@
           <_name>Porto Alegre</_name>
           <coordinates>-30.033333 -51.200000</coordinates>
           <location>
-            <_name>Porto Alegre</_name>
+            <name>Porto Alegre</name>
             <code>SBCO</code>
             <coordinates>-30.016667 -51.216667</coordinates>
           </location>
           <location>
-            <_name>Porto Alegre Airport</_name>
+            <name>Porto Alegre Airport</name>
             <code>SBPA</code>
             <tz-hint>America/Sao_Paulo</tz-hint>
             <coordinates>-30.000000 -51.183333</coordinates>
@@ -9550,29 +9550,29 @@
           <_name>Rio de Janeiro</_name>
           <coordinates>-22.900000 -43.233333</coordinates>
           <location>
-            <_name>Rio de Janeiro Airport</_name>
+            <name>Rio de Janeiro Airport</name>
             <code>SBRJ</code>
             <tz-hint>America/Sao_Paulo</tz-hint>
             <coordinates>-22.900000 -43.166667</coordinates>
           </location>
           <location>
-            <_name>Galeao</_name>
+            <name>Galeao</name>
             <code>SBGL</code>
             <tz-hint>America/Sao_Paulo</tz-hint>
             <coordinates>-22.816667 -43.250000</coordinates>
           </location>
           <location>
-            <_name>Afonsos Airport</_name>
+            <name>Afonsos Airport</name>
             <code>SBAF</code>
             <coordinates>-22.866667 -43.366667</coordinates>
           </location>
           <location>
-            <_name>Jacarepagua Airport</_name>
+            <name>Jacarepagua Airport</name>
             <code>SBJR</code>
             <coordinates>-22.983333 -43.366667</coordinates>
           </location>
           <location>
-            <_name>Rio de Janeiro-Santa Cruz Air Base</_name>
+            <name>Rio de Janeiro-Santa Cruz Air Base</name>
             <code>SBSC</code>
             <coordinates>-22.933333 -43.716667</coordinates>
           </location>
@@ -9766,12 +9766,12 @@
           <_name>SÃo Paulo</_name>
           <coordinates>-23.533333 -46.616667</coordinates>
           <location>
-            <_name>Marte Airport</_name>
+            <name>Marte Airport</name>
             <code>SBMT</code>
             <coordinates>-23.516667 -46.633333</coordinates>
           </location>
           <location>
-            <_name>Congonhas Airport</_name>
+            <name>Congonhas Airport</name>
             <code>SBSP</code>
             <tz-hint>America/Sao_Paulo</tz-hint>
             <coordinates>-23.616667 -46.650000</coordinates>
@@ -11663,17 +11663,17 @@
         <_name>Caracas</_name>
         <coordinates>10.500000 -66.916667</coordinates>
         <location>
-          <_name>La Carlota Airport</_name>
+          <name>La Carlota Airport</name>
           <code>SVFM</code>
           <coordinates>10.500000 -66.883333</coordinates>
         </location>
         <location>
-          <_name>Simon Bolivar International Airport</_name>
+          <name>Simon Bolivar International Airport</name>
           <code>SVMI</code>
           <coordinates>10.600000 -66.983333</coordinates>
         </location>
         <location>
-          <_name>Oscar Macha Airport</_name>
+          <name>Oscar Macha Airport</name>
           <code>SVCS</code>
           <coordinates>10.300000 -66.816667</coordinates>
         </location>
@@ -12178,12 +12178,12 @@
         <_name>Minsk</_name>
         <coordinates>53.900000 27.566667</coordinates>
         <location>
-          <_name>Loshitsa / Minsk International</_name>
+          <name>Loshitsa / Minsk International</name>
           <code>UMMM</code>
           <coordinates>53.865000 27.541667</coordinates>
         </location>
         <location>
-          <_name>Minsk</_name>
+          <name>Minsk</name>
           <code>UMMS</code>
           <coordinates>53.933333 27.633333</coordinates>
         </location>
@@ -13139,12 +13139,12 @@
         <_name>Helsinki</_name>
         <coordinates>60.175556 24.934167</coordinates>
         <location>
-          <_name>Helsinki-Malmi</_name>
+          <name>Helsinki-Malmi</name>
           <code>EFHF</code>
           <coordinates>60.250000 25.050000</coordinates>
         </location>
         <location>
-          <_name>Helsinki-Vantaa</_name>
+          <name>Helsinki-Vantaa</name>
           <code>EFHK</code>
           <coordinates>60.316667 24.966667</coordinates>
         </location>
@@ -13924,12 +13924,12 @@
         <_name>Lyon</_name>
         <coordinates>45.750000 4.850000</coordinates>
         <location>
-          <_name>Lyon-Bron Airport</_name>
+          <name>Lyon-Bron Airport</name>
           <code>LFLY</code>
           <coordinates>45.716667 4.950000</coordinates>
         </location>
         <location>
-          <_name>Lyon-Satolas Airport</_name>
+          <name>Lyon-Satolas Airport</name>
           <code>LFLL</code>
           <coordinates>45.733333 5.083333</coordinates>
         </location>
@@ -14029,12 +14029,12 @@
         <_name>Nancy</_name>
         <coordinates>48.683333 6.200000</coordinates>
         <location>
-          <_name>Nancy-Essey Airport</_name>
+          <name>Nancy-Essey Airport</name>
           <code>LFSN</code>
           <coordinates>48.683333 6.216667</coordinates>
         </location>
         <location>
-          <_name>Nancy-Ochey Airport</_name>
+          <name>Nancy-Ochey Airport</name>
           <code>LFSO</code>
           <coordinates>48.583333 5.966667</coordinates>
         </location>
@@ -14104,17 +14104,17 @@
         <_name>Paris</_name>
         <coordinates>48.866667 2.333333</coordinates>
         <location>
-          <_name>Paris-Le Bourget Airport</_name>
+          <name>Paris-Le Bourget Airport</name>
           <code>LFPB</code>
           <coordinates>48.966667 2.450000</coordinates>
         </location>
         <location>
-          <_name>Paris-Orly</_name>
+          <name>Paris-Orly</name>
           <code>LFPO</code>
           <coordinates>48.733333 2.400000</coordinates>
         </location>
         <location>
-          <_name>Charles de Gaulle International Airport</_name>
+          <name>Charles de Gaulle International Airport</name>
           <code>LFPG</code>
           <coordinates>49.016667 2.533333</coordinates>
         </location>
@@ -14284,12 +14284,12 @@
         <_name>Toulouse</_name>
         <coordinates>43.600000 1.433333</coordinates>
         <location>
-          <_name>Toulouse-Blagnac Airport</_name>
+          <name>Toulouse-Blagnac Airport</name>
           <code>LFBO</code>
           <coordinates>43.633333 1.366667</coordinates>
         </location>
         <location>
-          <_name>Toulouse-Francazal Airport</_name>
+          <name>Toulouse-Francazal Airport</name>
           <code>LFBF</code>
           <coordinates>43.533333 1.366667</coordinates>
         </location>
@@ -14673,17 +14673,17 @@
           <_name>Berlin</_name>
           <coordinates>52.516667 13.400000</coordinates>
           <location>
-            <_name>Berlin-Tempelhof</_name>
+            <name>Berlin-Tempelhof</name>
             <code>EDDI</code>
             <coordinates>52.466667 13.400000</coordinates>
           </location>
           <location>
-            <_name>Berlin-Tegel</_name>
+            <name>Berlin-Tegel</name>
             <code>EDDT</code>
             <coordinates>52.566667 13.316667</coordinates>
           </location>
           <location>
-            <_name>Berlin-Schoenefeld</_name>
+            <name>Berlin-Schoenefeld</name>
             <code>EDDB</code>
             <coordinates>52.383333 13.516667</coordinates>
           </location>
@@ -14718,12 +14718,12 @@
           <_name>Hamburg</_name>
           <coordinates>53.550000 10.000000</coordinates>
           <location>
-            <_name>Hamburg-Fuhlsbuettel</_name>
+            <name>Hamburg-Fuhlsbuettel</name>
             <code>EDDH</code>
             <coordinates>53.633333 10.000000</coordinates>
           </location>
           <location>
-            <_name>Hamburg-Finkenwerder</_name>
+            <name>Hamburg-Finkenwerder</name>
             <code>EDHI</code>
             <coordinates>53.533333 9.833333</coordinates>
           </location>
@@ -16052,12 +16052,12 @@
         <_name>Aviano</_name>
         <coordinates>46.070556 12.594722</coordinates>
         <location>
-          <_name>Aviano</_name>
+          <name>Aviano</name>
           <code>LIPA</code>
           <coordinates>46.033333 12.600000</coordinates>
         </location>
         <location>
-          <_name>Aviano US Air Force Base</_name>
+          <name>Aviano US Air Force Base</name>
           <code>LIYW</code>
           <coordinates>46.033333 12.616667</coordinates>
         </location>
@@ -16107,12 +16107,12 @@
         <_name>Brescia</_name>
         <coordinates>45.550000 10.250000</coordinates>
         <location>
-          <_name>Ghedi Airport</_name>
+          <name>Ghedi Airport</name>
           <code>LIPL</code>
           <coordinates>45.416667 10.283333</coordinates>
         </location>
         <location>
-          <_name>Montichiara Airport</_name>
+          <name>Montichiara Airport</name>
           <code>LIPO</code>
           <coordinates>45.400556 10.316389</coordinates>
         </location>
@@ -16172,12 +16172,12 @@
         <_name>Catania</_name>
         <coordinates>37.500000 15.100000</coordinates>
         <location>
-          <_name>Fontanarossa Airport</_name>
+          <name>Fontanarossa Airport</name>
           <code>LICC</code>
           <coordinates>37.466667 15.050000</coordinates>
         </location>
         <location>
-          <_name>Sigonella Airport</_name>
+          <name>Sigonella Airport</name>
           <code>LICZ</code>
           <coordinates>37.400000 14.916667</coordinates>
         </location>
@@ -16406,12 +16406,12 @@
         <_name>Milan</_name>
         <coordinates>45.466667 9.200000</coordinates>
         <location>
-          <_name>Linate Airport</_name>
+          <name>Linate Airport</name>
           <code>LIML</code>
           <coordinates>45.433333 9.283333</coordinates>
         </location>
         <location>
-          <_name>Malpensa Airport</_name>
+          <name>Malpensa Airport</name>
           <code>LIMC</code>
           <coordinates>45.616667 8.733333</coordinates>
         </location>
@@ -16464,12 +16464,12 @@
         <_name>Palermo</_name>
         <coordinates>38.116667 13.366667</coordinates>
         <location>
-          <_name>Palermo Boccadifalco</_name>
+          <name>Palermo Boccadifalco</name>
           <code>LICP</code>
           <coordinates>38.100000 13.300000</coordinates>
         </location>
         <location>
-          <_name>Punta Raisi Airport</_name>
+          <name>Punta Raisi Airport</name>
           <code>LICJ</code>
           <coordinates>38.183333 13.100000</coordinates>
         </location>
@@ -16612,17 +16612,17 @@
         <_name>Rome</_name>
         <coordinates>41.900000 12.483333</coordinates>
         <location>
-          <_name>Urbe Airport</_name>
+          <name>Urbe Airport</name>
           <code>LIRU</code>
           <coordinates>41.950000 12.500000</coordinates>
         </location>
         <location>
-          <_name>Ciampino Airport</_name>
+          <name>Ciampino Airport</name>
           <code>LIRA</code>
           <coordinates>41.783333 12.583333</coordinates>
         </location>
         <location>
-          <_name>Roma Fiumicino</_name>
+          <name>Roma Fiumicino</name>
           <code>LIRF</code>
           <coordinates>41.800000 12.233333</coordinates>
         </location>
@@ -16722,12 +16722,12 @@
         <_name>Treviso</_name>
         <coordinates>45.666667 12.245000</coordinates>
         <location>
-          <_name>S. Angelo Airport</_name>
+          <name>S. Angelo Airport</name>
           <code>LIPH</code>
           <coordinates>45.650000 12.183333</coordinates>
         </location>
         <location>
-          <_name>Istrana Airport</_name>
+          <name>Istrana Airport</name>
           <code>LIPS</code>
           <coordinates>45.683333 12.100000</coordinates>
         </location>
@@ -18157,12 +18157,12 @@
         <_name>Bucharest</_name>
         <coordinates>44.433333 26.100000</coordinates>
         <location>
-          <_name>Bucharest / Imh</_name>
+          <name>Bucharest / Imh</name>
           <code>LRBS</code>
           <coordinates>44.500000 26.133333</coordinates>
         </location>
         <location>
-          <_name>Bucuresti Otopeni</_name>
+          <name>Bucuresti Otopeni</name>
           <code>LROP</code>
           <coordinates>44.550000 26.100000</coordinates>
         </location>
@@ -18727,19 +18727,19 @@
         <_name>Moscow</_name>
         <coordinates>55.752222 37.615556</coordinates>
         <location>
-          <_name>Vnukovo Airport</_name>
+          <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>
+          <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>
+          <name>Domodedovo Airport</name>
           <code>UUDD</code>
           <tz-hint>Europe/Moscow</tz-hint>
           <coordinates>55.400000 37.900000</coordinates>
@@ -19963,12 +19963,12 @@
         <_name>GÃteborg</_name>
         <coordinates>57.716667 11.966667</coordinates>
         <location>
-          <_name>GÃteborg-Save Airport</_name>
+          <name>GÃteborg-Save Airport</name>
           <code>ESGP</code>
           <coordinates>57.783333 11.883333</coordinates>
         </location>
         <location>
-          <_name>GÃteborg-Landvetter Airport</_name>
+          <name>GÃteborg-Landvetter Airport</name>
           <code>ESGG</code>
           <coordinates>57.666667 12.300000</coordinates>
         </location>
@@ -20148,12 +20148,12 @@
         <_name>Stockholm</_name>
         <coordinates>59.333333 18.050000</coordinates>
         <location>
-          <_name>Stockholm-Bromma Airport</_name>
+          <name>Stockholm-Bromma Airport</name>
           <code>ESSB</code>
           <coordinates>59.350000 17.950000</coordinates>
         </location>
         <location>
-          <_name>Stockholm-Arlanda Airport</_name>
+          <name>Stockholm-Arlanda Airport</name>
           <code>ESSA</code>
           <coordinates>59.650000 17.950000</coordinates>
         </location>
@@ -20364,12 +20364,12 @@
         <_name>Adana</_name>
         <coordinates>37.001667 35.328889</coordinates>
         <location>
-          <_name>Adana-Sakirpasa Airport</_name>
+          <name>Adana-Sakirpasa Airport</name>
           <code>LTAF</code>
           <coordinates>36.983333 35.300000</coordinates>
         </location>
         <location>
-          <_name>Adana-Incirlik Airport</_name>
+          <name>Adana-Incirlik Airport</name>
           <code>LTAG</code>
           <coordinates>37.000000 35.416667</coordinates>
         </location>
@@ -20379,17 +20379,17 @@
         <_name>Ankara</_name>
         <coordinates>39.927222 32.864444</coordinates>
         <location>
-          <_name>Ankara-Guvercin Lik Airport</_name>
+          <name>Ankara-Guvercin Lik Airport</name>
           <code>LTAB</code>
           <coordinates>39.933333 32.750000</coordinates>
         </location>
         <location>
-          <_name>Ankara-Etimesgut Airport</_name>
+          <name>Ankara-Etimesgut Airport</name>
           <code>LTAD</code>
           <coordinates>39.950000 32.683333</coordinates>
         </location>
         <location>
-          <_name>Ankara-Esenboga Airport</_name>
+          <name>Ankara-Esenboga Airport</name>
           <code>LTAC</code>
           <coordinates>40.116667 32.983333</coordinates>
         </location>
@@ -20519,12 +20519,12 @@
         <_name>Istanbul</_name>
         <coordinates>41.018611 28.964722</coordinates>
         <location>
-          <_name>Istanbul-Ataturk Airport</_name>
+          <name>Istanbul-Ataturk Airport</name>
           <code>LTBA</code>
           <coordinates>40.966667 28.816667</coordinates>
         </location>
         <location>
-          <_name>Istanbul-Sabiha Gokcen Airport</_name>
+          <name>Istanbul-Sabiha Gokcen Airport</name>
           <code>LTFJ</code>
           <coordinates>40.898611 29.309167</coordinates>
         </location>
@@ -20534,12 +20534,12 @@
         <_name>Izmir</_name>
         <coordinates>38.410375 27.142010</coordinates>
         <location>
-          <_name>Izmir-Cigli Airport</_name>
+          <name>Izmir-Cigli Airport</name>
           <code>LTBL</code>
           <coordinates>38.500000 27.016667</coordinates>
         </location>
         <location>
-          <_name>Izmir-Adnan Menderes Airport</_name>
+          <name>Izmir-Adnan Menderes Airport</name>
           <code>LTBJ</code>
           <coordinates>38.266667 27.150000</coordinates>
         </location>
@@ -20949,19 +20949,19 @@
           <_name>London</_name>
           <coordinates>51.500000 -0.116667</coordinates>
           <location>
-            <_name>Heathrow Airport</_name>
+            <name>Heathrow Airport</name>
             <code>EGLL</code>
             <zone>:southeast</zone>
             <coordinates>51.483333 -0.450000</coordinates>
           </location>
           <location>
-            <_name>London City Airport</_name>
+            <name>London City Airport</name>
             <code>EGLC</code>
             <zone>:southeast</zone>
             <coordinates>51.500000 -0.500000</coordinates>
           </location>
           <location>
-            <_name>Gatwick Airport</_name>
+            <name>Gatwick Airport</name>
             <code>EGKK</code>
             <zone>:southeast</zone>
             <coordinates>51.150000 -0.183333</coordinates>
@@ -21356,13 +21356,13 @@
           <_name>Carlisle</_name>
           <coordinates>54.883333 -2.933333</coordinates>
           <location>
-            <_name>Carlisle</_name>
+            <name>Carlisle</name>
             <code>EGNC</code>
             <zone>:northwest</zone>
             <coordinates>54.933333 -2.950000</coordinates>
           </location>
           <location>
-            <_name>Spadeadam</_name>
+            <name>Spadeadam</name>
             <code>EGOM</code>
             <coordinates>55.050000 -2.550000</coordinates>
           </location>
@@ -21482,13 +21482,13 @@
           <_name>Belfast</_name>
           <coordinates>54.583333 -5.933333</coordinates>
           <location>
-            <_name>Belfast / Harbour</_name>
+            <name>Belfast / Harbour</name>
             <code>EGAC</code>
             <zone>:nireland</zone>
             <coordinates>54.600000 -5.883333</coordinates>
           </location>
           <location>
-            <_name>Aldergrove Airport</_name>
+            <name>Aldergrove Airport</name>
             <code>EGAA</code>
             <zone>:nireland</zone>
             <coordinates>54.650000 -6.216667</coordinates>
@@ -22142,12 +22142,12 @@
         <_name>AbÅ MÅsÄ</_name>
         <coordinates>25.914444 54.995278</coordinates>
         <location>
-          <_name>Abumusa Island, Abumusa Airport</_name>
+          <name>Abumusa Island, Abumusa Airport</name>
           <code>OIBA</code>
           <coordinates>25.875833 55.033611</coordinates>
         </location>
         <location>
-          <_name>Sirri Island, Sirri Airport</_name>
+          <name>Sirri Island, Sirri Airport</name>
           <code>OIBS</code>
           <coordinates>25.909444 54.539444</coordinates>
         </location>
@@ -22920,12 +22920,12 @@
         <_name>Doha</_name>
         <coordinates>25.286667 51.533333</coordinates>
         <location>
-          <_name>Doha International Airport</_name>
+          <name>Doha International Airport</name>
           <code>OTBD</code>
           <coordinates>25.250000 51.566667</coordinates>
         </location>
         <location>
-          <_name>Al Udeid</_name>
+          <name>Al Udeid</name>
           <code>KQIR</code>
           <coordinates>25.116667 51.300000</coordinates>
         </location>
@@ -23191,12 +23191,12 @@
         <_name>Riyadh</_name>
         <coordinates>24.640833 46.772778</coordinates>
         <location>
-          <_name>Riyadh</_name>
+          <name>Riyadh</name>
           <code>OERY</code>
           <coordinates>24.716667 46.733333</coordinates>
         </location>
         <location>
-          <_name>King Khaled International Airport</_name>
+          <name>King Khaled International Airport</name>
           <code>OERK</code>
           <coordinates>24.933333 46.716667</coordinates>
         </location>
@@ -23333,12 +23333,12 @@
         <_name>Abu Dhabi</_name>
         <coordinates>24.466667 54.366667</coordinates>
         <location>
-          <_name>Abu Dhabi Bateen Airport</_name>
+          <name>Abu Dhabi Bateen Airport</name>
           <code>OMAD</code>
           <coordinates>24.433333 54.466667</coordinates>
         </location>
         <location>
-          <_name>Abu Dhabi International Airport</_name>
+          <name>Abu Dhabi International Airport</name>
           <code>OMAA</code>
           <coordinates>24.433333 54.650000</coordinates>
         </location>
@@ -23690,12 +23690,12 @@
           <_name>Banff</_name>
           <coordinates>51.166667 -115.566667</coordinates>
           <location>
-            <_name>Banff</_name>
+            <name>Banff</name>
             <code>CWBA</code>
             <coordinates>51.183333 -115.566667</coordinates>
           </location>
           <location>
-            <_name>Banff Marine Aviation Reporting Station</_name>
+            <name>Banff Marine Aviation Reporting Station</name>
             <code>CWZG</code>
             <coordinates>51.200000 -115.550000</coordinates>
           </location>
@@ -23735,12 +23735,12 @@
           <_name>Calgary</_name>
           <coordinates>51.083333 -114.083333</coordinates>
           <location>
-            <_name>Calgary International</_name>
+            <name>Calgary International</name>
             <code>CYYC</code>
             <coordinates>51.116667 -114.016667</coordinates>
           </location>
           <location>
-            <_name>Calgary-Springbank Airport</_name>
+            <name>Calgary-Springbank Airport</name>
             <code>CYBW</code>
             <coordinates>51.100000 -114.366667</coordinates>
           </location>
@@ -23810,27 +23810,27 @@
           <_name>Edmonton</_name>
           <coordinates>53.550000 -113.500000</coordinates>
           <location>
-            <_name>Edmonton Municipal CR10</_name>
+            <name>Edmonton Municipal CR10</name>
             <code>CXEC</code>
             <coordinates>53.566667 -113.516667</coordinates>
           </location>
           <location>
-            <_name>Edmonton Municipal</_name>
+            <name>Edmonton Municipal</name>
             <code>CYXD</code>
             <coordinates>53.566667 -113.516667</coordinates>
           </location>
           <location>
-            <_name>Edmonton Namao</_name>
+            <name>Edmonton Namao</name>
             <code>CYED</code>
             <coordinates>53.666667 -113.466667</coordinates>
           </location>
           <location>
-            <_name>Edmonton International</_name>
+            <name>Edmonton International</name>
             <code>CYEG</code>
             <coordinates>53.300000 -113.583333</coordinates>
           </location>
           <location>
-            <_name>Edmonton International</_name>
+            <name>Edmonton International</name>
             <code>CXEG</code>
             <coordinates>53.300000 -113.600000</coordinates>
           </location>
@@ -23880,12 +23880,12 @@
           <_name>Fort McMurray</_name>
           <coordinates>56.733333 -111.383333</coordinates>
           <location>
-            <_name>Fort McMurray</_name>
+            <name>Fort McMurray</name>
             <code>CXMM</code>
             <coordinates>56.650000 -111.216667</coordinates>
           </location>
           <location>
-            <_name>Fort McMurray</_name>
+            <name>Fort McMurray</name>
             <code>CYMM</code>
             <coordinates>56.650000 -111.216667</coordinates>
           </location>
@@ -24065,12 +24065,12 @@
           <_name>Whitecourt</_name>
           <coordinates>54.133333 -115.683333</coordinates>
           <location>
-            <_name>Whitecourt</_name>
+            <name>Whitecourt</name>
             <code>CXZU</code>
             <coordinates>54.150000 -115.783333</coordinates>
           </location>
           <location>
-            <_name>Whitecourt</_name>
+            <name>Whitecourt</name>
             <code>CYZU</code>
             <coordinates>54.150000 -115.783333</coordinates>
           </location>
@@ -24450,12 +24450,12 @@
           <_name>Natal</_name>
           <coordinates>49.733333 -114.850000</coordinates>
           <location>
-            <_name>Sparwood, Sparwood-Elk Valley Airport</_name>
+            <name>Sparwood, Sparwood-Elk Valley Airport</name>
             <code>CWSW</code>
             <coordinates>49.750000 -114.883333</coordinates>
           </location>
           <location>
-            <_name>Sparwood Automatic Weather Reporting System</_name>
+            <name>Sparwood Automatic Weather Reporting System</name>
             <code>CWGW</code>
             <coordinates>49.750000 -114.900000</coordinates>
           </location>
@@ -24796,42 +24796,42 @@
           <_name>Victoria</_name>
           <coordinates>48.433333 -123.350000</coordinates>
           <location>
-            <_name>Victoria Harbour</_name>
+            <name>Victoria Harbour</name>
             <code>CYWH</code>
             <coordinates>48.416667 -123.333333</coordinates>
           </location>
           <location>
-            <_name>Victoria Automatic Weather Reporting System</_name>
+            <name>Victoria Automatic Weather Reporting System</name>
             <code>CWLM</code>
             <coordinates>48.416667 -123.316667</coordinates>
           </location>
           <location>
-            <_name>Victoria University</_name>
+            <name>Victoria University</name>
             <code>CWYJ</code>
             <coordinates>48.450000 -123.300000</coordinates>
           </location>
           <location>
-            <_name>Vic. Hartland Automatic Weather Reporting System</_name>
+            <name>Vic. Hartland Automatic Weather Reporting System</name>
             <code>CWVV</code>
             <coordinates>48.533333 -123.466667</coordinates>
           </location>
           <location>
-            <_name>Kelp Reefs</_name>
+            <name>Kelp Reefs</name>
             <code>CWZO</code>
             <coordinates>48.550000 -123.233333</coordinates>
           </location>
           <location>
-            <_name>Victoria International Airport</_name>
+            <name>Victoria International Airport</name>
             <code>CYYJ</code>
             <coordinates>48.650000 -123.433333</coordinates>
           </location>
           <location>
-            <_name>Sheringham Automatic Weather Reporting System</_name>
+            <name>Sheringham Automatic Weather Reporting System</name>
             <code>CWSP</code>
             <coordinates>48.383333 -123.916667</coordinates>
           </location>
           <location>
-            <_name>Saturna Island Meteorological Aeronautical Presentation System</_name>
+            <name>Saturna Island Meteorological Aeronautical Presentation System</name>
             <code>CWEZ</code>
             <coordinates>48.783333 -123.050000</coordinates>
           </location>
@@ -24940,12 +24940,12 @@
           <_name>Gillam</_name>
           <coordinates>56.350000 -94.700000</coordinates>
           <location>
-            <_name>Gillam</_name>
+            <name>Gillam</name>
             <code>CYGX</code>
             <coordinates>56.350000 -94.700000</coordinates>
           </location>
           <location>
-            <_name>Gillam</_name>
+            <name>Gillam</name>
             <code>CWGX</code>
             <coordinates>56.366667 -94.700000</coordinates>
           </location>
@@ -25075,12 +25075,12 @@
           <_name>Winnipeg</_name>
           <coordinates>49.883333 -97.166667</coordinates>
           <location>
-            <_name>Winnipeg The Forks</_name>
+            <name>Winnipeg The Forks</name>
             <code>CXWN</code>
             <coordinates>49.883333 -97.133333</coordinates>
           </location>
           <location>
-            <_name>Winnipeg International Airportman.</_name>
+            <name>Winnipeg International Airportman.</name>
             <code>CYWG</code>
             <coordinates>49.900000 -97.233333</coordinates>
           </location>
@@ -25156,12 +25156,12 @@
           <_name>Saint Leonard</_name>
           <coordinates>47.166667 -67.916667</coordinates>
           <location>
-            <_name>Saint Leonard Airport</_name>
+            <name>Saint Leonard Airport</name>
             <code>CYSL</code>
             <coordinates>47.150000 -67.833333</coordinates>
           </location>
           <location>
-            <_name>St Leonard Automatic Weather Reporting System</_name>
+            <name>St Leonard Automatic Weather Reporting System</name>
             <code>CWIY</code>
             <coordinates>47.150000 -67.816667</coordinates>
           </location>
@@ -25495,12 +25495,12 @@
           <_name>DÃlÄne</_name>
           <coordinates>65.183333 -123.416667</coordinates>
           <location>
-            <_name>DÃlÄne Airport</_name>
+            <name>DÃlÄne Airport</name>
             <code>CYWJ</code>
             <coordinates>65.200000 -123.433333</coordinates>
           </location>
           <location>
-            <_name>DÃlÄne</_name>
+            <name>DÃlÄne</name>
             <code>CXDE</code>
             <coordinates>65.216667 -123.433333</coordinates>
           </location>
@@ -25584,12 +25584,12 @@
           <_name>Inuvik</_name>
           <coordinates>68.350000 -133.700000</coordinates>
           <location>
-            <_name>Inuvik</_name>
+            <name>Inuvik</name>
             <code>CYEV</code>
             <coordinates>68.300000 -133.483333</coordinates>
           </location>
           <location>
-            <_name>Trail Valley</_name>
+            <name>Trail Valley</name>
             <code>CXTV</code>
             <coordinates>68.750000 -133.500000</coordinates>
           </location>
@@ -25791,12 +25791,12 @@
           <_name>Halifax</_name>
           <coordinates>44.650000 -63.600000</coordinates>
           <location>
-            <_name>McNabs Island</_name>
+            <name>McNabs Island</name>
             <code>CXMI</code>
             <coordinates>44.600000 -63.533333</coordinates>
           </location>
           <location>
-            <_name>Halifax International Airport</_name>
+            <name>Halifax International Airport</name>
             <code>CYHZ</code>
             <coordinates>44.883333 -63.500000</coordinates>
           </location>
@@ -26052,12 +26052,12 @@
           <_name>Qikiqtarjuaq</_name>
           <coordinates>67.550000 -64.033333</coordinates>
           <location>
-            <_name>Qikiqtarjuaq Airport</_name>
+            <name>Qikiqtarjuaq Airport</name>
             <code>CYVM</code>
             <coordinates>67.550000 -64.033333</coordinates>
           </location>
           <location>
-            <_name>Qikiqtarjuaq</_name>
+            <name>Qikiqtarjuaq</name>
             <code>CWVD</code>
             <coordinates>67.533333 -63.783333</coordinates>
           </location>
@@ -26555,18 +26555,18 @@
           <_name>Toronto</_name>
           <coordinates>43.666667 -79.416667</coordinates>
           <location>
-            <_name>Toronto Island Airport</_name>
+            <name>Toronto Island Airport</name>
             <code>CYTZ</code>
             <coordinates>43.633333 -79.400000</coordinates>
           </location>
           <location>
-            <_name>Toronto Pearson International</_name>
+            <name>Toronto Pearson International</name>
             <code>CYYZ</code>
             <radar>047</radar>
             <coordinates>43.666667 -79.633333</coordinates>
           </location>
           <location>
-            <_name>Toronto Buttonville</_name>
+            <name>Toronto Buttonville</name>
             <code>CYKZ</code>
             <radar>047</radar>
             <coordinates>43.866667 -79.366667</coordinates>
@@ -26828,12 +26828,12 @@
           <_name>Cap-aux-Meules</_name>
           <coordinates>47.383333 -61.866667</coordinates>
           <location>
-            <_name>Iles-De-La-Madelein</_name>
+            <name>Iles-De-La-Madelein</name>
             <code>CWGR</code>
             <coordinates>47.416667 -61.800000</coordinates>
           </location>
           <location>
-            <_name>Iles de la Madeleineque.</_name>
+            <name>Iles de la Madeleineque.</name>
             <code>CYGR</code>
             <coordinates>47.416667 -61.783333</coordinates>
           </location>
@@ -27054,12 +27054,12 @@
           <_name>Longue-Pointe-de-Mingan</_name>
           <coordinates>50.266667 -64.150000</coordinates>
           <location>
-            <_name>Longue Point de Mingan</_name>
+            <name>Longue Point de Mingan</name>
             <code>CWBT</code>
             <coordinates>50.266667 -64.233333</coordinates>
           </location>
           <location>
-            <_name>Ile Aux Perroquets</_name>
+            <name>Ile Aux Perroquets</name>
             <code>CWQR</code>
             <coordinates>50.223611 -64.208333</coordinates>
           </location>
@@ -27131,18 +27131,18 @@
           <_name>Montreal</_name>
           <coordinates>45.500000 -73.583333</coordinates>
           <location>
-            <_name>McTavish Automated Reporting Station</_name>
+            <name>McTavish Automated Reporting Station</name>
             <code>CWTA</code>
             <coordinates>45.500000 -73.583333</coordinates>
           </location>
           <location>
-            <_name>Pierre Elliot Trudeau International Airport</_name>
+            <name>Pierre Elliot Trudeau International Airport</name>
             <code>CYUL</code>
             <radar>cxx</radar>
             <coordinates>45.466667 -73.750000</coordinates>
           </location>
           <location>
-            <_name>Montreal-Mirabel Airport</_name>
+            <name>Montreal-Mirabel Airport</name>
             <code>CYMX</code>
             <radar>cxx</radar>
             <coordinates>45.683333 -74.033333</coordinates>
@@ -27445,12 +27445,12 @@
           <_name>Sept-Ãles</_name>
           <coordinates>50.200000 -66.383333</coordinates>
           <location>
-            <_name>Pointe Noire</_name>
+            <name>Pointe Noire</name>
             <code>CWIP</code>
             <coordinates>50.166667 -66.433333</coordinates>
           </location>
           <location>
-            <_name>Sept-Ãles</_name>
+            <name>Sept-Ãles</name>
             <code>CYZV</code>
             <coordinates>50.216667 -66.266667</coordinates>
           </location>
@@ -27556,12 +27556,12 @@
           <_name>Buffalo Narrows</_name>
           <coordinates>55.854167 -108.484167</coordinates>
           <location>
-            <_name>Buffalo Narrows</_name>
+            <name>Buffalo Narrows</name>
             <code>CYVT</code>
             <coordinates>55.833333 -108.450000</coordinates>
           </location>
           <location>
-            <_name>Buffalo Narrows</_name>
+            <name>Buffalo Narrows</name>
             <code>CWVT</code>
             <coordinates>55.833333 -108.433333</coordinates>
           </location>
@@ -27611,12 +27611,12 @@
           <_name>La Ronge</_name>
           <coordinates>55.100000 -105.300000</coordinates>
           <location>
-            <_name>La Ronge</_name>
+            <name>La Ronge</name>
             <code>CXOX</code>
             <coordinates>55.150000 -105.266667</coordinates>
           </location>
           <location>
-            <_name>La Ronge</_name>
+            <name>La Ronge</name>
             <code>CYVC</code>
             <coordinates>55.150000 -105.266667</coordinates>
           </location>
@@ -27656,12 +27656,12 @@
           <_name>Maple Creek</_name>
           <coordinates>49.916667 -109.466667</coordinates>
           <location>
-            <_name>Maplecreek Automatic Weather Reporting System</_name>
+            <name>Maplecreek Automatic Weather Reporting System</name>
             <code>CWMQ</code>
             <coordinates>49.900000 -109.466667</coordinates>
           </location>
           <location>
-            <_name>Cypress Hills Park</_name>
+            <name>Cypress Hills Park</name>
             <code>CWVP</code>
             <coordinates>49.650000 -109.516667</coordinates>
           </location>
@@ -27721,17 +27721,17 @@
           <_name>Regina</_name>
           <coordinates>50.450000 -104.616667</coordinates>
           <location>
-            <_name>Regina</_name>
+            <name>Regina</name>
             <code>CYQR</code>
             <coordinates>50.433333 -104.666667</coordinates>
           </location>
           <location>
-            <_name>Regina University</_name>
+            <name>Regina University</name>
             <code>CWDJ</code>
             <coordinates>50.400000 -104.583333</coordinates>
           </location>
           <location>
-            <_name>Bratts Lake</_name>
+            <name>Bratts Lake</name>
             <code>CXBK</code>
             <coordinates>50.200000 -104.700000</coordinates>
           </location>
@@ -27957,12 +27957,12 @@
           <_name>Teslin</_name>
           <coordinates>60.166667 -132.700000</coordinates>
           <location>
-            <_name>Teslin</_name>
+            <name>Teslin</name>
             <code>CYZW</code>
             <coordinates>60.166667 -132.733333</coordinates>
           </location>
           <location>
-            <_name>Teslin Marine Aviation Reporting Station</_name>
+            <name>Teslin Marine Aviation Reporting Station</name>
             <code>CWZW</code>
             <coordinates>60.166667 -132.766667</coordinates>
           </location>
@@ -28433,12 +28433,12 @@
           <_name>Monterrey</_name>
           <coordinates>25.666667 -100.316667</coordinates>
           <location>
-            <_name>Monterrey International Airport</_name>
+            <name>Monterrey International Airport</name>
             <code>MMAN</code>
             <coordinates>25.866667 -100.233333</coordinates>
           </location>
           <location>
-            <_name>Gen Maria Airport</_name>
+            <name>Gen Maria Airport</name>
             <code>MMMY</code>
             <coordinates>25.783333 -100.100000</coordinates>
           </location>
@@ -29178,14 +29178,14 @@
           <_name>Huntsville</_name>
           <coordinates>34.730369 -86.586104</coordinates>
           <location>
-            <_name>Madison County Executive Airport</_name>
+            <name>Madison County Executive Airport</name>
             <code>KMDQ</code>
             <zone>ALZ006</zone>
             <radar>tip</radar>
             <coordinates>34.861389 -86.557222</coordinates>
           </location>
           <location>
-            <_name>Huntsville International / Jones Field</_name>
+            <name>Huntsville International / Jones Field</name>
             <code>KHSV</code>
             <zone>ALZ006</zone>
             <radar>tip</radar>
@@ -29199,14 +29199,14 @@
           <_name>Mobile</_name>
           <coordinates>30.694357 -88.043054</coordinates>
           <location>
-            <_name>Mobile Downtown Airport</_name>
+            <name>Mobile Downtown Airport</name>
             <code>KBFM</code>
             <zone>ALZ061</zone>
             <radar>bix</radar>
             <coordinates>30.613889 -88.063333</coordinates>
           </location>
           <location>
-            <_name>Mobile Regional Airport</_name>
+            <name>Mobile Regional Airport</name>
             <code>KMOB</code>
             <zone>ALZ061</zone>
             <radar>bix</radar>
@@ -29220,14 +29220,14 @@
           <_name>Montgomery</_name>
           <coordinates>32.366805 -86.299969</coordinates>
           <location>
-            <_name>Maxwell Air Force Base / Montgomery</_name>
+            <name>Maxwell Air Force Base / Montgomery</name>
             <code>KMXF</code>
             <zone>ALZ044</zone>
             <radar>bhm</radar>
             <coordinates>32.383333 -86.366667</coordinates>
           </location>
           <location>
-            <_name>Dannelly Field</_name>
+            <name>Dannelly Field</name>
             <code>KMGM</code>
             <zone>ALZ044</zone>
             <radar>bhm</radar>
@@ -29255,12 +29255,12 @@
           <_name>Ozark</_name>
           <coordinates>31.459058 -85.640493</coordinates>
           <location>
-            <_name>Hanchey AHP / Ozark</_name>
+            <name>Hanchey AHP / Ozark</name>
             <code>KHEY</code>
             <coordinates>31.350000 -85.666667</coordinates>
           </location>
           <location>
-            <_name>Cairns Army Air Field / Ozark</_name>
+            <name>Cairns Army Air Field / Ozark</name>
             <code>KOZR</code>
             <zone>ALZ066</zone>
             <radar>tlh</radar>
@@ -29365,28 +29365,28 @@
           <_name>Anchorage</_name>
           <coordinates>61.218056 -149.900278</coordinates>
           <location>
-            <_name>Merrill Field Airport</_name>
+            <name>Merrill Field Airport</name>
             <code>PAMR</code>
             <zone>AKZ015</zone>
             <radar>alaska</radar>
             <coordinates>61.216667 -149.850000</coordinates>
           </location>
           <location>
-            <_name>Lake Hood Seaplane Base</_name>
+            <name>Lake Hood Seaplane Base</name>
             <code>PALH</code>
             <zone>AKZ015</zone>
             <radar>alaska</radar>
             <coordinates>61.183333 -149.966667</coordinates>
           </location>
           <location>
-            <_name>Elmendorf Air Force Base</_name>
+            <name>Elmendorf Air Force Base</name>
             <code>PAED</code>
             <zone>AKZ015</zone>
             <radar>alaska</radar>
             <coordinates>61.253056 -149.793889</coordinates>
           </location>
           <location>
-            <_name>Ted Stevens Anchorage International Airport</_name>
+            <name>Ted Stevens Anchorage International Airport</name>
             <code>PANC</code>
             <zone>AKZ015</zone>
             <radar>alaska</radar>
@@ -29760,13 +29760,13 @@
           <_name>Eureka Roadhouse</_name>
           <coordinates>61.938611 -147.168056</coordinates>
           <location>
-            <_name>Eureka, Skelton Airport</_name>
+            <name>Eureka, Skelton Airport</name>
             <code>PAZK</code>
             <radar>alaska</radar>
             <coordinates>61.933333 -147.166667</coordinates>
           </location>
           <location>
-            <_name>Sheep Mountain, Sheep Mountain Airport</_name>
+            <name>Sheep Mountain, Sheep Mountain Airport</name>
             <code>PASP</code>
             <radar>alaska</radar>
             <coordinates>61.811944 -147.506944</coordinates>
@@ -29779,21 +29779,21 @@
           <_name>Fairbanks</_name>
           <coordinates>64.837778 -147.716389</coordinates>
           <location>
-            <_name>Fort Wainwright AAF</_name>
+            <name>Fort Wainwright AAF</name>
             <code>PAFB</code>
             <zone>AKZ001</zone>
             <radar>alaska</radar>
             <coordinates>64.836667 -147.595556</coordinates>
           </location>
           <location>
-            <_name>Fairbanks International Airport</_name>
+            <name>Fairbanks International Airport</name>
             <code>PAFA</code>
             <zone>AKZ007</zone>
             <radar>alaska</radar>
             <coordinates>64.803889 -147.876111</coordinates>
           </location>
           <location>
-            <_name>Eielson Air Force Base</_name>
+            <name>Eielson Air Force Base</name>
             <code>PAEI</code>
             <zone>AKZ007</zone>
             <radar>alaska</radar>
@@ -30412,13 +30412,13 @@
           <_name>Platinum</_name>
           <coordinates>59.013056 -161.816389</coordinates>
           <location>
-            <_name>Platinum</_name>
+            <name>Platinum</name>
             <code>PAPM</code>
             <radar>alaska</radar>
             <coordinates>59.016667 -161.816667</coordinates>
           </location>
           <location>
-            <_name>Cape Newenham, Cape Newenham LRRS Airport</_name>
+            <name>Cape Newenham, Cape Newenham LRRS Airport</name>
             <code>PAEH</code>
             <radar>alaska</radar>
             <coordinates>58.650000 -162.066667</coordinates>
@@ -30839,14 +30839,14 @@
           <_name>Whittier</_name>
           <coordinates>60.773056 -148.683889</coordinates>
           <location>
-            <_name>Whittier</_name>
+            <name>Whittier</name>
             <code>PAWR</code>
             <zone>AKZ015</zone>
             <radar>alaska</radar>
             <coordinates>60.766667 -148.683333</coordinates>
           </location>
           <location>
-            <_name>Portage, Portage Glacier</_name>
+            <name>Portage, Portage Glacier</name>
             <code>PATO</code>
             <radar>alaska</radar>
             <coordinates>60.783333 -148.833333</coordinates>
@@ -31055,14 +31055,14 @@
           <_name>Mesa</_name>
           <coordinates>33.422269 -111.822640</coordinates>
           <location>
-            <_name>Mesa / Falcon Field</_name>
+            <name>Mesa / Falcon Field</name>
             <code>KFFZ</code>
             <zone>AZZ023</zone>
             <radar>phx</radar>
             <coordinates>33.466667 -111.733333</coordinates>
           </location>
           <location>
-            <_name>Williams Gateway Airport</_name>
+            <name>Williams Gateway Airport</name>
             <code>KIWA</code>
             <zone>AZZ015</zone>
             <radar>phx</radar>
@@ -31114,21 +31114,21 @@
           <_name>Phoenix</_name>
           <coordinates>33.448377 -112.074037</coordinates>
           <location>
-            <_name>Phoenix Sky Harbor International Airport</_name>
+            <name>Phoenix Sky Harbor International Airport</name>
             <code>KPHX</code>
             <zone>AZZ023</zone>
             <radar>phx</radar>
             <coordinates>33.434167 -112.051111</coordinates>
           </location>
           <location>
-            <_name>Phoenix-Deer Valley Municipal Airport</_name>
+            <name>Phoenix-Deer Valley Municipal Airport</name>
             <code>KDVT</code>
             <zone>AZZ023</zone>
             <radar>phx</radar>
             <coordinates>33.690278 -112.065556</coordinates>
           </location>
           <location>
-            <_name>Luke Air Force Base / Phoenix</_name>
+            <name>Luke Air Force Base / Phoenix</name>
             <code>KLUF</code>
             <zone>AZZ023</zone>
             <radar>phx</radar>
@@ -31238,14 +31238,14 @@
           <_name>Tucson</_name>
           <coordinates>32.221743 -110.926479</coordinates>
           <location>
-            <_name>Davis-Monthan Air Force Base</_name>
+            <name>Davis-Monthan Air Force Base</name>
             <code>KDMA</code>
             <zone>AZZ033</zone>
             <radar>phx</radar>
             <coordinates>32.166667 -110.883333</coordinates>
           </location>
           <location>
-            <_name>Tucson International Airport</_name>
+            <name>Tucson International Airport</name>
             <code>KTUS</code>
             <zone>AZZ033</zone>
             <radar>phx</radar>
@@ -31397,14 +31397,14 @@
           <_name>Fayetteville</_name>
           <coordinates>36.062579 -94.157426</coordinates>
           <location>
-            <_name>Drake Field</_name>
+            <name>Drake Field</name>
             <code>KFYV</code>
             <zone>ARZ010</zone>
             <radar>okc</radar>
             <coordinates>36.010278 -94.167778</coordinates>
           </location>
           <location>
-            <_name>Fayetteville / Springdale, Northwest Arkansas Regional Airport</_name>
+            <name>Fayetteville / Springdale, Northwest Arkansas Regional Airport</name>
             <code>KXNA</code>
             <zone>ARZ010</zone>
             <radar>okc</radar>
@@ -31499,14 +31499,14 @@
           <_name>Little Rock</_name>
           <coordinates>34.746481 -92.289595</coordinates>
           <location>
-            <_name>Adams Field</_name>
+            <name>Adams Field</name>
             <code>KLIT</code>
             <zone>ARZ044</zone>
             <radar>lit</radar>
             <coordinates>34.726667 -92.236111</coordinates>
           </location>
           <location>
-            <_name>Little Rock Air Force Base</_name>
+            <name>Little Rock Air Force Base</name>
             <code>KLRF</code>
             <zone>ARZ044</zone>
             <radar>lit</radar>
@@ -31646,12 +31646,12 @@
           <_name>Springdale</_name>
           <coordinates>36.186744 -94.128814</coordinates>
           <location>
-            <_name>Springdale Municipal</_name>
+            <name>Springdale Municipal</name>
             <code>KASG</code>
             <coordinates>36.183333 -94.116667</coordinates>
           </location>
           <location>
-            <_name>Fayetteville / Springdale, Northwest Arkansas Regional Airport</_name>
+            <name>Fayetteville / Springdale, Northwest Arkansas Regional Airport</name>
             <code>KXNA</code>
             <zone>ARZ010</zone>
             <radar>okc</radar>
@@ -32044,14 +32044,14 @@
           <_name>Edwards</_name>
           <coordinates>34.926088 -117.935068</coordinates>
           <location>
-            <_name>Edwards Air Force Base</_name>
+            <name>Edwards Air Force Base</name>
             <code>KEDW</code>
             <zone>CAZ025</zone>
             <radar>lax</radar>
             <coordinates>34.916667 -117.900000</coordinates>
           </location>
           <location>
-            <_name>Edwards Air Force Auxiliary North Base</_name>
+            <name>Edwards Air Force Auxiliary North Base</name>
             <code>K9L2</code>
             <coordinates>34.983333 -117.850000</coordinates>
           </location>
@@ -32422,14 +32422,14 @@
           <_name>Lompoc</_name>
           <coordinates>34.639150 -120.457941</coordinates>
           <location>
-            <_name>Lompoc Airport</_name>
+            <name>Lompoc Airport</name>
             <code>KLPC</code>
             <zone>CAZ035</zone>
             <radar>lax</radar>
             <coordinates>34.666667 -120.466667</coordinates>
           </location>
           <location>
-            <_name>Vandenberg Air Force Base</_name>
+            <name>Vandenberg Air Force Base</name>
             <code>KVBG</code>
             <zone>CAZ039</zone>
             <radar>lax</radar>
@@ -32469,21 +32469,21 @@
           <_name>Los Angeles</_name>
           <coordinates>34.052234 -118.243685</coordinates>
           <location>
-            <_name>Los Angeles / USC Campus Downtown</_name>
+            <name>Los Angeles / USC Campus Downtown</name>
             <code>KCQT</code>
             <zone>CAZ041</zone>
             <radar>lax</radar>
             <coordinates>34.016667 -118.283333</coordinates>
           </location>
           <location>
-            <_name>Los Angeles International Airport</_name>
+            <name>Los Angeles International Airport</name>
             <code>KLAX</code>
             <zone>CAZ041</zone>
             <radar>lax</radar>
             <coordinates>33.938056 -118.388889</coordinates>
           </location>
           <location>
-            <_name>Whiteman Airport</_name>
+            <name>Whiteman Airport</name>
             <code>KWHP</code>
             <zone>CAZ041</zone>
             <radar>lax</radar>
@@ -32509,14 +32509,14 @@
           <_name>Marysville</_name>
           <coordinates>39.145725 -121.591355</coordinates>
           <location>
-            <_name>Yuba County Airport</_name>
+            <name>Yuba County Airport</name>
             <code>KMYV</code>
             <zone>CAZ016</zone>
             <radar>sfo</radar>
             <coordinates>39.097778 -121.569722</coordinates>
           </location>
           <location>
-            <_name>Beale Air Force Base</_name>
+            <name>Beale Air Force Base</name>
             <code>KBAB</code>
             <zone>CAZ016</zone>
             <radar>sfo</radar>
@@ -32530,14 +32530,14 @@
           <_name>Merced</_name>
           <coordinates>37.302163 -120.482968</coordinates>
           <location>
-            <_name>Merced Municipal Airport</_name>
+            <name>Merced Municipal Airport</name>
             <code>KMCE</code>
             <zone>CAZ020</zone>
             <radar>sfo</radar>
             <coordinates>37.283056 -120.507778</coordinates>
           </location>
           <location>
-            <_name>Merced / Castle Air Force Base</_name>
+            <name>Merced / Castle Air Force Base</name>
             <code>KMER</code>
             <coordinates>37.366667 -120.566667</coordinates>
           </location>
@@ -32715,17 +32715,17 @@
           <_name>Oceanside</_name>
           <coordinates>33.195870 -117.379483</coordinates>
           <location>
-            <_name>Oceanside Municipal Airport</_name>
+            <name>Oceanside Municipal Airport</name>
             <code>KOKB</code>
             <coordinates>33.218056 -117.351389</coordinates>
           </location>
           <location>
-            <_name>Oceanside Municipal Airport</_name>
+            <name>Oceanside Municipal Airport</name>
             <code>KOKH</code>
             <coordinates>33.219444 -117.349444</coordinates>
           </location>
           <location>
-            <_name>Oceanside, Camp Pendleton, Marine Corps Air Station</_name>
+            <name>Oceanside, Camp Pendleton, Marine Corps Air Station</name>
             <code>KNFG</code>
             <zone>CAZ043</zone>
             <radar>lax</radar>
@@ -32779,14 +32779,14 @@
           <_name>Oxnard</_name>
           <coordinates>34.197505 -119.177052</coordinates>
           <location>
-            <_name>Oxnard Airport</_name>
+            <name>Oxnard Airport</name>
             <code>KOXR</code>
             <zone>CAZ040</zone>
             <radar>lax</radar>
             <coordinates>34.200556 -119.203056</coordinates>
           </location>
           <location>
-            <_name>Point Mugu, Naval Air Warfare Center</_name>
+            <name>Point Mugu, Naval Air Warfare Center</name>
             <code>KNTD</code>
             <radar>lax</radar>
             <coordinates>34.123889 -119.121667</coordinates>
@@ -32799,14 +32799,14 @@
           <_name>Palm Springs</_name>
           <coordinates>33.830296 -116.545292</coordinates>
           <location>
-            <_name>Palm Springs Regional Airport</_name>
+            <name>Palm Springs Regional Airport</name>
             <code>KPSP</code>
             <zone>CAZ061</zone>
             <radar>lax</radar>
             <coordinates>33.822222 -116.503611</coordinates>
           </location>
           <location>
-            <_name>Jacqueline Cochran Regional Airport</_name>
+            <name>Jacqueline Cochran Regional Airport</name>
             <code>KTRM</code>
             <coordinates>33.626667 -116.159444</coordinates>
           </location>
@@ -32956,14 +32956,14 @@
           <_name>Riverside</_name>
           <coordinates>33.953349 -117.396156</coordinates>
           <location>
-            <_name>Riverside Municipal Airport</_name>
+            <name>Riverside Municipal Airport</name>
             <code>KRAL</code>
             <zone>CAZ048</zone>
             <radar>lax</radar>
             <coordinates>33.951389 -117.450556</coordinates>
           </location>
           <location>
-            <_name>Riverside / March Air Force Base</_name>
+            <name>Riverside / March Air Force Base</name>
             <code>KRIV</code>
             <zone>CAZ061</zone>
             <radar>lax</radar>
@@ -32977,21 +32977,21 @@
           <_name>Sacramento</_name>
           <coordinates>38.581572 -121.494400</coordinates>
           <location>
-            <_name>Sacramento Executive Airport</_name>
+            <name>Sacramento Executive Airport</name>
             <code>KSAC</code>
             <zone>CAZ017</zone>
             <radar>sfo</radar>
             <coordinates>38.506944 -121.495000</coordinates>
           </location>
           <location>
-            <_name>Sacramento International Airport</_name>
+            <name>Sacramento International Airport</name>
             <code>KSMF</code>
             <zone>CAZ017</zone>
             <radar>sfo</radar>
             <coordinates>38.701389 -121.593889</coordinates>
           </location>
           <location>
-            <_name>Sacramento Mather Airport</_name>
+            <name>Sacramento Mather Airport</name>
             <code>KMHR</code>
             <coordinates>38.550000 -121.300000</coordinates>
           </location>
@@ -33045,41 +33045,41 @@
           <_name>San Diego</_name>
           <coordinates>32.715329 -117.157255</coordinates>
           <location>
-            <_name>San Diego International-Lindbergh Field</_name>
+            <name>San Diego International-Lindbergh Field</name>
             <code>KSAN</code>
             <zone>CAZ043</zone>
             <radar>lax</radar>
             <coordinates>32.733611 -117.183056</coordinates>
           </location>
           <location>
-            <_name>San Diego, North Island, Naval Air Station</_name>
+            <name>San Diego, North Island, Naval Air Station</name>
             <code>KNZY</code>
             <radar>lax</radar>
             <coordinates>32.690833 -117.208889</coordinates>
           </location>
           <location>
-            <_name>Montgomery Field</_name>
+            <name>Montgomery Field</name>
             <code>KMYF</code>
             <zone>CAZ043</zone>
             <radar>lax</radar>
             <coordinates>32.814444 -117.136389</coordinates>
           </location>
           <location>
-            <_name>Miramar MCAS / Mitscher Field Airport</_name>
+            <name>Miramar MCAS / Mitscher Field Airport</name>
             <code>KNKX</code>
             <zone>CAZ043</zone>
             <radar>lax</radar>
             <coordinates>32.868333 -117.142500</coordinates>
           </location>
           <location>
-            <_name>San Diego / El Cajon, Gillespie Field Airport</_name>
+            <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>
           <location>
-            <_name>Brown Field Municipal Airport</_name>
+            <name>Brown Field Municipal Airport</name>
             <code>KSDM</code>
             <zone>CAZ050</zone>
             <radar>lax</radar>
@@ -33107,14 +33107,14 @@
           <_name>San Jose</_name>
           <coordinates>37.339386 -121.894955</coordinates>
           <location>
-            <_name>San Jose International Airport</_name>
+            <name>San Jose International Airport</name>
             <code>KSJC</code>
             <zone>CAZ513</zone>
             <radar>sfo</radar>
             <coordinates>37.359167 -121.924167</coordinates>
           </location>
           <location>
-            <_name>San Jose / Reid / Hillv</_name>
+            <name>San Jose / Reid / Hillv</name>
             <code>KRHV</code>
             <coordinates>37.333333 -121.816667</coordinates>
           </location>
@@ -33581,14 +33581,14 @@
           <_name>Colorado Springs</_name>
           <coordinates>38.833882 -104.821363</coordinates>
           <location>
-            <_name>City of Colorado Springs Municipal Airport</_name>
+            <name>City of Colorado Springs Municipal Airport</name>
             <code>KCOS</code>
             <zone>COZ071</zone>
             <radar>den</radar>
             <coordinates>38.815833 -104.710833</coordinates>
           </location>
           <location>
-            <_name>Air Force Academy</_name>
+            <name>Air Force Academy</name>
             <code>KAFF</code>
             <zone>COZ071</zone>
             <radar>den</radar>
@@ -33642,21 +33642,21 @@
           <_name>Denver</_name>
           <coordinates>39.739154 -104.984703</coordinates>
           <location>
-            <_name>Centennial Airport</_name>
+            <name>Centennial Airport</name>
             <code>KAPA</code>
             <zone>COZ040</zone>
             <radar>den</radar>
             <coordinates>39.563889 -104.848333</coordinates>
           </location>
           <location>
-            <_name>Denver International Airport</_name>
+            <name>Denver International Airport</name>
             <code>KDEN</code>
             <zone>COZ040</zone>
             <radar>den</radar>
             <coordinates>39.832778 -104.657500</coordinates>
           </location>
           <location>
-            <_name>Denver NEXRAD Station</_name>
+            <name>Denver NEXRAD Station</name>
             <code>KFTG</code>
             <coordinates>39.783333 -104.550000</coordinates>
           </location>
@@ -34310,14 +34310,14 @@
           <_name>Washington</_name>
           <coordinates>38.895112 -77.036366</coordinates>
           <location>
-            <_name>Washington DC, Reagan National Airport</_name>
+            <name>Washington DC, Reagan National Airport</name>
             <code>KDCA</code>
             <zone>VAZ054</zone>
             <radar>dca</radar>
             <coordinates>38.848333 -77.034167</coordinates>
           </location>
           <location>
-            <_name>Washington DC, Washington-Dulles International Airport</_name>
+            <name>Washington DC, Washington-Dulles International Airport</name>
             <code>KIAD</code>
             <zone>VAZ042</zone>
             <radar>dca</radar>
@@ -34470,7 +34470,7 @@
           <_name>Crestview</_name>
           <coordinates>30.762133 -86.570508</coordinates>
           <location>
-            <_name>Sikes Airport</_name>
+            <name>Sikes Airport</name>
             <code>KCEW</code>
             <tz-hint>America/Chicago</tz-hint>
             <zone>FLZ006</zone>
@@ -34478,7 +34478,7 @@
             <coordinates>30.772222 -86.520000</coordinates>
           </location>
           <location>
-            <_name>Duke Field / Eglin Auxiliary</_name>
+            <name>Duke Field / Eglin Auxiliary</name>
             <code>KEGI</code>
             <tz-hint>America/Chicago</tz-hint>
             <zone>FLZ006</zone>
@@ -34535,14 +34535,14 @@
           <_name>Fort Lauderdale</_name>
           <coordinates>26.122308 -80.143379</coordinates>
           <location>
-            <_name>Fort Lauderdale / Hollywood International Airport</_name>
+            <name>Fort Lauderdale / Hollywood International Airport</name>
             <code>KFLL</code>
             <zone>FLZ072</zone>
             <radar>mia</radar>
             <coordinates>26.068056 -80.152500</coordinates>
           </location>
           <location>
-            <_name>Fort Lauderdale Executive Airport</_name>
+            <name>Fort Lauderdale Executive Airport</name>
             <code>KFXE</code>
             <zone>FLZ072</zone>
             <radar>mia</radar>
@@ -34556,14 +34556,14 @@
           <_name>Fort Myers</_name>
           <coordinates>26.640628 -81.872308</coordinates>
           <location>
-            <_name>Page Field</_name>
+            <name>Page Field</name>
             <code>KFMY</code>
             <zone>FLZ065</zone>
             <radar>mia</radar>
             <coordinates>26.584167 -81.862500</coordinates>
           </location>
           <location>
-            <_name>Southwest Florida International Airport</_name>
+            <name>Southwest Florida International Airport</name>
             <code>KRSW</code>
             <zone>FLZ065</zone>
             <radar>mia</radar>
@@ -34657,28 +34657,28 @@
           <_name>Jacksonville</_name>
           <coordinates>30.332184 -81.655651</coordinates>
           <location>
-            <_name>Jacksonville, Naval Air Station</_name>
+            <name>Jacksonville, Naval Air Station</name>
             <code>KNIP</code>
             <zone>FLZ025</zone>
             <radar>tlh</radar>
             <coordinates>30.234167 -81.674722</coordinates>
           </location>
           <location>
-            <_name>Craig Municipal Airport</_name>
+            <name>Craig Municipal Airport</name>
             <code>KCRG</code>
             <zone>FLZ025</zone>
             <radar>tlh</radar>
             <coordinates>30.336111 -81.514722</coordinates>
           </location>
           <location>
-            <_name>Jacksonville International Airport</_name>
+            <name>Jacksonville International Airport</name>
             <code>KJAX</code>
             <zone>FLZ025</zone>
             <radar>tlh</radar>
             <coordinates>30.494444 -81.693333</coordinates>
           </location>
           <location>
-            <_name>Cecil Field Airport</_name>
+            <name>Cecil Field Airport</name>
             <code>KVQQ</code>
             <coordinates>30.218611 -81.876667</coordinates>
           </location>
@@ -34690,14 +34690,14 @@
           <_name>Key West</_name>
           <coordinates>24.555702 -81.782591</coordinates>
           <location>
-            <_name>Key West International Airport</_name>
+            <name>Key West International Airport</name>
             <code>KEYW</code>
             <zone>FLZ075</zone>
             <radar>mia</radar>
             <coordinates>24.553611 -81.753611</coordinates>
           </location>
           <location>
-            <_name>Key West, Naval Air Station</_name>
+            <name>Key West, Naval Air Station</name>
             <code>KNQX</code>
             <zone>FLZ075</zone>
             <radar>mia</radar>
@@ -34795,21 +34795,21 @@
           <_name>Miami</_name>
           <coordinates>25.774266 -80.193659</coordinates>
           <location>
-            <_name>Miami International Airport</_name>
+            <name>Miami International Airport</name>
             <code>KMIA</code>
             <zone>FLZ074</zone>
             <radar>mia</radar>
             <coordinates>25.790556 -80.316389</coordinates>
           </location>
           <location>
-            <_name>Opa Locka Airport</_name>
+            <name>Opa Locka Airport</name>
             <code>KOPF</code>
             <zone>FLZ074</zone>
             <radar>mia</radar>
             <coordinates>25.910000 -80.283056</coordinates>
           </location>
           <location>
-            <_name>Kendall-Tamiami Executive Airport</_name>
+            <name>Kendall-Tamiami Executive Airport</name>
             <code>KTMB</code>
             <zone>FLZ074</zone>
             <radar>mia</radar>
@@ -34823,12 +34823,12 @@
           <_name>Milton</_name>
           <coordinates>30.632415 -87.039688</coordinates>
           <location>
-            <_name>Milton, Whiting Field South</_name>
+            <name>Milton, Whiting Field South</name>
             <code>KNDZ</code>
             <coordinates>30.697222 -87.020000</coordinates>
           </location>
           <location>
-            <_name>Milton, Whiting Field Naval Air Station North</_name>
+            <name>Milton, Whiting Field Naval Air Station North</name>
             <code>KNSE</code>
             <tz-hint>America/Chicago</tz-hint>
             <zone>FLZ004</zone>
@@ -34895,26 +34895,26 @@
           <_name>Orlando</_name>
           <coordinates>28.538335 -81.379237</coordinates>
           <location>
-            <_name>Orlando Executive Airport</_name>
+            <name>Orlando Executive Airport</name>
             <code>KORL</code>
             <zone>FLZ045</zone>
             <radar>tpa</radar>
             <coordinates>28.546389 -81.335833</coordinates>
           </location>
           <location>
-            <_name>Orlando International Airport</_name>
+            <name>Orlando International Airport</name>
             <code>KMCO</code>
             <zone>FLZ045</zone>
             <radar>tpa</radar>
             <coordinates>28.417222 -81.325000</coordinates>
           </location>
           <location>
-            <_name>Kissimmee Municipal Airport</_name>
+            <name>Kissimmee Municipal Airport</name>
             <code>KISM</code>
             <coordinates>28.289722 -81.437222</coordinates>
           </location>
           <location>
-            <_name>Sanford Airport</_name>
+            <name>Sanford Airport</name>
             <code>KSFB</code>
             <zone>FLZ046</zone>
             <radar>tpa</radar>
@@ -34967,7 +34967,7 @@
           <_name>Pensacola</_name>
           <coordinates>30.421309 -87.216915</coordinates>
           <location>
-            <_name>Pensacola Regional Airport</_name>
+            <name>Pensacola Regional Airport</name>
             <code>KPNS</code>
             <tz-hint>America/Chicago</tz-hint>
             <zone>FLZ002</zone>
@@ -34975,7 +34975,7 @@
             <coordinates>30.478056 -87.186944</coordinates>
           </location>
           <location>
-            <_name>Pensacola, Naval Air Station</_name>
+            <name>Pensacola, Naval Air Station</name>
             <code>KNPA</code>
             <tz-hint>America/Chicago</tz-hint>
             <zone>FLZ002</zone>
@@ -35083,31 +35083,31 @@
           <_name>Tampa</_name>
           <coordinates>27.947522 -82.458428</coordinates>
           <location>
-            <_name>Peter O Knight Airport</_name>
+            <name>Peter O Knight Airport</name>
             <code>KTPF</code>
             <coordinates>27.915556 -82.449167</coordinates>
           </location>
           <location>
-            <_name>Tampa International Airport</_name>
+            <name>Tampa International Airport</name>
             <code>KTPA</code>
             <zone>FLZ051</zone>
             <radar>tpa</radar>
             <coordinates>27.961389 -82.540278</coordinates>
           </location>
           <location>
-            <_name>Macdill Air Force Base, Fl.</_name>
+            <name>Macdill Air Force Base, Fl.</name>
             <code>KMCF</code>
             <zone>FLZ051</zone>
             <radar>tpa</radar>
             <coordinates>27.850000 -82.500000</coordinates>
           </location>
           <location>
-            <_name>Vandenberg Airport</_name>
+            <name>Vandenberg Airport</name>
             <code>KVDF</code>
             <coordinates>28.013889 -82.345278</coordinates>
           </location>
           <location>
-            <_name>St. Petersburg, Whitted Airport</_name>
+            <name>St. Petersburg, Whitted Airport</name>
             <code>KSPG</code>
             <zone>FLZ050</zone>
             <radar>tpa</radar>
@@ -35133,13 +35133,13 @@
           <_name>Titusville</_name>
           <coordinates>28.612219 -80.807554</coordinates>
           <location>
-            <_name>Titusville, NASA Shuttle Landing Facility</_name>
+            <name>Titusville, NASA Shuttle Landing Facility</name>
             <code>KTTS</code>
             <radar>tpa</radar>
             <coordinates>28.616667 -80.700000</coordinates>
           </location>
           <location>
-            <_name>Titusville</_name>
+            <name>Titusville</name>
             <code>KTIX</code>
             <zone>FLZ047</zone>
             <radar>tpa</radar>
@@ -35271,28 +35271,28 @@
           <_name>Atlanta</_name>
           <coordinates>33.748995 -84.387982</coordinates>
           <location>
-            <_name>Hartsfield - Jackson Atlanta International Airport</_name>
+            <name>Hartsfield - Jackson Atlanta International Airport</name>
             <code>KATL</code>
             <zone>GAZ033</zone>
             <radar>atl</radar>
             <coordinates>33.640278 -84.426944</coordinates>
           </location>
           <location>
-            <_name>Fulton County Airport-Brown Field</_name>
+            <name>Fulton County Airport-Brown Field</name>
             <code>KFTY</code>
             <zone>GAZ033</zone>
             <radar>atl</radar>
             <coordinates>33.777500 -84.524444</coordinates>
           </location>
           <location>
-            <_name>De Kalb-Peachtree Airport</_name>
+            <name>De Kalb-Peachtree Airport</name>
             <code>KPDK</code>
             <zone>GAZ033</zone>
             <radar>atl</radar>
             <coordinates>33.878333 -84.298056</coordinates>
           </location>
           <location>
-            <_name>Peachtree City-Falcon Field</_name>
+            <name>Peachtree City-Falcon Field</name>
             <code>KFFC</code>
             <zone>GAZ033</zone>
             <radar>atl</radar>
@@ -35306,12 +35306,12 @@
           <_name>Augusta</_name>
           <coordinates>33.470970 -81.974838</coordinates>
           <location>
-            <_name>Daniel Field</_name>
+            <name>Daniel Field</name>
             <code>KDNL</code>
             <coordinates>33.466944 -82.038611</coordinates>
           </location>
           <location>
-            <_name>Bush Field</_name>
+            <name>Bush Field</name>
             <code>KAGS</code>
             <zone>GAZ065</zone>
             <radar>atl</radar>
@@ -35351,14 +35351,14 @@
           <_name>Brunswick</_name>
           <coordinates>31.149953 -81.491489</coordinates>
           <location>
-            <_name>Malcolm McKinnon Airport</_name>
+            <name>Malcolm McKinnon Airport</name>
             <code>KSSI</code>
             <zone>GAZ154</zone>
             <radar>tlh</radar>
             <coordinates>31.151667 -81.391389</coordinates>
           </location>
           <location>
-            <_name>Brunswick / Glynco</_name>
+            <name>Brunswick / Glynco</name>
             <code>KBQK</code>
             <coordinates>31.250000 -81.466667</coordinates>
           </location>
@@ -35546,14 +35546,14 @@
           <_name>Marietta</_name>
           <coordinates>33.952602 -84.549933</coordinates>
           <location>
-            <_name>Marietta / Dobbins Air Force Base</_name>
+            <name>Marietta / Dobbins Air Force Base</name>
             <code>KMGE</code>
             <zone>GAZ032</zone>
             <radar>atl</radar>
             <coordinates>33.916667 -84.516667</coordinates>
           </location>
           <location>
-            <_name>Cobb County-McCollum Field Airport</_name>
+            <name>Cobb County-McCollum Field Airport</name>
             <code>KRYY</code>
             <coordinates>34.013056 -84.598611</coordinates>
           </location>
@@ -35630,14 +35630,14 @@
           <_name>Savannah</_name>
           <coordinates>32.083541 -81.099834</coordinates>
           <location>
-            <_name>Hunter U. S. Army Airfield</_name>
+            <name>Hunter U. S. Army Airfield</name>
             <code>KSVN</code>
             <zone>GAZ119</zone>
             <radar>tlh</radar>
             <coordinates>32.016667 -81.150000</coordinates>
           </location>
           <location>
-            <_name>Savannah International Airport</_name>
+            <name>Savannah International Airport</name>
             <code>KSAV</code>
             <zone>GAZ119</zone>
             <radar>tlh</radar>
@@ -35787,21 +35787,21 @@
           <_name>Honolulu</_name>
           <coordinates>21.306944 -157.858333</coordinates>
           <location>
-            <_name>Honolulu International Airport</_name>
+            <name>Honolulu International Airport</name>
             <code>PHNL</code>
             <zone>HIZ002</zone>
             <radar>hawaii</radar>
             <coordinates>21.327500 -157.943056</coordinates>
           </location>
           <location>
-            <_name>Kaneohe, Marine Corps Air Station</_name>
+            <name>Kaneohe, Marine Corps Air Station</name>
             <code>PHNG</code>
             <zone>HIZ002</zone>
             <radar>hawaii</radar>
             <coordinates>21.453889 -157.765556</coordinates>
           </location>
           <location>
-            <_name>Oahu, Kalaeloa Airport</_name>
+            <name>Oahu, Kalaeloa Airport</name>
             <code>PHJR</code>
             <coordinates>21.308333 -158.068056</coordinates>
           </location>
@@ -36380,35 +36380,35 @@
           <_name>Chicago</_name>
           <coordinates>41.850033 -87.650052</coordinates>
           <location>
-            <_name>Chicago Midway Airport</_name>
+            <name>Chicago Midway Airport</name>
             <code>KMDW</code>
             <zone>ILZ014</zone>
             <radar>ord</radar>
             <coordinates>41.784167 -87.755278</coordinates>
           </location>
           <location>
-            <_name>Chicago-O'Hare International Airport</_name>
+            <name>Chicago-O'Hare International Airport</name>
             <code>KORD</code>
             <zone>ILZ013</zone>
             <radar>ord</radar>
             <coordinates>41.979722 -87.904444</coordinates>
           </location>
           <location>
-            <_name>Lansing Municipal Airport</_name>
+            <name>Lansing Municipal Airport</name>
             <code>KIGQ</code>
             <zone>ILZ014</zone>
             <radar>ord</radar>
             <coordinates>41.540000 -87.532222</coordinates>
           </location>
           <location>
-            <_name>Chicago / Wheeling, Pal-Waukee Airport</_name>
+            <name>Chicago / Wheeling, Pal-Waukee Airport</name>
             <code>KPWK</code>
             <zone>ILZ006</zone>
             <radar>ord</radar>
             <coordinates>42.120833 -87.904722</coordinates>
           </location>
           <location>
-            <_name>Chicago / Romeoville, Lewis University Airport</_name>
+            <name>Chicago / Romeoville, Lewis University Airport</name>
             <code>KLOT</code>
             <zone>ILZ014</zone>
             <radar>ord</radar>
@@ -37179,14 +37179,14 @@
           <_name>Indianapolis</_name>
           <coordinates>39.768377 -86.158042</coordinates>
           <location>
-            <_name>Indianapolis International Airport</_name>
+            <name>Indianapolis International Airport</name>
             <code>KIND</code>
             <zone>INZ047</zone>
             <radar>ind</radar>
             <coordinates>39.725000 -86.281944</coordinates>
           </location>
           <location>
-            <_name>Indianapolis, Eagle Creek Airpark</_name>
+            <name>Indianapolis, Eagle Creek Airpark</name>
             <code>KEYE</code>
             <coordinates>39.825000 -86.295833</coordinates>
           </location>
@@ -38124,14 +38124,14 @@
           <_name>Kansas City</_name>
           <coordinates>39.114171 -94.627457</coordinates>
           <location>
-            <_name>Kansas City Downtown Airport</_name>
+            <name>Kansas City Downtown Airport</name>
             <code>KMKC</code>
             <zone>MOZ037</zone>
             <radar>mkc</radar>
             <coordinates>39.120833 -94.596944</coordinates>
           </location>
           <location>
-            <_name>Kansas City International Airport</_name>
+            <name>Kansas City International Airport</name>
             <code>KMCI</code>
             <zone>MOZ029</zone>
             <radar>mkc</radar>
@@ -38211,14 +38211,14 @@
           <_name>Olathe</_name>
           <coordinates>38.881396 -94.819129</coordinates>
           <location>
-            <_name>Johnson County Executive Airport</_name>
+            <name>Johnson County Executive Airport</name>
             <code>KOJC</code>
             <zone>KSZ105</zone>
             <radar>mkc</radar>
             <coordinates>38.850000 -94.739167</coordinates>
           </location>
           <location>
-            <_name>Olathe, New Century Aircenter</_name>
+            <name>Olathe, New Century Aircenter</name>
             <code>KIXD</code>
             <zone>KSZ105</zone>
             <radar>mkc</radar>
@@ -38298,14 +38298,14 @@
           <_name>Topeka</_name>
           <coordinates>39.048334 -95.678037</coordinates>
           <location>
-            <_name>Philip Billard Municipal Airport</_name>
+            <name>Philip Billard Municipal Airport</name>
             <code>KTOP</code>
             <zone>KSZ039</zone>
             <radar>mkc</radar>
             <coordinates>39.072500 -95.625833</coordinates>
           </location>
           <location>
-            <_name>Forbes Field</_name>
+            <name>Forbes Field</name>
             <code>KFOE</code>
             <zone>KSZ039</zone>
             <radar>mkc</radar>
@@ -38319,21 +38319,21 @@
           <_name>Wichita</_name>
           <coordinates>37.692236 -97.337545</coordinates>
           <location>
-            <_name>Wichita Mid-Continent Airport</_name>
+            <name>Wichita Mid-Continent Airport</name>
             <code>KICT</code>
             <zone>KSZ083</zone>
             <radar>ddc</radar>
             <coordinates>37.647222 -97.429444</coordinates>
           </location>
           <location>
-            <_name>McConnell Air Force Base</_name>
+            <name>McConnell Air Force Base</name>
             <code>KIAB</code>
             <zone>KSZ083</zone>
             <radar>ddc</radar>
             <coordinates>37.616667 -97.266667</coordinates>
           </location>
           <location>
-            <_name>Colonel James Jabara Airport</_name>
+            <name>Colonel James Jabara Airport</name>
             <code>KAAO</code>
             <coordinates>37.749722 -97.218889</coordinates>
           </location>
@@ -38477,14 +38477,14 @@
           <_name>Louisville</_name>
           <coordinates>38.254238 -85.759407</coordinates>
           <location>
-            <_name>Bowman Field Airport</_name>
+            <name>Bowman Field Airport</name>
             <code>KLOU</code>
             <zone>KYZ030</zone>
             <radar>lex</radar>
             <coordinates>38.227778 -85.663611</coordinates>
           </location>
           <location>
-            <_name>Standiford Field</_name>
+            <name>Standiford Field</name>
             <code>KSDF</code>
             <zone>KYZ030</zone>
             <radar>lex</radar>
@@ -38588,14 +38588,14 @@
           <_name>Alexandria</_name>
           <coordinates>31.311294 -92.445137</coordinates>
           <location>
-            <_name>Alexandria International Airport</_name>
+            <name>Alexandria International Airport</name>
             <code>KAEX</code>
             <zone>LAZ028</zone>
             <radar>shv</radar>
             <coordinates>31.334722 -92.558611</coordinates>
           </location>
           <location>
-            <_name>Alexandria Esler Regional Airport</_name>
+            <name>Alexandria Esler Regional Airport</name>
             <code>KESF</code>
             <zone>LAZ028</zone>
             <radar>shv</radar>
@@ -38842,19 +38842,19 @@
           <_name>New Orleans</_name>
           <coordinates>29.954648 -90.075072</coordinates>
           <location>
-            <_name>New Orleans Lakefront Airport</_name>
+            <name>New Orleans Lakefront Airport</name>
             <code>KNEW</code>
             <coordinates>30.049444 -90.028889</coordinates>
           </location>
           <location>
-            <_name>Naval Air Station - Alvin Callender Field</_name>
+            <name>Naval Air Station - Alvin Callender Field</name>
             <code>KNBG</code>
             <zone>LAZ062</zone>
             <radar>bix</radar>
             <coordinates>29.825278 -90.035000</coordinates>
           </location>
           <location>
-            <_name>New Orleans International Airport</_name>
+            <name>New Orleans International Airport</name>
             <code>KMSY</code>
             <zone>LAZ062</zone>
             <radar>bix</radar>
@@ -38916,20 +38916,20 @@
           <_name>Shreveport</_name>
           <coordinates>32.525152 -93.750179</coordinates>
           <location>
-            <_name>Shreveport Downtown Airport</_name>
+            <name>Shreveport Downtown Airport</name>
             <code>KDTN</code>
             <zone>LAZ001</zone>
             <radar>shv</radar>
             <coordinates>32.542500 -93.744722</coordinates>
           </location>
           <location>
-            <_name>Barksdale Air Force Base</_name>
+            <name>Barksdale Air Force Base</name>
             <code>KBAD</code>
             <radar>shv</radar>
             <coordinates>32.500000 -93.666667</coordinates>
           </location>
           <location>
-            <_name>Shreveport Regional Airport</_name>
+            <name>Shreveport Regional Airport</name>
             <code>KSHV</code>
             <zone>LAZ001</zone>
             <radar>shv</radar>
@@ -39201,28 +39201,28 @@
           <_name>Baltimore</_name>
           <coordinates>39.290385 -76.612189</coordinates>
           <location>
-            <_name>Baltimore, Inner Harbor</_name>
+            <name>Baltimore, Inner Harbor</name>
             <code>KDMH</code>
             <zone>MDZ011</zone>
             <radar>dca</radar>
             <coordinates>39.283333 -76.616667</coordinates>
           </location>
           <location>
-            <_name>Baltimore-Washington International Airport</_name>
+            <name>Baltimore-Washington International Airport</name>
             <code>KBWI</code>
             <zone>MDZ014</zone>
             <radar>dca</radar>
             <coordinates>39.166667 -76.683333</coordinates>
           </location>
           <location>
-            <_name>Baltimore / Martin</_name>
+            <name>Baltimore / Martin</name>
             <code>KMTN</code>
             <zone>MDZ011</zone>
             <radar>dca</radar>
             <coordinates>39.333333 -76.416667</coordinates>
           </location>
           <location>
-            <_name>Fort Meade / Tipton</_name>
+            <name>Fort Meade / Tipton</name>
             <code>KFME</code>
             <zone>MDZ014</zone>
             <radar>dca</radar>
@@ -39905,26 +39905,26 @@
           <_name>Detroit</_name>
           <coordinates>42.331427 -83.045754</coordinates>
           <location>
-            <_name>Detroit City Airport</_name>
+            <name>Detroit City Airport</name>
             <code>KDET</code>
             <zone>MIZ076</zone>
             <radar>dtw</radar>
             <coordinates>42.409167 -83.010000</coordinates>
           </location>
           <location>
-            <_name>Detroit Metropolitan Wayne County Airport</_name>
+            <name>Detroit Metropolitan Wayne County Airport</name>
             <code>KDTW</code>
             <zone>MIZ076</zone>
             <radar>dtw</radar>
             <coordinates>42.231389 -83.330833</coordinates>
           </location>
           <location>
-            <_name>Detroit / Grosse Ile, Grosse Ile Airport</_name>
+            <name>Detroit / Grosse Ile, Grosse Ile Airport</name>
             <code>KONZ</code>
             <coordinates>42.098611 -83.161111</coordinates>
           </location>
           <location>
-            <_name>Willow Run Airport</_name>
+            <name>Willow Run Airport</name>
             <code>KYIP</code>
             <zone>MIZ075</zone>
             <radar>dtw</radar>
@@ -40486,12 +40486,12 @@
           <_name>Saginaw</_name>
           <coordinates>43.419470 -83.950807</coordinates>
           <location>
-            <_name>Saginaw County H.W. Browne Airport</_name>
+            <name>Saginaw County H.W. Browne Airport</name>
             <code>KHYX</code>
             <coordinates>43.433333 -83.862500</coordinates>
           </location>
           <location>
-            <_name>MBS International Airport</_name>
+            <name>MBS International Airport</name>
             <code>KMBS</code>
             <zone>MIZ053</zone>
             <radar>mkg</radar>
@@ -40867,14 +40867,14 @@
           <_name>Duluth</_name>
           <coordinates>46.783273 -92.106579</coordinates>
           <location>
-            <_name>Sky Harbor Airport</_name>
+            <name>Sky Harbor Airport</name>
             <code>KDYT</code>
             <zone>MNZ019</zone>
             <radar>msp</radar>
             <coordinates>46.721944 -92.043333</coordinates>
           </location>
           <location>
-            <_name>Duluth International Airport</_name>
+            <name>Duluth International Airport</name>
             <code>KDLH</code>
             <zone>MNZ019</zone>
             <radar>msp</radar>
@@ -40990,14 +40990,14 @@
           <_name>Grand Marais</_name>
           <coordinates>47.750447 -90.334273</coordinates>
           <location>
-            <_name>Grand Marais, The Bay of Grand Marais</_name>
+            <name>Grand Marais, The Bay of Grand Marais</name>
             <code>KGNA</code>
             <zone>MNZ021</zone>
             <radar>msp</radar>
             <coordinates>47.833333 -90.383333</coordinates>
           </location>
           <location>
-            <_name>Grand Marais / Cook County Airport</_name>
+            <name>Grand Marais / Cook County Airport</name>
             <code>KCKC</code>
             <zone>MNZ021</zone>
             <radar>msp</radar>
@@ -41227,42 +41227,42 @@
           <_name>Minneapolis</_name>
           <coordinates>44.979965 -93.263836</coordinates>
           <location>
-            <_name>Minneapolis-St. Paul International Airport</_name>
+            <name>Minneapolis-St. Paul International Airport</name>
             <code>KMSP</code>
             <zone>MNZ060</zone>
             <radar>msp</radar>
             <coordinates>44.883056 -93.228889</coordinates>
           </location>
           <location>
-            <_name>Crystal Airport</_name>
+            <name>Crystal Airport</name>
             <code>KMIC</code>
             <zone>MNZ060</zone>
             <radar>msp</radar>
             <coordinates>45.062500 -93.350833</coordinates>
           </location>
           <location>
-            <_name>St. Paul, St. Paul Downtown Holman Field</_name>
+            <name>St. Paul, St. Paul Downtown Holman Field</name>
             <code>KSTP</code>
             <zone>MNZ062</zone>
             <radar>msp</radar>
             <coordinates>44.930278 -93.048056</coordinates>
           </location>
           <location>
-            <_name>Minneapolis / Blaine</_name>
+            <name>Minneapolis / Blaine</name>
             <code>KANE</code>
             <zone>MNZ060</zone>
             <radar>msp</radar>
             <coordinates>45.150000 -93.216667</coordinates>
           </location>
           <location>
-            <_name>Flying Cloud Airport</_name>
+            <name>Flying Cloud Airport</name>
             <code>KFCM</code>
             <zone>MNZ060</zone>
             <radar>msp</radar>
             <coordinates>44.832222 -93.470278</coordinates>
           </location>
           <location>
-            <_name>Airlake Airport</_name>
+            <name>Airlake Airport</name>
             <code>KLVN</code>
             <zone>MNZ060</zone>
             <radar>msp</radar>
@@ -41764,14 +41764,14 @@
           <_name>Columbus</_name>
           <coordinates>33.495674 -88.427263</coordinates>
           <location>
-            <_name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</_name>
+            <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>
           <location>
-            <_name>Columbus Air Force Base</_name>
+            <name>Columbus Air Force Base</name>
             <code>KCBM</code>
             <zone>MSZ031</zone>
             <radar>bhm</radar>
@@ -41826,12 +41826,12 @@
           <_name>Hattiesburg</_name>
           <coordinates>31.327119 -89.290339</coordinates>
           <location>
-            <_name>Bobby L Chain Municipal Airport</_name>
+            <name>Bobby L Chain Municipal Airport</name>
             <code>KHBG</code>
             <coordinates>31.265000 -89.253056</coordinates>
           </location>
           <location>
-            <_name>Hattiesburg / Laurel, Hattiesburg-Laurel Regional Airport</_name>
+            <name>Hattiesburg / Laurel, Hattiesburg-Laurel Regional Airport</name>
             <code>KPIB</code>
             <zone>MSZ066</zone>
             <radar>jan</radar>
@@ -41845,12 +41845,12 @@
           <_name>Jackson</_name>
           <coordinates>32.298757 -90.184810</coordinates>
           <location>
-            <_name>Hawkins Field Airport</_name>
+            <name>Hawkins Field Airport</name>
             <code>KHKS</code>
             <coordinates>32.334722 -90.222500</coordinates>
           </location>
           <location>
-            <_name>Jackson International Airport</_name>
+            <name>Jackson International Airport</name>
             <code>KJAN</code>
             <zone>MSZ048</zone>
             <radar>jan</radar>
@@ -41892,14 +41892,14 @@
           <_name>Meridian</_name>
           <coordinates>32.364310 -88.703656</coordinates>
           <location>
-            <_name>Key Field</_name>
+            <name>Key Field</name>
             <code>KMEI</code>
             <zone>MSZ052</zone>
             <radar>jan</radar>
             <coordinates>32.338056 -88.747778</coordinates>
           </location>
           <location>
-            <_name>Meridian Naval Air Station - McCain Field</_name>
+            <name>Meridian Naval Air Station - McCain Field</name>
             <code>KNMM</code>
             <zone>MSZ052</zone>
             <radar>jan</radar>
@@ -42989,21 +42989,21 @@
           <_name>Omaha</_name>
           <coordinates>41.258610 -95.937792</coordinates>
           <location>
-            <_name>Omaha, Eppley Airfield</_name>
+            <name>Omaha, Eppley Airfield</name>
             <code>KOMA</code>
             <zone>NEZ052</zone>
             <radar>oma</radar>
             <coordinates>41.310278 -95.899167</coordinates>
           </location>
           <location>
-            <_name>Omaha / Offutt Air Force Base</_name>
+            <name>Omaha / Offutt Air Force Base</name>
             <code>KOFF</code>
             <zone>NEZ052</zone>
             <radar>oma</radar>
             <coordinates>41.116667 -95.900000</coordinates>
           </location>
           <location>
-            <_name>Millard Airport</_name>
+            <name>Millard Airport</name>
             <code>KMLE</code>
             <zone>NEZ052</zone>
             <radar>oma</radar>
@@ -43212,21 +43212,21 @@
           <_name>Las Vegas</_name>
           <coordinates>36.174971 -115.137223</coordinates>
           <location>
-            <_name>North Las Vegas Airport</_name>
+            <name>North Las Vegas Airport</name>
             <code>KVGT</code>
             <zone>NVZ020</zone>
             <radar>las</radar>
             <coordinates>36.211667 -115.195833</coordinates>
           </location>
           <location>
-            <_name>McCarran International Airport</_name>
+            <name>McCarran International Airport</name>
             <code>KLAS</code>
             <zone>NVZ020</zone>
             <radar>las</radar>
             <coordinates>36.078889 -115.155278</coordinates>
           </location>
           <location>
-            <_name>Henderson Executive Airport</_name>
+            <name>Henderson Executive Airport</name>
             <code>KHND</code>
             <zone>NVZ020</zone>
             <radar>las</radar>
@@ -43752,14 +43752,14 @@
           <_name>Alamogordo</_name>
           <coordinates>32.899532 -105.960265</coordinates>
           <location>
-            <_name>Alamogordo-White</_name>
+            <name>Alamogordo-White</name>
             <code>KALM</code>
             <zone>NMZ024</zone>
             <radar>maf</radar>
             <coordinates>32.833333 -105.983333</coordinates>
           </location>
           <location>
-            <_name>Holloman Air Force Base</_name>
+            <name>Holloman Air Force Base</name>
             <code>KHMN</code>
             <coordinates>32.850000 -106.100000</coordinates>
           </location>
@@ -43771,14 +43771,14 @@
           <_name>Albuquerque</_name>
           <coordinates>35.084491 -106.651137</coordinates>
           <location>
-            <_name>Albuquerque International Airport</_name>
+            <name>Albuquerque International Airport</name>
             <code>KABQ</code>
             <zone>NMZ009</zone>
             <radar>abq</radar>
             <coordinates>35.041667 -106.614722</coordinates>
           </location>
           <location>
-            <_name>Double Eagle II Airport</_name>
+            <name>Double Eagle II Airport</name>
             <code>KAEG</code>
             <zone>NMZ009</zone>
             <radar>abq</radar>
@@ -43856,14 +43856,14 @@
           <_name>Clovis</_name>
           <coordinates>34.404799 -103.205227</coordinates>
           <location>
-            <_name>Cannon Air Force Base / Clovis</_name>
+            <name>Cannon Air Force Base / Clovis</name>
             <code>KCVS</code>
             <zone>NMZ021</zone>
             <radar>abq</radar>
             <coordinates>34.383333 -103.316667</coordinates>
           </location>
           <location>
-            <_name>Clovis Municipal Airport</_name>
+            <name>Clovis Municipal Airport</name>
             <code>KCVN</code>
             <zone>NMZ021</zone>
             <radar>abq</radar>
@@ -44385,21 +44385,21 @@
           <_name>New York</_name>
           <coordinates>40.714269 -74.005973</coordinates>
           <location>
-            <_name>New York City, Central Park</_name>
+            <name>New York City, Central Park</name>
             <code>KNYC</code>
             <zone>NYZ076</zone>
             <radar>nyc</radar>
             <coordinates>40.783333 -73.966667</coordinates>
           </location>
           <location>
-            <_name>La Guardia Airport</_name>
+            <name>La Guardia Airport</name>
             <code>KLGA</code>
             <zone>NYZ076</zone>
             <radar>nyc</radar>
             <coordinates>40.779167 -73.880000</coordinates>
           </location>
           <location>
-            <_name>Kennedy International Airport</_name>
+            <name>Kennedy International Airport</name>
             <code>KJFK</code>
             <zone>NYZ076</zone>
             <radar>nyc</radar>
@@ -44872,21 +44872,21 @@
           <_name>Fayetteville</_name>
           <coordinates>35.052664 -78.878359</coordinates>
           <location>
-            <_name>Fayetteville Regional Airport</_name>
+            <name>Fayetteville Regional Airport</name>
             <code>KFAY</code>
             <zone>NCZ088</zone>
             <radar>clt</radar>
             <coordinates>34.989444 -78.880000</coordinates>
           </location>
           <location>
-            <_name>Fort Bragg / Simmons Army Airfield</_name>
+            <name>Fort Bragg / Simmons Army Airfield</name>
             <code>KFBG</code>
             <zone>NCZ088</zone>
             <radar>clt</radar>
             <coordinates>35.133333 -78.933333</coordinates>
           </location>
           <location>
-            <_name>Pope Air Force Base</_name>
+            <name>Pope Air Force Base</name>
             <code>KPOB</code>
             <zone>NCZ088</zone>
             <radar>clt</radar>
@@ -45553,14 +45553,14 @@
           <_name>Grand Forks</_name>
           <coordinates>47.925257 -97.032855</coordinates>
           <location>
-            <_name>Grand Forks International Airport</_name>
+            <name>Grand Forks International Airport</name>
             <code>KGFK</code>
             <zone>NDZ027</zone>
             <radar>bis</radar>
             <coordinates>47.948056 -97.182500</coordinates>
           </location>
           <location>
-            <_name>Grand Forks Air Force Base</_name>
+            <name>Grand Forks Air Force Base</name>
             <code>KRDR</code>
             <zone>NDZ027</zone>
             <radar>bis</radar>
@@ -45601,14 +45601,14 @@
           <_name>Minot</_name>
           <coordinates>48.232509 -101.296273</coordinates>
           <location>
-            <_name>Minot International Airport</_name>
+            <name>Minot International Airport</name>
             <code>KMOT</code>
             <zone>NDZ011</zone>
             <radar>bis</radar>
             <coordinates>48.259444 -101.280278</coordinates>
           </location>
           <location>
-            <_name>Minot Air Force Base</_name>
+            <name>Minot Air Force Base</name>
             <code>KMIB</code>
             <zone>NDZ011</zone>
             <radar>bis</radar>
@@ -45654,14 +45654,14 @@
           <_name>Akron</_name>
           <coordinates>41.081445 -81.519005</coordinates>
           <location>
-            <_name>Akron Fulton International Airport</_name>
+            <name>Akron Fulton International Airport</name>
             <code>KAKR</code>
             <zone>OHZ021</zone>
             <radar>pit</radar>
             <coordinates>41.037500 -81.464167</coordinates>
           </location>
           <location>
-            <_name>Akron-Canton Regional Airport</_name>
+            <name>Akron-Canton Regional Airport</name>
             <code>KCAK</code>
             <zone>OHZ021</zone>
             <radar>pit</radar>
@@ -45683,14 +45683,14 @@
           <_name>Cincinnati</_name>
           <coordinates>39.162004 -84.456886</coordinates>
           <location>
-            <_name>Cincinnati Municipal Airport, Lunken Field</_name>
+            <name>Cincinnati Municipal Airport, Lunken Field</name>
             <code>KLUK</code>
             <zone>OHZ077</zone>
             <radar>ind</radar>
             <coordinates>39.105833 -84.415833</coordinates>
           </location>
           <location>
-            <_name>Covington / Cincinnati, Cincinnati / Northern Kentucky International Airport</_name>
+            <name>Covington / Cincinnati, Cincinnati / Northern Kentucky International Airport</name>
             <code>KCVG</code>
             <zone>KYZ092</zone>
             <radar>ind</radar>
@@ -45702,21 +45702,21 @@
           <_name>Cleveland</_name>
           <coordinates>41.499495 -81.695409</coordinates>
           <location>
-            <_name>Burke Lakefront Airport</_name>
+            <name>Burke Lakefront Airport</name>
             <code>KBKL</code>
             <zone>OHZ011</zone>
             <radar>dtw</radar>
             <coordinates>41.525556 -81.668889</coordinates>
           </location>
           <location>
-            <_name>Cleveland-Hopkins International Airport</_name>
+            <name>Cleveland-Hopkins International Airport</name>
             <code>KCLE</code>
             <zone>OHZ011</zone>
             <radar>dtw</radar>
             <coordinates>41.405000 -81.852778</coordinates>
           </location>
           <location>
-            <_name>Cleveland / Cuyahoga</_name>
+            <name>Cleveland / Cuyahoga</name>
             <code>KCGF</code>
             <zone>OHZ011</zone>
             <radar>dtw</radar>
@@ -45728,28 +45728,28 @@
           <_name>Columbus</_name>
           <coordinates>39.961176 -82.998794</coordinates>
           <location>
-            <_name>Port Columbus International Airport</_name>
+            <name>Port Columbus International Airport</name>
             <code>KCMH</code>
             <zone>OHZ055</zone>
             <radar>ind</radar>
             <coordinates>39.995000 -82.876389</coordinates>
           </location>
           <location>
-            <_name>Bolton Field Airport</_name>
+            <name>Bolton Field Airport</name>
             <code>KTZR</code>
             <zone>OHZ055</zone>
             <radar>ind</radar>
             <coordinates>39.900833 -83.137222</coordinates>
           </location>
           <location>
-            <_name>Ohio State University Airport</_name>
+            <name>Ohio State University Airport</name>
             <code>KOSU</code>
             <zone>OHZ055</zone>
             <radar>ind</radar>
             <coordinates>40.078056 -83.078056</coordinates>
           </location>
           <location>
-            <_name>Rickenbacker Air National Guard Base</_name>
+            <name>Rickenbacker Air National Guard Base</name>
             <code>KLCK</code>
             <zone>OHZ070</zone>
             <radar>ind</radar>
@@ -45761,21 +45761,21 @@
           <_name>Dayton</_name>
           <coordinates>39.758948 -84.191607</coordinates>
           <location>
-            <_name>Dayton / Wright-Patterson Air Force Base</_name>
+            <name>Dayton / Wright-Patterson Air Force Base</name>
             <code>KFFO</code>
             <zone>OHZ061</zone>
             <radar>ind</radar>
             <coordinates>39.833333 -84.050000</coordinates>
           </location>
           <location>
-            <_name>Cox Dayton International Airport</_name>
+            <name>Cox Dayton International Airport</name>
             <code>KDAY</code>
             <zone>OHZ061</zone>
             <radar>ind</radar>
             <coordinates>39.906111 -84.218611</coordinates>
           </location>
           <location>
-            <_name>Dayton-Wright Brothers Airport</_name>
+            <name>Dayton-Wright Brothers Airport</name>
             <code>KMGY</code>
             <zone>OHZ061</zone>
             <radar>ind</radar>
@@ -45915,14 +45915,14 @@
           <_name>Toledo</_name>
           <coordinates>41.663938 -83.555212</coordinates>
           <location>
-            <_name>Metcalf Field</_name>
+            <name>Metcalf Field</name>
             <code>KTDZ</code>
             <zone>OHZ003</zone>
             <radar>dtw</radar>
             <coordinates>41.563056 -83.476389</coordinates>
           </location>
           <location>
-            <_name>Toledo Express Airport</_name>
+            <name>Toledo Express Airport</name>
             <code>KTOL</code>
             <zone>OHZ003</zone>
             <radar>dtw</radar>
@@ -46004,14 +46004,14 @@
           <_name>Altus</_name>
           <coordinates>34.638126 -99.333975</coordinates>
           <location>
-            <_name>Altus Air Force Base</_name>
+            <name>Altus Air Force Base</name>
             <code>KLTS</code>
             <zone>OKZ036</zone>
             <radar>ama</radar>
             <coordinates>34.650000 -99.266667</coordinates>
           </location>
           <location>
-            <_name>Altus / Quartz Mountain Regional Airport</_name>
+            <name>Altus / Quartz Mountain Regional Airport</name>
             <code>KAXS</code>
             <coordinates>34.698611 -99.338056</coordinates>
           </location>
@@ -46035,14 +46035,14 @@
           <_name>Ardmore</_name>
           <coordinates>34.174261 -97.143625</coordinates>
           <location>
-            <_name>Ardmore Downtown Executive Airport</_name>
+            <name>Ardmore Downtown Executive Airport</name>
             <code>K1F0</code>
             <zone>OKZ046</zone>
             <radar>dfw</radar>
             <coordinates>34.146944 -97.122500</coordinates>
           </location>
           <location>
-            <_name>Ardmore Municipal Airport</_name>
+            <name>Ardmore Municipal Airport</name>
             <code>KADM</code>
             <zone>OKZ046</zone>
             <radar>dfw</radar>
@@ -46118,12 +46118,12 @@
           <_name>Clinton</_name>
           <coordinates>35.515606 -98.967307</coordinates>
           <location>
-            <_name>Clinton Regional Airport</_name>
+            <name>Clinton Regional Airport</name>
             <code>KCLK</code>
             <coordinates>35.538056 -98.921389</coordinates>
           </location>
           <location>
-            <_name>Clinton-Sherman Airport</_name>
+            <name>Clinton-Sherman Airport</name>
             <code>KCSM</code>
             <zone>OKZ016</zone>
             <radar>ama</radar>
@@ -46185,14 +46185,14 @@
           <_name>Enid</_name>
           <coordinates>36.395589 -97.878391</coordinates>
           <location>
-            <_name>Vance Air Force Base / Enid</_name>
+            <name>Vance Air Force Base / Enid</name>
             <code>KEND</code>
             <zone>OKZ012</zone>
             <radar>ama</radar>
             <coordinates>36.333333 -97.916667</coordinates>
           </location>
           <location>
-            <_name>Enid Woodring Regional Airport</_name>
+            <name>Enid Woodring Regional Airport</name>
             <code>KWDG</code>
             <zone>OKZ012</zone>
             <radar>ama</radar>
@@ -46295,14 +46295,14 @@
           <_name>Lawton</_name>
           <coordinates>34.608685 -98.390331</coordinates>
           <location>
-            <_name>Fort Sill</_name>
+            <name>Fort Sill</name>
             <code>KFSI</code>
             <zone>OKZ038</zone>
             <radar>ama</radar>
             <coordinates>34.600000 -98.400000</coordinates>
           </location>
           <location>
-            <_name>Lawton Municipal Airport</_name>
+            <name>Lawton Municipal Airport</name>
             <code>KLAW</code>
             <zone>OKZ038</zone>
             <radar>ama</radar>
@@ -46354,21 +46354,21 @@
           <_name>Oklahoma City</_name>
           <coordinates>35.467560 -97.516428</coordinates>
           <location>
-            <_name>Will Rogers World Airport</_name>
+            <name>Will Rogers World Airport</name>
             <code>KOKC</code>
             <zone>OKZ025</zone>
             <radar>okc</radar>
             <coordinates>35.388611 -97.600278</coordinates>
           </location>
           <location>
-            <_name>Tinker Air Force Base</_name>
+            <name>Tinker Air Force Base</name>
             <code>KTIK</code>
             <zone>OKZ025</zone>
             <radar>okc</radar>
             <coordinates>35.416667 -97.383333</coordinates>
           </location>
           <location>
-            <_name>Wiley Post Airport</_name>
+            <name>Wiley Post Airport</name>
             <code>KPWA</code>
             <zone>OKZ025</zone>
             <radar>okc</radar>
@@ -46494,14 +46494,14 @@
           <_name>Tulsa</_name>
           <coordinates>36.153982 -95.992775</coordinates>
           <location>
-            <_name>Tulsa International Airport</_name>
+            <name>Tulsa International Airport</name>
             <code>KTUL</code>
             <zone>OKZ060</zone>
             <radar>okc</radar>
             <coordinates>36.197500 -95.886389</coordinates>
           </location>
           <location>
-            <_name>Jones Jr. Airport</_name>
+            <name>Jones Jr. Airport</name>
             <code>KRVS</code>
             <zone>OKZ060</zone>
             <radar>okc</radar>
@@ -46804,21 +46804,21 @@
           <_name>Portland</_name>
           <coordinates>45.523452 -122.676207</coordinates>
           <location>
-            <_name>Portland International Airport</_name>
+            <name>Portland International Airport</name>
             <code>KPDX</code>
             <zone>ORZ006</zone>
             <radar>pdx</radar>
             <coordinates>45.590833 -122.600278</coordinates>
           </location>
           <location>
-            <_name>Portland-Troutdale Airport</_name>
+            <name>Portland-Troutdale Airport</name>
             <code>KTTD</code>
             <zone>ORZ004</zone>
             <radar>pdx</radar>
             <coordinates>45.551111 -122.408889</coordinates>
           </location>
           <location>
-            <_name>Portland-Hillsboro Airport</_name>
+            <name>Portland-Hillsboro Airport</name>
             <code>KHIO</code>
             <zone>ORZ004</zone>
             <radar>pdx</radar>
@@ -47053,14 +47053,14 @@
           <_name>Harrisburg</_name>
           <coordinates>40.273700 -76.884418</coordinates>
           <location>
-            <_name>Capital City Airport</_name>
+            <name>Capital City Airport</name>
             <code>KCXY</code>
             <zone>PAZ057</zone>
             <radar>har</radar>
             <coordinates>40.217222 -76.851389</coordinates>
           </location>
           <location>
-            <_name>Harrisburg International Airport</_name>
+            <name>Harrisburg International Airport</name>
             <code>KMDT</code>
             <zone>PAZ057</zone>
             <radar>har</radar>
@@ -47192,21 +47192,21 @@
           <_name>Philadelphia</_name>
           <coordinates>39.952335 -75.163789</coordinates>
           <location>
-            <_name>Philadelphia International Airport</_name>
+            <name>Philadelphia International Airport</name>
             <code>KPHL</code>
             <zone>PAZ071</zone>
             <radar>har</radar>
             <coordinates>39.868333 -75.231111</coordinates>
           </location>
           <location>
-            <_name>Northeast Philadelphia Airport</_name>
+            <name>Northeast Philadelphia Airport</name>
             <code>KPNE</code>
             <zone>PAZ071</zone>
             <radar>har</radar>
             <coordinates>40.078889 -75.013611</coordinates>
           </location>
           <location>
-            <_name>Wings Field Airport</_name>
+            <name>Wings Field Airport</name>
             <code>KLOM</code>
             <coordinates>40.137500 -75.265000</coordinates>
           </location>
@@ -47218,14 +47218,14 @@
           <_name>Pittsburgh</_name>
           <coordinates>40.440625 -79.995886</coordinates>
           <location>
-            <_name>Allegheny County Airport</_name>
+            <name>Allegheny County Airport</name>
             <code>KAGC</code>
             <zone>PAZ021</zone>
             <radar>har</radar>
             <coordinates>40.354722 -79.921667</coordinates>
           </location>
           <location>
-            <_name>Pittsburgh International Airport</_name>
+            <name>Pittsburgh International Airport</name>
             <code>KPIT</code>
             <zone>PAZ021</zone>
             <radar>har</radar>
@@ -47415,14 +47415,14 @@
           <_name>Providence</_name>
           <coordinates>41.823989 -71.412834</coordinates>
           <location>
-            <_name>Theodore Francis Green State Airport</_name>
+            <name>Theodore Francis Green State Airport</name>
             <code>KPVD</code>
             <zone>RIZ002</zone>
             <radar>bos</radar>
             <coordinates>41.723889 -71.428056</coordinates>
           </location>
           <location>
-            <_name>N. Kingston / Quonset</_name>
+            <name>N. Kingston / Quonset</name>
             <code>KOQU</code>
             <zone>RIZ006</zone>
             <radar>bos</radar>
@@ -47510,21 +47510,21 @@
           <_name>Columbia</_name>
           <coordinates>34.000710 -81.034814</coordinates>
           <location>
-            <_name>Columbia Owens Downtown Airport</_name>
+            <name>Columbia Owens Downtown Airport</name>
             <code>KCUB</code>
             <zone>SCZ028</zone>
             <radar>chs</radar>
             <coordinates>33.970833 -80.994444</coordinates>
           </location>
           <location>
-            <_name>Columbia Metropolitan Airport</_name>
+            <name>Columbia Metropolitan Airport</name>
             <code>KCAE</code>
             <zone>SCZ028</zone>
             <radar>chs</radar>
             <coordinates>33.941944 -81.118056</coordinates>
           </location>
           <location>
-            <_name>McEntire Air National Guard Weather Facility Base</_name>
+            <name>McEntire Air National Guard Weather Facility Base</name>
             <code>KMMT</code>
             <zone>SCZ028</zone>
             <radar>chs</radar>
@@ -47979,12 +47979,12 @@
           <_name>Clarksville</_name>
           <coordinates>36.529771 -87.359453</coordinates>
           <location>
-            <_name>Outlaw Field Airport</_name>
+            <name>Outlaw Field Airport</name>
             <code>KCKV</code>
             <coordinates>36.621944 -87.415000</coordinates>
           </location>
           <location>
-            <_name>Fort Campbell U. S. Army Airfield</_name>
+            <name>Fort Campbell U. S. Army Airfield</name>
             <code>KHOP</code>
             <tz-hint>America/Chicago</tz-hint>
             <zone>KYZ017</zone>
@@ -48147,14 +48147,14 @@
           <_name>Abilene</_name>
           <coordinates>32.448736 -99.733144</coordinates>
           <location>
-            <_name>Abilene Regional Airport</_name>
+            <name>Abilene Regional Airport</name>
             <code>KABI</code>
             <zone>TXZ127</zone>
             <radar>maf</radar>
             <coordinates>32.410278 -99.681667</coordinates>
           </location>
           <location>
-            <_name>Dyess Air Force Base</_name>
+            <name>Dyess Air Force Base</name>
             <code>KDYS</code>
             <zone>TXZ127</zone>
             <radar>maf</radar>
@@ -48229,14 +48229,14 @@
           <_name>Austin</_name>
           <coordinates>30.267153 -97.743061</coordinates>
           <location>
-            <_name>Austin City, Austin Camp Mabry</_name>
+            <name>Austin City, Austin Camp Mabry</name>
             <code>KATT</code>
             <zone>TXZ192</zone>
             <radar>sat</radar>
             <coordinates>30.316667 -97.766667</coordinates>
           </location>
           <location>
-            <_name>Austin-Bergstrom International Airport</_name>
+            <name>Austin-Bergstrom International Airport</name>
             <code>KAUS</code>
             <zone>TXZ192</zone>
             <radar>sat</radar>
@@ -48439,14 +48439,14 @@
           <_name>Corpus Christi</_name>
           <coordinates>27.800583 -97.396381</coordinates>
           <location>
-            <_name>Corpus Christi International Airport</_name>
+            <name>Corpus Christi International Airport</name>
             <code>KCRP</code>
             <zone>TXZ243</zone>
             <radar>bro</radar>
             <coordinates>27.773056 -97.512778</coordinates>
           </location>
           <location>
-            <_name>Corpus Christi Naval Air Station / Truax Field</_name>
+            <name>Corpus Christi Naval Air Station / Truax Field</name>
             <code>KNGP</code>
             <zone>TXZ243</zone>
             <radar>bro</radar>
@@ -48509,28 +48509,28 @@
           <_name>Dallas</_name>
           <coordinates>32.783056 -96.806667</coordinates>
           <location>
-            <_name>Dallas Love Field</_name>
+            <name>Dallas Love Field</name>
             <code>KDAL</code>
             <zone>TXZ119</zone>
             <radar>dfw</radar>
             <coordinates>32.852500 -96.855556</coordinates>
           </location>
           <location>
-            <_name>Redbird Airport</_name>
+            <name>Redbird Airport</name>
             <code>KRBD</code>
             <zone>TXZ119</zone>
             <radar>dfw</radar>
             <coordinates>32.675833 -96.863889</coordinates>
           </location>
           <location>
-            <_name>Addison Airport</_name>
+            <name>Addison Airport</name>
             <code>KADS</code>
             <zone>TXZ119</zone>
             <radar>dfw</radar>
             <coordinates>32.966667 -96.833333</coordinates>
           </location>
           <location>
-            <_name>Dallas / Fort Worth, Dallas / Fort Worth International Airport</_name>
+            <name>Dallas / Fort Worth, Dallas / Fort Worth International Airport</name>
             <code>KDFW</code>
             <zone>TXZ119</zone>
             <radar>dfw</radar>
@@ -48661,35 +48661,35 @@
           <_name>Fort Worth</_name>
           <coordinates>32.725409 -97.320850</coordinates>
           <location>
-            <_name>Fort Worth, Naval Air Station</_name>
+            <name>Fort Worth, Naval Air Station</name>
             <code>KNFW</code>
             <zone>TXZ118</zone>
             <radar>dfw</radar>
             <coordinates>32.765833 -97.433333</coordinates>
           </location>
           <location>
-            <_name>Meacham International Airport</_name>
+            <name>Meacham International Airport</name>
             <code>KFTW</code>
             <zone>TXZ118</zone>
             <radar>dfw</radar>
             <coordinates>32.825278 -97.364167</coordinates>
           </location>
           <location>
-            <_name>Forth Worth Spinks Airport</_name>
+            <name>Forth Worth Spinks Airport</name>
             <code>KFWS</code>
             <zone>TXZ118</zone>
             <radar>dfw</radar>
             <coordinates>32.566667 -97.300000</coordinates>
           </location>
           <location>
-            <_name>Fort Worth Alliance Airport</_name>
+            <name>Fort Worth Alliance Airport</name>
             <code>KAFW</code>
             <zone>TXZ118</zone>
             <radar>dfw</radar>
             <coordinates>32.973333 -97.318056</coordinates>
           </location>
           <location>
-            <_name>Dallas / Fort Worth, Dallas / Fort Worth International Airport</_name>
+            <name>Dallas / Fort Worth, Dallas / Fort Worth International Airport</name>
             <code>KDFW</code>
             <zone>TXZ119</zone>
             <radar>dfw</radar>
@@ -48900,42 +48900,42 @@
           <_name>Houston</_name>
           <coordinates>29.763284 -95.363271</coordinates>
           <location>
-            <_name>Houston Hobby Airport</_name>
+            <name>Houston Hobby Airport</name>
             <code>KHOU</code>
             <zone>TXZ213</zone>
             <radar>gls</radar>
             <coordinates>29.637500 -95.282500</coordinates>
           </location>
           <location>
-            <_name>Houston Intercontinental Airport</_name>
+            <name>Houston Intercontinental Airport</name>
             <code>KIAH</code>
             <zone>TXZ213</zone>
             <radar>gls</radar>
             <coordinates>29.992500 -95.363889</coordinates>
           </location>
           <location>
-            <_name>Houston / Ellington</_name>
+            <name>Houston / Ellington</name>
             <code>KEFD</code>
             <zone>TXZ213</zone>
             <radar>gls</radar>
             <coordinates>29.600000 -95.166667</coordinates>
           </location>
           <location>
-            <_name>Pearland Regional Airport</_name>
+            <name>Pearland Regional Airport</name>
             <code>KLVJ</code>
             <zone>TXZ213</zone>
             <radar>gls</radar>
             <coordinates>29.521111 -95.241944</coordinates>
           </location>
           <location>
-            <_name>Sugar Land Municipal / Hull Field Airport</_name>
+            <name>Sugar Land Municipal / Hull Field Airport</name>
             <code>KSGR</code>
             <zone>TXZ213</zone>
             <radar>gls</radar>
             <coordinates>29.622222 -95.656667</coordinates>
           </location>
           <location>
-            <_name>Hooks Memorial Airport</_name>
+            <name>Hooks Memorial Airport</name>
             <code>KDWH</code>
             <zone>TXZ213</zone>
             <radar>gls</radar>
@@ -49019,19 +49019,19 @@
           <_name>Killeen</_name>
           <coordinates>31.117119 -97.727796</coordinates>
           <location>
-            <_name>Fort Hood, Hood AAF Ft Hood</_name>
+            <name>Fort Hood, Hood AAF Ft Hood</name>
             <code>KHLR</code>
             <coordinates>31.133333 -97.700000</coordinates>
           </location>
           <location>
-            <_name>Skylark Field Airport</_name>
+            <name>Skylark Field Airport</name>
             <code>KILE</code>
             <zone>TXZ158</zone>
             <radar>sat</radar>
             <coordinates>31.083333 -97.683333</coordinates>
           </location>
           <location>
-            <_name>Fort Hood, Robert Gray AAF Ft Hood</_name>
+            <name>Fort Hood, Robert Gray AAF Ft Hood</name>
             <code>KGRK</code>
             <zone>TXZ158</zone>
             <radar>sat</radar>
@@ -49200,12 +49200,12 @@
           <_name>Midland</_name>
           <coordinates>31.997346 -102.077915</coordinates>
           <location>
-            <_name>Midland Airpark</_name>
+            <name>Midland Airpark</name>
             <code>KMDD</code>
             <coordinates>32.036389 -102.100833</coordinates>
           </location>
           <location>
-            <_name>Midland International Airport</_name>
+            <name>Midland International Airport</name>
             <code>KMAF</code>
             <zone>TXZ062</zone>
             <radar>maf</radar>
@@ -49514,21 +49514,21 @@
           <_name>San Antonio</_name>
           <coordinates>29.424122 -98.493628</coordinates>
           <location>
-            <_name>Stinson Municipal Airport</_name>
+            <name>Stinson Municipal Airport</name>
             <code>KSSF</code>
             <zone>TXZ205</zone>
             <radar>sat</radar>
             <coordinates>29.338889 -98.471667</coordinates>
           </location>
           <location>
-            <_name>Kelly Air Force Base</_name>
+            <name>Kelly Air Force Base</name>
             <code>KSKF</code>
             <zone>TXZ205</zone>
             <radar>sat</radar>
             <coordinates>29.383333 -98.583333</coordinates>
           </location>
           <location>
-            <_name>San Antonio International Airport</_name>
+            <name>San Antonio International Airport</name>
             <code>KSAT</code>
             <zone>TXZ205</zone>
             <radar>sat</radar>
@@ -49739,14 +49739,14 @@
           <_name>Waco</_name>
           <coordinates>31.549333 -97.146670</coordinates>
           <location>
-            <_name>Waco Regional Airport</_name>
+            <name>Waco Regional Airport</name>
             <code>KACT</code>
             <zone>TXZ159</zone>
             <radar>sat</radar>
             <coordinates>31.617222 -97.227778</coordinates>
           </location>
           <location>
-            <_name>McGregor Executive Airport</_name>
+            <name>McGregor Executive Airport</name>
             <code>KPWG</code>
             <radar>dfw</radar>
             <coordinates>31.483333 -97.316667</coordinates>
@@ -49926,14 +49926,14 @@
           <_name>Ogden</_name>
           <coordinates>41.223000 -111.973830</coordinates>
           <location>
-            <_name>Ogden-Hinckley Airport</_name>
+            <name>Ogden-Hinckley Airport</name>
             <code>KOGD</code>
             <zone>UTZ002</zone>
             <radar>slc</radar>
             <coordinates>41.193611 -112.016389</coordinates>
           </location>
           <location>
-            <_name>Hill Air Force Base / Ogden</_name>
+            <name>Hill Air Force Base / Ogden</name>
             <code>KHIF</code>
             <zone>UTZ002</zone>
             <radar>slc</radar>
@@ -50482,14 +50482,14 @@
           <_name>Newport News</_name>
           <coordinates>36.978759 -76.428003</coordinates>
           <location>
-            <_name>Newport News / Williamsburg International Airport</_name>
+            <name>Newport News / Williamsburg International Airport</name>
             <code>KPHF</code>
             <zone>VAZ093</zone>
             <radar>ric</radar>
             <coordinates>37.131944 -76.493056</coordinates>
           </location>
           <location>
-            <_name>Fort Eustis / Felker</_name>
+            <name>Fort Eustis / Felker</name>
             <code>KFAF</code>
             <radar>ric</radar>
             <coordinates>37.133333 -76.616667</coordinates>
@@ -50502,14 +50502,14 @@
           <_name>Norfolk</_name>
           <coordinates>36.846815 -76.285218</coordinates>
           <location>
-            <_name>Norfolk, Naval Air Station</_name>
+            <name>Norfolk, Naval Air Station</name>
             <code>KNGU</code>
             <zone>VAZ093</zone>
             <radar>ric</radar>
             <coordinates>36.933611 -76.295833</coordinates>
           </location>
           <location>
-            <_name>Norfolk International Airport</_name>
+            <name>Norfolk International Airport</name>
             <code>KORF</code>
             <zone>VAZ093</zone>
             <radar>ric</radar>
@@ -51143,14 +51143,14 @@
           <_name>Seattle</_name>
           <coordinates>47.606209 -122.332071</coordinates>
           <location>
-            <_name>Seattle Boeing Field</_name>
+            <name>Seattle Boeing Field</name>
             <code>KBFI</code>
             <zone>WAZ508</zone>
             <radar>sea</radar>
             <coordinates>47.545833 -122.313611</coordinates>
           </location>
           <location>
-            <_name>Seattle-Tacoma International Airport</_name>
+            <name>Seattle-Tacoma International Airport</name>
             <code>KSEA</code>
             <zone>WAZ508</zone>
             <radar>sea</radar>
@@ -51178,14 +51178,14 @@
           <_name>Spokane</_name>
           <coordinates>47.658780 -117.426047</coordinates>
           <location>
-            <_name>Felts Field</_name>
+            <name>Felts Field</name>
             <code>KSFF</code>
             <zone>WAZ034</zone>
             <radar>sea</radar>
             <coordinates>47.685556 -117.320278</coordinates>
           </location>
           <location>
-            <_name>Spokane International Airport</_name>
+            <name>Spokane International Airport</name>
             <code>KGEG</code>
             <zone>WAZ034</zone>
             <radar>sea</radar>
@@ -51212,14 +51212,14 @@
           <_name>Tacoma</_name>
           <coordinates>47.252877 -122.444291</coordinates>
           <location>
-            <_name>Tacoma Narrows Airport</_name>
+            <name>Tacoma Narrows Airport</name>
             <code>KTIW</code>
             <zone>WAZ007</zone>
             <radar>sea</radar>
             <coordinates>47.267500 -122.576111</coordinates>
           </location>
           <location>
-            <_name>Tacoma / McChord Air Force Base</_name>
+            <name>Tacoma / McChord Air Force Base</name>
             <code>KTCM</code>
             <zone>WAZ007</zone>
             <radar>sea</radar>
@@ -51885,14 +51885,14 @@
           <_name>Milwaukee</_name>
           <coordinates>43.038902 -87.906474</coordinates>
           <location>
-            <_name>General Mitchell International Airport</_name>
+            <name>General Mitchell International Airport</name>
             <code>KMKE</code>
             <zone>WIZ066</zone>
             <radar>ord</radar>
             <coordinates>42.955000 -87.904444</coordinates>
           </location>
           <location>
-            <_name>Milwaukee / Timmerman</_name>
+            <name>Milwaukee / Timmerman</name>
             <code>KMWC</code>
             <zone>WIZ066</zone>
             <radar>ord</radar>

Modified: trunk/data/update-locations.py
==============================================================================
--- trunk/data/update-locations.py	(original)
+++ trunk/data/update-locations.py	Tue Nov 25 18:39:18 2008
@@ -4,6 +4,7 @@
 import codecs
 import locale
 import math
+import os
 import re
 import sqlite3
 import sys
@@ -245,7 +246,7 @@
            self.name.find('Republic') != -1 or \
            self.name.find('lands') != -1:
             self.in_name = 'the ' + self.name
-        elif re.search(r'(IM|MV|PH|PS|SC|TF|VA)', self.iso_code):
+        elif re.search(r'(BS|IM|MV|PH|PS|SC|TF|VA)', self.iso_code):
             self.in_name = 'the ' + self.name
         else:
             self.in_name = self.name
@@ -346,7 +347,7 @@
         print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
         print '%s  <coordinates>%s</coordinates>' % (indent, self.coordinates)
         for item in self.contents:
-            item.print_xml(indent + '  ', self, len(self.contents) > 1)
+            item.print_xml(indent + '  ', self)
         print '%s</city>' % indent
 
 class Location(LocBase):
@@ -365,7 +366,7 @@
             if self.code in station_comments:
                 self.comment = station_comments[self.code]
 
-    def print_xml(self, indent, city=None, localize=True):
+    def print_xml(self, indent, city=None):
         print '%s<location>' % indent
         name = self.name
         if city is not None:
@@ -379,10 +380,7 @@
                 name = name[:-len(city.name) - 2]
         #if self.comment is not None:
         #    print '%s  <!-- %s -->' % (indent, self.comment)
-        if localize:
-            print '%s  <_name>%s</_name>' % (indent, saxutils.escape(name))
-        else:
-            print '%s  <name>%s</name>' % (indent, saxutils.escape(name))
+        print '%s  <name>%s</name>' % (indent, saxutils.escape(name))
         print '%s  <code>%s</code>' % (indent, self.code)
         LocBase.print_xml(self, indent)
         print '%s</location>' % indent
@@ -625,7 +623,8 @@
 
     return city
 
-observations = urllib.urlopen('http://gnome.org/~danw/observations.txt')
+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()]
 observations.close()
 

Modified: trunk/libgweather/gweather-xml.c
==============================================================================
--- trunk/libgweather/gweather-xml.c	(original)
+++ trunk/libgweather/gweather-xml.c	Tue Nov 25 18:39:18 2008
@@ -47,7 +47,7 @@
     children = gweather_location_get_children (gloc);
     level = gweather_location_get_level (gloc);
 
-    if (!children[0] && level < GWEATHER_LOCATION_WEATHER_STATION) {
+    if (!children[0]) {
 	gweather_location_free_children (gloc, children);
 	return TRUE;
     }
@@ -69,36 +69,19 @@
 	break;
 
     case GWEATHER_LOCATION_CITY:
-	/* If multiple children, treat this like a
-	 * region/country/adm1. If a single child, merge with that
-	 * location.
-	 */
+	/* Merge with child location */
 	gtk_tree_store_append (store, &iter, parent);
 	gtk_tree_store_set (store, &iter,
 			    GWEATHER_XML_COL_LOC, name,
 			    -1);
-	if (children[0] && !children[1]) {
-	    wloc = gweather_location_to_weather_location (children[0], name);
-	    gtk_tree_store_set (store, &iter,
-				GWEATHER_XML_COL_POINTER, wloc,
-				-1);
-	}
-	break;
-
-    case GWEATHER_LOCATION_WEATHER_STATION:
-	gtk_tree_store_append (store, &iter, parent);
-	gtk_tree_store_set (store, &iter,
-			    GWEATHER_XML_COL_LOC, name,
-			    -1);
-
-	parent_loc = gweather_location_get_parent (gloc);
-	if (parent_loc && gweather_location_get_level (parent_loc) == GWEATHER_LOCATION_CITY)
-	    name = gweather_location_get_name (parent_loc);
-	wloc = gweather_location_to_weather_location (gloc, name);
+	wloc = gweather_location_to_weather_location (children[0], name);
 	gtk_tree_store_set (store, &iter,
 			    GWEATHER_XML_COL_POINTER, wloc,
 			    -1);
 	break;
+
+    case GWEATHER_LOCATION_WEATHER_STATION:
+	break;
     }
 
     for (i = 0; children[i]; i++) {

Modified: trunk/libgweather/location-entry.c
==============================================================================
--- trunk/libgweather/location-entry.c	(original)
+++ trunk/libgweather/location-entry.c	Tue Nov 25 18:39:18 2008
@@ -312,58 +312,10 @@
 	break;
 
     case GWEATHER_LOCATION_CITY:
-	if (children[0] && children[1]) {
-	    /* If there are multiple (<location>) children, add a line
-	     * for each of them.
-	     */
-	    for (i = 0; children[i]; i++) {
-		display_name = g_strdup_printf ("%s (%s), %s",
-						gweather_location_get_name (loc),
-						gweather_location_get_name (children[i]),
-						parent_display_name);
-		compare_name = g_strdup_printf ("%s (%s), %s",
-						gweather_location_get_sort_name (loc),
-						gweather_location_get_sort_name (children[i]),
-						parent_compare_name);
-
-		gtk_tree_store_append (store, &iter, NULL);
-		gtk_tree_store_set (store, &iter,
-				    GWEATHER_LOCATION_ENTRY_COL_LOCATION, children[i],
-				    GWEATHER_LOCATION_ENTRY_COL_DISPLAY_NAME, display_name,
-				    GWEATHER_LOCATION_ENTRY_COL_COMPARE_NAME, compare_name,
-				    -1);
-
-		g_free (display_name);
-		g_free (compare_name);
-	    }
-	} else if (children[0]) {
-	    /* Else there's only one location. This is a mix of the
-	     * city-with-multiple-location case above and the
-	     * location-with-no-city case below.
-	     */
-	    display_name = g_strdup_printf ("%s, %s",
-					    gweather_location_get_name (loc),
-					    parent_display_name);
-	    compare_name = g_strdup_printf ("%s, %s",
-					    gweather_location_get_sort_name (loc),
-					    parent_compare_name);
-
-	    gtk_tree_store_append (store, &iter, NULL);
-	    gtk_tree_store_set (store, &iter,
-				GWEATHER_LOCATION_ENTRY_COL_LOCATION, children[0],
-				GWEATHER_LOCATION_ENTRY_COL_DISPLAY_NAME, display_name,
-				GWEATHER_LOCATION_ENTRY_COL_COMPARE_NAME, compare_name,
-				-1);
+	if (!children[0])
+	    break;
 
-	    g_free (display_name);
-	    g_free (compare_name);
-	}
-	break;
-
-    case GWEATHER_LOCATION_WEATHER_STATION:
-	/* <location> with no parent <city>, or <city> with a single
-	 * child <location>.
-	 */
+	/* Merge the city name with the location-specific information. */
 	display_name = g_strdup_printf ("%s, %s",
 					gweather_location_get_name (loc),
 					parent_display_name);
@@ -373,7 +325,7 @@
 
 	gtk_tree_store_append (store, &iter, NULL);
 	gtk_tree_store_set (store, &iter,
-			    GWEATHER_LOCATION_ENTRY_COL_LOCATION, loc,
+			    GWEATHER_LOCATION_ENTRY_COL_LOCATION, children[0],
 			    GWEATHER_LOCATION_ENTRY_COL_DISPLAY_NAME, display_name,
 			    GWEATHER_LOCATION_ENTRY_COL_COMPARE_NAME, compare_name,
 			    -1);
@@ -381,6 +333,10 @@
 	g_free (display_name);
 	g_free (compare_name);
 	break;
+
+    case GWEATHER_LOCATION_WEATHER_STATION:
+	/* Shouldn't happen. Ignore */
+	break;
     }
 
     gweather_location_free_children (loc, children);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]