libgweather r348 - in trunk: . data

[danw svn gnome org]

Author: danw
Date: Mon Aug 25 13:11:50 2008
New Revision: 348
URL: http://svn.gnome.org/viewvc/libgweather?rev=348&view=rev

Log:
	* data/city-fixups.pl: Remove duplicate Bangkok, Thailand under a
	separate name. #548630.

	* data/station-fixups.pl: Fix typo in MMGL (Guadalajara, Mexico)
	#549047. Rename VTBD (Don Muang, Thailand) to "Bangkok" to avoid
	adding a useless extra entry (especially since that entry was
	buggy for another reason anyway). #548630.

	* data/Locations.xml.in: Regen. Adds the string "Guadalajara", but
	that was there in 2.22 so translations of it are already
	available.

	* data/Makefile.am (rebuild-locations, locationdb.sqlite): Fix;
	city-fixups.pl and station-fixups.pl changes require a locationdb
	rebuild, not just Locations.xml.in


Modified:
   trunk/ChangeLog
   trunk/data/Locations.xml.in
   trunk/data/Makefile.am
   trunk/data/city-fixups.pl
   trunk/data/station-fixups.pl

Modified: trunk/data/Locations.xml.in
==============================================================================
--- trunk/data/Locations.xml.in	(original)
+++ trunk/data/Locations.xml.in	Mon Aug 25 13:11:50 2008
@@ -5790,18 +5790,6 @@
       </timezones>
       <tz-hint>Asia/Bangkok</tz-hint>
       <city>
-        <!-- Translators: this is a city in Thailand.
-             This is one of several cities in Thailand called "Ban Don
-             Muang".
-          -->
-        <_name>Ban Don Muang (1)</_name>
-        <coordinates>13.916667 100.600000</coordinates>
-        <location>
-          <name>Don Muang</name>
-          <code>VTBD</code>
-          <coordinates>13.916667 100.600000</coordinates>
-        </location>
-      </city>
       <city>
         <!-- Translators: this is the capital of Thailand.
              "Bangkok" is the traditional English name.
@@ -5866,16 +5854,6 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Thailand -->
-        <_name>Krung Thep</_name>
-        <coordinates>13.750000 100.516667</coordinates>
-        <location>
-          <name>Don Muang</name>
-          <code>VTBD</code>
-          <coordinates>13.916667 100.600000</coordinates>
-        </location>
-      </city>
-      <city>
         <!-- Translators: this is a city in Thailand -->
         <_name>Lampang</_name>
         <coordinates>18.298333 99.507222</coordinates>
@@ -28351,10 +28329,10 @@
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Jalisco in Mexico -->
-          <_name>El Zapote</_name>
-          <coordinates>20.516667 -103.300000</coordinates>
+          <_name>Guadalajara</_name>
+          <coordinates>20.666667 -103.333333</coordinates>
           <location>
-            <name>Don Miguel, Guadalaj Airport</name>
+            <name>Don Miguel, Guadalajara Airport</name>
             <code>MMGL</code>
             <coordinates>20.516667 -103.316667</coordinates>
           </location>

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Aug 25 13:11:50 2008
@@ -49,10 +49,10 @@
 	$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
 
 ### Locations.xml.in rebuild
-rebuild-locations: locationdb.sqlite update-locations.py city-fixups.pl station-fixups.pl
+rebuild-locations: locationdb.sqlite update-locations.py
 	($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in
 
-locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt
+locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl
 	$(srcdir)/build-locationdb.pl
 
 EXTRA_DIST =	\

Modified: trunk/data/city-fixups.pl
==============================================================================
--- trunk/data/city-fixups.pl	(original)
+++ trunk/data/city-fixups.pl	Mon Aug 25 13:11:50 2008
@@ -8,7 +8,8 @@
   next if /-364867.*Tacna/; # Tacna, Peru
   next if /6034170.*Bujumbura/; # Bujumbura, Burundi
   next if /-225337.*Akita/; # Akita, Japan
-  next if /\t10074674\t/; # Tehran, Iran
+  next if /10074674.*\tIR\t/; # Tehran, Iran
+  next if /-3414440.*\tTH\t/; # Bangkok, Thailand
 
   # "ZÃrich" should be listed with an English name of "Zurich"
   if (/-2554935.*ZÃrich/) {

Modified: trunk/data/station-fixups.pl
==============================================================================
--- trunk/data/station-fixups.pl	(original)
+++ trunk/data/station-fixups.pl	Mon Aug 25 13:11:50 2008
@@ -85,6 +85,7 @@
   if (/^LFPG;/) { s/Paris-Aeroport Charles de Gaulle/Paris, Charles de Gaulle International Airport/; }
   if (/^LIPO;/) { s/Montichia;/Montichiara;/; } # 350945
   if (/^LOAV;/) { s/Lugplatz/Flugplatz/; }
+  if (/^MMGL;/) { s/Guadalaj;/Guadalajara;/; }
   if (/^MMMD;/) { s/ lic / /; }
   if (/^MNMG;/) { s/Managua A. C. Sandino/Managua, A. C. Sandino Airport/; }
   if (/^MTPP;/) { s/ \/ Aeroport International/ International Airport/; }
@@ -105,6 +106,11 @@
   if (/^UBBG;/) { s/Gyanca/Gyandzha/; }
   if (/^UKDR;/) { s/Krivyy/Kryvyy/; }
 
+
+  ### "Move" some stations to keep them from matching irrelevant cities
+  if (/^VTBD;/) { s/Don Muang/Bangkok/; }
+
+
   ### Untranslate/unabbreviate the word "Airport". (The names in
   ### nsd_cccc.txt don't seem to be especially close to
   ### correct/official, so this is a net win.