opentrep-svn Mailing List for Open Travel Request Parser (Page 2)
Status: Beta
Brought to you by:
denis_arnaud
Menu
▾
▴
opentrep-svn — Subversion Activity Notification List
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(19) |
Sep
(4) |
Oct
(10) |
Nov
(2) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(3) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
(1) |
Sep
(9) |
Oct
|
Nov
(1) |
Dec
|
| 2011 |
Jan
|
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <den...@us...> - 2010-03-06 15:04:26
|
Revision: 214
http://opentrep.svn.sourceforge.net/opentrep/?rev=214&view=rev
Author: denis_arnaud
Date: 2010-03-06 15:04:19 +0000 (Sat, 06 Mar 2010)
Log Message:
-----------
[DB] Fixed a few items in the old dataabase input files.
Modified Paths:
--------------
trunk/opentrep/db/data/ref_city2.csv
Modified: trunk/opentrep/db/data/ref_city2.csv
===================================================================
--- trunk/opentrep/db/data/ref_city2.csv 2010-03-06 15:00:49 UTC (rev 213)
+++ trunk/opentrep/db/data/ref_city2.csv 2010-03-06 15:04:19 UTC (rev 214)
@@ -11125,11 +11125,11 @@
zzv,,,y,y,n,n,oh,us,namer,itc1,us105,-81.88,39.95,39.95,-81.88,ZZV,NA,NA
zzw,,,y,y,n,n,ns,au,austl,itc3,au011,0.0002778,0.0002778,0.0002778,0.0002778,ZZW,NA,NA
zzz,,,y,y,n,y,,zz,none,itc2,zz,0.2333,51.88,51.88,0.2333,ZZZ,NA,NA
-chd,,,,,,,,,,,,,,,33.32,-111.9,NA,NA,US
-dvx,,,,,,,,,,,,,,,39.13,-75.47,NA,NA,US
-gww,,,,,,,,,,,,,,,52.57,13.3,NA,NA,DE
-kck,,,,,,,,,,,,,,,39.12,-94.65,NA,NA,US
-sda,,,,,,,,,,,,,,,33.262539,44.234578,NA,NA,IQ
-slj,,,,,,,,,,,,,,,33.32,-111.9,NA,NA,US
-viz,,,,,,,,,,,,,,,23.18,75.77,NA,NA,IN
-xnw,,,,,,,,,,,,,,,51.88,0.2333,NA,NA,GB
+chd,,,,,,,,,,,,,,33.32,-111.9,NA,NA,US
+dvx,,,,,,,,,,,,,,39.13,-75.47,NA,NA,US
+gww,,,,,,,,,,,,,,52.57,13.3,NA,NA,DE
+kck,,,,,,,,,,,,,,39.12,-94.65,NA,NA,US
+sda,,,,,,,,,,,,,,33.262539,44.234578,NA,NA,IQ
+slj,,,,,,,,,,,,,,33.32,-111.9,NA,NA,US
+viz,,,,,,,,,,,,,,23.18,75.77,NA,NA,IN
+xnw,,,,,,,,,,,,,,51.88,0.2333,NA,NA,GB
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-03-06 15:00:56
|
Revision: 213
http://opentrep.svn.sourceforge.net/opentrep/?rev=213&view=rev
Author: denis_arnaud
Date: 2010-03-06 15:00:49 +0000 (Sat, 06 Mar 2010)
Log Message:
-----------
[Python] Added a finalize() method. [DB] Gave more weight to Houston and Dallas.
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_names.csv
trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
trunk/opentrep/opentrep/python/pyopentrep.cpp
trunk/opentrep/opentrep/python/pyopentrep.py
Modified: trunk/opentrep/db/data/ref_place_names.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_names.csv 2010-01-23 13:49:16 UTC (rev 212)
+++ trunk/opentrep/db/data/ref_place_names.csv 2010-03-06 15:00:49 UTC (rev 213)
@@ -1808,7 +1808,7 @@
en,dez,deirezzor,deirezzor/sy:al
en,dfi,defiance,defiance/oh/us:memorial
en,dfp,drumduff,drumduff/ql/au
-en,dfw,dallas fort worth,dallas/tx/us:dallas ft worth
+en,dfw,dallas fort worth,dallas/tx/us:dallas ft worth,dallas,dallas
en,dga,dangriga,dangriga/bz
en,dgb,danger bay,danger bay/ak/us
en,dgc,degahbur,degahbur/et
@@ -3114,7 +3114,7 @@
en,hor,horta,horta/pt
en,hos,chos malal oscar,chos malal/ne/ar:oscar reguera
en,hot,hot springs,hot springs/ar/us:memorial fld
-en,hou,houston hou,houston/tx/us:hobby
+en,hou,houston,houston/tx/us:hobby,houston,houston
en,hov,orsta volda,orsta volda/no:hovden
en,how,fort kobbe,fort kobbe/pa:howard afb,air force base
en,hox,homalin,homalin/mm
@@ -5925,7 +5925,7 @@
en,ora,oran,oran/sa/ar
en,orb,orebro airport,orebro/se:orebro airport
en,orc,orocue,orocue/co
-en,ord,chicago ord,chicago/il/us:o'hare intl
+en,ord,chicago ord,chicago/il/us:o'hare intl,ord,ohare
en,ore,orleans,orleans/fr
en,orf,norfolk intl,norfolk/va/us:norfolk intl
en,org,paramaribo org,paramaribo/sr:zorg en hoop
Modified: trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2010-01-23 13:49:16 UTC (rev 212)
+++ trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2010-03-06 15:00:49 UTC (rev 213)
@@ -1,4 +1,4 @@
-database=../../test/traveldb
+database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
log=opentrep_indexer.log
user=opentrep
passwd=opentrep
Modified: trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-01-23 13:49:16 UTC (rev 212)
+++ trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-03-06 15:00:49 UTC (rev 213)
@@ -1,4 +1,4 @@
-database=../../test/traveldb
+database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
log=opentrep_searcher.log
user=opentrep
passwd=opentrep
Modified: trunk/opentrep/opentrep/python/pyopentrep.cpp
===================================================================
--- trunk/opentrep/opentrep/python/pyopentrep.cpp 2010-01-23 13:49:16 UTC (rev 212)
+++ trunk/opentrep/opentrep/python/pyopentrep.cpp 2010-03-06 15:00:49 UTC (rev 213)
@@ -247,6 +247,31 @@
return isEverythingOK;
}
+ /** Wrapper around the search use case. */
+ bool finalize () {
+ bool isEverythingOK = true;
+
+ try {
+
+ // Finalize the context
+ if (_opentrepService != NULL) {
+ delete _opentrepService; _opentrepService = NULL;
+ }
+
+ // Close the output stream
+ if (_logOutputStream != NULL) {
+ // DEBUG
+ *_logOutputStream << "Python wrapper finalization" << std::endl;
+ _logOutputStream->close();
+ delete _logOutputStream; _logOutputStream = NULL;
+ }
+
+ } catch (...) {
+ }
+
+ return isEverythingOK;
+ }
+
private:
/** Handle on the OpenTREP services (API). */
OPENTREP_Service* _opentrepService;
@@ -260,5 +285,6 @@
boost::python::class_<OPENTREP::OpenTrepSearcher> ("OpenTrepSearcher")
.def ("search", &OPENTREP::OpenTrepSearcher::search)
.def ("searchWithFullDetails", &OPENTREP::OpenTrepSearcher::searchWithFullDetails)
- .def ("init", &OPENTREP::OpenTrepSearcher::init);
+ .def ("init", &OPENTREP::OpenTrepSearcher::init)
+ .def ("finalize", &OPENTREP::OpenTrepSearcher::finalize);
}
Modified: trunk/opentrep/opentrep/python/pyopentrep.py
===================================================================
--- trunk/opentrep/opentrep/python/pyopentrep.py 2010-01-23 13:49:16 UTC (rev 212)
+++ trunk/opentrep/opentrep/python/pyopentrep.py 2010-03-06 15:00:49 UTC (rev 213)
@@ -52,7 +52,7 @@
# Initialise the OpenTrep C++ library
import libpyopentrep
openTrepLibrary = libpyopentrep.OpenTrepSearcher()
-openTrepLibrary.init('../../test/traveldb', 'pyopentrep.log', 'opentrep', 'opentrep', 'localhost', '3306', 'trep_opentrep')
+openTrepLibrary.init('/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb', 'pyopentrep.log', 'opentrep', 'opentrep', 'localhost', '3306', 'trep_opentrep')
# If no search string was supplied as arguments of the command-line,
# ask the user for some
@@ -126,3 +126,7 @@
#print "Locations:"
#print locations
+
+# Free the OpenTREP library resource
+openTrepLibrary.finalize()
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-23 13:49:23
|
Revision: 212
http://opentrep.svn.sourceforge.net/opentrep/?rev=212&view=rev
Author: denis_arnaud
Date: 2010-01-23 13:49:16 +0000 (Sat, 23 Jan 2010)
Log Message:
-----------
[Fedora Soci-3.0.0] Fixed the g++-4.4 compatibility issue.
Modified Paths:
--------------
branches/soci-3.0.0/configure.ac
branches/soci-3.0.0/soci/backends/mysql/test/Makefile.am
branches/soci-3.0.0/soci.spec.in
Modified: branches/soci-3.0.0/configure.ac
===================================================================
--- branches/soci-3.0.0/configure.ac 2010-01-23 12:25:46 UTC (rev 211)
+++ branches/soci-3.0.0/configure.ac 2010-01-23 13:49:16 UTC (rev 212)
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# RPM release number
-RPM_RELEASE="13"
+RPM_RELEASE="16"
AC_SUBST(RPM_RELEASE)
# Shared library versioning
@@ -163,8 +163,10 @@
AC_SUBST(BOOST_LIBS)
AC_SUBST(BOOST_DATE_TIME_LIB)
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
+AC_SUBST(BOOST_FILESYSTEM_LIB)
+AC_SUBST(BOOST_THREAD_LIB)
+AC_SUBST(BOOST_PYTHON_LIB)
-
# --------------------------------------------------------------------
# Support for MySQL backend (C client API): http://www.mysql.org
# --------------------------------------------------------------------
@@ -182,8 +184,8 @@
if test "x$enable_backend_mysql" = "xyes"; then
MYSQL_DIRS="mysql"
- MYSQL_REQ_VERSION="3.0.0"
- AX_LIB_MYSQL([$MYSQL_REQ_VERSION])
+# MYSQL_REQ_VERSION="3.0.0"
+ AX_MYSQL
fi
AM_CONDITIONAL([HAVE_MYSQL], [test "x$enable_backend_mysql" = xyes])
#MYSQL_DIRS="mysql"
@@ -377,7 +379,7 @@
- MySQL support ........ : ${enable_backend_mysql}
o MYSQL_VERSION ...... : ${MYSQL_VERSION}
o MYSQL_CFLAGS ....... : ${MYSQL_CFLAGS}
- o MYSQL_LDFLAGS ...... : ${MYSQL_LDFLAGS}
+ o MYSQL_LIBS ......... : ${MYSQL_LIBS}
- PostGreSQL support ... : ${enable_backend_postgresql}
o POSTGRESQL_VERSION . : ${POSTGRESQL_VERSION}
Modified: branches/soci-3.0.0/soci/backends/mysql/test/Makefile.am
===================================================================
--- branches/soci-3.0.0/soci/backends/mysql/test/Makefile.am 2010-01-23 12:25:46 UTC (rev 211)
+++ branches/soci-3.0.0/soci/backends/mysql/test/Makefile.am 2010-01-23 13:49:16 UTC (rev 212)
@@ -13,6 +13,6 @@
test_mysql_LDADD =
test_mysql_LDFLAGS = $(top_builddir)/soci/core/libsoci_core.la -ldl \
$(top_builddir)/soci/backends/mysql/libsoci_mysql.la \
- $(MYSQL_LDFLAGS)
+ $(MYSQL_LIBS)
#nodist_pkginclude_HEADERS = $(mysql_test_h_sources)
Modified: branches/soci-3.0.0/soci.spec.in
===================================================================
--- branches/soci-3.0.0/soci.spec.in 2010-01-23 12:25:46 UTC (rev 211)
+++ branches/soci-3.0.0/soci.spec.in 2010-01-23 13:49:16 UTC (rev 212)
@@ -27,7 +27,7 @@
URL: http://%{name}.sourceforge.net
Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz
# That patch will be submitted upstream
-Patch0: %{name}-%{version}-@RPM_RELEASE@-fix-gcc43-compatibility.patch
+Patch0: %{name}-%{version}-@RPM_RELEASE@-fix-gcc44-compatibility.patch
# That patch will be submitted upstream
Patch1: %{name}-%{version}-@RPM_RELEASE@-fix-gnu-autotools-compatibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -147,7 +147,7 @@
%prep
%setup -q
-# Apply the g++ 4.3 compatibility patch
+# Apply the g++ 4.4 compatibility patch
%patch0 -p1
# Rename change-log and license file, so that they comply with
@@ -287,6 +287,15 @@
%changelog
+* Sat Jan 23 2010 Denis Arnaud <den...@m4...> 3.0.0-16
+- Added a missing cstring header include for g++-4.4 compatibility
+
+* Fri Jan 22 2010 Rahul Sundaram <sun...@fe...> - 3.0.0-15
+- Rebuild for Boost soname bump
+
+* Sun Jul 26 2009 Fedora Release Engineering <re...@li...> - 3.0.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sat May 09 2009 Denis Arnaud <den...@m4...> 3.0.0-13
- Introduced distinct dependencies for different distributions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-23 12:29:28
|
Revision: 211
http://opentrep.svn.sourceforge.net/opentrep/?rev=211&view=rev
Author: denis_arnaud
Date: 2010-01-23 12:25:46 +0000 (Sat, 23 Jan 2010)
Log Message:
-----------
[Soci-3.0.0] Fixed a compilation issue with g++ 4.4, with the postgresql test.
Modified Paths:
--------------
branches/soci-3.0.0/soci/backends/postgresql/test/test-postgresql.cpp
Modified: branches/soci-3.0.0/soci/backends/postgresql/test/test-postgresql.cpp
===================================================================
--- branches/soci-3.0.0/soci/backends/postgresql/test/test-postgresql.cpp 2010-01-05 17:01:56 UTC (rev 210)
+++ branches/soci-3.0.0/soci/backends/postgresql/test/test-postgresql.cpp 2010-01-23 12:25:46 UTC (rev 211)
@@ -23,6 +23,7 @@
#include <cmath>
#include <ctime>
#include <cstdlib>
+#include <cstring>
using namespace soci;
using namespace soci::tests;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-05 17:02:03
|
Revision: 210
http://opentrep.svn.sourceforge.net/opentrep/?rev=210&view=rev
Author: denis_arnaud
Date: 2010-01-05 17:01:56 +0000 (Tue, 05 Jan 2010)
Log Message:
-----------
[SOCI] Updated the external references to the configuration sub-directory.
Property Changed:
----------------
branches/soci-3.0.0/
trunk/soci/
Property changes on: branches/soci-3.0.0
___________________________________________________________________
Modified: svn:externals
- config https://opentrep.svn.sourceforge.net/svnroot/opentrep/trunk/opentrep/config
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
Property changes on: trunk/soci
___________________________________________________________________
Modified: svn:externals
- config https://opentrep.svn.sourceforge.net/svnroot/opentrep/trunk/opentrep/config
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-12-31 12:25:27
|
Revision: 208
http://opentrep.svn.sourceforge.net/opentrep/?rev=208&view=rev
Author: denis_arnaud
Date: 2009-12-31 12:23:45 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
[Test] ExtraCC is now referenced as an external project, rather than embedded.
Modified Paths:
--------------
trunk/opentrep/Makefile.am
trunk/opentrep/configure.ac
trunk/opentrep/test/IndexBuildingTestSuite.cpp
trunk/opentrep/test/Makefile.am
Property Changed:
----------------
trunk/opentrep/
Property changes on: trunk/opentrep
___________________________________________________________________
Added: svn:externals
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit
Modified: trunk/opentrep/Makefile.am
===================================================================
--- trunk/opentrep/Makefile.am 2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/Makefile.am 2009-12-31 12:23:45 UTC (rev 208)
@@ -25,7 +25,7 @@
# Build in these directories:
SUBDIRS = @PACKAGE@ win32 po man $(INFO_DOC_DIR) $(HTML_DOC_DIR) db \
- gui $(TEST_DIR)
+ gui extracppunit $(TEST_DIR)
# Configuration helpers
Modified: trunk/opentrep/configure.ac
===================================================================
--- trunk/opentrep/configure.ac 2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/configure.ac 2009-12-31 12:23:45 UTC (rev 208)
@@ -292,7 +292,7 @@
gui/Makefile
gui/icons/Makefile
gui/psp/Makefile
- test/com/Makefile
+ extracppunit/Makefile
test/parsers/Makefile
test/i18n/Makefile
test/i18n/icu/Makefile
Modified: trunk/opentrep/test/IndexBuildingTestSuite.cpp
===================================================================
--- trunk/opentrep/test/IndexBuildingTestSuite.cpp 2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/test/IndexBuildingTestSuite.cpp 2009-12-31 12:23:45 UTC (rev 208)
@@ -2,7 +2,7 @@
#include <fstream>
#include <string>
// CPPUNIT
-#include <test/com/CppUnitCore.hpp>
+#include <extracppunit/CppUnitCore.hpp>
// OpenTrep
#include <opentrep/OPENTREP_Service.hpp>
#include <opentrep/Location.hpp>
Modified: trunk/opentrep/test/Makefile.am
===================================================================
--- trunk/opentrep/test/Makefile.am 2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/test/Makefile.am 2009-12-31 12:23:45 UTC (rev 208)
@@ -1,22 +1,25 @@
-## command sub-directory
+## test/opentrep sub-directory
include $(top_srcdir)/Makefile.common
MAINTAINERCLEANFILES = Makefile.in
##
-SUBDIRS = com parsers
+SUBDIRS = parsers
+EXTRA_DIST = testIndexer.sh testSearcher.sh
+
##
check_PROGRAMS = IndexBuildingTestSuite
TESTS = $(check_PROGRAMS)
XFAIL_TESTS = #IndexBuildingTestSuite
+#
IndexBuildingTestSuite_SOURCES = IndexBuildingTestSuite.hpp \
IndexBuildingTestSuite.cpp
IndexBuildingTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
-IndexBuildingTestSuite_LDADD = $(top_builddir)/test/com/libcppunitcore.la
+IndexBuildingTestSuite_LDADD = \
+ $(top_builddir)/extracppunit/libextracc-extracppunit.la
IndexBuildingTestSuite_LDFLAGS = \
- $(BOOST_LIBS) $(SOCI_LIBS) $(CPPUNIT_LIBS) \
+ $(BOOST_LIBS) $(SOCI_LIBS) $(XAPIAN_LIBS) $(CPPUNIT_LIBS) \
$(top_builddir)/@PACKAGE@/lib@PACKAGE@.la
-EXTRA_DIST = testIndexer.sh testSearcher.sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-12-31 12:25:22
|
Revision: 209
http://opentrep.svn.sourceforge.net/opentrep/?rev=209&view=rev
Author: denis_arnaud
Date: 2009-12-31 12:25:09 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
[Conf] The config directory is now imported from the StdAir project.
Removed Paths:
-------------
trunk/opentrep/config/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-12-28 15:19:04
|
Revision: 207
http://opentrep.svn.sourceforge.net/opentrep/?rev=207&view=rev
Author: denis_arnaud
Date: 2009-12-28 15:18:46 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
[Conf] Suppressed useless dependencies on SOCI and MySQL.
Modified Paths:
--------------
trunk/opentrep/config/ax_mysql.m4
trunk/opentrep/config/soci.m4
Modified: trunk/opentrep/config/ax_mysql.m4
===================================================================
--- trunk/opentrep/config/ax_mysql.m4 2009-12-14 18:16:43 UTC (rev 206)
+++ trunk/opentrep/config/ax_mysql.m4 2009-12-28 15:18:46 UTC (rev 207)
@@ -25,7 +25,7 @@
MYSQL_inc_check="$with_mysql/include $with_mysql/include/mysql"
MYSQL_bin_check="$with_mysql/bin"],
[MYSQL_lib_check="/usr/lib64 /usr/lib /usr/lib64/mysql /usr/lib/mysql /usr/local/lib64 /usr/local/lib /usr/local/lib/mysql /usr/local/mysql/lib /usr/local/mysql/lib/mysql /opt/mysql/lib /opt/mysql/lib/mysql"
- MYSQL_inc_check="/usr/include /usr/local/include /usr/local/mysql/include /opt/mysql/include"
+ MYSQL_inc_check="/usr/include/mysql /usr/local/include/mysql /usr/local/mysql/include /usr/local/mysql/include/mysql /opt/mysql/include/mysql"
MYSQL_bin_check="/usr/bin /usr/local/bin /usr/local/mysql/bin"])
AC_ARG_WITH(mysql-lib,
@@ -113,10 +113,10 @@
AC_MSG_RESULT([$MYSQL_libdir])
- case "$MYSQL_libdir" in
- /usr/lib) ;;
- *) LDFLAGS="$LDFLAGS -L${MYSQL_libdir}" ;;
- esac
+# case "$MYSQL_libdir" in
+# /usr/lib) ;;
+# *) LDFLAGS="$LDFLAGS -L${MYSQL_libdir}" ;;
+# esac
#
# Look for MySQL C API headers
@@ -125,7 +125,7 @@
MYSQL_incdir=
for m in $MYSQL_inc_check
do
- if test -d "$m" && test -f "$m/mysql/mysql.h"
+ if test -d "$m" && test -f "$m/mysql.h"
then
MYSQL_incdir=$m
break
Modified: trunk/opentrep/config/soci.m4
===================================================================
--- trunk/opentrep/config/soci.m4 2009-12-14 18:16:43 UTC (rev 206)
+++ trunk/opentrep/config/soci.m4 2009-12-28 15:18:46 UTC (rev 207)
@@ -53,6 +53,7 @@
if (test -f "$m/lib$SOCI_CORE_LIB.so" || test -f "$m/lib$SOCI_CORE_LIB.a")
then
SOCI_libdir=$m
+ break
fi
if (test -f "$m/lib${SOCI_CORE_LIB}-${SOCI_LIB_SUFFIX}.so" \
|| test -f "$m/lib${SOCI_CORE_LIB}-${SOCI_LIB_SUFFIX}.a")
@@ -78,10 +79,10 @@
AC_MSG_RESULT([$SOCI_libdir])
- case "$SOCI_libdir" in
- /usr/lib) ;;
- *) LDFLAGS="$LDFLAGS -L${SOCI_libdir}" ;;
- esac
+# case "$SOCI_libdir" in
+# /usr/lib) ;;
+# *) LDFLAGS="$LDFLAGS -L${SOCI_libdir}" ;;
+# esac
#
@@ -118,8 +119,8 @@
then
SOCI_LIBS="-L${SOCI_libdir}"
fi
- SOCI_CFLAGS="-DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED $SOCI_CFLAGS"
- SOCI_LIBS="$SOCI_LIBS -l${SOCI_CORE_LIB} -l${SOCI_MYSQL_LIB} -ldl"
+ SOCI_CFLAGS="-DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED ${MYSQL_CFLAGS} ${SOCI_CFLAGS}"
+ SOCI_LIBS="${MYSQL_LIBS} ${SOCI_LIBS} -l${SOCI_CORE_LIB} -l${SOCI_MYSQL_LIB} -ldl"
AC_SUBST(SOCI_CFLAGS)
AC_SUBST(SOCI_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-12-14 18:16:51
|
Revision: 206
http://opentrep.svn.sourceforge.net/opentrep/?rev=206&view=rev
Author: denis_arnaud
Date: 2009-12-14 18:16:43 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
[Boost Config] Added a dependency on MPICH2, instead of on OpenMPI.
Modified Paths:
--------------
trunk/opentrep/config/ax_boost.m4
trunk/opentrep/configure.ac
Added Paths:
-----------
trunk/opentrep/config/mpich2.m4
trunk/opentrep/config/openmpi.m4
Modified: trunk/opentrep/config/ax_boost.m4
===================================================================
--- trunk/opentrep/config/ax_boost.m4 2009-11-11 21:02:44 UTC (rev 205)
+++ trunk/opentrep/config/ax_boost.m4 2009-12-14 18:16:43 UTC (rev 206)
@@ -19,7 +19,10 @@
dnl AC_SUBST(BOOST_SIGNALS_LIB)
dnl AC_SUBST(BOOST_DATE_TIME_LIB)
dnl AC_SUBST(BOOST_REGEX_LIB)
-dnl AC_SUBST(BOOST_PYTHON)
+dnl AC_SUBST(BOOST_PYTHON_LIB)
+dnl AC_SUBST(BOOST_ASIO_LIB)
+dnl AC_SUBST(BOOST_MPI_LIB)
+dnl AC_SUBST(BOOST_MPI_PYTHON_LIB)
dnl AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
dnl
dnl And sets:
@@ -35,6 +38,9 @@
dnl HAVE_BOOST_DATE_TIME
dnl HAVE_BOOST_REGEX
dnl HAVE_BOOST_PYTHON
+dnl HAVE_BOOST_ASIO
+dnl HAVE_BOOST_MPI
+dnl HAVE_BOOST_MPI_PYTHON
dnl HAVE_BOOST_UNIT_TEST_FRAMEWORK
dnl
dnl @category InstalledPackages
@@ -60,12 +66,6 @@
],
[want_boost="yes"])
- AC_ARG_WITH([boost-libs-suffixes],
- AC_HELP_STRING([--with-boost-libs-suffixes=SUF1,SUF2...],
- [Specify the list of suffix to append to boost libs to try them (separated by commas)]),
- [ac_boost_libs_suffixes="$withval"],
- [ac_boost_libs_suffixes=",-mt,-$CC,-$CC-mt,-$CC-mt-s,-$CC-s,-mgw,-mgw-mt,-mgw-mt-s,-mgw-s"])
-
# AC_CANONICAL_BUILD
BOOST_MDW_VERSION="1-33-1"
BOOSTLIB_MDW_VERSION="1_33_1"
@@ -242,6 +242,9 @@
AC_SUBST(BOOST_LIBS)
AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+#
+# Boost::Filesystem
+#
AC_CACHE_CHECK([whether the Boost::Filesystem library is available],
ax_cv_boost_filesystem,
[AC_LANG_SAVE
@@ -256,7 +259,10 @@
if test "$ax_cv_boost_filesystem" = "yes"; then
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::FILESYSTEM library is available])
BN=boost_filesystem
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_FILESYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes" break],
[link_filesystem="no"])
@@ -266,6 +272,9 @@
fi
fi
+#
+# Boost::System
+#
AC_CACHE_CHECK([whether the Boost::System library is available],
ax_cv_boost_system,
[AC_LANG_SAVE
@@ -280,7 +289,9 @@
if test "$ax_cv_boost_system" = "yes"; then
AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::SYSTEM library is available])
BN=boost_system
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_SYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes" break],
[link_system="no"])
@@ -290,6 +301,9 @@
fi
fi
+#
+# Boost::Program_Options
+#
AC_CACHE_CHECK([whether the Boost::Program_Options library is available],
ax_cv_boost_program_options,
[AC_LANG_SAVE
@@ -303,7 +317,11 @@
if test "$ax_cv_boost_program_options" = yes; then
AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
BN=boost_program_options
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib" AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes" break],
[link_program_options="no"])
@@ -313,6 +331,9 @@
fi
fi
+#
+# Boost::Threads
+#
AC_CACHE_CHECK(whether the Boost::Thread library is available,
ax_cv_boost_thread,
[AC_LANG_SAVE
@@ -345,7 +366,12 @@
AC_SUBST(BOOST_CFLAGS)
AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::THREAD library is available])
BN=boost_thread
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-mt $BN-$CC $BN-$CC-mt \
+ $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -354,6 +380,9 @@
fi
fi
+#
+# Boost::IOStreams
+#
AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
ax_cv_boost_iostreams,
[AC_LANG_SAVE
@@ -372,7 +401,11 @@
if test "x$ax_cv_boost_iostreams" = "xyes"; then
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
BN=boost_iostreams
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -381,6 +414,9 @@
fi
fi
+#
+# Boost::Serialization
+#
AC_CACHE_CHECK(whether the Boost::Serialization library is available,
ax_cv_boost_serialization,
[AC_LANG_SAVE
@@ -399,13 +435,21 @@
if test "x$ax_cv_boost_serialization" = "xyes"; then
AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available])
BN=boost_serialization
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_SERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_SERIALIZATION_LIB) link_thread="yes" break],
[link_thread="no"])
done
BN=boost_wserialization
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_WSERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_WSERIALIZATION_LIB) link_thread="yes" break],
[link_thread="no"])
@@ -415,6 +459,9 @@
fi
fi
+#
+# Boost::Signals
+#
AC_CACHE_CHECK(whether the Boost::Signals library is available,
ax_cv_boost_signals,
[AC_LANG_SAVE
@@ -430,15 +477,22 @@
if test "x$ax_cv_boost_signals" = "xyes"; then
AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available])
BN=boost_signals
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
- AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_thread="yes" break],
- [link_thread="no"])
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes" break],
+ [link_signals="no"])
done
- if test "x$link_thread" = "xno"; then
+ if test "x$link_signals" = "xno"; then
AC_MSG_NOTICE(Could not link against $ax_lib !)
fi
fi
+#
+# Boost::Date_Time
+#
AC_CACHE_CHECK(whether the Boost::Date_Time library is available,
ax_cv_boost_date_time,
[AC_LANG_SAVE
@@ -454,15 +508,22 @@
if test "x$ax_cv_boost_date_time" = "xyes"; then
AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
BN=boost_date_time
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
- AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_thread="yes" break],
- [link_thread="no"])
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes" break],
+ [link_date_time="no"])
done
- if test "x$link_thread"="no" = "xno"; then
+ if test "x$link_date_time"="no" = "xno"; then
AC_MSG_NOTICE(Could not link against $ax_lib !)
fi
fi
+#
+# Boost::Regex
+#
AC_CACHE_CHECK(whether the Boost::Regex library is available,
ax_cv_boost_regex,
[AC_LANG_SAVE
@@ -476,7 +537,11 @@
if test "x$ax_cv_boost_regex" = "xyes"; then
AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
BN=boost_regex
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
+ $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_REGEX_LIB="-l$ax_lib" AC_SUBST(BOOST_REGEX_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -485,47 +550,136 @@
fi
fi
- # AC_CACHE_CHECK(whether the Boost::Mpi library is available,
- # ax_cv_boost_mpi,
- # [AC_LANG_SAVE
- # AC_LANG_CPLUSPLUS
+#
+# Boost::ASIO: it needs Boost.System, Boost.Regex, Boost.Thread and
+# Boost.DateTime, but does not produce any (other) library.
+#
+ AC_CACHE_CHECK(whether the Boost::Asio library is available,
+ ax_cv_boost_asio,
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/asio.hpp>]],
+ [[boost::asio::io_service io;
+ boost::system::error_code timer_result;
+ boost::asio::deadline_timer t(io);
+ t.cancel();
+ io.run_one();
+ return 0;
+ ]]),
+ ax_cv_boost_asio=yes, ax_cv_boost_asio=no)
+ AC_LANG_RESTORE
+ ])
+ if test "x$ax_cv_boost_asio" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::Asio library is available])
+ BOOST_ASIO_LIB="${BOOST_SYSTEM_LIB} ${BOOST_THREAD_LIB}"
+ BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_DATE_TIME_LIB}"
+ BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_REGEX_LIB}"
+ BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_SERIALIZATION_LIB}"
+ fi
- # saved_cflags="${CPPFLAGS}"
- # saved_ldflags="${LDFLAGS}"
- # CPPFLAGS="${CPPFLAGS} ${OPENMPI_CFLAGS}"
- # LDFLAGS="${LDFLAGS} ${OPENMPI_LIBS}"
-
- # AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/mpi/communicator.hpp>
- # ]],
- # [[boost::mpi::communicator world; return 0;]]),
- # ax_cv_boost_mpi=yes, ax_cv_boost_mpi=no)
- # AC_LANG_RESTORE
- # CPPFLAGS="${saved_cflags}"
- # LDFLAGS="${saved_ldflags}"
- # ])
+#
+# Support for Python and MPI (MPICH2, Boost::MPI, Boost::Python,
+# Boost::Serialization, Boost::MPI_Python)
+#
+ CPPFLAGS_ORIG="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${PYTHON_CFLAGS} ${MPICH2_CFLAGS}"
+ LDFLAGS_ORIG="${LDFLAGS}"
+ LDFLAGS="${LDFLAGS} ${PYTHON_LIBS} ${PYTHON_ADD_LIBS} ${MPICH2_LIBS}"
+#
+# Boost::Python
+#
AC_CACHE_CHECK(whether the Boost::Python library is available,
ax_cv_boost_python,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- saved_cflags="${CPPFLAGS}"
- saved_ldflags="${LDFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${PYTHON_CFLAGS}"
- LDFLAGS="${LDFLAGS} ${PYTHON_LIBS} ${PYTHON_ADD_LIBS}"
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/python.hpp>
char const* greet() { return "hello"; }
- BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet); }]]),
+ BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet);}
+ ]]),
ax_cv_boost_python=yes, ax_cv_boost_python=no)
AC_LANG_RESTORE
- CPPFLAGS="${saved_cflags}"
- LDFLAGS="${saved_ldflags}"
])
BOOST_PYTHON_LIB="-lboost_python"
AC_SUBST(BOOST_PYTHON_LIB)
+#
+# Boost::MPI
+#
+ AC_CACHE_CHECK(whether the Boost::Mpi library is available,
+ ax_cv_boost_mpi,
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/mpi.hpp>]],
+ [[
+ return 0;
+ ]]),
+ ax_cv_boost_mpi=yes, ax_cv_boost_mpi=no)
+ AC_LANG_RESTORE
+ ])
+ if test "x$ax_cv_boost_mpi" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_MPI,,[define if the Boost::Mpi library is available])
+ BN=boost_mpi
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+
+ AC_CHECK_LIB($ax_lib, main, [BOOST_MPI_LIB="-l$ax_lib" AC_SUBST(BOOST_MPI_LIB) link_mpi="yes" break],
+ [link_mpi="no"])
+ done
+ if test "x$link_mpi" = "xno"; then
+ AC_MSG_NOTICE(Could not link against $ax_lib !)
+ else
+ BOOST_MPI_LIB="${BOOST_MPI_LIB} ${BOOST_SERIALIZATION_LIB}"
+ fi
+ fi
+
+#
+# Boost::MPI_Python
+#
+ AC_CACHE_CHECK(whether the Boost::Mpi_Python library is available,
+ ax_cv_boost_mpi_python,
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/mpi/python/serialize.hpp>
+ ]],
+ [[
+ return 0;
+ ]]),
+ ax_cv_boost_mpi_python=yes, ax_cv_boost_mpi_python=no)
+ AC_LANG_RESTORE
+ ])
+ if test "x$ax_cv_boost_mpi_python" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_MPI_PYTHON,,[define if the Boost::Mpi_Python library is available])
+ BN=boost_mpi_python
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ AC_CHECK_LIB($ax_lib, main, [BOOST_MPI_PYTHON_LIB="-l$ax_lib" AC_SUBST(BOOST_MPI_PYTHON_LIB) link_mpi_python="yes" break],
+ [link_mpi_python="no"])
+ done
+ if test "x$link_mpi_python" = "xno"; then
+ AC_MSG_NOTICE(Could not link against $ax_lib !)
+ else
+ BOOST_MPI_PYTHON_LIB="${BOOST_MPI_PYTHON_LIB} ${BOOST_SERIALIZATION_LIB}"
+ BOOST_MPI_PYTHON_LIB="${BOOST_MPI_PYTHON_LIB} ${BOOST_PYTHON_LIB}"
+ BOOST_MPI_PYTHON_LIB="${BOOST_MPI_PYTHON_LIB} ${BOOST_MPI_LIB}"
+ fi
+ fi
+
+#
+# End of section on support for MPI
+#
+ CPPFLAGS="${CPPFLAGS_ORIG}"
+ LDFLAGS="${LDFLAGS_ORIG}"
+
+#
+# Boost::UnitTestFramework
+#
AC_CACHE_CHECK(whether the Boost::UnitTestFramework library is available,
ax_cv_boost_unit_test_framework,
[AC_LANG_SAVE
@@ -540,7 +694,10 @@
AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_test_framework library is available])
BN=boost_unit_test_framework
saved_ldflags="${LDFLAGS}"
- for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
LDFLAGS="${LDFLAGS} -l$ax_lib"
AC_CACHE_CHECK(the name of the Boost::UnitTestFramework library,
ax_cv_boost_unit_test_framework,
@@ -564,8 +721,12 @@
AC_MSG_NOTICE(Could not link against $ax_lib !)
fi
fi
- fi
+
+
+ fi dnl endif test "$succeeded"
+
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
- fi
+
+ fi dnl endif test "x$want_boost"
])
Added: trunk/opentrep/config/mpich2.m4
===================================================================
--- trunk/opentrep/config/mpich2.m4 (rev 0)
+++ trunk/opentrep/config/mpich2.m4 2009-12-14 18:16:43 UTC (rev 206)
@@ -0,0 +1,187 @@
+dnl @synopsis AX_MPICH2
+dnl
+dnl This macro tries to find Mpich2 C API header and library locations.
+dnl
+dnl We define the following configure script flags:
+dnl
+dnl --with-mpich2: Give prefix for both library and headers, and try
+dnl to guess subdirectory names for each. (e.g. Tack /lib and
+dnl /include onto given dir name, and other common schemes.)
+dnl --with-mpich2-lib: Similar to --with-mpich2, but for library only.
+dnl --with-mpich2-include: Similar to --with-mpich2, but for headers
+dnl only.
+dnl
+dnl @version 1.0, 2009/10/08
+dnl @author Denis Arnaud <den...@m4...>
+
+AC_DEFUN([AX_MPICH2],
+[
+
+dnl
+dnl Check the CPU (and OS) architecture: 32 or 64 bits
+dnl
+ARCH=`arch`
+if test "${ARCH}" = "i386" -o "${ARCH}" = "i686" -o "${ARCH}" = "ppc" -o "${ARCH}" = "sparcv9"
+then
+ MODE=32
+ MODEFLAG="-m32"
+elif test "${ARCH}" = "ia64"
+then
+ MODE=64
+elif test "${ARCH}" = "s390"
+then
+ MODE=31
+elif test "${ARCH}" = "s390x"
+then
+ MODE=64
+elif test "${ARCH}" = "x86_64" -o "${ARCH}" = "ppc64" -o "${ARCH}" = "sparc64"
+then
+ MODE=64
+ MODEFLAG="-m64"
+fi
+
+GENARCH="${ARCH}"
+if test "${ARCH}" = "i686"
+then
+ GENARCH="i386"
+fi
+
+MPICH2_DEF_VERSION="1.3.3"
+MPICH2_DEF_CC="gcc"
+MPIDIR="${MPICH2_DEF_VERSION}-${MPICH2_DEF_CC}"
+
+ #
+ # Set up configure script macros
+ #
+ AC_ARG_WITH(mpich2,
+ [ --with-mpich2=<path> root directory path of Mpich2 installation],
+ [MPICH2_lib_check="$with_mpich2/lib${MODE}/mpich2 $with_mpich2/lib/mpich2 $with_mpich2/lib${MODE} $with_mpich2/lib"
+ MPICH2_inc_check="$with_mpich2/include $with_mpich2/include/mpich2 $with_mpich2/include/mpich2/${MPIDIR}"],
+ [MPICH2_lib_check="/usr/lib${MODE} /usr/lib /usr/lib${MODE}/mpich2 /usr/lib/mpich2 /usr/lib${MODE}/mpich2/lib /usr/lib/mpich2/lib /usr/lib${MODE}/mpich2/${MPIDIR} /usr/lib/mpich2/${MPIDIR} /usr/local/lib${MODE} /usr/local/lib /usr/local/lib${MODE}/mpich2 /usr/local/lib/mpich2 /usr/local/lib${MODE}/mpich2/${MPIDIR} /usr/local/lib/mpich2/${MPIDIR} /usr/local/mpich2/lib${MODE} /usr/local/mpich2/lib /usr/local/mpich2/${MPIDIR}/lib${MODE} /usr/local/mpich2/${MPIDIR}/lib$ /opt/mpich2/lib /opt/mpich2/${MPIDIR}/lib /opt/mpich2/lib/mpich2"
+ MPICH2_inc_check="/usr/include /usr/include/mpich2 /usr/include/mpich2/${MPIDIR} /usr/local/include /usr/local/include/mpich2 /usr/local/include/mpich2/${MPIDIR} /opt/mpich2/include /opt/mpich2/${MPIDIR}/include"])
+
+ AC_ARG_WITH(mpich2-lib,
+ [ --with-mpich2-lib=<path> directory path of Mpich2 library installation],
+ [MPICH2_lib_check="$with_mpich2_lib $with_mpich2_lib/lib${MODE} $with_mpich2_lib/lib $with_mpich2_lib/lib${MODE}/mpich2 $with_mpich2_lib/lib/mpich2 $with_mpich2_lib/lib${MODE}/mpich2/${MPIDIR} $with_mpich2_lib/lib/mpich2/${MPIDIR}"])
+
+ AC_ARG_WITH(mpich2-include,
+ [ --with-mpich2-include=<path> directory path of Mpich2 header installation],
+ [MPICH2_inc_check="$with_mpich2_include $with_mpich2_include/include $with_mpich2_include/include/mpich2 $with_mpich2_include/include/mpich2/${MPIDIR}"])
+
+ # Mpich2 library
+ MPICH2_LIB=mpichcxx
+ MPICH2_LIBC=mpich
+
+ #
+ # Look for Mpich2 library
+ #
+ AC_MSG_CHECKING([for Mpich2 library directory])
+ MPICH2_libdir=
+ for m in ${MPICH2_lib_check}
+ do
+ if test -d "$m"
+ then
+ if (test -f "$m/lib$MPICH2_LIB.so" || test -f "$m/lib$MPICH2_LIB.a")
+ then
+ MPICH2_libdir=$m
+ break
+ fi
+ fi
+ done
+
+ if test -z "$MPICH2_libdir"
+ then
+ AC_MSG_ERROR([Didn't find $MPICH2_LIB library in '$MPICH2_lib_check'])
+ fi
+
+ case "$MPICH2_libdir" in
+ /* ) ;;
+ * ) AC_MSG_ERROR([The Mpich2 library directory ($MPICH2_libdir) must be an absolute path.]) ;;
+ esac
+
+ AC_MSG_RESULT([$MPICH2_libdir])
+
+ #
+ # Look for Mpich2 headers
+ #
+ AC_MSG_CHECKING([for Mpich2 include directory])
+ MPICH2_incdir=
+ for m in $MPICH2_inc_check
+ do
+ if test -d "$m" && test -f "$m/mpi.h"
+ then
+ MPICH2_incdir=$m
+ break
+ fi
+ done
+
+ if test -z "$MPICH2_incdir"
+ then
+ AC_MSG_ERROR([Didn't find the Mpich2 include dir in '$MPICH2_inc_check'])
+ fi
+
+ case "$MPICH2_incdir" in
+ /* ) ;;
+ * ) AC_MSG_ERROR([The Mpich2 include directory ($MPICH2_incdir) must be an absolute path.]) ;;
+ esac
+
+ AC_MSG_RESULT([$MPICH2_incdir])
+
+ #
+ # Look for Mpich2 version
+ #
+ min_mpich2_version=ifelse([$1], , 1.0.0, $1)
+ AC_MSG_CHECKING([for Mpich2 version >= $min_mpich2_version])
+
+ # Derive the full version, e.g., 1.3.3
+ MPICH2_VERSION=`echo ${MPICH2_incdir} | sed 's/.*\/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1.\2.\3/g'`
+ if test -z "${MPICH2_VERSION}" ; then
+ MPICH2_VERSION=${MPICH2_DEF_VERSION}
+ fi
+
+ # Calculation of major, minor, micro
+ mpich2_major_version=`echo $MPICH2_VERSION | sed 's/^\([[0-9]]*\).*/\1/'`
+ if test "x${mpich2_major_version}" = "x" ; then
+ mpich2_major_version=0
+ fi
+
+ mpich2_minor_version=`echo $MPICH2_VERSION | \
+ sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\2/'`
+ if test "x${mpich2_minor_version}" = "x" ; then
+ mpich2_minor_version=0
+ fi
+
+ mpich2_micro_version=`echo $MPICH2_VERSION | \
+ sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\3/'`
+ if test "x${mpich2_micro_version}" = "x" ; then
+ mpich2_micro_version=0
+ fi
+
+ AC_MSG_RESULT([$MPICH2_VERSION])
+
+ #
+ # Derive the flags for compilation and linking
+ #
+ MPICH2_CFLAGS="-I${MPICH2_incdir} ${MODEFLAG}"
+ MPICH2_LIBS="-L${MPICH2_libdir} -lmpichcxx"
+
+ #
+ # Make the changes permanent
+ #
+ AC_SUBST(MPICH2_VERSION)
+ AC_SUBST(MPICH2_CFLAGS)
+ AC_SUBST(MPICH2_LIBS)
+
+ # Test linking with mpich2
+ save_LIBS="$LIBS"
+ if test -z "$MPICH2_LIBS"
+ then
+ MPICH2_LIBS="-L/usr/lib${MODE}/mpich2 -lmpich"
+ fi
+ LIBS="$LIBS $MPICH2_LIBS"
+ AC_CHECK_LIB($MPICH2_LIBC, MPID_Comm_direct,
+ [],
+ [AC_MSG_ERROR([Could not find working Mpich2 library!])]
+ )
+ LIBS="$save_LIBS"
+]) dnl AX_MPICH2
Added: trunk/opentrep/config/openmpi.m4
===================================================================
--- trunk/opentrep/config/openmpi.m4 (rev 0)
+++ trunk/opentrep/config/openmpi.m4 2009-12-14 18:16:43 UTC (rev 206)
@@ -0,0 +1,186 @@
+dnl @synopsis AX_OPENMPI
+dnl
+dnl This macro tries to find Openmpi C API header and library locations.
+dnl
+dnl We define the following configure script flags:
+dnl
+dnl --with-openmpi: Give prefix for both library and headers, and try
+dnl to guess subdirectory names for each. (e.g. Tack /lib and
+dnl /include onto given dir name, and other common schemes.)
+dnl --with-openmpi-lib: Similar to --with-openmpi, but for library only.
+dnl --with-openmpi-include: Similar to --with-openmpi, but for headers
+dnl only.
+dnl
+dnl @version 1.0, 2009/10/08
+dnl @author Denis Arnaud <den...@m4...>
+
+AC_DEFUN([AX_OPENMPI],
+[
+
+dnl
+dnl Check the CPU (and OS) architecture: 32 or 64 bits
+dnl
+ARCH=`arch`
+if test "${ARCH}" = "i386" -o "${ARCH}" = "i686" -o "${ARCH}" = "ppc" -o "${ARCH}" = "sparcv9"
+then
+ MODE=32
+ MODEFLAG="-m32"
+elif test "${ARCH}" = "ia64"
+then
+ MODE=64
+elif test "${ARCH}" = "s390"
+then
+ MODE=31
+elif test "${ARCH}" = "s390x"
+then
+ MODE=64
+elif test "${ARCH}" = "x86_64" -o "${ARCH}" = "ppc64" -o "${ARCH}" = "sparc64"
+then
+ MODE=64
+ MODEFLAG="-m64"
+fi
+
+GENARCH="${ARCH}"
+if test "${ARCH}" = "i686"
+then
+ GENARCH="i386"
+fi
+
+OPENMPI_DEF_VERSION="1.3.3"
+OPENMPI_DEF_CC="gcc"
+MPIDIR="${OPENMPI_DEF_VERSION}-${OPENMPI_DEF_CC}"
+
+ #
+ # Set up configure script macros
+ #
+ AC_ARG_WITH(openmpi,
+ [ --with-openmpi=<path> root directory path of Openmpi installation],
+ [OPENMPI_lib_check="$with_openmpi/lib${MODE}/openmpi $with_openmpi/lib/openmpi $with_openmpi/lib${MODE} $with_openmpi/lib"
+ OPENMPI_inc_check="$with_openmpi/include $with_openmpi/include/openmpi $with_openmpi/include/openmpi/${MPIDIR}"],
+ [OPENMPI_lib_check="/usr/lib${MODE} /usr/lib /usr/lib${MODE}/openmpi /usr/lib/openmpi /usr/lib${MODE}/openmpi/lib /usr/lib/openmpi/lib /usr/lib${MODE}/openmpi/${MPIDIR} /usr/lib/openmpi/${MPIDIR} /usr/local/lib${MODE} /usr/local/lib /usr/local/lib${MODE}/openmpi /usr/local/lib/openmpi /usr/local/lib${MODE}/openmpi/${MPIDIR} /usr/local/lib/openmpi/${MPIDIR} /usr/local/openmpi/lib${MODE} /usr/local/openmpi/lib /usr/local/openmpi/${MPIDIR}/lib${MODE} /usr/local/openmpi/${MPIDIR}/lib$ /opt/openmpi/lib /opt/openmpi/${MPIDIR}/lib /opt/openmpi/lib/openmpi"
+ OPENMPI_inc_check="/usr/include /usr/include/openmpi /usr/include/openmpi-${ARCH} /usr/include/openmpi-${GENARCH} /usr/include/openmpi/${MPIDIR} /usr/local/include /usr/local/include/openmpi /usr/local/include/openmpi/${MPIDIR} /opt/openmpi/include /opt/openmpi/${MPIDIR}/include"])
+
+ AC_ARG_WITH(openmpi-lib,
+ [ --with-openmpi-lib=<path> directory path of Openmpi library installation],
+ [OPENMPI_lib_check="$with_openmpi_lib $with_openmpi_lib/lib${MODE} $with_openmpi_lib/lib $with_openmpi_lib/lib${MODE}/openmpi $with_openmpi_lib/lib/openmpi $with_openmpi_lib/lib${MODE}/openmpi/${MPIDIR} $with_openmpi_lib/lib/openmpi/${MPIDIR}"])
+
+ AC_ARG_WITH(openmpi-include,
+ [ --with-openmpi-include=<path> directory path of Openmpi header installation],
+ [OPENMPI_inc_check="$with_openmpi_include $with_openmpi_include/include $with_openmpi_include/include/openmpi $with_openmpi_include/include/openmpi/${MPIDIR}"])
+
+ # OpenMPI library
+ OPENMPI_LIB=mpi
+
+ #
+ # Look for OpenMPI library
+ #
+ AC_MSG_CHECKING([for OpenMPI library directory])
+ OPENMPI_libdir=
+ for m in ${OPENMPI_lib_check}
+ do
+ if test -d "$m"
+ then
+ if (test -f "$m/lib$OPENMPI_LIB.so" || test -f "$m/lib$OPENMPI_LIB.a")
+ then
+ OPENMPI_libdir=$m
+ break
+ fi
+ fi
+ done
+
+ if test -z "$OPENMPI_libdir"
+ then
+ AC_MSG_ERROR([Didn't find $OPENMPI_LIB library in '$OPENMPI_lib_check'])
+ fi
+
+ case "$OPENMPI_libdir" in
+ /* ) ;;
+ * ) AC_MSG_ERROR([The Openmpi library directory ($OPENMPI_libdir) must be an absolute path.]) ;;
+ esac
+
+ AC_MSG_RESULT([$OPENMPI_libdir])
+
+ #
+ # Look for OpenMPI headers
+ #
+ AC_MSG_CHECKING([for OpenMPI include directory])
+ OPENMPI_incdir=
+ for m in $OPENMPI_inc_check
+ do
+ if test -d "$m" && test -f "$m/mpi.h"
+ then
+ OPENMPI_incdir=$m
+ break
+ fi
+ done
+
+ if test -z "$OPENMPI_incdir"
+ then
+ AC_MSG_ERROR([Didn't find the Openmpi include dir in '$OPENMPI_inc_check'])
+ fi
+
+ case "$OPENMPI_incdir" in
+ /* ) ;;
+ * ) AC_MSG_ERROR([The Openmpi include directory ($OPENMPI_incdir) must be an absolute path.]) ;;
+ esac
+
+ AC_MSG_RESULT([$OPENMPI_incdir])
+
+ #
+ # Look for OpenMPI version
+ #
+ min_openmpi_version=ifelse([$1], , 1.0.0, $1)
+ AC_MSG_CHECKING([for OpenMPI version >= $min_openmpi_version])
+
+ # Derive the full version, e.g., 1.3.3
+ OPENMPI_VERSION=`echo ${OPENMPI_incdir} | sed 's/.*\/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1.\2.\3/g'`
+ if test -z "${OPENMPI_VERSION}" ; then
+ OPENMPI_VERSION=${OPENMPI_DEF_VERSION}
+ fi
+
+ # Calculation of major, minor, micro
+ openmpi_major_version=`echo $OPENMPI_VERSION | sed 's/^\([[0-9]]*\).*/\1/'`
+ if test "x${openmpi_major_version}" = "x" ; then
+ openmpi_major_version=0
+ fi
+
+ openmpi_minor_version=`echo $OPENMPI_VERSION | \
+ sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\2/'`
+ if test "x${openmpi_minor_version}" = "x" ; then
+ openmpi_minor_version=0
+ fi
+
+ openmpi_micro_version=`echo $OPENMPI_VERSION | \
+ sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\3/'`
+ if test "x${openmpi_micro_version}" = "x" ; then
+ openmpi_micro_version=0
+ fi
+
+ AC_MSG_RESULT([$OPENMPI_VERSION])
+
+ #
+ # Derive the flags for compilation and linking
+ #
+ OPENMPI_CFLAGS="-I${OPENMPI_incdir} -I${OPENMPI_incdir}/openmpi -I${OPENMPI_incdir}/${MODE} ${MODEFLAG}"
+ OPENMPI_LIBS="-L${OPENMPI_libdir} -lmpi_cxx"
+
+ #
+ # Make the changes permanent
+ #
+ AC_SUBST(OPENMPI_VERSION)
+ AC_SUBST(OPENMPI_CFLAGS)
+ AC_SUBST(OPENMPI_LIBS)
+
+ # Test linking with openmpi
+ save_LIBS="$LIBS"
+ if test -z "$OPENMPI_LIBS"
+ then
+ OPENMPI_LIBS="-L/usr/lib${MODE}/openmpi/${MPIDIR} -lmpi_cxx"
+ fi
+ LIBS="$LIBS $OPENMPI_LIBS"
+ AC_CHECK_LIB($OPENMPI_LIB, ompi_mpi_char,
+ [],
+ [AC_MSG_ERROR([Could not find working Openmpi library!])]
+ )
+ LIBS="$save_LIBS"
+]) dnl AX_OPENMPI
Modified: trunk/opentrep/configure.ac
===================================================================
--- trunk/opentrep/configure.ac 2009-11-11 21:02:44 UTC (rev 205)
+++ trunk/opentrep/configure.ac 2009-12-14 18:16:43 UTC (rev 206)
@@ -112,16 +112,47 @@
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_ADD_LIBS)
-# --------------------------------------------------------
-# Boost (STL Extensions: http://www.boost.org)
-# --------------------------------------------------------
+# -----------------------------------------------------------
+# Python: http://www.python.org
+# -----------------------------------------------------------
+PGAC_CHECK_PYTHON_EMBED_SETUP
+AC_SUBST(PYTHON_VERSION)
+AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_CFLAGS)
+AC_SUBST(PYTHON_ADD_LIBS)
+
+# -----------------------------------------------------------
+# MPICH2: http://www.mcs.anl.gov/research/projects/mpich2
+# Note: Boost.MPI depends on MPICH2, rather than on OpenMPI
+# -----------------------------------------------------------
+#AX_MPICH2
+#AC_SUBST(MPICH2_VERSION)
+#AC_SUBST(MPICH2_CFLAGS)
+#AC_SUBST(MPICH2_LIBS)
+
+# -----------------------------------------------------------
+# OpenMPI: http://www.open-mpi.org
+# -----------------------------------------------------------
+#AX_OPENMPI
+#AC_SUBST(OPENMPI_VERSION)
+#AC_SUBST(OPENMPI_CFLAGS)
+#AC_SUBST(OPENMPI_LIBS)
+
+# ---------------------------------------------------------------
+# Boost (STL Extensions): http://www.boost.org
+# ---------------------------------------------------------------
AX_BOOST([1.33])
AC_SUBST(BOOST_VERSION)
AC_SUBST(BOOST_CFLAGS)
AC_SUBST(BOOST_LIBS)
AC_SUBST(BOOST_DATE_TIME_LIB)
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
+AC_SUBST(BOOST_FILESYSTEM_LIB)
+AC_SUBST(BOOST_THREAD_LIB)
AC_SUBST(BOOST_PYTHON_LIB)
+#AC_SUBST(BOOST_ASIO_LIB)
+#AC_SUBST(BOOST_MPI_LIB)
+#AC_SUBST(BOOST_MPI_PYTHON_LIB)
# --------------------------------------------------------------------
# Support for MySQL (C client API): http://www.mysql.org
@@ -325,7 +356,12 @@
o BOOST_LIBS ...... : ${BOOST_LIBS}
o BOOST_DT_LIB .... : ${BOOST_DATE_TIME_LIB}
o BOOST_PO_LIB .... : ${BOOST_PROGRAM_OPTIONS_LIB}
- o BOOST_PYTH_LIB .. : ${BOOST_PYTHON_LIB}
+ o BOOST_FS_LIB .... : ${BOOST_FILESYSTEM_LIB}
+ o BOOST_THRD_LIB .. : ${BOOST_THREAD_LIB}
+ o BOOST_PY_LIB .... : ${BOOST_PYTHON_LIB}
+ o BOOST_ASIO_LIB .. : ${BOOST_ASIO_LIB}
+ o BOOST_MPI_LIB ... : ${BOOST_MPI_LIB}
+ o BOOST_MPIPY_LIB . : ${BOOST_MPI_PYTHON_LIB}
- MySQL ............. :
o MYSQL_version ... : ${MYSQL_VERSION}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-11-11 21:02:55
|
Revision: 205
http://opentrep.svn.sourceforge.net/opentrep/?rev=205&view=rev
Author: denis_arnaud
Date: 2009-11-11 21:02:44 +0000 (Wed, 11 Nov 2009)
Log Message:
-----------
[Test] Added a few literal (UTF-8) string tests.
Modified Paths:
--------------
trunk/opentrep/test/i18n/icu/icuustring.cpp
trunk/opentrep/test/i18n/utf8/utf8.cpp
Added Paths:
-----------
trunk/opentrep/test/i18n/utf8/pyutf8.py
Modified: trunk/opentrep/test/i18n/icu/icuustring.cpp
===================================================================
--- trunk/opentrep/test/i18n/icu/icuustring.cpp 2009-11-02 14:43:52 UTC (rev 204)
+++ trunk/opentrep/test/i18n/icu/icuustring.cpp 2009-11-11 21:02:44 UTC (rev 205)
@@ -97,16 +97,19 @@
// extract() overload that takes a UConverter argument.
// cnv = ucnv_open(NULL, &errorCode);
cnv = ucnv_open("UTF-8", &errorCode);
- if(U_FAILURE(errorCode)) {
- fprintf(stderr, "error %s opening the default converter\n", u_errorName(errorCode));
- return errorCode;
+ if (U_FAILURE(errorCode)) {
+ fprintf (stderr, "error %s opening the default converter\n",
+ u_errorName(errorCode));
+ return errorCode;
}
- ucnv_setFromUCallBack(cnv, UCNV_FROM_U_CALLBACK_ESCAPE, UCNV_ESCAPE_C, NULL, NULL, &errorCode);
- if(U_FAILURE(errorCode)) {
- fprintf(stderr, "error %s setting the escape callback in the default converter\n", u_errorName(errorCode));
- ucnv_close(cnv);
- return errorCode;
+ ucnv_setFromUCallBack (cnv, UCNV_FROM_U_CALLBACK_ESCAPE, UCNV_ESCAPE_C,
+ NULL, NULL, &errorCode);
+ if (U_FAILURE(errorCode)) {
+ fprintf (stderr, "error %s setting the escape callback in the default converter\n",
+ u_errorName(errorCode));
+ ucnv_close(cnv);
+ return errorCode;
}
demoCaseMapInCPlusPlus();
Added: trunk/opentrep/test/i18n/utf8/pyutf8.py
===================================================================
--- trunk/opentrep/test/i18n/utf8/pyutf8.py (rev 0)
+++ trunk/opentrep/test/i18n/utf8/pyutf8.py 2009-11-11 21:02:44 UTC (rev 205)
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+charList = [ '\xd9', '\x83', '\xd8', '\xa7', '\xd9', '\x81', '\x20', '\xd8',
+ '\xa7', '\xd9', '\x84', '\xd8', '\xac', '\xd8', '\xa7', '\xd8',
+ '\xb9', '\x00' ]
+
+location = ''
+location = ''.join(charList)
+
+print location
Property changes on: trunk/opentrep/test/i18n/utf8/pyutf8.py
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/opentrep/test/i18n/utf8/utf8.cpp
===================================================================
--- trunk/opentrep/test/i18n/utf8/utf8.cpp 2009-11-02 14:43:52 UTC (rev 204)
+++ trunk/opentrep/test/i18n/utf8/utf8.cpp 2009-11-11 21:02:44 UTC (rev 205)
@@ -15,6 +15,7 @@
#include <cstdio>
#include <cstring>
#include <cstdarg>
+#include <iostream>
#ifdef WIN32
#include <malloc.h>
#else
@@ -478,6 +479,12 @@
// ////////////////// M A I N ///////////////////
int main (int argc, char* argv[]) {
+
+ const char query2[] = { 0xd9, 0x83, 0xd8, 0xa7, 0xd9, 0x81, ' ', 0xd8,
+ 0xa7, 0xd9, 0x84, 0xd8, 0xac, 0xd8, 0xa7, 0xd8,
+ 0xb9, 0 };
+ std::cout << "String: '" << query2 << "'" << std::endl;
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-11-02 14:44:12
|
Revision: 204
http://opentrep.svn.sourceforge.net/opentrep/?rev=204&view=rev
Author: denis_arnaud
Date: 2009-11-02 14:43:52 +0000 (Mon, 02 Nov 2009)
Log Message:
-----------
[Struct] Deleted duplicated build of the core library.
Modified Paths:
--------------
trunk/opentrep/opentrep/Makefile.am
trunk/opentrep/opentrep/core/Makefile.am
trunk/opentrep/opentrep/core/sources.mk
Modified: trunk/opentrep/opentrep/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/Makefile.am 2009-10-31 00:09:00 UTC (rev 203)
+++ trunk/opentrep/opentrep/Makefile.am 2009-11-02 14:43:52 UTC (rev 204)
@@ -10,18 +10,7 @@
EXTRA_DIST = config_msvc.h
-# Library
-lib_LTLIBRARIES = lib@PACKAGE@.la
-
-lib@PACKAGE@_la_SOURCES = $(service_h_sources) $(service_cc_sources)
-lib@PACKAGE@_la_LIBADD = $(top_builddir)/@PACKAGE@/basic/libbas.la \
- $(top_builddir)/@PACKAGE@/bom/libbom.la \
- $(top_builddir)/@PACKAGE@/factory/libfac.la \
- $(top_builddir)/@PACKAGE@/dbadaptor/libdba.la \
- $(top_builddir)/@PACKAGE@/command/libcmd.la \
- $(top_builddir)/@PACKAGE@/service/libsvc.la
-lib@PACKAGE@_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-
# Header files
-nobase_pkginclude_HEADERS = $(service_h_sources)
-nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
+#nobase_pkginclude_HEADERS = $(service_h_sources)
+#nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
+
Modified: trunk/opentrep/opentrep/core/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/core/Makefile.am 2009-10-31 00:09:00 UTC (rev 203)
+++ trunk/opentrep/opentrep/core/Makefile.am 2009-11-02 14:43:52 UTC (rev 204)
@@ -22,3 +22,8 @@
lib@PACKAGE@_la_LDFLAGS = \
$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(SOCI_LIBS) -version-info $(GENERIC_LIBRARY_VERSION)
+
+# Header files
+pkginclude_HEADERS = $(service_h_sources)
+nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
+
Modified: trunk/opentrep/opentrep/core/sources.mk
===================================================================
--- trunk/opentrep/opentrep/core/sources.mk 2009-10-31 00:09:00 UTC (rev 203)
+++ trunk/opentrep/opentrep/core/sources.mk 2009-11-02 14:43:52 UTC (rev 204)
@@ -1,3 +1,9 @@
-service_h_sources = $(top_srcdir)/opentrep/OPENTREP_Types.hpp \
- $(top_srcdir)/opentrep/OPENTREP_Service.hpp
+service_h_sources = \
+ $(top_srcdir)/opentrep/OPENTREP_Types.hpp \
+ $(top_srcdir)/opentrep/OPENTREP_Abstract.hpp \
+ $(top_srcdir)/opentrep/DBParams.hpp \
+ $(top_srcdir)/opentrep/Location.hpp \
+ $(top_srcdir)/opentrep/DistanceErrorRule.hpp \
+ $(top_srcdir)/opentrep/OPENTREP_Service.hpp
service_cc_sources =
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-31 00:09:14
|
Revision: 203
http://opentrep.svn.sourceforge.net/opentrep/?rev=203&view=rev
Author: denis_arnaud
Date: 2009-10-31 00:09:00 +0000 (Sat, 31 Oct 2009)
Log Message:
-----------
Upstream integration.
Modified Paths:
--------------
branches/soci-3.0.0/soci/backends/sqlite3/statement.cpp
branches/soci-3.0.0/soci/core/backend-loader.cpp
branches/soci-3.0.0/soci/core/soci-platform.h
branches/soci-3.0.0/soci/core/soci-simple.cpp
Modified: branches/soci-3.0.0/soci/backends/sqlite3/statement.cpp
===================================================================
--- branches/soci-3.0.0/soci/backends/sqlite3/statement.cpp 2009-10-09 08:55:29 UTC (rev 202)
+++ branches/soci-3.0.0/soci/backends/sqlite3/statement.cpp 2009-10-31 00:09:00 UTC (rev 203)
@@ -343,6 +343,11 @@
type = dt_string;
typeFound = true;
}
+ if (dt.find("boolean", 0) != std::string::npos)
+ {
+ type = dt_integer;
+ typeFound = true;
+ }
if (typeFound)
{
Modified: branches/soci-3.0.0/soci/core/backend-loader.cpp
===================================================================
--- branches/soci-3.0.0/soci/core/backend-loader.cpp 2009-10-09 08:55:29 UTC (rev 202)
+++ branches/soci-3.0.0/soci/core/backend-loader.cpp 2009-10-31 00:09:00 UTC (rev 203)
@@ -11,6 +11,9 @@
#include <map>
#include <cassert>
#include <cstdlib>
+#ifndef _MSC_VER
+#include <stdint.h>
+#endif
using namespace soci;
using namespace soci::dynamic_backends;
Modified: branches/soci-3.0.0/soci/core/soci-platform.h
===================================================================
--- branches/soci-3.0.0/soci/core/soci-platform.h 2009-10-09 08:55:29 UTC (rev 202)
+++ branches/soci-3.0.0/soci/core/soci-platform.h 2009-10-31 00:09:00 UTC (rev 203)
@@ -12,8 +12,10 @@
#ifdef _MSC_VER
// Define if you have the vsnprintf variants.
-#define HAVE_VSNPRINTF 1
-#define vsnprintf _vsnprintf
+#if _MSC_VER < 1500
+# define HAVE_VSNPRINTF 1
+# define vsnprintf _vsnprintf
+#endif
// Define if you have the snprintf variants.
#define HAVE_SNPRINTF 1
Modified: branches/soci-3.0.0/soci/core/soci-simple.cpp
===================================================================
--- branches/soci-3.0.0/soci/core/soci-simple.cpp 2009-10-09 08:55:29 UTC (rev 202)
+++ branches/soci-3.0.0/soci/core/soci-simple.cpp 2009-10-31 00:09:00 UTC (rev 203)
@@ -473,7 +473,7 @@
// helper for formatting date values
char const * format_date(statement_wrapper & wrapper, std::tm const & d)
{
- sprintf(wrapper.date_formatted, "%d %d %d %d %d %d",
+ std::sprintf(wrapper.date_formatted, "%d %d %d %d %d %d",
d.tm_year + 1900, d.tm_mon + 1, d.tm_mday,
d.tm_hour, d.tm_min, d.tm_sec);
@@ -490,7 +490,7 @@
int hour;
int minute;
int second;
- int const converted = sscanf(val, "%d %d %d %d %d %d",
+ int const converted = std::sscanf(val, "%d %d %d %d %d %d",
&year, &month, &day, &hour, &minute, &second);
if (converted != 6)
{
@@ -1511,7 +1511,7 @@
// format is: "YYYY MM DD hh mm ss"
std::tm const & d = wrapper->use_dates[name];
- sprintf(wrapper->date_formatted, "%d %d %d %d %d %d",
+ std::sprintf(wrapper->date_formatted, "%d %d %d %d %d %d",
d.tm_year + 1900, d.tm_mon + 1, d.tm_mday,
d.tm_hour, d.tm_min, d.tm_sec);
@@ -1528,10 +1528,10 @@
// bind all into elements
- size_t const into_elements = wrapper->into_types.size();
+ int const into_elements = static_cast<int>(wrapper->into_types.size());
if (wrapper->into_kind == statement_wrapper::single)
{
- for (size_t i = 0; i != into_elements; ++i)
+ for (int i = 0; i != into_elements; ++i)
{
switch (wrapper->into_types[i])
{
@@ -1563,8 +1563,7 @@
else
{
// vector elements
-
- for (size_t i = 0; i != into_elements; ++i)
+ for (int i = 0; i != into_elements; ++i)
{
switch (wrapper->into_types[i])
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-09 08:55:39
|
Revision: 202
http://opentrep.svn.sourceforge.net/opentrep/?rev=202&view=rev
Author: denis_arnaud
Date: 2009-10-09 08:55:29 +0000 (Fri, 09 Oct 2009)
Log Message:
-----------
[Conf] Improved the Boost M4 macro file (added Boost System library).
Modified Paths:
--------------
trunk/opentrep/config/ax_boost.m4
Modified: trunk/opentrep/config/ax_boost.m4
===================================================================
--- trunk/opentrep/config/ax_boost.m4 2009-10-04 18:10:32 UTC (rev 201)
+++ trunk/opentrep/config/ax_boost.m4 2009-10-09 08:55:29 UTC (rev 202)
@@ -10,6 +10,7 @@
dnl
dnl AC_SUBST(BOOST_CFLAGS) / AC_SUBST(BOOST_LIBS)
dnl AC_SUBST(BOOST_FILESYSTEM_LIB)
+dnl AC_SUBST(BOOST_SYSTEM_LIB)
dnl AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
dnl AC_SUBST(BOOST_THREAD_LIB)
dnl AC_SUBST(BOOST_IOSTREAMS_LIB)
@@ -25,6 +26,7 @@
dnl
dnl HAVE_BOOST
dnl HAVE_BOOST_FILESYSTEM
+dnl HAVE_BOOST_SYSTEM
dnl HAVE_BOOST_PROGRAM_OPTIONS
dnl HAVE_BOOST_THREAD
dnl HAVE_BOOST_IOSTREAMS
@@ -58,6 +60,12 @@
],
[want_boost="yes"])
+ AC_ARG_WITH([boost-libs-suffixes],
+ AC_HELP_STRING([--with-boost-libs-suffixes=SUF1,SUF2...],
+ [Specify the list of suffix to append to boost libs to try them (separated by commas)]),
+ [ac_boost_libs_suffixes="$withval"],
+ [ac_boost_libs_suffixes=",-mt,-$CC,-$CC-mt,-$CC-mt-s,-$CC-s,-mgw,-mgw-mt,-mgw-mt-s,-mgw-s"])
+
# AC_CANONICAL_BUILD
BOOST_MDW_VERSION="1-33-1"
BOOSTLIB_MDW_VERSION="1_33_1"
@@ -248,10 +256,7 @@
if test "$ax_cv_boost_filesystem" = "yes"; then
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::FILESYSTEM library is available])
BN=boost_filesystem
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
- $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main,
[BOOST_FILESYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes" break],
[link_filesystem="no"])
@@ -261,6 +266,30 @@
fi
fi
+ AC_CACHE_CHECK([whether the Boost::System library is available],
+ ax_cv_boost_system,
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
+ [[using namespace boost::system;
+ error_code myErrorCode();
+ return 0;]]),
+ ax_cv_boost_system=yes, ax_cv_boost_system=no)
+ AC_LANG_RESTORE
+ ])
+ if test "$ax_cv_boost_system" = "yes"; then
+ AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::SYSTEM library is available])
+ BN=boost_system
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
+ AC_CHECK_LIB($ax_lib, main,
+ [BOOST_SYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes" break],
+ [link_system="no"])
+ done
+ if test "x$link_system" = "xno"; then
+ AC_MSG_NOTICE(Could not link against $ax_lib !)
+ fi
+ fi
+
AC_CACHE_CHECK([whether the Boost::Program_Options library is available],
ax_cv_boost_program_options,
[AC_LANG_SAVE
@@ -274,11 +303,7 @@
if test "$ax_cv_boost_program_options" = yes; then
AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
BN=boost_program_options
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main,
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib" AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes" break],
[link_program_options="no"])
@@ -320,11 +345,7 @@
AC_SUBST(BOOST_CFLAGS)
AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::THREAD library is available])
BN=boost_thread
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -351,11 +372,7 @@
if test "x$ax_cv_boost_iostreams" = "xyes"; then
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
BN=boost_iostreams
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -382,21 +399,13 @@
if test "x$ax_cv_boost_serialization" = "xyes"; then
AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available])
BN=boost_serialization
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main,
[BOOST_SERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_SERIALIZATION_LIB) link_thread="yes" break],
[link_thread="no"])
done
BN=boost_wserialization
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main,
[BOOST_WSERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_WSERIALIZATION_LIB) link_thread="yes" break],
[link_thread="no"])
@@ -421,11 +430,7 @@
if test "x$ax_cv_boost_signals" = "xyes"; then
AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available])
BN=boost_signals
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -449,11 +454,7 @@
if test "x$ax_cv_boost_date_time" = "xyes"; then
AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
BN=boost_date_time
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -475,11 +476,7 @@
if test "x$ax_cv_boost_regex" = "xyes"; then
AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
BN=boost_regex
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
AC_CHECK_LIB($ax_lib, main, [BOOST_REGEX_LIB="-l$ax_lib" AC_SUBST(BOOST_REGEX_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -488,27 +485,47 @@
fi
fi
+ # AC_CACHE_CHECK(whether the Boost::Mpi library is available,
+ # ax_cv_boost_mpi,
+ # [AC_LANG_SAVE
+ # AC_LANG_CPLUSPLUS
+
+ # saved_cflags="${CPPFLAGS}"
+ # saved_ldflags="${LDFLAGS}"
+ # CPPFLAGS="${CPPFLAGS} ${OPENMPI_CFLAGS}"
+ # LDFLAGS="${LDFLAGS} ${OPENMPI_LIBS}"
+
+ # AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/mpi/communicator.hpp>
+ # ]],
+ # [[boost::mpi::communicator world; return 0;]]),
+ # ax_cv_boost_mpi=yes, ax_cv_boost_mpi=no)
+ # AC_LANG_RESTORE
+ # CPPFLAGS="${saved_cflags}"
+ # LDFLAGS="${saved_ldflags}"
+ # ])
+
AC_CACHE_CHECK(whether the Boost::Python library is available,
ax_cv_boost_python,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
saved_cflags="${CPPFLAGS}"
saved_ldflags="${LDFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PYTHON_CFLAGS}"
LDFLAGS="${LDFLAGS} ${PYTHON_LIBS} ${PYTHON_ADD_LIBS}"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/python.hpp> char const* greet() { return "hello"; } BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet); }]]),
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/python.hpp>
+ char const* greet() { return "hello"; }
+ BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet); }]]),
ax_cv_boost_python=yes, ax_cv_boost_python=no)
AC_LANG_RESTORE
+ CPPFLAGS="${saved_cflags}"
+ LDFLAGS="${saved_ldflags}"
])
BOOST_PYTHON_LIB="-lboost_python"
AC_SUBST(BOOST_PYTHON_LIB)
- CPPFLAGS="${saved_cflags}"
- LDFLAGS="${saved_ldflags}"
-
AC_CACHE_CHECK(whether the Boost::UnitTestFramework library is available,
ax_cv_boost_unit_test_framework,
[AC_LANG_SAVE
@@ -523,10 +540,7 @@
AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_test_framework library is available])
BN=boost_unit_test_framework
saved_ldflags="${LDFLAGS}"
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
- $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do
LDFLAGS="${LDFLAGS} -l$ax_lib"
AC_CACHE_CHECK(the name of the Boost::UnitTestFramework library,
ax_cv_boost_unit_test_framework,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-04 18:10:38
|
Revision: 201
http://opentrep.svn.sourceforge.net/opentrep/?rev=201&view=rev
Author: denis_arnaud
Date: 2009-10-04 18:10:32 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Dev] The number of (database) entries is now shown after the indexation.
Modified Paths:
--------------
trunk/opentrep/opentrep/OPENTREP_Service.hpp
trunk/opentrep/opentrep/OPENTREP_Types.hpp
trunk/opentrep/opentrep/batches/indexer.cpp
trunk/opentrep/opentrep/command/IndexBuilder.cpp
trunk/opentrep/opentrep/command/IndexBuilder.hpp
trunk/opentrep/opentrep/service/OPENTREP_Service.cpp
Modified: trunk/opentrep/opentrep/OPENTREP_Service.hpp
===================================================================
--- trunk/opentrep/opentrep/OPENTREP_Service.hpp 2009-10-04 17:50:46 UTC (rev 200)
+++ trunk/opentrep/opentrep/OPENTREP_Service.hpp 2009-10-04 18:10:32 UTC (rev 201)
@@ -24,7 +24,7 @@
public:
// /////////// Business Methods /////////////
/** Build the Xapian database (index) on the BOM held in memory. */
- void buildSearchIndex();
+ NbOfDBEntries_T buildSearchIndex();
/** Match the given string, thanks to a full-text search on the
underlying Xapian index (named "database").
Modified: trunk/opentrep/opentrep/OPENTREP_Types.hpp
===================================================================
--- trunk/opentrep/opentrep/OPENTREP_Types.hpp 2009-10-04 17:50:46 UTC (rev 200)
+++ trunk/opentrep/opentrep/OPENTREP_Types.hpp 2009-10-04 18:10:32 UTC (rev 201)
@@ -96,6 +96,9 @@
/** Travel search query. */
typedef std::string TravelQuery_T;
+ /** Number of entries in the Xapian database. */
+ typedef unsigned int NbOfDBEntries_T;
+
/** Word, which is the atomic element of a query string. */
typedef std::string Word_T;
Modified: trunk/opentrep/opentrep/batches/indexer.cpp
===================================================================
--- trunk/opentrep/opentrep/batches/indexer.cpp 2009-10-04 17:50:46 UTC (rev 200)
+++ trunk/opentrep/opentrep/batches/indexer.cpp 2009-10-04 18:10:32 UTC (rev 201)
@@ -212,11 +212,15 @@
lXapianDatabaseName);
// Launch the indexation
- opentrepService.buildSearchIndex();
+ const OPENTREP::NbOfDBEntries_T lNbOfEntries =
+ opentrepService.buildSearchIndex();
// Close the Log outputFile
logOutputFile.close();
+ //
+ std::cout << lNbOfEntries << " entries have been processed" << std::endl;
+
} catch (const OPENTREP::RootException& otexp) {
std::cerr << "Standard exception: " << otexp.what() << std::endl;
return -1;
Modified: trunk/opentrep/opentrep/command/IndexBuilder.cpp
===================================================================
--- trunk/opentrep/opentrep/command/IndexBuilder.cpp 2009-10-04 17:50:46 UTC (rev 200)
+++ trunk/opentrep/opentrep/command/IndexBuilder.cpp 2009-10-04 18:10:32 UTC (rev 201)
@@ -141,9 +141,10 @@
}
// //////////////////////////////////////////////////////////////////////
- void IndexBuilder::
+ NbOfDBEntries_T IndexBuilder::
buildSearchIndex (soci::session& ioSociSession,
const TravelDatabaseName_T& iTravelDatabaseName) {
+ NbOfDBEntries_T oNbOfEntries = 0;
try {
@@ -164,7 +165,6 @@
lDatabase.begin_transaction();
// Iterate through the retrieved database rows
- int idx = 1;
const bool shouldDoReset = true;
bool hasStillData = DBManager::iterateOnStatement (lSelectStatement,
lPlace,
@@ -174,11 +174,13 @@
// Xapian index
IndexBuilder::addDocumentToIndex (lDatabase, lPlace);
+ //
+ ++oNbOfEntries;
+
// DEBUG
- OPENTREP_LOG_DEBUG ("[" << idx << "] " << lPlace);
+ OPENTREP_LOG_DEBUG ("[" << oNbOfEntries << "] " << lPlace);
- // Index incrementing
- ++idx;
+ // Iterate on the MySQL database cursor
hasStillData = DBManager::iterateOnStatement (lSelectStatement, lPlace,
shouldDoReset);
}
@@ -198,6 +200,8 @@
OPENTREP_LOG_ERROR ("Error: " << lStdError.what());
throw RootException();
}
+
+ return oNbOfEntries;
}
}
Modified: trunk/opentrep/opentrep/command/IndexBuilder.hpp
===================================================================
--- trunk/opentrep/opentrep/command/IndexBuilder.hpp 2009-10-04 17:50:46 UTC (rev 200)
+++ trunk/opentrep/opentrep/command/IndexBuilder.hpp 2009-10-04 18:10:32 UTC (rev 201)
@@ -29,7 +29,8 @@
static void addDocumentToIndex (Xapian::WritableDatabase&, Place&);
/** Build Xapian database. */
- static void buildSearchIndex (soci::session&, const TravelDatabaseName_T&);
+ static NbOfDBEntries_T buildSearchIndex (soci::session&,
+ const TravelDatabaseName_T&);
private:
/** Constructors. */
Modified: trunk/opentrep/opentrep/service/OPENTREP_Service.cpp
===================================================================
--- trunk/opentrep/opentrep/service/OPENTREP_Service.cpp 2009-10-04 17:50:46 UTC (rev 200)
+++ trunk/opentrep/opentrep/service/OPENTREP_Service.cpp 2009-10-04 18:10:32 UTC (rev 201)
@@ -99,7 +99,9 @@
}
// //////////////////////////////////////////////////////////////////////
- void OPENTREP_Service::buildSearchIndex () {
+ NbOfDBEntries_T OPENTREP_Service::buildSearchIndex () {
+ NbOfDBEntries_T oNbOfEntries = 0;
+
if (_opentrepServiceContext == NULL) {
throw NonInitialisedServiceException();
}
@@ -119,7 +121,8 @@
// Delegate the index building to the dedicated command
BasChronometer lBuildSearchIndexChronometer;
lBuildSearchIndexChronometer.start();
- IndexBuilder::buildSearchIndex (lSociSession, lTravelDatabaseName);
+ oNbOfEntries = IndexBuilder::buildSearchIndex (lSociSession,
+ lTravelDatabaseName);
const double lBuildSearchIndexMeasure =
lBuildSearchIndexChronometer.elapsed();
@@ -131,7 +134,9 @@
} catch (const std::exception& error) {
OPENTREP_LOG_ERROR ("Exception: " << error.what());
throw BuildIndexException();
- }
+ }
+
+ return oNbOfEntries;
}
// //////////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-04 17:50:53
|
Revision: 200
http://opentrep.svn.sourceforge.net/opentrep/?rev=200&view=rev
Author: denis_arnaud
Date: 2009-10-04 17:50:46 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Dev] When indexing, if there is an exception, it is now propagated, so that the program can be stopped.
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_details.csv
trunk/opentrep/opentrep/command/DBManager.cpp
Modified: trunk/opentrep/db/data/ref_place_details.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 17:33:37 UTC (rev 199)
+++ trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 17:50:46 UTC (rev 200)
@@ -7853,7 +7853,7 @@
slg,,,y,y,n,n, ar ,us,namer,itc1,us107, -94.53 , 36.18 ,
slh,,,y,y,n,y, ,vu,austl,itc3,vu115, 167.6 , -15.85 ,
sli,,,y,y,n,y, ,zm,afric,itc2,zm, 26.37 , -12.17 ,
-slj,chd,y,y,n,y, az ,us,namer,us109, -111.916364 , 33.298523 ,
+slj,chd,,y,y,n,y, az ,us,namer,us109, -111.916364 , 33.298523 ,
slk,,,y,y,n,y, ny ,us,namer,itc1,us105, -74.2 , 44.4 ,
sll,,,y,y,n,y, ,om,meast,itc2,om, 54.1 , 17.03 ,
slm,,,y,y,n,y, ,es,europ,itc2,es045, -5.65 , 40.97 ,
Modified: trunk/opentrep/opentrep/command/DBManager.cpp
===================================================================
--- trunk/opentrep/opentrep/command/DBManager.cpp 2009-10-04 17:33:37 UTC (rev 199)
+++ trunk/opentrep/opentrep/command/DBManager.cpp 2009-10-04 17:50:46 UTC (rev 200)
@@ -168,6 +168,7 @@
} catch (std::exception const& lException) {
OPENTREP_LOG_ERROR ("Error: " << lException.what());
+ throw SQLDatabaseException();
}
return hasStillData;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-04 17:33:48
|
Revision: 199
http://opentrep.svn.sourceforge.net/opentrep/?rev=199&view=rev
Author: denis_arnaud
Date: 2009-10-04 17:33:37 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Data] Sorted the referential file for place names.
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_details.csv
trunk/opentrep/db/data/ref_place_names.csv
Modified: trunk/opentrep/db/data/ref_place_details.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 17:10:53 UTC (rev 198)
+++ trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 17:33:37 UTC (rev 199)
@@ -6210,7 +6210,7 @@
pht,,,y,y,n,n, tn ,us,namer,itc1,us107, -88.38 , 36.33 ,
phu,,,y,y,n,n, ,vn,seasi,itc3,vn, 106.8 , 11.28 ,
phw,,,y,y,n,y, ,za,afric,itc2,za, 31.12 , -23.98 ,
-phx,,,y,y,n,y, az ,us,namer,itc1,us109, -112 , 33.43 ,
+phx,,,y,y,n,y, az ,us,namer,itc1,us109, -112.017081 , 33.427799 ,
phy,,,y,y,n,n, ,th,seasi,itc3,th, 101.2 , 16.68 ,
phz,,,y,y,n,n, ,th,seasi,itc3,th, 98.77 , 7.733 ,
pia,,,y,y,n,y, il ,us,namer,itc1,us107, -89.68 , 40.67 ,
Modified: trunk/opentrep/db/data/ref_place_names.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_names.csv 2009-10-04 17:10:53 UTC (rev 198)
+++ trunk/opentrep/db/data/ref_place_names.csv 2009-10-04 17:33:37 UTC (rev 199)
@@ -1,676 +1,313 @@
concat_ws(',', language_code, code, classical_name, extended_name, alternate_name1, alternate_name2, alternate_name3, alternate_name4, alternate_name5, alternate_name6, alternate_name7, alternate_name8, alternate_name9, alternate_name10)
-en,cyz,cauayan,cauayan/ph
-en,cza,chichen itza,chichen itza/mx
-en,czb,cruz alta,cruz alta/rs/br:carlos ruhl
-en,czc,copper center,copper center/ak/us
-en,cze,coro,coro/ve
-en,czf,cape romanzof,cape romanzof/ak/us
-en,czh,corozal,corozal/bz
-en,czj,corazon de jesus,corazon de jesus/pa
-en,czk,cascade locks,cascade locks/or/us:cascade l
-en,czl,constantine,constantine/dz:ain el bey
-en,czm,cozumel,cozumel/mx
-en,czn,chisana,chisana/ak/us:chisana field
-en,czo,chistochina,chistochina/ak/us
-en,czp,cape pole,cape pole/ak/us
-en,czs,cruzeiro do sul,cruzeiro do sul/ac/br:campo
-en,czt,carrizo springs,carrizo springs/tx/us
-en,czu,corozal,corozal/co
-en,czw,czestochowa,czestochowa/pl
-en,czx,changzhou,changzhou/cn
-en,czy,cluny,cluny/ql/au
-en,czz,campo,campo/ca/us
-en,daa,fort belvoir,fort belvoir/va/us:davison aaf
-en,dab,daytona beach,daytona beach/fl/us:regional
-en,dac,dhaka,dhaka/bd:zia international
-en,dad,da nang,da nang/vn
-en,dae,daparizo,daparizo/in
-en,daf,daup,daup/pg
-en,dag,daggett,daggett/ca/us:barstow daggett
-en,dah,dathina,dathina/ye
-en,dai,darjeeling,darjeeling/in
-en,daj,dauan island,dauan island/ql/au
-en,dak,dakhla,dakhla oasis/eg:dakhla
-en,dal,dallas dal,dallas/tx/us:love field
-en,dam,damascus,damascus/sy:intl
-en,dan,danville,danville/va/us:municipal
-en,dao,dabo,dabo/pg
-en,dap,darchula,darchula/np
-en,dar,dar es salaam,dar es salaam/tz:intl
-en,das,great bear lake,great bear lake/nt/ca
-en,dat,datong,datong/cn
-en,dau,daru,daru/pg
-en,dav,david,david/pa:enrique malek
-en,dax,daxian,daxian/cn
-en,day,dayton day,dayton/oh/us:james cox dayton
-en,daz,darwaz,darwaz/af
-en,dba,dalbandin,dalbandin/pk
-en,dbb,dabaa alalamain,dabaa city/eg:alalamain intl
-en,dbd,dhanbad,dhanbad/in
-en,dbm,debra marcos,debra marcos/et
-en,dbn,dublin,dublin/ga/us:municipal
-en,dbo,dubbo,dubbo/ns/au
-en,dbp,debepare,debepare/pg
-en,dbq,dubuque,dubuque/ia/us:dubuque mnpl
-en,dbs,dubois,dubois/id/us
-en,dbt,debra tabor,debra tabor/et
-en,dbu,dambula,dambula/lk:dambula oya tank
-en,dbv,dubrovnik,dubrovnik/hr
-en,dby,dalby,dalby/ql/au
-en,dca,washington dca,washington/dc/us:r reagan nat
-en,dcf,dominica dcf,dominica/dm:cane field
-en,dci,decimomannu,decimomannu/it:r decimomannu
-en,dck,dahl creek,dahl creek/ak/us:dahl creek
-en,dcm,castres,castres/fr:mazamet
-en,dcn,derby dcn,derby/wa/au:curtin
-en,dcr,decatur,decatur/in/us:decatur hi way
-en,dct,duncan town,duncan town/bs
-en,dcu,decatur,decatur/al/us:pyor
-en,ddc,dodge city,dodge city/ks/us:mncpl
-en,ddg,dandong,dandong/cn
-en,ddi,daydream is,daydream is/ql/au
-en,ddm,dodoima,dodoima/pg
-en,ddn,delta downs,delta downs/ql/au
-en,ddp,dorado,dorado/pr:dorado beach
-en,ddu,dadu,dadu/pk
-en,bfs,belfast intl,belfast/gb:international
-en,bft,beaufort,beaufort/sc/us:county
-en,bfu,bengbu,bengbu/cn
-en,bfv,buri ram,buri ram/th
-en,bfw,sidi belabbes,sidi belabbes/dz:sidi belabbes
-en,bfx,bafoussam,bafoussam/cm
-en,bga,bucaramanga,bucaramanga/co:palo negro
-en,bgb,booue,booue/ga
-en,bgc,braganca,braganca/pt
-en,bgd,borger,borger/tx/us
-en,bge,bainbridge,bainbridge/ga/us:decatur cnty
-en,bgf,bangui,bangui/cf
-en,bgg,bongouanou,bongouanou/ci
-en,bgh,boghe,boghe/mr:abbaye
-en,bgi,bridgetown,bridgetown/bb:grantley adams
-en,bgj,borgarfjordur eys,borgarfjordur eystri/is
-en,bgk,big creek,big creek/bz
-en,bgl,baglung,baglung/np
-en,bgm,binghamton,binghamton/ny/us
-en,bgn,brueggen,brueggen/de:r a f
-en,bgo,bergen,bergen/no:flesland
-en,bgp,bongo,bongo/ga
-en,bgq,big lake,big lake/ak/us
-en,bgr,bangor,bangor/me/us:international
-en,bgs,big spring afb,big spring/tx/us:webb afb,air force base
-en,bgt,bagdad,bagdad/az/us
-en,bgu,bangassou,bangassou/cf
-en,bgv,bento goncalves,bento goncalves/rs/br
-en,bgw,baghdad,baghdad/iq
-en,bgx,bage,bage/rs/br
-en,bgy,milan bgy,milan/it:orio al serio
-en,bgz,braga,braga/pt
-en,bha,bahia de caraquez,bahia de caraquez/ec
-en,bhb,bar harbor,bar harbor/me/us
-en,bhc,bhurban,bhurban/pk:heliport
-en,bhd,belfast city,belfast/gb:belfast city
-en,bhe,blenheim,blenheim/nz
-en,bhf,bahia cupica,bahia cupica/co
-en,bhg,brus laguna,brus laguna/hn
-en,bhh,bisha,bisha/sa
-en,bhi,bahia blanca,bahia blanca/ba/ar:comandante
-en,bhj,bhuj,bhuj/in:rudra mata
-en,bhk,bukhara,bukhara/uz
-en,bhl,bahia angeles,bahia angeles/mx
-en,bhm,birmingham,birmingham/al/us
-en,bhn,beihan,beihan/ye
-en,bho,bhopal,bhopal/in
-en,bhp,bhojpur,bhojpur/np
-en,bhq,broken hill,broken hill/ns/au
-en,bhr,bharatpur,bharatpur/np
-en,bhs,bathurst,bathurst/ns/au:raglan
-en,bht,brighton downs,brighton downs/ql/au
-en,bhu,bhavnagar,bhavnagar/in
-en,bhv,bahawalpur,bahawalpur/pk
-en,bhw,sargodha bhw,sargodha/pk:bhagatanwala
-en,bhx,birmingham,birmingham/gb:international
-en,bhy,beihai,beihai/cn
-en,bhz,belo horizonte,belo horizonte/mg/br
-en,bia,bastia,bastia/fr:poretta
-en,bib,baidoa,baidoa/so
-en,bic,big creek,big creek/ak/us
-en,bid,block island,block island/ri/us
-en,bie,beatrice,beatrice/ne/us
-en,bif,el paso biggs aaf,el paso/tx/us:biggs aaf
-en,big,big delta,big delta/ak/us:intermediate
-en,bih,bishop,bishop/ca/us
-en,bii,bikini atoll,bikini atoll/mh:enyu airfield
-en,bij,biliau,biliau/pg
-en,bik,biak,biak/id:mokmer
-en,bil,billings,billings/mt/us
-en,bim,bimini int,bimini/bs:international
-en,bin,bamiyan,bamiyan/af
-en,bio,bilbao,bilbao/es
-en,dea,dera ghazi khan,dera ghazi khan/pk
-en,deb,debrecen,debrecen/hu
-en,isd,iscuande,iscuande/co
-en,ise,isparta,isparta/tr
-en,isg,ishigaki,ishigaki/jp
-en,ish,ischia,ischia/it
-en,isi,isisford,isisford/ql/au
-en,isj,isla mujeres,isla mujeres/mx
-en,isk,nasik,nasik/in:gandhinagar apt
-en,isl,isabel pass,isabel pass/ak/us
-en,ism,kissimmee,kissimmee/fl/us:municipal
-en,isn,williston,williston/nd/us:sloulin field
-en,iso,kinston,kinston/nc/us:stallings field
-en,isp,islip,islip/ny/us:long island macar
-en,isq,manistique,manistique/mi/us:schoolcraft
-en,iss,wiscasset,wiscasset/me/us
-en,ist,istanbul,istanbul/tr:ataturk
-en,isu,sulaymaniyah,sulaymaniyah/iq:international
-en,isw,wisconsin rapids,wisconsin rapids/wi/us:alexan
-en,ita,itacoatiara,itacoatiara/am/br
-en,itb,itaituba,itaituba/pa/br
-en,ite,itubera,itubera/ba/br
-en,ith,ithaca,ithaca/ny/us:tompkins county
-en,iti,itambacuri,itambacuri/mg/br
-en,itj,itajai,itajai/sc/br
-en,itk,itokama,itokama/pg
-en,itm,osaka itami apt,osaka itami apt/jp:itami
-en,itn,itabuna,itabuna/ba/br
-en,ito,hilo,hilo/hi/us:hilo international
-en,itp,itaperuna,itaperuna/rj/br:itaperuna
-en,itq,itaqui,itaqui/rs/br
-en,itr,itumbiara,itumbiara/go/br:itumbiara
-en,iue,niue island,niue island/nu:hanan
-en,iul,ilu,ilu/id
-en,ium,summit lake,summit lake/bc/ca
-en,ius,inus,inus/pg
-en,iva,ambanja,ambanja/mg
-en,ivc,invercargill,invercargill/nz
-en,ivg,ivangrad,ivangrad/me
-en,ivh,ivishak,ivishak/ak/us
-en,ivl,ivalo,ivalo/fi
-en,ivo,chivolo,chivolo/co
-en,ivr,inverell,inverell/ns/au
-en,ivw,inverway,inverway/nt/au
-en,iwa,ivanova,ivanova/ru
-en,iwd,ironwood,ironwood/mi/us:gogebic county
-en,iwj,iwami,iwami/jp:iwami aiport
-en,iwo,iwo jima vol,iwo jima vol/jp:iwo jima base
-en,iws,houston west,houston/tx/us:west houston
-en,ixa,agartala,agartala/in:singerbhil
-en,ixb,bagdogra,bagdogra/in
-en,ixc,chandigarh,chandigarh/in
-en,ixd,allahabad,allahabad/in:bamrauli
-en,ixe,mangalore,mangalore/in:bajpe
-en,ixg,belgaum,belgaum/in:sambre
-en,ixh,kailashahar,kailashahar/in
-en,ixi,lilabari,lilabari/in
-en,ixj,jammu,jammu/in:satwari
-en,ixk,keshod,keshod/in
-en,ixl,leh,leh/in
-en,ixm,madurai,madurai/in
-en,ixn,khowai,khowai/in
-en,ixp,pathankot,pathankot/in
-en,ixq,kamalpur,kamalpur/in
-en,ixr,ranchi,ranchi/in
-en,ixs,silchar,silchar/in:kumbhirgram
-en,ixt,pasighat,pasighat/in
-en,ixu,aurangabad,aurangabad/in:chikkalthana
-en,ixv,along,along/in
-en,ixw,jamshedpur,jamshedpur/in:sonari
-en,ixy,kandla,kandla/in
-en,ixz,port blair,port blair/in
-en,iyk,inyokern,inyokern/ca/us:kern county
-en,izm,izmir,izmir/tr
-en,izo,izumo,izumo/jp
-en,izt,ixtepec,ixtepec/mx
-en,jaa,jalalabad,jalalabad/af
-en,cew,crestview,crestview/fl/us:bob sikes
-en,cex,chena hot springs,chena hot springs/ak/us
-en,hoy,hoy island,hoy island/gb
-en,hpa,ha'apai,ha'apai/to:salote pilolevu
-en,hpb,hooper bay,hooper bay/ak/us
-en,hpe,hope vale,hope vale/ql/au
-en,hph,haiphong,haiphong/vn:catbi
-en,hpn,westchester count,westchester county/ny/us:westc
-en,hpp,poipet,poipet/kh
-en,hpr,pretoria hpr,pretoria/za:central hpr
-en,hpt,hampton,hampton/ia/us:municipal
-en,hpv,kauai island hpv,kauai island/hi/us:princeville
-en,hpy,baytown,baytown/tx/us
-en,hqm,aberdeen,aberdeen/wa/us
-en,hra,mansehra,mansehra/pk
-en,hrb,harbin,harbin/cn
-en,hrc,zhairem,zhairem/kz
-en,hrd,harstad,harstad/no:harstad
-en,hre,harare,harare/zw
-en,hrg,hurghada,hurghada/eg
-en,hrj,chaurjhari,chaurjhari/np
-en,hrk,kharkiv,kharkiv/ua,kharkov
-en,hrl,harlingen,harlingen/tx/us:valley intl
-en,hrm,hassi r'mel,hassi r'mel/dz:tilrempt
-en,hrn,heron island,heron island/ql/au:heliport
-en,hro,harrison,harrison/ar/us:boone county
-en,hrr,herrera,herrera/co
-en,hrs,harrismith,harrismith/za:harrismith
-en,hrt,harrogate,harrogate/gb:linton on ouse
-en,hry,henbury,henbury/nt/au
-en,hrz,horizontina,horizontina/rs/br
-en,hsb,harrisburg,harrisburg/il/us:raleigh
-en,hsc,shaoguan,shaoguan/cn
-en,hsg,saga,saga/jp:saga airport
-en,hsh,las vegas hsh,las vegas/nv/us:henderson sky
-en,hsi,hastings,hastings/ne/us
-en,hsk,huesca,huesca/es
-en,hsl,huslia,huslia/ak/us
-en,hsm,horsham,horsham/vi/au
-en,hsn,zhoushan,zhoushan/cn
-en,hsp,hot springs,hot springs/va/us:ingalls fld
-en,hss,hissar,hissar/in
-en,hst,homestead,homestead/fl/us:afb,air force base
-en,hsv,huntsvil decatur,huntsville/al/us:intl apt
-en,hsz,hsinchu,hsinchu/tw
-en,hta,chita,chita/ru
-en,htb,terre de bas,terre de bas/gp
-en,htf,hatfield,hatfield/gb
-en,htg,hatanga,hatanga/ru
-en,hth,hawthorne,hawthorne/nv/us
-en,hti,hamilton island,hamilton island/ql/au
-en,htl,houghton,houghton/mi/us:roscommon cnty
-en,htm,khatgal,khatgal/mn
-en,htn,hotan,hotan/cn
-en,hto,east hampton,east hampton/ny/us
-en,htr,hateruma,hateruma/jp
-en,hts,huntington,huntington/wv/us:tri state
-en,htu,hopetoun,hopetoun/vi/au
-en,htv,huntsville,huntsville/tx/us
-en,htw,chesapeake,huntington/oh/us
-en,hty,hatay,hatay/tr:hatay
-en,htz,hato corozal,hato corozal/co
-en,hua,huntsville aaf,huntsville/al/us:redstone aaf
-en,hub,humbert river,humbert river/nt/au
-en,huc,humacao arpt,humacao/pr:humacao arpt
-en,hud,humboldt,humboldt/ia/us
-en,hue,humera,humera/et
-en,huf,terre haute,terre haute/in/us:hulman field
-en,hug,huehuetenango,huehuetenango/gt
-en,huh,huahine,huahine/pf:huahine
-en,hui,hue,hue/vn:phu bai
-en,huj,hugo,hugo/ok/us
-en,huk,hukuntsi,hukuntsi/bw
-en,hul,houlton,houlton/me/us:international
-en,hum,houma,houma/la/us:terrebonne
-en,hun,hualien,hualien/tw
-en,huq,houn,houn/ly
-en,gtc,green turtle,green turtle/bs
-en,gte,groote eylandt,groote eylandt/nt/au:alyangula
-en,gtf,great falls intl,great falls/mt/us:intl
-en,gtg,grantsburg,grantsburg/wi/us:municipal
-en,gti,guettin,guettin/de
-en,gtk,sungei tekai,sungei tekai/my
-en,gtn,mount cook gtn,mount cook/nz:glentanner
-en,gto,gorontalo,gorontalo/id:tolotio
-en,gtp,grants pass,grants pass/or/us
-en,gtr,columbus gtr,columbus/ms/us:golden triangle
-en,gts,granites,granites/nt/au
-en,gtt,georgetown,georgetown/ql/au
-en,gtw,zlin,zlin/cz:holesov
-en,gty,gettysburg,gettysburg/pa/us
-en,gua,guatemala city,guatemala city/gt:la aurora
-en,gub,guerrero negro,guerrero negro/mx
-en,guc,gunnison,gunnison/co/us
-en,gud,goundam,goundam/ml
-en,gue,guriaso,guriaso/pg
-en,guf,gulf shores,gulf shores/al/us:edwards
-en,gug,guari,guari/pg
-en,guh,gunnedah,gunnedah/ns/au
-en,gui,guiria,guiria/ve
-en,guj,guaratingueta,guaratingueta/sp/br
-en,gul,goulburn,goulburn/ns/au
-en,gum,guam won pat intl,guam/gu:a.b won pat intl
-en,gun,montgomery gu afb,montgomery/al/us:gunter afb,air force base
-en,guo,gualaco,gualaco/hn
-en,gup,gallup,gallup/nm/us:senator clark
-en,guq,guanare,guanare/ve
-en,gur,alotau,alotau/pg:gurney
-en,gus,peru,peru/in/us:grissom afb,air force base
-en,gut,guetersloh,guetersloh/de
-en,guu,grundarfjordur,grundarfjordur/is
-en,guv,mougulu,mougulu/pg
-en,guw,atyrau,atyrau/kz
-en,gux,guna,guna/in
-en,guy,guymon,guymon/ok/us
-en,guz,guarapari,guarapari/es/br
-en,gva,geneva,geneva/ch:geneva intl
-en,gve,gordonsville,gordonsville/va/us:municipal
-en,gvi,green river,green river/pg
-en,gvl,gainesville,gainesville/ga/us:lee gilmer
-en,gvn,sovetskaya gavan,sovetskaya gavan/ru:sovetskaya
-en,gvp,greenvale,greenvale/ql/au
-en,gvr,governador valada,governador valada/mg/br
-en,gvt,greenville,greenville/tx/us:majors field
-en,gvw,grandview,grandview/mo/us:richards gebau
-en,gvx,gavle,gavle/se:sandviken
-en,gwa,gwa,gwa/mm
-en,gwd,gwadar,gwadar/pk
-en,gwe,gweru,gweru/zw
-en,gwl,gwalior,gwalior/in
-en,gwn,gnarowein,gnarowein/pg
-en,gwo,greenwood,greenwood/ms/us:leflore
-en,gws,glenwood springs,glenwood springs/co/us
-en,gwt,westerland,westerland/de:westerland sylt
-en,gwv,glendale,glendale/wv/us
-en,gww,goldsboro wayne,goldsboro/nc/us:goldsboro wayne mncpl,goldsboro wayne municipal
-en,gwy,galway,galway/ie:carnmore
-en,gxf,seiyun,seiyun/ye
-en,gxg,negage,negage/ao
-en,gxh,mildenhall naf,mildenhall/gb:naf
-en,gxq,coyhaique,coyhaique/cl:ten vidal
-en,gxx,yagoua,yagoua/cm
-en,gxy,greeley,greeley/co/us:weld county
-en,gya,guayaramerin,guayaramerin/bo
-en,gyd,baku intl,baku/az:heydar aliyev intl
-en,gye,guayaquil,guayaquil/ec:jose joaquin de o
-en,gyi,gisenyi,gisenyi/rw
-en,gyl,argyle,argyle/wa/au
-en,gym,guaymas,guaymas/mx:gen jose m yanez
-en,gyn,goiania,goiania/go/br:santa genoveva
-en,gyp,gympie,gympie/ql/au
-en,dec,decatur,decatur/il/us:decatur apt
-en,ded,dehra dun,dehra dun/in
-en,def,dezful,dezful/ir:dezful
-en,deh,decorah,decorah/ia/us:municipal
-en,dei,denis island,denis island/sc
-en,del,delhi,delhi/in:indira gandhi intl,new delhi
-en,dem,dembidollo,dembidollo/et
-en,den,denver,denver/co/us:denver intl
-en,deo,dearborn,dearborn/mi/us:hyatt regency
-en,dep,deparizo,deparizo/in
-en,der,derim,derim/pg
-en,des,desroches,desroches/sc
-en,det,detroit city,detroit/mi/us:detroit city
-en,dez,deirezzor,deirezzor/sy:al
-en,dfi,defiance,defiance/oh/us:memorial
-en,dfp,drumduff,drumduff/ql/au
-en,dfw,dallas fort worth,dallas/tx/us:dallas ft worth
-en,dga,dangriga,dangriga/bz
-en,dgb,danger bay,danger bay/ak/us
-en,dgc,degahbur,degahbur/et
-en,dgd,dalgaranga,dalgaranga/wa/au
-en,dge,mudgee,mudgee/ns/au
-en,dgf,douglas lake,douglas lake/bc/ca
-en,dgg,daugo,daugo/pg
-en,dgk,dugong,dugong/mz
-en,dgl,douglas municipal,douglas/az/us:municipal
-en,dgm,dongguan,dongguan/cn
-en,dgn,dahlgren,dahlgren/va/us:naf
-en,dgo,durango,durango/mx:guadalupe victoria
-en,dgp,daugavpils,daugavpils/lv
-en,dgr,dargaville,dargaville/nz
-en,dgt,dumaguete,dumaguete/ph
-en,dgu,dedougou,dedougou/bf
-en,dgw,douglas,douglas/wy/us:converse county
-en,dha,dhahran,dhahran/sa
-en,dhd,durham downs,durham downs/ql/au
-en,dhf,abu dhabi al dhaf,abu dhabi/ae:al dhafra milit
-en,dhi,dhangarhi,dhangarhi/np
-en,dhl,dhala,dhala/ye
-en,dhm,dharamsala,dharamsala/in:gaggal airport
-en,dhn,dothan,dothan/al/us:regional apt
-en,dhr,den helder,den helder/nl:de kooy
-en,dht,dalhart,dalhart/tx/us
-en,dib,dibrugarh,dibrugarh/in:chabua
-en,dic,dili,dili/cd
-en,die,antsiranana,antsiranana/mg:antsiranana
-en,dig,diqing,diqing/cn:diqing
-en,dij,dijon,dijon/fr
-en,dik,dickinson,dickinson/nd/us
-en,dil,dili,dili/tl:comoro
-en,dim,dimbokro,dimbokro/ci
-en,din,dien bien phu,dien bien/vn:dien bien airport
-en,dio,diomede island,diomede island/ak/us
-en,dip,diapaga,diapaga/bf
-en,diq,divinopolis,divinopolis/mg/br
-en,dir,dire dawa,dire dawa/et:aba tenna d yilma
-en,dis,loubomo,loubomo/cg
-en,diu,diu,diu/in
-en,div,divo,divo/ci
-en,diw,dickwella mawella,dickwella/lk:mawella lagoon
-en,diy,diyarbakir,diyarbakir/tr
-en,dja,djougou,djougou/bj
-en,djb,jambi,jambi/id:sultan taha syarifudn
-en,dje,djerba,djerba/tn:melita
-en,djg,djanet,djanet/dz:inedbirenne
-en,djj,jayapura,jayapura/id:sentani
-en,djm,djambala,djambala/cg
-en,djn,delta junction,delta junction/ak/us
-en,djo,daloa,daloa/ci
-en,dju,djupivogur,djupivogur/is
-en,dki,dunk island,dunk island/ql/au
-en,dkk,dunkirk,dunkirk/ny/us
-en,dkr,dakar,dakar/sn:yoff
-en,dks,dikson,dikson/ru
+en,aaa,anaa,anaa/pf
+en,aab,arrabury,arrabury/ql/au
+en,aac,al arish,al arish/eg
+en,aad,ad dabbah,ad dabbah/sd
+en,aae,annaba,annaba/dz:les salines
+en,aaf,apalachicola,apalachicola/fl/us:municipal
+en,aag,arapoti,arapoti/pr/br
+en,aah,aachen,aachen/de:merzbruck
+en,aai,arraias,arraias/to/br
+en,aaj,awaradam,awaradam/sr:cayana airstrip
+en,aak,aranuka,aranuka/ki
+en,aal,aalborg,aalborg/dk
+en,aam,mala mala,mala mala/za
+en,aan,al ain,al ain/ae
+en,aao,anaco,anaco/ve
+en,aap,houston andrau,houston/tx/us:andrau airpark
+en,aaq,anapa,anapa/ru
+en,aar,aarhus,aarhus/dk:aarhus
+en,aas,apalapsili,apalapsili/id
+en,aat,altay,altay/cn
+en,aau,asau,asau/ws
+en,aav,alah,alah/ph
+en,aaw,abbottabad,abbottabad/pk
+en,aax,araxa,araxa/mg/br
+en,aay,al ghaydah,al ghaydah/ye
+en,aaz,quetzaltenango,quetzaltenan/gt:quetzaltenango
+en,aba,abakan,abakan/ru
+en,abb,abingdon,abingdon/gb:raf station
+en,abc,albacete,albacete/es:los llanos
+en,abd,abadan,abadan/ir
+en,abe,allentown bthlehm,allentown bthlehm/pa/us
+en,abf,abaiang,abaiang/ki
+en,abg,abingdon,abingdon/ql/au
+en,abh,alpha,alpha/ql/au
+en,abi,abilene,abilene/tx/us:abilene mnpl
+en,abj,abidjan,abidjan/ci:f houphouet boigny
+en,abk,kabri dar,kabri dar/et
+en,abl,ambler,ambler/ak/us
+en,abm,bamaga,bamaga/ql/au
+en,abn,albina,albina/sr
+en,abo,aboisso,aboisso/ci
+en,abp,atkamba,atkamba/pg
+en,abq,albuquerque,albuquerque/nm/us:intl
+en,abr,aberdeen,aberdeen/sd/us:aberdeen mnpl
+en,abs,abu simbel,abu simbel/eg
+en,abt,al baha,al baha/sa:al aqiq
+en,abu,atambua,atambua/id
+en,abv,abuja,abuja/ng:international
+en,abw,abau,abau/pg
+en,abx,albury,albury/ns/au
+en,aby,albany dough cnty,albany/ga/us:dougherty county
+en,abz,aberdeen dyce,aberdeen/gb:dyce
+en,aca,acapulco,acapulco/mx:alvarez intl
+en,acb,bellaire,bellaire/mi/us:antrim county
+en,acc,accra,accra/gh:kotoka
+en,acd,acandi,acandi/co
+en,ace,lanzarote,lanzarote/es
+en,ach,altenrhein,altenrhein/ch
+en,aci,alderney,alderney/gb:the blaye
+en,acj,anuradhapura,anuradhapura/lk:anuradhapura
+en,ack,nantucket,nantucket/ma/us:memorial
+en,acl,aguaclara,aguaclara/co
+en,acm,arica,arica/co
+en,acn,ciudad acuna,ciudad ac/mx:ciudad acuna intl
+en,aco,ascona,ascona/ch
+en,acp,sahand,sahand/ir:sahand airport
+en,acr,araracuara,araracuara/co
+en,acs,achinsk,achinsk/ru
+en,act,waco municipal,waco/tx/us:waco mnpl
+en,acu,achutupo,achutupo/pa
+en,acv,arcata,arcata/ca/us:eureka
+en,acx,xingyi,xingyi/cn:xingyi
+en,acy,atlantic cty acy,atlantic cty/nj/us:intl
+en,acz,zabol,zabol/ir:zabol airport
+en,ada,adana,adana/tr
+en,adb,izmir menderes,izmir/tr:adnan menderes
+en,adc,andakombe,andakombe/pg
+en,add,addis ababa,addis ababa/et:bole
+en,ade,aden,aden/ye:international
+en,adf,adiyaman,adiyaman/tr:adiyaman
+en,adg,adrian,adrian/mi/us:lenawee county
+en,adh,aldan,aldan/ru
+en,adi,arandis,arandis/na
+en,adj,amman civil marka,amman c/jo:civil marka airport
+en,adk,adak island,adak island/ak/us:adak island
+en,adl,adelaide,adelaide/sa/au
+en,adm,ardmore municipal,ardmore/ok/us:municipal
+en,adn,andes,andes/co
+en,ado,andamooka,andamooka/sa/au
+en,adp,ampara,ampara/lk:ampara
+en,adq,kodiak,kodiak/ak/us:kodiak airport
+en,adr,andrews,andrews/sc/us
+en,ads,dallas addison,dallas/tx/us:addison
+en,adt,ada,ada/ok/us
+en,adu,ardabil,ardabil/ir
+en,adv,andover,andover/gb
+en,adw,camp springs adw,camp springs/md/us:andrews afb,air force base
+en,adx,st andrews,st andrews/gb:leuchars
+en,ady,alldays,alldays/za
+en,adz,san andres island,san andres island/co
+en,aea,abemama atoll,abemama atoll/ki
+en,aeb,baise,baise/cn
+en,aed,aleneva,aleneva/ak/us
+en,aee,adareil,adareil/sd:adareil
+en,aeg,aek godang,aek godang/id
+en,aeh,abecher,abecher/td
+en,aei,algeciras,algeciras/es
+en,aek,aseki,aseki/pg
+en,ael,albert lea,albert lea/mn/us
+en,aeo,aioun el atrouss,aioun el atrouss/mr
+en,aep,buenos aires aep,buenos aires/ba/ar:j. newbery
+en,aer,adler sochi,adler sochi/ru
+en,aes,aalesund,aalesund/no:vigra
+en,aet,allakaket,allakaket/ak/us
+en,aeu,abu musa,abu musa/ir:abu musa airport
+en,aex,alexandria,alexandr/la/us:alexandria intl
+en,aey,akureyri,akureyri/is
+en,afa,san rafael,san rafael/md/ar
+en,afd,port alfred,port alfred/za
+en,aff,colorado springs,colorado springs/co/us:usaf ac
+en,afi,amalfi,amalfi/co
+en,afk,kondavattavan,ampara/lk:kondavattavan tank
+en,afl,alta floresta,alta floresta/mt/br
+en,afn,jaffrey,jaffrey/nh/us:municipal
+en,afo,afton,afton/wy/us:municipal
+en,afr,afore,afore/pg
+en,afs,zarafshan,zarafshan/uz
+en,aft,afutara aerodrome,afutara/sb:afutara aerodrome
+en,afw,dallas afw,dallas/tx/us:ft worth alliance
+en,afy,afyon,afyon/tr
+en,afz,sabzevar,sabzevar/ir
+en,aga,agadir al massira,agadir/ma:al massira
+en,agb,munich augsburg,munich/de:augsburg muehlhausen
+en,agc,pittsburgh,pittsburgh/pa/us:allegheny cou
+en,agd,anggi,anggi/id
+en,age,wangerooge,wangerooge/de:flugplatz
+en,agf,agen,agen/fr:la garenne
+en,agg,angoram,angoram/pg
+en,agh,angelholm,angelholm/se:angelholm airport
+en,agi,wageningen,wageningen/sr
+en,agj,aguni,aguni/jp
+en,agk,kagua,kagua/pg
+en,agl,wanigela,wanigela/pg
+en,agm,tasiilaq,tasiilaq/gl
+en,agn,angoon,angoon/ak/us
+en,ago,magnolia,magnolia/ar/us:municipal
+en,agp,malaga,malaga/es
+en,agq,agrinion,agrinion/gr
+en,agr,agra,agra/in:kheria
+en,ags,augusta bush fld,augusta/ga/us:bush field
+en,agt,ciudad del este,ciudad del este/py:alejo garci
+en,agu,aguascalientes,aguascalientes/mx
+en,agv,acarigua,acarigua/ve
+en,agw,agnew,agnew/ql/au
+en,agx,agatti island,agatti island/in
+en,agy,argyle downs,argyle downs/wa/au
+en,agz,aggeneys,aggeneys/za
+en,aha,okinawa,okinawa/jp:naha afb,air force base
+en,ahb,abha,abha/sa
+en,ahc,herlong,herlong/ca/us:amedee aaf
+en,ahd,ardmore downtown,ardmore/ok/us:downtown
+en,ahe,ahe,ahe/pf
+en,ahf,arapahoe,arapahoe/ne/us:municipal
+en,ahh,amery,amery/wi/us:municipal
+en,ahi,amahai,amahai/id
+en,ahl,aishalton,aishalton/gy
+en,ahm,ashland,ashland/or/us:sumner parker fi
+en,ahn,athens,athens/ga/us
+en,aho,alghero,alghero/it:fertilia
+en,ahs,ahuas,ahuas/hn
+en,aht,amchitka,amchitka/ak/us
+en,ahu,al hoceima,al hoceima/ma:charif al idriss
+en,ahy,ambatolahy,ambatolahy/mg
+en,ahz,alpe d huez,alpe d huez/fr
+en,aia,alliance,alliance/ne/us
+en,aib,anita bay,anita bay/ak/us
+en,aic,airok,airok/mh
+en,aid,anderson,anderson/in/us:anderson mnpl
+en,aie,aiome,aiome/pg
+en,aif,assis,assis/sp/br
+en,aig,yalinga,yalinga/cf
+en,aih,aiambak,aiambak/pg
+en,aii,alisabieh,alisabieh/dj
+en,aik,aiken,aiken/sc/us:municipal
+en,ail,ailigandi,ailigandi/pa
+en,aim,ailuk island,ailuk island/mh
+en,ain,wainwright,wainwright/ak/us
+en,aio,atlantic,atlantic/ia/us:municipal
+en,aip,ailinglapalap isl,ailinglapalap isl/mh
+en,air,aripuana,aripuana/mt/br
+en,ais,arorae island,arorae island/ki
+en,ait,aitutaki,aitutaki/ck
+en,aiu,atiu island,atiu island/ck
+en,aiv,aliceville,aliceville/al/us:george downer
+en,aiw,ai ais,ai ais/na
+en,aiy,atlantic city,atlantic city/nj/us:bader fiel
+en,aiz,kaiser lake ozark,kaiser lake ozark/mo/us:lee c
+en,aja,ajaccio,ajaccio/fr:campo dell oro
+en,ajf,jouf,jouf/sa
+en,aji,agri,agri/tr
+en,ajj,akjoujt,akjoujt/mr
+en,ajk,araak,araak/ir:araak
+en,ajl,aizawl,aizawl/in
+en,ajn,anjouan,anjouan/km:ouani
+en,ajo,aljouf,aljouf/ye
+en,ajr,arvidsjaur,arvidsjaur/se
+en,ajs,abreojos,abreojos/mx
+en,aju,aracaju,aracaju/se/br:aracaju
+en,ajy,agades,agades/ne
+en,aka,ankang,ankang/cn
+en,akb,atka,atka/ak/us
+en,akc,akron canton,akron canto/oh/us:akron fulton
+en,akd,akola,akola/in
+en,ake,akieni,akieni/ga
+en,akf,kufrah,kufrah/ly
+en,akg,anguganak,anguganak/pg
+en,akh,al kharj,al k/sa:prince sultan air base
+en,aki,akiak,akiak/ak/us
+en,akj,asahikawa,asahikawa/jp
+en,akk,akhiok,akhiok/ak/us:akhiok spb
+en,akl,auckland,auckland/nz:auckland
+en,akm,zakouma,zakouma/td
+en,akn,king salmon,king salmon/ak/us
+en,ako,akron,akron/co/us:washington co
+en,akp,anaktuvuk,anaktuvuk/ak/us
+en,akq,astraksetra,astraksetra/id:gunung batin
+en,akr,akure,akure/ng
+en,aks,auki,auki/sb:gwaunaru'u
+en,akt,akrotiri,akrotiri/cy:akrotiri raf
+en,aku,aksu,aksu/cn
+en,akv,akulivik,akulivik/qc/ca
+en,akw,aghajari,aghajari/ir:aghajari
+en,akx,aktyubinsk,aktyubinsk/kz
+en,aky,sittwe,sittwe/mm:civil
+en,ala,almaty,almaty/kz
+en,alb,albany intl,albany/ny/us:albany intl apt
+en,alc,alicante,alicante/es
+en,ald,alerta,alerta/pe
+en,ale,alpine,alpine/tx/us
+en,alf,alta,alta/no
+en,alg,algiers,algiers/dz:houari boumediene
+en,alh,albany,albany/wa/au
+en,ali,alice,alice/tx/us:international
+en,alj,alexander bay,alexander bay/za:kortdoorn
+en,alk,asela,asela/et
+en,all,albenga,albenga/it
+en,alm,alamogordo alm,alamogordo/nm/us:municipal
+en,aln,alton,alton/il/us
+en,alo,waterloo,waterloo/ia/us
+en,alp,aleppo,aleppo/sy:nejrab
+en,alq,alegrete,alegrete/rs/br:federal
+en,alr,alexandra,alexandra/nz
+en,als,alamosa,alamosa/co/us:municipal
+en,alt,alenquer,alenquer/pa/br
+en,alu,alula,alula/so
+en,alv,andorra la vella,andorra la vella/ad:heliport
+en,alw,walla walla,walla walla/wa/us
+en,alx,alexander city,alexander city/al/us:tc russel
+en,aly,alexandria aly,alexandria/eg:el nohza
+en,alz,alitak,alitak/ak/us:alitak spb
+en,ama,amarillo int,amarillo/tx/us:international
+en,amb,ambilobe,ambilobe/mg
+en,amc,am timan,am timan/td
+en,amd,ahmedabad,ahmedabad/in
+en,ame,alto molocue,alto molocue/mz
+en,amf,ama,ama/pg
+en,amg,amboin,amboin/pg
+en,amh,arba mintch,arba mintch/et
+en,ami,mataram,mataram/id:selaparang
+en,amj,almenara,almenara/mg/br
+en,amk,durango,durango/co/us:animas airpark
+en,aml,puerto armuellas,puerto armuellas/pa
+en,amm,amman,amman/jo:queen alia
+en,amn,alma,alma/mi/us:gratiot community
+en,amo,mao,mao/td
+en,amp,ampanihy,ampanihy/mg
+en,amq,ambon,ambon/id:pattimura
+en,amr,arno,arno/mh
+en,ams,amsterdam,amsterdam/nl:schiphol
+en,amt,amata,amata/nt/au
+en,amu,amanab,amanab/pg
+en,amv,amderma,amderma/ru
+en,amw,ames,ames/ia/us
+en,amx,ammaroo,ammaroo/nt/au
+en,amy,ambatomainty,ambatomainty/mg
+en,amz,ardmore,ardmore/nz
+en,ana,anaheim,anaheim/ca/us
+en,anb,anniston,anniston/al/us:county
+en,anc,anchorage intl,anchorage/ak/us:anchorage intl
+en,and,anderson,anderson/sc/us
+en,ane,angers,angers/fr:marce
+en,anf,antofagasta,antofagasta/cl:cerro moreno
+en,ang,angouleme,angouleme/fr:brie-champniers
+en,anh,anuha isld resort,anuha island resort/sb
+en,ani,aniak,aniak/ak/us
+en,anj,zanaga,zanaga/cg
+en,ank,ankara etimesgut,ankara/tr:etimesgut
+en,anl,andulo,andulo/ao
+en,anm,antalaha,antalaha/mg:antsirabato
+en,ann,annette island,annette island/ak/us
+en,ano,angoche,angoche/mz
+en,anp,annapolis,annapolis/md/us:lee
+en,anq,angola,angola/in/us:tri state steuben
+en,anr,antwerp brussels,brussels/be:antwerp brussels n
+en,ans,andahuaylas,andahuaylas/pe
+en,ant,st anton,st anton/at
en,anu,antigua,antigua/ag:vc bird intl
en,anv,anvik,anvik/ak/us
en,anw,ainsworth,ainsworth/ne/us
-en,cey,murray,murray/ky/us:calloway county
-en,cez,cortez,cortez/co/us:montezuma county
-en,cfa,coffee point,coffee point/ak/us
-en,cfb,cabo frio,cabo f/rj/br:cabo frio airport
-en,cfc,cacador,cacador/sc/br
-en,cfd,bryan,bryan/tx/us:coulter field
-en,cfe,clermont ferrand,clermont ferrand/fr:aulnat
-en,cff,cafunfo,cafunfo/ao
-en,cfg,cienfuegos,cienfuegos/cu
-en,cfh,clifton hills,clifton hills/sa/au
-en,cfi,camfield,camfield/nt/au
-en,cfk,chlef,chlef/dz:abou bakr belkaid
-en,cfn,donegal,donegal/ie
-en,cfo,confreza,confreza/mt/br
-en,cfp,carpentaria downs,carpentaria downs/ql/au
-en,cfq,creston,creston/bc/ca
-en,cfr,caen,caen/fr:carpiquet
-en,cfs,coffs harbour,coffs harbour/ns/au
-en,cft,clifton,clifton/az/us:morenci
-en,cfu,kerkyra/i kapodi,kerkyra/gr:i kapodistrais
-en,cfv,coffeyville,coffeyville/ks/us:municipal
-en,cga,craig,craig/ak/us:craig spb
-en,cgb,cuiaba,cuiaba/mt/br:m rondon
-en,cgc,cape gloucester,cape gloucester/pg
-en,cgd,changde,changde/cn
-en,cge,cambridge,cambridge/md/us
-en,cgf,cleveland cgf,cleveland/oh/us:cuyahoga
-en,cgg,casiguran,casiguran/ph
-en,cgh,sao paulo cgh,sao paulo/sp/br:congonhas
-en,cgi,cape girardeau,cape girardeau/mo/us
-en,cgj,chingola,chingola/zm
-en,cgk,jakarta intl,jakarta/id:soekarno hatta intl
-en,cgm,camiguin,camiguin/ph:mambajao
-en,cgn,cologne/bonn,cologne/de:koeln/bonn
-en,cgo,zhengzhou,zhengzhou/cn
-en,cgp,chittagong,chittagong/bd:patenga
-en,cgq,changchun,changchun/cn
-en,cgr,campo grande,campo grande/ms/br:intl
-en,cgs,college park,college park/md/us
-en,cgt,chinguitti,chinguitti/mr
-en,cgu,ciudad guayana,ciudad guayana/ve
-en,cgv,caiguna,caiguna/wa/au
-en,cgx,chicago cgx,chicago/il/us:merrill c meigs
-en,cgy,cagayan de oro,cagayan de oro/ph:lumbia
-en,cgz,casa grande,casa grande/az/us:municipal
-en,cha,chattanooga,chattanooga/tn/us:lovell field
-en,chb,chilas,chilas/pk
-en,chc,christchurch,christchurch/nz
-en,chd,chandler mncpl,chandler/az/us:chandler municipal,phoenix chandler
-en,che,caherciveen,caherciveen/ie:reenroe
-en,chf,jinhae,jinhae/kr
-en,chg,chaoyang,chaoyang/cn:chaoyang airport
-en,chh,chachapoyas,chachapoyas/pe
-en,chi,chicago,chicago/il/us
-en,chj,chipinge,chipinge/zw
-en,chk,chickasha,chickasha/ok/us:municipal
-en,chl,challis,challis/id/us
-en,chm,chimbote,chimbote/pe
-en,chn,jeonju,jeonju/kr
-en,cho,charlottesville,charlottesville/va/us:albemarl
-en,chp,circle hot spring,circle hot spring/ak/us
-en,chq,chania,chania/gr:souda
-en,chr,chateauroux,chateauroux/fr
-en,chs,charleston,charleston/sc/us
-en,cht,chatham island,chatham island/nz:karewa
-en,chu,chuathbaluk,chuathbaluk/ak/us
-en,chv,chaves,chaves/pt
-en,chw,jiuquan,jiuquan/cn
-en,chx,changuinola,changuinola/pa
-en,chy,choiseul bay,choiseul bay/sb
-en,fkl,franklin,franklin/pa/us:chess lambertin
-en,fkn,franklin,franklin/va/us:municipal
-en,efw,jefferson,jefferson/ia/us:municipal
-en,ega,engati,engati/pg
-en,egc,bergerac,bergerac/fr:roumanieres
-en,ege,vail eagle,vail eagle/co/us:eagle county
-en,egi,valparaiso duke f,valparaiso/fl/us:duke field
-en,egl,neghelli,neghelli/et
-en,egm,sege,sege/sb
-en,egn,geneina,geneina/sd
-en,ego,belgorod,belgorod/ru
-en,egp,eagle pass,eagle pass/tx/us:maverick co
-en,egs,egilsstadir,egilsstadir/is
-en,egv,eagle river,eagle river/wi/us
-en,egx,egegik,egegik/ak/us
-en,ehd,pseudo city code,pseudo city code/zz
-en,ehl,el bolson,el bolson/rn/ar
-en,ehm,cape newenham,cape newenham/ak/us
-en,eht,east hartford,east hartford/ct/us:rentschler
-en,eia,eia,eia/pg:popondetta
-en,eib,eisenach,eisenach/de
-en,eie,eniseysk,eniseysk/ru
-en,eih,einasleigh,einasleigh/ql/au
-en,eik,eisk,eisk/ru
-en,eil,fairbanks afb,fairbanks/ak/us:eielson afb,air force base
-en,ein,eindhoven,eindhoven/nl
-en,eis,beef island,beef island/vg
-en,eiy,ein yahav,ein yahav/il
-en,eja,barrancabermeja,barrancabermeja/co:variguies
-en,ejh,wedjh,wedjh/sa
-en,ejt,mili atoll,mili atoll/mh:enijet airport
-en,eka,eureka,eureka/ca/us:murray field
-en,ekb,ekibastuz,ekibastuz/kz
-en,ekd,elkedra,elkedra/nt/au
-en,eke,ekereku,ekereku/gy
-en,eki,elkhart,elkhart/in/us:elkhart mnpl
-en,ekn,elkins,elkins/wv/us
-en,eko,elko,elko/nv/us
-en,eks,shakhtersk,shakhtersk/ru:shakhtersk
-en,ekt,eskilstuna,eskilstuna/se
-en,ekx,elizabethtown,elizabethtown/ky/us
-en,ela,eagle lake,eagle lake/tx/us
-en,elb,el banco,el banco/co:san bernado
-en,elc,elcho island,elcho island/nt/au
-en,eld,el dorado,el dorado/ar/us:goodwin field
-en,ele,el real,el real/pa
-en,elf,el fasher,el fasher/sd
-en,elg,el golea,el golea/dz
-en,elh,north eleuthera,north eleuthera/bs:intl
-en,eli,elim,elim/ak/us
-en,elj,el recreo,el recreo/co
-en,elk,elk city,elk city/ok/us:municipal
-en,ell,ellisras,ellisras/za
-en,elm,elmira,elmira/ny/us
-en,eln,ellensburg,ellensburg/wa/us:bowers field
-en,elo,eldorado,eldorado/mi/ar
-en,elp,el paso intl,el paso/tx/us:el paso intl
-en,elq,gassim,gassim/sa
-en,elr,elelim indonesia,elelim/id
-en,els,east london,east london/za:east london
-en,elt,tour sinai city,tour sinai city/eg
-en,elu,el oued,el oued/dz:guemar
-en,elv,elfin cove,elfin cove/ak/us:elfin cove s
-en,elw,ellamar,ellamar/ak/us
-en,elx,el tigre,el tigre/ve
-en,ely,ely,ely/nv/us:yelland
-en,elz,wellsville,wellsville/ny/us:municipal
-en,ema,east midlands,nottingham/gb:east midlands
-en,emb,san francisco emb,san francisco/ca/us:embarkader
-en,emd,emerald,emerald/ql/au
-en,eme,emden,emden/de
-en,emg,empangeni,empangeni/za
-en,emi,emirau,emirau/pg
-en,emk,emmonak,emmonak/ak/us
-en,eml,emmen,emmen/ch:emmen
-en,emm,kemerer,kemerer/wy/us
-en,gog,gobabis,gobabis/na
-en,goh,nuuk,nuuk/gl
-en,goi,goa,goa/in:dabolim
-en,goj,nizhniy novgorod,nizhniy novgorod/ru
-en,gok,guthrie,guthrie/ok/us
-en,gol,gold beach,gold beach/or/us:state
-en,gom,goma,goma/cd
-en,gon,groton,groton/ct/us:groton new london
-en,goo,goondiwindi,goondiwindi/ql/au
-en,gop,gorakhpur,gorakhpur/in
-en,goq,golmud,golmud/cn
-en,gor,gore,gore/et
-en,gos,gosford,gosford/ns/au
-en,got,gothenburg got,gothenburg/se:landvetter
-en,gou,garoua,garoua/cm
-en,gov,gove,gove/nt/au:nhulunbuy
-en,goy,gal oya,gal oya/lk:amparai
-en,goz,gorna orechovitsa,gorna orechovitsa/bg
-en,gpa,patras,patras/gr:araxos airport
-en,gpb,guarapuava,guarapuava/pr/br:tancredo
-en,gpi,guapi,guapi/co
-en,gpl,guapiles,guapiles/cr
-en,gpn,garden point,garden point/nt/au
-en,gpo,general pico,general pico/lp/ar
-en,gps,galapagos is,galapagos is/ec:baltra
-en,gpt,gulfport,gulfport/ms/us:biloxi regional
-en,gpz,grand rapids,grand rapids/mn/us
-en,gqj,machrihanish,machrihanish/gb:raf station
-en,gqq,galion,galion/oh/us
-en,gra,gamarra,gamarra/co
-en,grb,green bay,green bay/wi/us:austin field
-en,grc,grand cess,grand cess/lr
-en,grd,greenwood,greenwood/sc/us
-en,gre,greenville,greenville/il/us:municipal
-en,grf,tacoma gray aaf,tacoma/wa/us:gray aaf
-en,grg,gardez,gardez/af
-en,grh,garuahi,garuahi/pg
-en,gri,grand island,grand island/ne/us
-en,grj,george,george/za
-en,grk,killeen gray aaf,killeen/tx/us:gray aaf
-en,grl,garasa,garasa/pg
-en,grm,grand marais,grand marais/mn/us:devils trck
-en,grn,gordon,gordon/ne/us
-en,gro,girona,girona/es:costa brava
-en,grp,gurupi,gurupi/go/br
-en,grq,groningen,groningen/nl:eelde
-en,grr,grand rapids,grand rapids/mi/us:gerald r fo
-en,grs,grosseto,grosseto/it:baccarini
-en,grt,gujrat,gujrat/pk
-en,gru,sao paulo gru,sao paulo/sp/br:guarulhos intl
-en,grv,groznyj,groznyj/ru
-en,grw,graciosa island,graciosa island/pt
-en,grx,granada,granada/es
-en,gry,grimsey,grimsey/is
-en,grz,graz,graz/at:thalerhof
-en,gsa,long pasia,long pasia/my
-en,gsb,goldsboro,goldsboro/nc/us:seymour johns
-en,gsc,gascoyne junction,gascoyne junction/wa/au
-en,gse,gothenburg gse,gothenburg gse/se:saeve
-en,gsh,goshen,goshen/in/us
-en,gsi,guadalcanal,guadalcanal/sb
-en,gsl,taltheilei,taltheilei/nt/ca
-en,gsm,gheshm,gheshm/ir
-en,gsn,mount gunson,mount gunson/sa/au
-en,gso,greensboro,greensboro/high point/nc/us:pi
-en,gsp,greenvl spartanbg,greenville/sc/us:spartanburg
-en,gsq,shark alowainat,shark alowainat/eg
-en,gsr,gardo,gardo/so
-en,gss,sabi sabi,sabi sabi/za
-en,gst,gustavus airport,gustavus/ak/us:gustavus
-en,gsu,gedaref,gedaref/sd
-en,gsy,grimsby,grimsby/gb:binbrook
-en,gta,gatokae,gatokae/sb:aerodrom
-en,gtb,genting,genting/my
en,anx,andenes,andenes/no
en,any,anthony,anthony/ks/us
en,anz,angus downs,angus downs/nt/au
@@ -744,529 +381,9 @@
en,ars,aragarcas,aragarcas/go/br
en,art,watertown,watertown/ny/us
en,aru,aracatuba,aracatuba/sp/br
-en,hus,hughes,hughes/ak/us:municipal
-en,hut,hutchinson,hutchinson/ks/us
-en,huu,huanuco,huanuco/pe
-en,fkq,fak fak,fak fak/id
-en,fks,fukushima,fukushima/jp:airport
-en,fla,florencia,florencia/co:capitolio
-en,flb,floriano,floriano/pi/br:cangapara
-en,flc,falls creek,falls creek/vi/au
-en,fld,fond du lac,fond du lac/wi/us
-en,fle,petersburg aaf,petersburg/va/us:fort lee aaf
-en,flf,flensburg,flensburg/de:schaferhaus
-en,flg,flagstaff,flagstaff/az/us:pulliam field
-en,flh,flotta,flotta/gb
-en,fli,flateyri,flateyri/is
-en,flj,falls bay,falls bay/ak/us
-en,fll,ft lauderdale,ft lauderdale/fl/us:fll intl
-en,flm,filadelfia,filadelfia/py
-en,fln,florianopolis,florianopolis/sc/br:hercilio l
-en,flo,florence,florence/sc/us
-en,flp,flippin,flippin/ar/us
-en,flr,florence,florence/it:peretola
-en,fls,flinders island,flinders island/ts/au
-en,flt,flat,flat/ak/us
-en,flu,new york flushing,new york/ny/us:flushing helipo
-en,flv,fort leavenworth,fort leavenworth/ks/us:sherman
-en,flw,flores island/san,flores island/pt:santa cruz
-en,flx,fallon municipal,fallon/nv/us:municipal
-en,fly,finley,finley/ns/au
-en,fma,formosa,formosa/fo/ar:el pucu
-en,fmc,five mile,five mile/ak/us
-en,fme,fort meade,fort meade/md/us:tipton aaf
-en,fmg,flamingo,flamingo/cr
-en,fmh,falmouth,falmouth/ma/us:otis afb,air force base
-en,fmi,kalemie,kalemie/cd
-en,fmm,memmingen,memmingen/de:allgaeu
-en,fmn,farmington,farmington/nm/us:mnpl
-en,fmo,muenster,muenster/de
-en,fms,fort madison,fort madison/ia/us:municipal
-en,fmu,florence mnpl,florence/or/us:municipal
-en,fmy,fort myers fmy,fort myers/fl/us:page field
-en,fna,freetown fna,freetown/sl:lungi intl
-en,fnb,neubrandenburg,neubrandenburg/de
-en,fnc,madeira,madeira/pt:madeira
-en,fne,fane,fane/pg
-en,fng,fada ngourma,fada ngourma/bf
-en,fnh,fincha,fincha/et
-en,fni,nimes,nimes/fr:garons
-en,fnj,pyongyang,pyongyang/kp:sunan
-en,fnk,fin creek,fin creek/ak/us
-en,fnl,ft collins love,fort collins love/co/us:mncpl
-en,fnr,funter bay,funter bay/ak/us:spb
-en,fnt,flint,flint/mi/us:bishop
-en,foa,foula,foula/gb
-en,fob,fort bragg,fort bragg/ca/us
-en,foc,fuzhou,fuzhou/cn
-en,fod,fort dodge,fort dodge/ia/us
-en,foe,topeka forbes,topeka forbes/ks/us:forbes afb,air force base
-en,fog,foggia,foggia/it:gino lisa
-en,fok,westhampton,westhampton/ny/us:suffolk cnty
-en,fom,foumban,foumban/cm
-en,fon,fortuna,fortuna/cr:fortuna airport
-en,foo,numfoor,numfoor/id
-en,fop,forest park,forest park/ga/us:morris aaf
-en,for,fortaleza,fortaleza/ce/br:pinto martins
-en,fos,forrest,forrest/wa/au
-en,fot,forster,forster/ns/au
-en,fou,fougamou,fougamou/ga
-en,fox,fox,fox/ak/us
-en,foy,foya,foya/lr
-en,fpo,freeport,freeport/bs:grand bahama intl
-en,fpr,fort pierce,fort pierce/fl/us:st lucie cnt
-en,fpy,perry,perry/fl/us:perry foley
-en,bcw,benguera island,benguera island/mz
-en,bcx,beloreck,beloreck/ru
-en,bcy,bulchi,bulchi/et
-en,lar,laramie,laramie/wy/us:general brees
-en,las,las vegas las,las vegas/nv/us:mccarran intl
-en,lat,la uribe,la uribe/co
-en,lau,lamu,lamu/ke
-en,lav,lalomalava,lalomalava/ws
-en,law,lawton,lawton/ok/us:lawton mnpl
-en,lax,los angeles,los angeles/ca/us:intl,los angeles
-en,lay,ladysmith,ladysmith/za
-en,laz,bom jesus da lapa,bom jesus da lapa/ba/br
-en,lba,leeds,leeds/gb:leeds bradford
-en,lbb,lubbock intl,lubbock/tx/us:lubbock intl
-en,lbc,luebeck,hamburg/de:luebeck
-en,lbd,khudzhand,khudzhand/tj
-en,lbe,latrobe,latrobe/pa/us:westmoreland cnt
-en,lbf,north platte,north platte/ne/us:lee bird fl
-en,lbg,paris le bourget,paris le bourget/fr:le bourget
-en,lbh,sydney palm beach,sydney/ns/au:palm beach spb
-en,lbi,albi,albi/fr:le sequestre
-en,lbj,labuan bajo,labuan bajo/id:mutiara
-en,lbk,liboi,liboi/ke
-en,lbl,liberal,liberal/ks/us:municipal
-en,lbm,luabo,luabo/mz
-en,lbn,lake baringo,lake baringo/ke
-en,lbo,lusambo,lusambo/cd
-en,lbp,long banga,long banga/my:airfield
-en,lbq,lambarene,lambarene/ga
-en,lbr,labrea,labrea/am/br
-en,lbs,labasa,labasa/fj
-en,lbt,lumberton,lumberton/nc/us
-en,lbu,labuan,labuan/my
-en,lbv,libreville,libreville/ga:leon m ba
-en,lbw,long bawan,long bawan/id
-en,lbx,lubang,lubang/ph
-en,lby,la baule,la baule/fr:montoir
-en,lbz,lukapa,lukapa/ao
-en,lca,larnaca,larnaca/cy
-en,lcb,pontes e lacerda,pontes e lacerda/mt/br
-en,lcc,lecce,lecce/it:galatina
-en,lcd,louis trichardt,louis trichardt/za
-en,lce,la ceiba,la ceiba/hn:goloson intl
-en,lcf,rio dulce,rio dulce/gt:las vegas airport
-en,lcg,la coruna,la coruna/es
-en,lch,lake charles,lake charles/la/us:mnpl
-en,lci,laconia,laconia/nh/us:municipal
-en,lcj,lodz,lodz/pl:lodz lublinek airport
-en,lck,columbus lck,columbus/oh/us:rickenbacker
-en,lcl,la coloma,la coloma/cu
-en,lcm,la cumbre,la cumbre/cd/ar
-en,lcn,balcanoona,balcanoona/sa/au
-en,lco,lague,lague/cg
-en,lcp,loncopue,loncopue/ne/ar
-en,lcr,la chorrera,la chorrera/co
-en,lcs,las canas,las canas/cr
-en,lcv,lucca,lucca/it
-en,lcx,longyan,longyan/cn:liancheng apt
-en,lcy,london city,london/gb:london city
-en,lda,malda,malda/in
-en,ldb,londrina,londrina/pr/br
-en,ldc,lindeman island,lindeman island/ql/au
-en,lde,lourdes tarbes,lourdes/fr:lourdes tarbes intl
-en,ldg,leshukonskoye,leshukonskoye/ru:leshukonskoye
-en,ldh,lord howe island,lord howe island/ns/au
-en,ldi,lindi,lindi/tz:kikwetu
-en,ldj,linden,linden/nj/us
-en,ldk,lidkoping,lidkoping/se:hovby
-en,ldm,ludington,ludington/mi/us:mason county
-en,ldn,lamidanda,lamidanda/np
-en,ldo,ladouanie,ladouanie/sr
-en,ldr,lodar,lodar/ye
-en,lds,fictitious,fictitious/zz
-en,ldu,lahad datu,lahad datu/my
-en,ldv,landivisiau,landivisiau/fr
-en,ldw,lansdowne,lansdowne/wa/au
-en,ldx,st laurent du mar,st laurent du maroni/gf
-en,lyt,lady elliot islan,lady elliot islan/ql/au
-en,lyu,ely,ely/mn/us
-en,lyx,lydd ashford,lydd/gb:london ashford
-en,lza,luiza,luiza/cd
-en,lzc,lazaro cardenas,lazaro cardenas/mx
-en,lzd,lanzhou lzd,lanzhou/cn:lanzhoudong
-en,lzh,liuzhou,liuzhou/cn
-en,lzi,luozi,luozi/cd
-en,lzm,luzamba,luzamba/ao
-en,lzn,nangan,nangan/cn
-en,lzo,luzhou,luzhou/cn
-en,lzr,lizard island,lizard island/ql/au
-en,lzy,lin zhi,lin zhi/cn
-en,maa,chennai,chennai/in
-en,mab,maraba,maraba/pa/br
-en,mac,macon smart,macon/ga/us:smart
-en,mad,madrid barajas,madrid/es:barajas
-en,mae,madera,madera/ca/us
-en,maf,midland odessa rg,midland/tx/us:odessa
-en,mag,madang,madang/pg
-en,mah,menorca,menorca/es
-en,mai,mangochi,mangochi/mw
-en,maj,majuro,majuro/mh:amata kabua intl
-en,mak,malakal,malakal/sd
-en,mal,mangole,mangole/id
-en,mam,matamoros,matamoros/mx
-en,man,manchester int,manchester/gb:manchester intl,manchester,man
-en,mao,manaus,manaus/am/br:eduardo gomes
-en,map,mamai,mamai/pg
-en,maq,mae sot,mae sot/th
-en,mar,maracaibo,maracaibo/ve:la chinita
-en,mas,manus island,manus island/pg:momote
-en,mat,matadi,matadi/cd
-en,mau,maupiti,maupiti/pf
-en,mav,maloelap island,maloelap island/mh
-en,maw,malden,malden/mo/us
-en,max,matam,matam/sn
-en,may,mangrove cay,mangrove cay/bs
-en,maz,mayaguez de hosto,mayaguez/pr:de hostos
-en,mba,mombasa,mombasa/ke:moi intl
-en,mbb,marble bar,marble bar/wa/au
-en,mbc,mbigou,mbigou/ga
-en,mbd,mmabatho,mmabatho/za:intl
-en,mbe,monbetsu,monbetsu/jp
-en,mbf,mount buffalo,mount buffalo/vi/au
-en,mbg,mobridge,mobridge/sd/us
-en,mbh,maryborough,maryborough/ql/au
-en,mbi,mbeya,mbeya/tz
-en,mbj,montego bay,montego bay/jm:sangster intl
-en,mbk,matupa,matupa/mt/br
-en,mbl,manistee,manistee/mi/us:blacker
-en,mbm,mkambati,mkambati/za
-en,mbn,mt barnett,mt barnett/wa/au
-en,mbo,mamburao,mamburao/ph
-en,mbp,moyobamba,moyobamba/pe
-en,mbq,mbarara,mbarara/ug
-en,mbr,mbout,mbout/mr
-en,mbs,saginaw baycity,saginaw/mi/us:tri city
-en,mbt,masbate,masbate/ph
-en,mbu,mbambanakira,mbambanakira/sb
-en,mbv,masa,masa/pg
-en,mbw,moorabbin,moorabbin/vi/au
-en,mbx,maribor,maribor/si
-en,mby,moberly,moberly/mo/us
-en,mbz,maues,maues/am/br
-en,mca,macenta,macenta/gn
-en,mcb,mccomb,mccomb/ms/us:pike county
-en,mcc,sacramento mcc,sacramento/ca/us:mcclellan afb,air force base
-en,mcd,mackinac island,mackinac island/mi/us
-en,mce,macready regional,merced/ca/us:macready regional
-en,mcf,tampa afb,tampa/fl/us:mac dill afb,air force base
-en,mcg,mcgrath,mcgrath/ak/us
-en,mch,machala,machala/ec
-en,mci,kansas city intl,kansas city/mo/us
-en,mcj,maicao,maicao/co
-en,mck,mccook,mccook/ne/us
-en,huv,hudiksvall,hudiksvall/se
-en,hux,huatulco,huatulco/mx
-en,huy,humberside,humberside/gb:humberside
-en,huz,huizhou,huizhou/cn
-en,hva,analalava,analalava/mg
-en,hvb,hervey bay,hervey bay/ql/au
-en,hvd,khovd,khovd/mn:khovd
-en,hve,hanksville,hanksville/ut/us:intermediate
-en,hvg,honningsvag,honningsvag/no:valan
-en,hvk,holmavik,holmavik/is
-en,hvm,hvammstangi,hvammstangi/is
-en,hvn,new haven,new haven/ct/us
-en,hvr,havre,havre/mt/us:city county
-en,hvs,hartsville,hartsville/sc/us:municipal
-en,hwa,hawabango,hawabango/pg
-en,hwd,hayward,hayward/ca/us:air terminal
-en,hwi,hawk inlet,hawk inlet/ak/us:spb
-en,hwk,hawker,hawker/sa/au:wilpena pound
-en,hwn,hwange nat park,hwange nat park/zw
-en,hwo,hollywood,hollywood/fl/us:north perry
-en,hxx,hay,hay/ns/au
-en,hya,hyannis,hyannis/ma/us:barnstable
-en,hyc,high wycombe,high wycombe/gb
-en,hyd,shamshabad,shamshabad/in:rajiv gandhi int
-en,hyf,hayfields,hayfields/pg
-en,hyg,hydaburg,hydaburg/ak/us:spb
-en,hyl,hollis,hollis/ak/us:spb
-en,hyn,huangyan,huangyan/cn
-en,hyr,hayward,hayward/wi/us:municipal
-en,hys,hays,hays/ks/us:municipal
-en,hyv,hyvinkaa,hyvinkaa/fi:hyvinkaa
-en,hzb,hazebrouck,hazebrouck/fr:merville calonne
-en,hzg,hanzhong,hanzhong/cn
-en,hzh,liping,liping city/cn:liping
-en,hzk,husavik,husavik/is
-en,hzl,hazleton,hazleton/pa/us
-en,hzp,fort mackay,fort mackay/ab/ca:horizon
-en,hzv,hazyview,hazyview/za
-en,iaa,igarka,igarka/ru
-en,iab,wichita afb,wichita/ks/us:mcconnell afb,air force base
-en,iad,washington dulles,washington/dc/us:dulles intl
-en,iag,niagara falls,niagara falls/ny/us:intl
-en,iah,houston-iah,houston/tx/us:g.bush intercont
-en,iam,in amenas,in amenas/dz
-en,ian,kiana,kiana/ak/us:bob barker mem
-en,iaq,bahregan,bahregan/ir
-en,iar,yaroslavl,yaroslavl/ru
-en,ias,iasi,iasi/ro
-en,iat,iata traffic serv,iata traffic serv/zz
-en,iau,iaura,iaura/pg
-en,iba,ibadan,ibadan/ng
-en,ibe,ibague,ibague/co
-en,ibi,iboki,iboki/pg
-en,ibl,indigo bay lodge,indigo bay lodge/mz
-en,ibo,ibo,ibo/mz
-en,ibp,iberia,iberia/pe
-en,ibz,ibiza,ibiza/es
-en,ica,icabaru,icabaru/ve
-en,ici,cicia,cicia/fj
-en,ick,nieuw nickerie,nieuw nickerie/sr
-en,icl,clarinda,clarinda/ia/us:municipal
-en,icn,seoul incheon int,seoul/kr:incheon international
-en,ico,sicogon island,sicogon island/ph
-en,icr,nicaro,nicaro/cu
-en,ics,cascade,cascade/id/us
-en,ict,wichita mid cont,wichita/ks/us:mid continent
-en,icy,icy bay,icy bay/ak/us
-en,ida,idaho falls,idaho falls/id/us:fanning fld
-en,idb,idre,idre/se
-en,idc,iladachilonzuene,ila da chilonzuene/mz
-en,idf,idiofa,idiofa/cd
-en,idg,ida grove,ida grove/ia/us:municipal
en,arv,minocqua,minocqua/wi/us:noble f lee
en,arw,arad,arad/ro
en,arx,asbury park,asbury park/nj/us
-en,bcz,bickerton island,bickerton island/nt/au
-en,bda,bermuda,bermuda/bm:bermuda intl
-en,bdb,bundaberg,bundaberg/ql/au
-en,bdc,barra do corda,barra do corda/ma/br
-en,bdd,badu island,badu island/ql/au
-en,bde,baudette,baudette/mn/us
-en,bdf,bradford,bradford/il/us:rinkenberger
-en,bdg,blanding,blanding/ut/us
-en,bdh,bandar lengeh,bandar lengeh/ir
-en,bdi,bird island,bird island/sc
-en,bdj,banjarmasin,banjarmasin/id:sjamsudin noor
-en,bdk,bondoukou,bondoukou/ci
-en,bdl,hartford/sprngfld,hartford/ct/us:bradley intl
-en,bdm,bandirma,bandirma/tr
-en,bdn,badin,badin/pk:talhar
-en,bdo,bandung,bandung/id:husein sastranegara
-en,bdp,bhadrapur,bhadrapur/np
-en,bdq,vadodara,vadodara/in
-en,bdr,bridgeport,bridgeport/ct/us:i sikorsky
-en,bds,brindisi,brindisi/it:papola casale
-en,bdt,gbadolite,gbadolite/cd
-en,bdu,bardufoss,bardufoss/no
-en,bdv,moba,moba/cd
-en,bdw,bedford downs,bedford downs/wa/au
-en,bdx,broadus,broadus/mt/us
-en,bdy,bandon,bandon/or/us:state
-en,bdz,baindoung,baindoung/pg
-en,bea,bereina,bereina/pg
-en,beb,benbecula,benbecula/gb
-en,bec,wichita beech,wichita beech/ks/us:beech
-en,bed,bedford hanscom,bedford ha/ma/us:hanscom field
-en,bee,beagle bay,beagle bay/wa/au
-en,bef,bluefields,bluefields/ni
-en,beg,belgrade,belgrade/rs:beograd
-en,beh,benthnhbr/stjosep,benton harbor/mi/us:ross field
-en,bei,beica,beica/et
-en,bej,berau,berau/id
-en,bek,bareli,bareli/in
-en,bel,belem,belem/pa/br:val de cans
-en,bem,bossembele,bossembele/cf
-en,ben,benghazi,benghazi/ly:benina intl
-en,beo,newcastle beo,newcastle/ns/au:belmont
-en,bep,bellary,bellary/in
-en,beq,bury st edmunds,bury st edmunds/gb:honington
-en,ber,berlin,berlin/de
-en,bes,brest,brest/fr:guipavas
-en,bet,bethel airport,bethel/ak/us:bethel airport
-en,beu,bedourie,bedourie/ql/au
-en,bev,beer sheba,beer sheba/il
-en,bew,beira,beira/mz
-en,bex,benson,benson/gb:raf station
-en,bey,beirut,beirut/lb:international
-en,bez,beru,beru/ki
-en,bfa,bahia negra,bahia negra/py:bahia negra
-en,bfb,blue fox bay,blue fox bay/ak/us
-en,bfc,bloomfield,bloomfield/ql/au
-en,bfd,bradford,bradford/pa/us
-en,bfe,bielefeld,bielefeld/de:bielefeld
-en,bff,scottsbluff,scottsbluff/ne/us:scotts bluff
-en,bfg,bullfrog basin,bullfrog basin/ut/us
-en,bfh,curitiba,curitiba/pr/br:bacacheri
-en,bfi,seattle bfi,seattle/wa/us:boeing fld intl
-en,bfj,ba,ba/fj:ba
-en,bfk,denver,denver/co/us:buckley angb
-en,bfl,bakersfield,bakersfield/ca/us:meadows fld
-en,bfm,mobile aerospace,mobile/al/us:mob aerospace
-en,bfn,bloemfontein,bloemfontein/za:intl
-en,bfo,buffalo range,buffalo range/zw
-en,bfp,beaver falls,beaver falls/pa/us
-en,mqt,sawyer intl,marquette/mi/us:sawyer intl
-en,mqu,mariquita,mariquita/co
-en,mqv,mostaganem,mostaganem/dz:mostaganem
-en,bza,bonanza,bonanza/ni:san pedro
-en,bzb,bazaruto island,bazaruto island/mz
-en,bzc,buzios,buzios/rj/br
-en,bzd,balranald,balranald/ns/au
-en,bze,belize city,belize/bz:p.s.w. goldson intl
-en,bzf,benton field,redding/ca/us:benton field
-en,bzg,bydgoszcz,bydgoszcz/pl
-en,bzh,bumi hills,bumi hills/zw:airfield
-en,bzi,balikesir,balikesir/tr
-en,bzk,briansk,briansk/ru
-en,bzl,barisal,barisal/bd
-en,bzm,bergen op zoom,bergen op zoom/nl:woensdrecht
-en,bzn,bozeman,bozeman/mt/us:gallatin field
-en,bzo,bolzano bozen,bolzano bozen/it:bolzano bozen
-en,bzp,bizant,bizant/ql/au
-en,bzr,beziers,beziers/fr:vias
-en,bzs,washington bzs,washington/dc/us:buzzards pt s
-en,bzt,brazoria,brazoria/tx/us:hinkles ferry
-en,bzu,buta,buta/cd
-en,bzv,brazzaville,brazzaville/cg:maya maya
-en,bzy,beltsy,beltsy/md
-en,bzz,brize norton,brize norton/gb:raf station
-en,caa,catacamas,catacamas/hn
-en,cab,cabinda,cabinda/ao
-en,cac,cascavel,cascavel/pr/br
-en,cad,cadillac,cadillac/mi/us
-en,cae,columbia met,columbia/sc/us:columbia met
-en,caf,carauari,carauari/am/br
-en,cag,cagliari,cagliari/it:elmas
-en,cah,ca mau,ca mau/vn
-en,cai,cairo,cairo/eg:cairo intl
-en,caj,canaima,canaima/ve
-en,cak,canton akron,canton akron/oh/us:akron
-en,cal,campbeltown,campbeltown/gb:machrihanish
-en,cam,camiri,camiri/bo
-en,can,guangzhou,guangzhou/cn:baiyun
-en,cao,clayton,clayton/nm/us
-en,cap,cap haitien,cap haitien/ht
-en,caq,caucasia,caucasia/co
-en,car,caribou,caribou/me/us:municipal
-en,cas,casablanca,casablanca/ma:anfa
-en,cat,cat island,cat island/bs
-en,cau,caruaru,caruaru/pe/br
-en,cav,cazombo,cazombo/ao
-en,caw,campos,campos/rj/br:bartolomeu lisand
-en,cax,carlisle,carlisle/gb
-en,cay,cayenne,cayenne/gf:rochambeau
-en,caz,cobar,cobar/ns/au
-en,cba,corner bay,corner bay/ak/us
-en,cbb,cochabamba,cochabamba/bo:j wilsterman
-en,cbc,cherrabun,cherrabun/wa/au
-en,cbd,car nicobar,car nicobar/in
-en,cbe,cumberland,cumberland/md/us:wiley ford
-en,cbf,council bluffs,council bluffs/ia/us:municipal
-en,cbg,cambridge,cambridge/gb
-en,cbh,bechar,bechar/dz:leger
-en,cbi,cape barren,cape barren/ts/au
-en,cbj,cabo rojo,cabo rojo/do
-en,cbk,colby,colby/ks/us:municipal
-en,cbl,ciudad bolivar,ciudad bolivar/ve
-en,cbm,columbus afb,columbus/ms/us:columbus afb,air force base
-en,cbn,cirebon,cirebon/id:penggung
-en,cbo,cotabato,cotabato/ph:awang
-en,cbp,coimbra,coimbra/pt
-en,cbq,calabar,calabar/ng
-en,cbr,canberra,canberra/ac/au
-en,cbs,cabimas,cabimas/ve:oro negro
-en,cbt,catumbela,catumbela/ao
-en,cbu,cottbus,cottbus/de:cottbus apt
-en,cbv,coban,coban/gt
-en,cbw,campo mourao,campo mourao/pr/br
-en,cbx,condobolin,condobolin/ns/au
-en,cby,canobie,canobie/ql/au
-en,cbz,cabin creek,cabin creek/ak/us
-en,dkv,docker river,docker river/nt/au
-en,dla,douala,douala/cm
-en,dlb,dalbertis,dalbertis/pg
-en,dlc,dalian,dalian/cn
-en,dld,geilo,geilo/no:dagali airport
-en,dle,dole,dole/fr:tavaux
-en,dlf,del rio afb,del rio/tx/us:laughlin afb,air force base
-en,dlg,dillingham,dillingham/ak/us:municipal
-en,dlh,duluth int,duluth/mn/us:duluth intl
-en,dli,dalat,dalat/vn:lienkhang
-en,dlk,dulkaninna,dulkaninna/sa/au
-en,dll,dillon,dillon/sc/us
-en,dlm,dalaman,dalaman/tr
-en,dln,dillon,dillon/mt/us
-en,dlo,dolomi,dolomi/ak/us
-en,dls,the dalles,the dalles/or/us
-en,dlu,dali,dali/cn:dali
-en,dlv,delissaville,delissaville/nt/au
-en,dly,dillons bay,dillons bay/vu
-en,dlz,dalanzadgad,dalanzadgad/mn
-en,dma,tucson afb,tucson/az/us:davis monthan afb,air force base
-en,dmb,zhambyl,zhambyl/kz
-en,dmd,doomadgee,doomadgee/ql/au
-en,dme,moscow dme,moscow/ru:domodedovo
-en,dmk,bkk don mueang,bangkok/th:don mueang intl
-en,dmm,dammam,dammam/sa:king fahad intl
-en,dmn,deming,deming/nm/us
-en,dmo,sedalia,sedalia/mo/us
-en,dmr,dhamar,dhamar/ye
-en,dmt,diamantino,diamantino/mt/br
-en,dmu,dimapur,dimapur/in
-en,dna,okinawa kad afb,okinawa/jp:kadena afb,air force base
-en,dnb,dunbar,dunbar/ql/au
-en,dnc,danane,danane/ci
-en,dnd,dundee,dundee/gb
-en,dne,dallas north arpt,dallas/tx/us:dallas north
-en,dnf,derna,derna/ly:martuba
-en,dng,doogan airport,doogan/wa/au:doogan airport
-en,dnh,dunhuang,dunhuang/cn
-en,dni,wad medani,wad medani/sd
-en,dnk,dnipropetrovsk,dnipropetrovsk/ua,dnepropetrovsk,yekaterinoslav,sicheslav,dnipro
-en,dnl,augusta daniel fd,augusta daniel/ga/us:daniel
-en,dnm,denham,denham/wa/au
-en,dnn,dalton,dalton/ga/us:municipal
-en,dno,dianopolis,dianopolis/to/br
-en,dnp,dang,dang/np
-en,dnq,deniliquin,deniliquin/ns/au
-en,dnr,dinard,dinard/fr:pleurtuit
-en,dns,denison,denison/ia/us:municipal
-en,dnt,stana laguna dnt,santa ana/ca/us:downtown hpt
-en,dnu,dinangat,dinangat/pg
-en,dnv,danville,danville/il/us:vermilion cnty
-en,dnx,dinder,dinder/sd:galegu
-en,dnz,denizli,denizli/tr:cardak
-en,doa,doany,doany/mg
-en,dob,dobo aru,dobo/id:airport
-en,doc,dornoch,dornoch/gb
-en,dod,dodoma,dodoma/tz
-en,doe,djoemoe,djoemoe/sr
-en,dof,dora bay,dora bay/ak/us
-en,dog,dongola,dongola/sd
-en,doh,doha,doha/qa
-en,doi,doini,doini/pg
-en,dok,donetsk,donetsk/ua
-en,dol,deauville,deauville/fr:st gatien
-en,dom,dominica dom,dominica/dm:melville hall
-en,don,dos lagunas,dos lagunas/gt
-en,doo,dorobisoro,dorobisoro/pg
-en,dop,dolpa,dolpa/np
-en,dor,dori,dori/bf
-en,dos,dios,dios/pg
-en,dou,dourados,dourados/ms/br
-en,dov,dover cheswold,dover cheswold/de/us:dover afb,air force base
-en,dox,dongara,dongara/wa/au
-en,doy,dongying,dongying/cn:dongying
-en,dpa,chicago dpa,chicago/il/us:dupage county
-en,dpe,dieppe,dieppe/fr
en,ary,ararat,ararat/vi/au
en,arz,n'zeto,n'zeto/ao
en,asa,assab,assab/er
@@ -1342,912 +459,305 @@
en,aut,atauro,atauro/id
en,auu,aurukun mission,aurukun mission/ql/au
en,auv,aumo,aumo/pg
-en,cog,condoto mandinga,condoto/co:mandinga
-en,coh,cooch behar,cooch behar/in
-en,blr,bangalore,bangalore/in:hindustan
-en,bls,bollon,bollon/ql/au
-en,blt,blackwater,blackwater/ql/au
-en,blu,blue canyon,blue canyon/ca/us
-en,blv,belleville,belleville/il/us:scott afb/mid,air force base
-en,blw,waimanalo,waimanalo/hi/us:bellows field
-en,blx,belluno,belluno/it
-en,bly,belmullet,belmullet/ie
-en,blz,blantyre,blantyre/mw:chileka
-en,bma,stockholm bromma,stockholm/se:bromma
-en,bmb,bumba,bumba/cd
-en,bmc,brigham city,brigham city/ut/us
-en,bmd,belo,belo/mg
-en,bme,broome,broome/wa/au
-en,bmf,bakouma,bakouma/cf
-en,bmg,bloomington,bloomington/in/us
-en,bmh,bomai,bomai/pg
-en,bmi,bloomington norma,bloomington/il/us:normal
-en,bmj,baramita,baramita/gy
-en,bmk,borkum,borkum/de
-en,bml,berlin,berlin/nh/us
-en,bmm,bitam,bitam/ga
-en,bmn,bamerny,bamerny/iq
-en,bmo,bhamo,bhamo/mm
-en,bmp,brampton island,brampton island/ql/au
-en,bmq,bamburi,bamburi/ke
-en,bmr,baltrum,baltrum/de:baltrum
-en,bms,brumado,brumado/ba/br
-en,bmt,beaumont mncpal,beaumont/tx/us:beaumont mncpl
-en,bmu,bima,bima/id
-en,bmv,banmethuot,banmethuot/vn:phung duc
-en,bmw,bordj badji mokht,bordj badji mokhtar/dz
-en,bmx,big mountain,big mountain/ak/us
-en,bmy,belep island,belep island/nc
-en,bmz,bamu,bamu/pg
-en,bna,nashville,nashville/tn/us:intl airportc
-en,bnb,boende,boende/cd
-en,bnc,beni,beni/cd
-en,bnd,bandar abbas,bandar abbas/ir
-en,bne,brisbane,brisbane/ql/au
-en,bnf,baranof,baranof/ak/us:warm spring bay
-en,bng,banning,banning/ca/us
-en,bnh,hartford barnes,hartford/ct/us:barnes
-en,bni,benin city,benin city/ng
-en,bnj,bonn,bonn/de:rail svc
-en,bnk,ballina,ballina/ns/au:byron gateway
-en,bnl,barnwell,barnwell/sc/us:barnwell cnty
-en,bnm,bodinumu,bodinumu/pg
-en,bnn,bronnoysund,bronnoysund/no:bronnoy
-en,bno,burns,burns/or/us
-en,bnp,bannu,bannu/pk
-en,bnq,baganga,baganga/ph
-en,bnr,banfora,banfora/bf
-en,bns,barinas,barinas/ve
-en,bnt,bundi,bundi/pg
-en,bnu,blumenau,blumenau/sc/br
-en,bnv,boana,boana/pg
-en,bnw,boone,boone/ia/us
-en,bnx,banja luka,banja luka/ba
-en,bny,bellona,bellona/sb
-en,bnz,banz,banz/pg
-en,boa,boma,boma/cd
-en,bob,bora bora,bora bora/pf:motu-mute
-en,boc,bocas del toro,bocas del toro/pa
-en,bod,bordeaux,bordeaux/fr:merignac
-en,boe,boundji,boundji/cg
-en,bof,washington afb,washington/dc/us:bolling afb,air force base
-en,bog,bogota,bogota/co:eldorado
-en,boh,bournemouth,bournemouth/gb:intl
-en,boi,boise,boise/id/us:air term gowen fld
-en,boj,bourgas,bourgas/bg
-en,bok,brookings,brookings/or/us:brookings stat
-en,bol,bally kelly,bally kelly/gb
-en,bom,mumbai,mumbai/in:chhatrapati shivaji
-en,bon,bonaire,bonaire/an:flamingo intl
-en,boo,bodo,bodo/no
-en,bop,bouar,bouar/cf
-en,emn,nema,nema/mr
-en,emo,emo,emo/pg
-en,emp,emporia,emporia/ks/us
-en,ems,embessa,embessa/pg
-en,emt,el monte,el monte/ca/us
-en,emx,el maiten,el maiten/cb/ar
-en,emy,el minya,el minya/eg
-en,ena,kenai,kenai/ak/us
-en,enb,eneabba west,eneabba west/wa/au
-en,enc,nancy essey,nancy/fr:essey
-en,end,enid vance afb,enid/ok/us:vance afb,air force base
-en,ene,ende,ende/id
-en,enf,enontekio,enontekio/fi
-en,enh,enshi,enshi/cn
-en,eni,el nido,el nido/ph
-en,enj,el naranjo,el naranjo/gt
-en,enk,enniskillen,enniskillen/gb:st angelo
-en,enl,centralia,centralia/il/us:municipal
-en,enn,nenana,nenana/ak/us:municipal
-en,eno,encarnacion,encarnacion/py:teniente
-en,enq,coronel e soto,coronel e soto a/hn
-en,ens,enschede,enschede/nl:twente
-en,ent,enewetak island,enewetak island/mh:enewetak
-en,enu,enugu,enugu/ng
-en,env,wendover,wendover/ut/us
-en,enw,kenosha,kenosha/wi/us:municipal
-en,eny,yan'an,yan'an/cn
-en,enz,mystery break,mystery break/nz:mystery break
-en,eoh,medellin,medellin/co:olaya herrera
-en,eoi,eday,eday/gb
-en,eok,keokuk,keokuk/ia/us
-en,eor,el dorado,el dorado/ve
-en,eos,neosho,neosho/mo/us
-en,eoz,elorza,elorza/ve
-en,epa,el palomar,el palomar/ba/ar
-en,epg,weeping water,weeping water/ne/us:browns
-en,eph,ephrata,ephrata/wa/us
-en,epi,epi,epi/vu
-en,epk,episkopi,episkopi/cy
-en,epl,epinal,epinal/fr:mirecourt
-en,epn,epena,epena/cg
-en,epr,esperance,esperance/wa/au
-en,eps,elportillo samana,el port/do:el portillo airport
-en,ept,eliptamin,eliptamin/pg
-en,epu,parnu,parnu/ee:parnu
-en,eqs,esquel,esquel/cb/ar
-en,era,erigavo,erigavo/so
-en,erb,ernabella,ernabella/sa/au
-en,erc,erzincan,erzincan/tr
-en,erd,berdyansk,berdyansk/ua
-en,ere,erave,erave/pg
-en,erf,erfurt,erfurt/de:erfurt
-en,erh,er rachidia,er rachidia/ma
-en,eri,erie,erie/pa/us:erie intl
-en,erm,erechim,erechim/rs/br:comandante k
-en,ern,eirunepe,eirunepe/am/br
-en,ero,eldred rock,eldred rock/ak/us:coast guard
-en,err,errol,errol/n...
[truncated message content] |
|
From: <den...@us...> - 2009-10-04 17:11:14
|
Revision: 198
http://opentrep.svn.sourceforge.net/opentrep/?rev=198&view=rev
Author: denis_arnaud
Date: 2009-10-04 17:10:53 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Data] Updated a Phoenix, AZ, US (PHX).
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_names.csv
Modified: trunk/opentrep/db/data/ref_place_names.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_names.csv 2009-10-04 16:49:30 UTC (rev 197)
+++ trunk/opentrep/db/data/ref_place_names.csv 2009-10-04 17:10:53 UTC (rev 198)
@@ -2026,7 +2026,7 @@
en,luc,laucala is,laucala is/fj
en,lud,luderitz,luderitz/na
en,lue,lucenec,lucenec/sk
-en,luf,phoenix luke afb,phoenix/az/us:phoenix luke afb,air force base
+en,luf,phoenix luke afb,luke/az/us:phoenix luke afb,air force base
en,lug,lugano,lugano/ch
en,luh,ludhiana,ludhiana/in
en,lui,la union,la union/hn
@@ -2538,7 +2538,7 @@
en,ayu,aiyura,aiyura/pg
en,ayw,ayawasi,ayawasi/id
en,ayz,amityville,amityville/ny/us:zahns
-en,aza,phoenix williams,phoenix/az/us:williams gateway,mesa gateway,chandler williams
+en,aza,phoenix williams,chandler/az/us:williams gateway,mesa gateway,chandler williams
en,azb,amazon bay,amazon bay/pg
en,azd,yazd,yazd/ir
en,azg,apatzingan,apatzingan/mx
@@ -5675,7 +5675,7 @@
en,scc,prudhoe bay deadh,prudhoe bay deadh/ak/us
en,scd,sulaco,sulaco/hn
en,sce,state college,state college/pa/us:university
-en,scf,phoenix scottsdale mncpl,phoenix/az/us:scottsdale mncpl,scottsdale municipal
+en,scf,phoenix scottsdale mncpl,scottsdale/az/us:scottsdale mncpl,scottsdale municipal
en,scg,spring creek,spring creek/ql/au
en,sch,schenectady,schenectady/ny/us:county
en,sci,san cristobal,san cristobal/ve
@@ -7543,7 +7543,7 @@
en,pht,paris,paris/tn/us:henry county
en,phu,phu vinh,phu vinh/vn
en,phw,phalaborwa,phalaborwa/za:h van eck
-en,phx,phoenix,phoenix/az/us:sky harbor intl
+en,phx,phoenix,phoenix/az/us:sky harbor intl,phoenix
en,phy,phetchabun,phetchabun/th:phetchabun apt
en,ldy,londonderry,londonderry/gb:eglinton
en,ldz,londolozi,londolozi/za
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-04 16:49:47
|
Revision: 197
http://opentrep.svn.sourceforge.net/opentrep/?rev=197&view=rev
Author: denis_arnaud
Date: 2009-10-04 16:49:30 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Data] Updated a few airport and city details.
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_details.csv
trunk/opentrep/db/data/ref_place_names.csv
Modified: trunk/opentrep/db/data/ref_place_details.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 13:48:47 UTC (rev 196)
+++ trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 16:49:30 UTC (rev 197)
@@ -1,638 +1,313 @@
concat(code, ',,,', is_airport, ',y,n,', is_commercial, ',') trim(state_code) concat(',', rel_country_code, ',', rel_region_code, ',', rel_continent_code, ',', rel_time_zone_grp, ',') longitude , latitude ,
-cyz,,,y,y,n,n, ,ph,pacif,itc3,ph, 121.8 , 16.92 ,
-cza,,,y,y,n,n, ,mx,namer,itc1,mx168, -88.57 , 20.67 ,
-czb,,,y,y,n,n, rs ,br,samer,itc1,br015, -53.5 , -28.63 ,
-czc,,,y,y,n,n, ak ,us,namer,itc1,us111, -145.3 , 61.95 ,
-cze,,,y,y,n,y, ,ve,samer,itc1,ve194, -69.67 , 11.42 ,
-czf,,,y,y,n,n, ak ,us,namer,itc1,us111, -166 , 61.73 ,
-czh,,,y,y,n,y, ,bz,camer,itc1,bz, -88.5 , 18.33 ,
-czj,,,y,y,n,n, ,pa,camer,itc1,pa, -77.98 , 9.017 ,
-czk,,,y,y,n,n, or ,us,namer,itc1,us110, -121.9 , 45.67 ,
-czl,,,y,y,n,y, ,dz,afric,itc2,dz, 6.617 , 36.28 ,
-czm,,,y,y,n,y, ,mx,namer,itc1,mx168, -86.93 , 20.52 ,
-czn,,,y,y,n,y, ak ,us,namer,itc1,us111, -142.1 , 62.08 ,
-czo,,,y,y,n,n, ak ,us,namer,itc1,us111, -144.7 , 62.57 ,
-czp,,,y,y,n,n, ak ,us,namer,itc1,us111, -133.8 , 55.97 ,
-czs,,,y,y,n,y, ac ,br,samer,itc1,br019, -72.63 , -7.633 ,
-czt,,,y,y,n,n, tx ,us,namer,itc1,us107, -99.87 , 28.52 ,
-czu,,,y,y,n,y, ,co,samer,itc1,co132, -75.28 , 9.333 ,
-czw,,,y,y,n,n, ,pl,eeuro,itc2,pl089, 19.1 , 50.82 ,
-czx,,,y,y,n,y, ,cn,asia,itc3,cn035, 120 , 31.75 ,
-czy,,,y,y,n,n, ql ,au,austl,itc3,au131, 139.5 , -24.5 ,
-czz,,,y,y,n,n, ca ,us,namer,itc1,us110, 9.817 , 2.367 ,
-daa,,,y,y,n,n, va ,us,namer,itc1,us105, -77.18 , 38.72 ,
-dab,,,y,y,n,y, fl ,us,namer,itc1,us105, -81.05 , 29.18 ,
-dac,,,y,y,n,y, ,bd,asia,itc3,bd, 90.38 , 23.77 ,
-dad,,,y,y,n,y, ,vn,seasi,itc3,vn, 108.2 , 16.03 ,
-dae,,,y,y,n,n, ,in,asia,itc3,in, 94.33 , 27.5 ,
-daf,,,y,y,n,n, ,pg,austl,itc3,pg, 145 , -4.733 ,
-dag,,,y,y,n,n, ca ,us,namer,itc1,us110, -116.8 , 34.85 ,
-dah,,,y,y,n,n, ,ye,meast,itc2,ye, 46.13 , 13.87 ,
-dai,,,y,y,n,n, ,in,asia,itc3,in, 88.27 , 27.03 ,
-daj,,,y,y,n,n, ql ,au,austl,itc3,au131, 142.5 , -9.433 ,
-dak,,,y,y,n,n, ,eg,afric,itc2,eg044, 29 , 25.41 ,
-dam,,,y,y,n,y, ,sy,meast,itc2,sy098, 36.23 , 33.48 ,
-dan,,,y,y,n,n, va ,us,namer,itc1,us105, -79.35 , 36.57 ,
-dao,,,n,y,n,n, ,pg,austl,itc3,pg, 147.8 , -8.417 ,
-dap,,,y,y,n,n, ,np,asia,itc3,np, 80.5 , 29.67 ,
-dar,,,y,y,n,y, ,tz,afric,itc2,tz, 39.2 , -6.883 ,
-das,,,n,y,n,n, nt ,ca,namer,itc1,ca029, -119.7 , 42.18 ,
-dat,,,y,y,n,y, ,cn,asia,itc3,cn035, 101.7 , 36.93 ,
-dau,,,y,y,n,y, ,pg,austl,itc3,pg, 143.2 , -9.083 ,
-dav,,,y,y,n,y, ,pa,camer,itc1,pa, -82.43 , 8.383 ,
-dax,,,y,y,n,y, ,cn,asia,itc3,cn035, 107.5 , 31.3 ,
-day,,,y,y,n,y, oh ,us,namer,itc1,us105, -84.22 , 39.9 ,
-daz,,,y,y,n,n, ,af,meast,itc3,af, 70.88 , 38.47 ,
-dba,,,y,y,n,y, ,pk,asia,itc3,pk163, 64.43 , 28.88 ,
-dbb,,,y,y,n,n, ,eg,afric,itc2,eg044, 28.46 , 30.92 ,
-dbd,,,y,y,n,n, ,in,asia,itc3,in, 86.45 , 23.8 ,
-dbm,,,y,y,n,n, ,et,afric,itc2,et, 37.77 , 10.28 ,
-dbn,,,y,y,n,n, ga ,us,namer,itc1,us105, -82.98 , 32.55 ,
-dbo,,,y,y,n,y, ns ,au,austl,itc3,au007, 148.6 , -32.22 ,
-dbp,,,y,y,n,n, ,pg,austl,itc3,pg, 141.9 , -6.283 ,
-dbq,,,y,y,n,y, ia ,us,namer,itc1,us107, -90.72 , 42.4 ,
-dbs,,,y,y,n,n, id ,us,namer,itc1,us108, -112.2 , 44.17 ,
-dbt,,,y,y,n,n, ,et,afric,itc2,et, 38 , 11.97 ,
-dbu,,,y,y,n,n, ,lk,asia,itc3,lk187, 80.65 , 7.851 ,
-dbv,,,y,y,n,y, ,hr,eeuro,itc2,hr152, 18.27 , 42.57 ,
-dby,,,y,y,n,n, ql ,au,austl,itc3,au131, 151.2 , -27.25 ,
-dci,,,y,y,n,n, ,it,europ,itc2,it067, 8.967 , 39.32 ,
-dck,,,y,y,n,n, ak ,us,namer,itc1,us111, -156.9 , 66.93 ,
-dcm,,,y,y,n,y, ,fr,europ,itc2,fr052, 2.283 , 43.55 ,
-dcr,,,y,y,n,n, in ,us,namer,itc1,us105, -84.93 , 40.83 ,
-dct,,,y,y,n,n, ,bs,carib,itc1,bs021, -75.73 , 22.18 ,
-dcu,,,y,y,n,n, al ,us,namer,itc1,us107, -86.98 , 34.6 ,
-ddc,,,y,y,n,y, ks ,us,namer,itc1,us107, -99.97 , 37.77 ,
-ddg,,,y,y,n,y, ,cn,asia,itc3,cn035, 124.3 , 40.2 ,
-ddi,,,y,y,n,n, ql ,au,austl,itc3,au131, 148.2 , -20.17 ,
-ddm,,,y,y,n,n, ,pg,austl,itc3,pg, 147.5 , -8.75 ,
-ddn,,,y,y,n,n, ql ,au,austl,itc3,au131, 141.3 , -16.92 ,
-ddp,,,y,y,n,n, ,pr,carib,itc1,pr, -66.25 , 18.5 ,
-ddu,,,y,y,n,n, ,pk,asia,itc3,pk163, 67.78 , 26.73 ,
-bfs,,,y,y,n,y, ,gb,europ,itc2,gb053, -6.233 , 54.65 ,
-bft,,,y,y,n,n, sc ,us,namer,itc1,us105, -80.63 , 32.42 ,
-bfu,,,y,y,n,n, ,cn,asia,itc3,cn035, 117.3 , 32.95 ,
-bfv,,,y,y,n,y, ,th,seasi,itc3,th, 103.3 , 15.23 ,
-bfw,,,y,y,n,n, ,dz,afric,itc2,dz, -0.5894 , 35.17 ,
-bfx,,,y,y,n,n, ,cm,afric,itc2,cm, 10.4 , 5.483 ,
-bga,,,y,y,n,y, ,co,samer,itc1,co132, -73.15 , 7.1 ,
-bgb,,,y,y,n,n, ,ga,afric,itc2,ga, 11.93 , -0.1 ,
-bgc,,,y,y,n,n, ,pt,europ,itc2,pt092, -6.75 , 41.82 ,
-bgd,,,y,y,n,n, tx ,us,namer,itc1,us107, -101.4 , 35.65 ,
-bge,,,y,y,n,n, ga ,us,namer,itc1,us105, -84.6 , 30.9 ,
-bgf,,,y,y,n,y, ,cf,afric,itc2,cf, 18.57 , 4.383 ,
-bgg,,,y,y,n,n, ,ci,afric,itc2,ci, -4.2 , 6.65 ,
-bgh,,,y,y,n,n, ,mr,afric,itc2,mr, -14.2 , 16.63 ,
-bgi,,,y,y,n,y, ,bb,carib,itc1,bb, -59.48 , 13.07 ,
-bgj,,,y,y,n,n, ,is,europ,itc2,is, -21.98 , 64.47 ,
-bgk,,,y,y,n,n, ,bz,camer,itc1,bz, -88.42 , 16.52 ,
-bgl,,,y,y,n,n, ,np,asia,itc3,np, 83.67 , 28.22 ,
-bgm,,,y,y,n,y, ny ,us,namer,itc1,us105, -75.98 , 42.22 ,
-bgn,,,y,y,n,n, ,de,europ,itc2,de040, 6.133 , 51.2 ,
-bgo,,,y,y,n,y, ,no,europ,itc2,no083, 5.217 , 60.3 ,
-bgp,,,y,y,n,n, ,ga,afric,itc2,ga, 10.22 , -2.167 ,
-bgq,,,y,y,n,n, ak ,us,namer,itc1,us111, -149.8 , 61.53 ,
-bgr,,,y,y,n,y, me ,us,namer,itc1,us105, -68.82 , 44.8 ,
-bgt,,,y,y,n,n, az ,us,namer,itc1,us109, -113.2 , 34.57 ,
-bgu,,,y,y,n,n, ,cf,afric,itc2,cf, 22.8 , 4.783 ,
-bgv,,,y,y,n,n, rs ,br,samer,itc1,br015, -51.52 , -29.17 ,
-bgw,,,y,y,n,y, ,iq,meast,itc2,iq066, 44.5 , 33.28 ,
-bgx,,,y,y,n,n, rs ,br,samer,itc1,br015, -54.12 , -31.38 ,
-bgz,,,y,y,n,n, ,pt,europ,itc2,pt092, -8.45 , 41.58 ,
-bha,,,y,y,n,n, ,ec,samer,itc1,ec042, -80.4 , -0.5833 ,
-bhb,,,y,y,n,y, me ,us,namer,itc1,us105, -68.37 , 44.45 ,
-bhc,,,y,y,n,n, ,pk,asia,itc3,pk163, 73.43 , 33.92 ,
-bhe,,,y,y,n,y, ,nz,austl,itc3,nz084, 173.9 , -41.53 ,
-bhf,,,y,y,n,n, ,co,samer,itc1,co132, -77.33 , 6.55 ,
-bhg,,,y,y,n,y, ,hn,camer,itc1,hn, -84.83 , 15.83 ,
-bhh,,,y,y,n,y, ,sa,meast,itc2,sa, 42.65 , 19.98 ,
-bhi,,,y,y,n,y, ba ,ar,samer,itc1,ar003, -62.18 , -38.72 ,
-bhj,,,y,y,n,y, ,in,asia,itc3,in, 69.67 , 23.28 ,
-bhk,,,y,y,n,y, ,uz,euras,itc3,uz138, 64.48 , 39.77 ,
-bhl,,,y,y,n,n, ,mx,namer,itc1,mx080, -113.6 , 28.95 ,
-bhm,,,y,y,n,y, al ,us,namer,itc1,us107, -86.75 , 33.57 ,
-bhn,,,y,y,n,n, ,ye,meast,itc2,ye, 45.73 , 14.78 ,
-bho,,,y,y,n,y, ,in,asia,itc3,in, 77.33 , 23.28 ,
-bhp,,,y,y,n,n, ,np,asia,itc3,np, 87.05 , 27.17 ,
-bhq,,,y,y,n,y, ns ,au,austl,itc3,au009, 141.5 , -32 ,
-bhr,,,y,y,n,y, ,np,asia,itc3,np, 84.42 , 27.68 ,
-bhs,,,y,y,n,y, ns ,au,austl,itc3,au007, 149.7 , -33.42 ,
-bht,,,y,y,n,n, ql ,au,austl,itc3,au131, 141.6 , -23.5 ,
-bhu,,,y,y,n,y, ,in,asia,itc3,in, 72.18 , 21.75 ,
-bhv,,,y,y,n,y, ,pk,asia,itc3,pk163, 71.68 , 29.4 ,
-bhx,,,y,y,n,y, ,gb,europ,itc2,gb053, -1.75 , 52.45 ,
-bhy,,,y,y,n,y, ,cn,asia,itc3,cn035, 109.1 , 21.48 ,
-bhz,,,n,y,n,n, mg ,br,samer,itc1,br015, -43.75 , -19.75 ,
-bia,,,y,y,n,y, ,fr,europ,itc2,fr052, 9.483 , 42.55 ,
-bib,,,y,y,n,n, ,so,afric,itc2,so, 43.8 , 3.067 ,
-bic,,,y,y,n,y, ak ,us,namer,itc1,us111, -157.6 , 57.67 ,
-bid,,,y,y,n,y, ri ,us,namer,itc1,us105, -71.58 , 41.17 ,
-bie,,,y,y,n,n, ne ,us,namer,itc1,us107, -96.75 , 40.32 ,
-big,,,y,y,n,n, ak ,us,namer,itc1,us111, -145.7 , 64 ,
-bih,,,y,y,n,n, ca ,us,namer,itc1,us110, -118.4 , 37.37 ,
-bii,,,y,y,n,y, ,mh,pacif,itc3,mh075, 165.4 , 11.58 ,
-bij,,,y,y,n,n, ,pg,austl,itc3,pg, 146.4 , -5.583 ,
-bik,,,y,y,n,y, ,id,seasi,itc3,id063, 136.1 , -1 ,
-bil,,,y,y,n,y, mt ,us,namer,itc1,us108, -108.5 , 45.8 ,
-bim,,,y,y,n,y, ,bs,carib,itc1,bs021, -79.28 , 25.7 ,
-bin,,,y,y,n,n, ,af,meast,itc3,af, 67.82 , 34.8 ,
-bio,,,y,y,n,y, ,es,europ,itc2,es045, -2.917 , 43.3 ,
-dea,,,y,y,n,y, ,pk,asia,itc3,pk163, 70.73 , 30.08 ,
-deb,,,y,y,n,y, ,hu,eeuro,itc2,hu060, 21.48 , 47.47 ,
-isd,,,y,y,n,n, ,co,samer,itc1,co132, -77.97 , 2.433 ,
-ise,,,y,y,n,n, ,tr,euras,itc2,tr101, 30.38 , 37.87 ,
-isg,,,y,y,n,y, ,jp,asia,itc3,jp, 124.2 , 24.33 ,
-ish,,,y,y,n,n, ,it,europ,itc2,it067, 13.83 , 40.63 ,
-isi,,,y,y,n,n, ql ,au,austl,itc3,au131, 144.4 , -24.2 ,
-isj,,,y,y,n,n, ,mx,namer,itc1,mx168, -86.75 , 21.27 ,
-isk,,,y,y,n,n, ,in,asia,itc3,in, 73.82 , 19.97 ,
-isl,,,y,y,n,n, ak ,us,namer,itc1,us111, -145 , 63.5 ,
-ism,,,y,y,n,n, fl ,us,namer,itc1,us105, -81.43 , 28.28 ,
-isn,,,y,y,n,y, nd ,us,namer,itc1,us107, -103.7 , 48.18 ,
-iso,,,y,y,n,n, nc ,us,namer,itc1,us105, -77.62 , 35.33 ,
-isp,,,y,y,n,y, ny ,us,namer,itc1,us105, -73.1 , 40.8 ,
-isq,,,y,y,n,n, mi ,us,namer,itc1,us105, -88.25 , 45.95 ,
-iss,,,y,y,n,n, me ,us,namer,itc1,us105, -69.72 , 43.97 ,
-ist,,,y,y,n,y, ,tr,euras,itc2,tr101, 28.82 , 40.97 ,
-isu,,,y,y,n,n, ,iq,meast,itc2,iq066, 45.31 , 35.56 ,
-isw,,,y,y,n,n, wi ,us,namer,itc1,us107, -89.84 , 44.36 ,
-ita,,,y,y,n,n, am ,br,samer,itc1,br018, -58.5 , -3.2 ,
-itb,,,y,y,n,n, pa ,br,samer,itc1,br018, -55.98 , -4.267 ,
-ite,,,y,y,n,n, ba ,br,samer,itc1,br016, -39.2 , -13.7 ,
-ith,,,y,y,n,y, ny ,us,namer,itc1,us105, -76.47 , 42.48 ,
-iti,,,y,y,n,n, mg ,br,samer,itc1,br015, -41.7 , -18.02 ,
-itj,,,y,y,n,n, sc ,br,samer,itc1,br015, -48.65 , -26.88 ,
-itk,,,y,y,n,n, ,pg,austl,itc3,pg, 147.3 , -9.517 ,
-itn,,,y,y,n,n, ba ,br,samer,itc1,br016, -39.38 , -14.8 ,
-ito,,,y,y,n,y, hi ,us,namer,itc1,us113, -155.1 , 19.72 ,
-itp,,,y,y,n,n, rj ,br,samer,itc1,br015, -41.87 , -21.22 ,
-itq,,,y,y,n,n, rs ,br,samer,itc1,br015, -56.53 , -29.17 ,
-itr,,,y,y,n,n, go ,br,samer,itc1,br015, -49.21 , -18.45 ,
-iue,,,y,y,n,y, ,nu,austl,itc3,nu, -169 , -19 ,
-iul,,,y,y,n,n, ,id,seasi,itc3,id063, 138.1 , -3.75 ,
-ium,,,y,y,n,n, bc ,ca,namer,itc1,ca031, -122.6 , 54.28 ,
-ius,,,y,y,n,n, ,pg,austl,itc3,pg, 155.2 , -5.817 ,
-iva,,,y,y,n,n, ,mg,afric,itc2,mg, 48.47 , -13.65 ,
-ivc,,,y,y,n,y, ,nz,austl,itc3,nz084, 168.3 , -46.42 ,
-ivg,,,y,y,n,n, ,me,europ,itc2,me188, 19.78 , 42.43 ,
-ivh,,,y,y,n,n, ak ,us,namer,itc1,us111, -148.3 , 69.4 ,
-ivl,,,y,y,n,y, ,fi,europ,itc2,fi047, 27.42 , 68.6 ,
-ivo,,,y,y,n,n, ,co,samer,itc1,co132, -74.68 , 10.02 ,
-ivr,,,y,y,n,y, ns ,au,austl,itc3,au007, 151.5 , -29.83 ,
-ivw,,,y,y,n,n, nt ,au,austl,itc3,au010, 129.2 , -17.77 ,
-iwa,,,y,y,n,n, ,ru,euras,itc2,ru130, 41 , 57 ,
-iwd,,,y,y,n,y, mi ,us,namer,itc1,us107, -90.13 , 46.53 ,
-iwj,,,y,y,n,y, ,jp,asia,itc3,jp, 141.8 , 43.2 ,
-iwo,,,y,y,n,n, ,jp,asia,itc3,jp, 4.183 , 7.633 ,
-ixa,,,y,y,n,y, ,in,asia,itc3,in, 91.25 , 23.9 ,
-ixb,,,y,y,n,y, ,in,asia,itc3,in, 88.33 , 26.73 ,
-ixc,,,y,y,n,y, ,in,asia,itc3,in, 76.8 , 30.67 ,
-ixd,,,y,y,n,y, ,in,asia,itc3,in, 81.73 , 25.43 ,
-ixe,,,y,y,n,y, ,in,asia,itc3,in, 74.9 , 12.98 ,
-ixg,,,y,y,n,y, ,in,asia,itc3,in, 74.6 , 15.85 ,
-ixh,,,y,y,n,n, ,in,asia,itc3,in, 92.02 , 24.32 ,
-ixi,,,y,y,n,y, ,in,asia,itc3,in, 94.1 , 27.27 ,
-ixj,,,y,y,n,y, ,in,asia,itc3,in, 74.83 , 32.68 ,
-ixk,,,y,y,n,n, ,in,asia,itc3,in, 70.32 , 21.32 ,
-ixl,,,y,y,n,y, ,in,asia,itc3,in, 77.58 , 34.17 ,
-ixm,,,y,y,n,y, ,in,asia,itc3,in, 78.08 , 9.833 ,
-ixn,,,y,y,n,n, ,in,asia,itc3,in, 91.63 , 24.07 ,
-ixp,,,y,y,n,n, ,in,asia,itc3,in, 75.63 , 32.23 ,
-ixq,,,y,y,n,n, ,in,asia,itc3,in, 91.82 , 24.13 ,
-ixr,,,y,y,n,y, ,in,asia,itc3,in, 85.32 , 23.32 ,
-ixs,,,y,y,n,y, ,in,asia,itc3,in, 92.52 , 24.97 ,
-ixt,,,y,y,n,n, ,in,asia,itc3,in, 95.37 , 28.07 ,
-ixu,,,y,y,n,y, ,in,asia,itc3,in, 75.42 , 19.88 ,
-ixv,,,y,y,n,n, ,in,asia,itc3,in, 94.83 , 28.42 ,
-ixw,,,y,y,n,y, ,in,asia,itc3,in, 86.17 , 22.82 ,
-ixy,,,y,y,n,y, ,in,asia,itc3,in, 70.1 , 23.12 ,
-ixz,,,y,y,n,y, ,in,asia,itc3,in, 92.73 , 11.67 ,
-iyk,,,y,y,n,y, ca ,us,namer,itc1,us110, -117.8 , 35.65 ,
-izm,,,n,y,n,n, ,tr,euras,itc2,tr101, 27.02 , 38.52 ,
-izo,,,y,y,n,y, ,jp,asia,itc3,jp, 132.7 , 35.42 ,
-izt,,,y,y,n,n, ,mx,namer,itc1,mx168, -95.1 , 16.57 ,
-jaa,,,y,y,n,n, ,af,meast,itc3,af, 70.5 , 34.4 ,
-cew,,,y,y,n,n, fl ,us,namer,itc1,us105, -86.52 , 30.78 ,
-cex,,,y,y,n,n, ak ,us,namer,itc1,us111, -146.1 , 65.05 ,
-hoy,,,y,y,n,n, ,gb,europ,itc2,gb053, -3.3 , 58.83 ,
-hpa,,,y,y,n,y, ,to,austl,itc3,to173, -174.3 , -19.82 ,
-hpb,,,y,y,n,y, ak ,us,namer,itc1,us111, -166.1 , 61.5 ,
-hpe,,,y,y,n,n, ql ,au,austl,itc3,au007, 144.9 , -14.67 ,
-hph,,,y,y,n,y, ,vn,seasi,itc3,vn, 106.7 , 20.87 ,
-hpn,,,y,y,n,y, ny ,us,namer,itc1,us105, -73.7 , 41.07 ,
-hpp,,,y,y,n,n, ,kh,seasi,itc3,kh, 102.7 , 13.65 ,
-hpt,,,y,y,n,n, ia ,us,namer,itc1,us107, -93.2 , 42.75 ,
-hpy,,,y,y,n,n, tx ,us,namer,itc1,us107, -94.97 , 29.73 ,
-hqm,,,y,y,n,n, wa ,us,namer,itc1,us110, -123.9 , 46.97 ,
-hra,,,y,y,n,n, ,pk,asia,itc3,pk163, 73.2 , 34.33 ,
-hrb,,,y,y,n,y, ,cn,asia,itc3,cn035, 126.6 , 46.02 ,
-hrc,,,y,y,n,n, ,kz,euras,itc3,kz164, 70.47 , 48.47 ,
-hrd,,,y,y,n,n, ,no,europ,itc2,no083, 16.5 , 68.8 ,
-hre,,,y,y,n,y, ,zw,afric,itc2,zw, 31 , -17.92 ,
-hrg,,,y,y,n,y, ,eg,afric,itc2,eg044, 33.87 , 27.2 ,
-hrj,,,y,y,n,n, ,np,asia,itc3,np, 83.83 , 28 ,
-hrk,,,y,y,n,y, ,ua,euras,itc2,ua127, 36.25 , 50 ,
-hrl,,,y,y,n,y, tx ,us,namer,itc1,us107, -97.75 , 26.2 ,
-hrm,,,y,y,n,n, ,dz,afric,itc2,dz, 3.267 , 32.92 ,
-hrn,,,y,y,n,n, ql ,au,austl,itc3,au131, 115.9 , -31.92 ,
-hro,,,y,y,n,y, ar ,us,namer,itc1,us107, -93.1 , 36.22 ,
-hrr,,,y,y,n,n, ,co,samer,itc1,co132, -75.85 , 3.217 ,
-hrs,,,y,y,n,n, ,za,afric,itc2,za, 29.1 , -28.23 ,
-hrt,,,y,y,n,y, ,gb,europ,itc2,gb053, -1.25 , 54.05 ,
-hry,,,y,y,n,n, nt ,au,austl,itc3,au010, 133.1 , -24.67 ,
-hrz,,,y,y,n,n, rs ,br,samer,itc1,br015, -54.34 , -27.64 ,
-hsb,,,y,y,n,n, il ,us,namer,itc1,us107, -88.55 , 37.73 ,
-hsc,,,y,y,n,n, ,cn,asia,itc3,cn035, 113.6 , 24.83 ,
-hsg,,,y,y,n,y, ,jp,asia,itc3,jp, 130.3 , 33.15 ,
-hsi,,,y,y,n,n, ne ,us,namer,itc1,us107, -98.43 , 40.6 ,
-hsk,,,y,y,n,n, ,es,europ,itc2,es045, -0.3303 , 42.09 ,
-hsl,,,y,y,n,y, ak ,us,namer,itc1,us111, -156.4 , 65.7 ,
-hsm,,,y,y,n,n, vi ,au,austl,itc3,au007, 141.8 , -36.5 ,
-hsn,,,y,y,n,y, ,cn,asia,itc3,cn035, 122.4 , 29.38 ,
-hsp,,,y,y,n,n, va ,us,namer,itc1,us105, -79.82 , 37.95 ,
-hss,,,y,y,n,n, ,in,asia,itc3,in, 75.8 , 29.17 ,
-hst,,,y,y,n,n, fl ,us,namer,itc1,us105, -80.48 , 25.48 ,
-hsv,,,y,y,n,y, al ,us,namer,itc1,us107, -86.77 , 34.63 ,
-hsz,,,y,y,n,n, ,tw,asia,itc3,tw, 120.9 , 24.82 ,
-hta,,,y,y,n,y, ,ru,euras,itc2,ru145, 113.3 , 52.03 ,
-htb,,,y,y,n,n, ,gp,carib,itc1,gp, -61.63 , 15.85 ,
-htf,,,y,y,n,n, ,gb,europ,itc2,gb053, -0.2333 , 51.75 ,
-htg,,,y,y,n,n, ,ru,euras,itc2,ru144, 102.5 , 71.97 ,
-hth,,,y,y,n,n, nv ,us,namer,itc1,us110, -118.6 , 38.55 ,
-hti,,,y,y,n,y, ql ,au,austl,itc3,au131, 149 , -20.35 ,
-htl,,,y,y,n,n, mi ,us,namer,itc1,us105, -88.57 , 47.1 ,
-htm,,,y,y,n,n, ,mn,asia,itc3,mn175, 100.2 , 50.45 ,
-htn,,,y,y,n,y, ,cn,asia,itc3,cn035, 78.5 , 40.5 ,
-hto,,,y,y,n,n, ny ,us,namer,itc1,us105, -72.23 , 40.97 ,
-htr,,,y,y,n,n, ,jp,asia,itc3,jp, 123.8 , 24.05 ,
-hts,,,y,y,n,y, wv ,us,namer,itc1,us105, -82.53 , 38.35 ,
-htu,,,y,y,n,n, vi ,au,austl,itc3,au007, 142.4 , -35.72 ,
-htv,,,y,y,n,n, tx ,us,namer,itc1,us107, -95.58 , 30.75 ,
-htw,,,y,y,n,n, oh ,us,namer,itc1,us105, -76.25 , 36.75 ,
-hty,,,y,y,n,y, ,tr,euras,itc2,tr101, 36.16 , 36.58 ,
-htz,,,y,y,n,n, ,co,samer,itc1,co132, -71.75 , 6.167 ,
-hub,,,y,y,n,n, nt ,au,austl,itc3,au010, 130.6 , -16.48 ,
-huc,,,y,y,n,n, ,pr,carib,itc1,pr, -65.8 , 18.14 ,
-hud,,,y,y,n,n, ia ,us,namer,itc1,us107, -94.22 , 42.73 ,
-hue,,,y,y,n,n, ,et,afric,itc2,et, 36.58 , 14.25 ,
-huf,,,y,y,n,n, in ,us,namer,itc1,us105, -87.3 , 39.45 ,
-hug,,,y,y,n,n, ,gt,camer,itc1,gt119, -91.47 , 15.33 ,
-huh,,,y,y,n,y, ,pf,pacif,itc3,pf087, -151 , -16.68 ,
-hui,,,y,y,n,y, ,vn,seasi,itc3,vn, 107.7 , 16.4 ,
-huj,,,y,y,n,n, ok ,us,namer,itc1,us107, -95.52 , 34.02 ,
-huk,,,y,y,n,n, ,bw,afric,itc2,bw, 21.75 , -23.98 ,
-hul,,,y,y,n,n, me ,us,namer,itc1,us105, -67.8 , 46.13 ,
-hum,,,y,y,n,n, la ,us,namer,itc1,us107, -90.67 , 29.58 ,
-hun,,,y,y,n,y, ,tw,asia,itc3,tw, 121.4 , 24.02 ,
-huq,,,y,y,n,n, ,ly,afric,itc2,ly122, 15.93 , 29.05 ,
-gtc,,,y,y,n,n, ,bs,carib,itc1,bs021, -77.33 , 26.78 ,
-gte,,,y,y,n,y, nt ,au,austl,itc3,au010, 136.5 , -14 ,
-gtf,,,y,y,n,y, mt ,us,namer,itc1,us108, -111.4 , 47.5 ,
-gtg,,,y,y,n,n, wi ,us,namer,itc1,us107, -92.68 , 45.78 ,
-gti,,,y,y,n,n, ,de,europ,itc2,de040, 12.32 , 54.38 ,
-gtk,,,y,y,n,n, ,my,seasi,itc3,my, 102.9 , 2.6 ,
-gto,,,y,y,n,y, ,id,seasi,itc3,id062, 122.9 , 0.65 ,
-gtp,,,y,y,n,n, or ,us,namer,itc1,us110, -123.4 , 42.51 ,
-gts,,,y,y,n,y, nt ,au,austl,itc3,au010, 133.6 , -26.95 ,
-gtt,,,y,y,n,n, ql ,au,austl,itc3,au131, 143.8 , -18.42 ,
-gtw,,,y,y,n,n, ,cz,eeuro,itc2,cz037, 17.67 , 49 ,
-gty,,,y,y,n,n, pa ,us,namer,itc1,us105, -77.23 , 39.83 ,
-gua,,,y,y,n,y, ,gt,camer,itc1,gt119, -90.53 , 14.57 ,
-gub,,,y,y,n,n, ,mx,namer,itc1,mx080, -114.2 , 28.67 ,
-guc,,,y,y,n,y, co ,us,namer,itc1,us108, -106.9 , 38.53 ,
-gud,,,y,y,n,n, ,ml,afric,itc2,ml, -3.6 , 16.35 ,
-gue,,,y,y,n,n, ,pg,austl,itc3,pg, 141.6 , -3.583 ,
-guf,,,y,y,n,n, al ,us,namer,itc1,us107, -87.58 , 30.17 ,
-gug,,,y,y,n,n, ,pg,austl,itc3,pg, 146.9 , -8.1 ,
-guh,,,y,y,n,n, ns ,au,austl,itc3,au007, 150.2 , -30.95 ,
-gui,,,y,y,n,n, ,ve,samer,itc1,ve194, -62.3 , 10.57 ,
-guj,,,y,y,n,n, sp ,br,samer,itc1,br015, -45.22 , -22.82 ,
-gul,,,y,y,n,n, ns ,au,austl,itc3,au007, 151.8 , -33.83 ,
-gum,,,y,y,n,y, ,gu,pacif,itc3,gu, 144.7 , 13.48 ,
-guo,,,y,y,n,n, ,hn,camer,itc1,hn, -86.03 , 15.08 ,
-gup,,,y,y,n,n, nm ,us,namer,itc1,us108, -108.8 , 35.52 ,
-guq,,,y,y,n,n, ,ve,samer,itc1,ve194, -69.75 , 9.033 ,
-gur,,,y,y,n,y, ,pg,austl,itc3,pg, 150.4 , -10.33 ,
-gus,,,y,y,n,n, in ,us,namer,itc1,us105, -86.15 , 40.65 ,
-gut,,,y,y,n,n, ,de,europ,itc2,de040, 8.383 , 51.9 ,
-guu,,,y,y,n,n, ,is,europ,itc2,is, -23.17 , 64.97 ,
-guv,,,y,y,n,n, ,pg,austl,itc3,pg, 142.4 , -6.283 ,
-guw,,,y,y,n,y, ,kz,euras,itc3,kz162, 51.9 , 47.12 ,
-gux,,,y,y,n,n, ,in,asia,itc3,in, 77.32 , 24.48 ,
-guy,,,y,y,n,n, ok ,us,namer,itc1,us107, -101.5 , 36.68 ,
-guz,,,y,y,n,n, es ,br,samer,itc1,br015, -40.48 , -22.82 ,
-gva,,,y,y,n,y, ,ch,europ,itc2,ch032, 6.117 , 46.23 ,
-gve,,,y,y,n,n, va ,us,namer,itc1,us105, -78.17 , 38.15 ,
-gvi,,,y,y,n,n, ,pg,austl,itc3,pg, 141.2 , -3.917 ,
-gvl,,,y,y,n,n, ga ,us,namer,itc1,us105, -83.83 , 34.27 ,
-gvn,,,y,y,n,y, ,ru,euras,itc2,ru146, 140.3 , 48.93 ,
-gvp,,,y,y,n,n, ql ,au,austl,itc3,au131, 144.6 , -15.78 ,
-gvr,,,y,y,n,y, mg ,br,samer,itc1,br015, -41.82 , -18.87 ,
-gvt,,,y,y,n,n, tx ,us,namer,itc1,us107, -96.12 , 33.13 ,
-gvw,,,y,y,n,n, mo ,us,namer,itc1,us107, -94.53 , 38.88 ,
-gvx,,,y,y,n,n, ,se,europ,itc2,se095, 17.02 , 60.52 ,
-gwa,,,y,y,n,n, ,mm,seasi,itc3,mm, 94.5 , 17.83 ,
-gwd,,,y,y,n,y, ,pk,asia,itc3,pk163, 62.33 , 25.22 ,
-gwe,,,y,y,n,n, ,zw,afric,itc2,zw, 29.98 , -19.67 ,
-gwl,,,y,y,n,y, ,in,asia,itc3,in, 78.23 , 26.28 ,
-gwn,,,y,y,n,n, ,pg,austl,itc3,pg, 146.3 , -6.567 ,
-gwo,,,y,y,n,n, ms ,us,namer,itc1,us107, -90.2 , 33.5 ,
-gws,,,y,y,n,n, co ,us,namer,itc1,us108, -107.3 , 39.53 ,
-gwt,,,y,y,n,y, ,de,europ,itc2,de040, 8.35 , 54.92 ,
-gwv,,,y,y,n,n, wv ,us,namer,itc1,us105, -81.63 , 38.35 ,
-gwy,,,y,y,n,y, ,ie,europ,itc2,ie064, -9.033 , 53.28 ,
-gxf,,,y,y,n,y, ,ye,meast,itc2,ye, 48.88 , 15.98 ,
-gxg,,,y,y,n,y, ,ao,afric,itc2,ao, 15.83 , -7.517 ,
-gxq,,,y,y,n,n, ,cl,samer,itc1,cl033, -72.52 , -45.5 ,
-gxx,,,y,y,n,n, ,cm,afric,itc2,cm, 15.23 , 10.35 ,
-gxy,,,y,y,n,n, co ,us,namer,itc1,us108, -104.6 , 40.33 ,
-gya,,,y,y,n,y, ,bo,samer,itc1,bo, -65.38 , -10.8 ,
-gye,,,y,y,n,y, ,ec,samer,itc1,ec042, -79.87 , -2.167 ,
-gyi,,,y,y,n,n, ,rw,afric,itc2,rw, 29.25 , -1.7 ,
-gyl,,,y,y,n,y, wa ,au,austl,itc3,au011, 128.5 , -16.63 ,
-gym,,,y,y,n,y, ,mx,namer,itc1,mx097, -110.9 , 27.97 ,
-gyn,,,y,y,n,y, go ,br,samer,itc1,br015, -49.3 , -16.72 ,
-gyp,,,y,y,n,n, ql ,au,austl,itc3,au131, 152.7 , -26.28 ,
-dec,,,y,y,n,y, il ,us,namer,itc1,us107, -88.87 , 39.83 ,
-ded,,,y,y,n,y, ,in,asia,itc3,in, 78.03 , 30.32 ,
-def,,,y,y,n,y, ,ir,meast,itc2,ir120, 48.38 , 32.43 ,
-deh,,,y,y,n,n, ia ,us,namer,itc1,us107, -91.83 , 43.32 ,
-dei,,,y,y,n,n, ,sc,iocea,itc2,sc, 55.67 , -3.8 ,
-del,,,y,y,n,y, ,in,asia,itc3,in, 77.12 , 28.57 ,
-dem,,,y,y,n,n, ,et,afric,itc2,et, 34.87 , 8.55 ,
-den,,,y,y,n,y, co ,us,namer,itc1,us108, -104.7 , 39.83 ,
-deo,,,y,y,n,n, mi ,us,namer,itc1,us105, -83.23 , 42.3 ,
-dep,,,y,y,n,n, ,in,asia,itc3,in, 78.47 , 17.38 ,
-der,,,y,y,n,n, ,pg,austl,itc3,pg, 146.8 , -6.1 ,
-des,,,y,y,n,n, ,sc,iocea,itc2,sc, 55.02 , -4.983 ,
-dez,,,y,y,n,y, ,sy,meast,itc2,sy098, 40.15 , 35.33 ,
-dfi,,,y,y,n,n, oh ,us,namer,itc1,us105, -84.37 , 41.28 ,
-dfp,,,y,y,n,n, ql ,au,austl,itc3,au131, 143 , -16 ,
-dfw,,,y,y,n,y, tx ,us,namer,itc1,us107, -97.04 , 32.9 ,
-dga,,,y,y,n,y, ,bz,camer,itc1,bz, -88.58 , 17.18 ,
-dgb,,,y,y,n,n, ak ,us,namer,itc1,us111, -152.8 , 58.08 ,
-dgc,,,y,y,n,n, ,et,afric,itc2,et, 43.58 , 8.233 ,
-dgd,,,y,y,n,n, wa ,au,austl,itc3,au011, 117.3 , -27.82 ,
-dge,,,y,y,n,y, ns ,au,austl,itc3,au007, 149.2 , -32.78 ,
-dgf,,,y,y,n,n, bc ,ca,namer,itc1,ca031, -120.2 , 10 ,
-dgg,,,y,y,n,n, ,pg,austl,itc3,pg, 140.7 , -2.533 ,
-dgk,,,y,y,n,n, ,mz,afric,itc2,mz, 35.42 , -22.18 ,
-dgm,,,y,y,n,n, ,cn,asia,itc3,cn035, 113.7 , 23.03 ,
-dgn,,,y,y,n,n, va ,us,namer,itc1,us105, 77.47 , 37.5 ,
-dgo,,,y,y,n,y, ,mx,namer,itc1,mx168, -104.7 , 24 ,
-dgp,,,y,y,n,n, ,lv,eeuro,itc2,lv126, 29.68 , 55.93 ,
-dgr,,,y,y,n,n, ,nz,austl,itc3,nz084, 173.9 , -35.93 ,
-dgt,,,y,y,n,y, ,ph,pacif,itc3,ph, 123.3 , 9.3 ,
-dgu,,,y,y,n,n, ,bf,afric,itc2,bf, -3.483 , 12.47 ,
-dgw,,,y,y,n,n, wy ,us,namer,itc1,us108, -105.4 , 42.75 ,
-dha,,,y,y,n,n, ,sa,meast,itc2,sa, 50.17 , 26.27 ,
-dhd,,,y,y,n,n, ql ,au,austl,itc3,au131, 141.9 , -27.07 ,
-dhi,,,y,y,n,n, ,np,asia,itc3,np, 80.67 , 28.25 ,
-dhl,,,y,y,n,n, ,ye,meast,itc2,ye, 44.72 , 13.73 ,
-dhm,,,y,y,n,y, ,in,asia,itc3,in, 78.47 , 17.38 ,
-dhn,,,y,y,n,y, al ,us,namer,itc1,us107, -85.45 , 31.32 ,
-dhr,,,y,y,n,n, ,nl,europ,itc2,nl082, 4.767 , 52.92 ,
-dht,,,y,y,n,n, tx ,us,namer,itc1,us107, 102.5 , 36.07 ,
-dib,,,y,y,n,y, ,in,asia,itc3,in, 94.9 , 27.48 ,
-dic,,,y,y,n,n, ,cd,afric,itc2,cd167, 125.6 , -8.55 ,
-die,,,y,y,n,y, ,mg,afric,itc2,mg, 49.3 , -12.35 ,
-dig,,,y,y,n,y, ,cn,asia,itc3,cn035, 99.68 , 27.79 ,
-dij,,,y,y,n,n, ,fr,europ,itc2,fr052, 5.083 , 47.27 ,
-dik,,,y,y,n,y, nd ,us,namer,itc1,us108, -102.8 , 46.8 ,
-dil,,,y,y,n,y, ,tl,asia,itc3,tl, 125.4 , -8.333 ,
-dim,,,y,y,n,n, ,ci,afric,itc2,ci, -4.7 , 6.65 ,
-din,,,y,y,n,y, ,vn,seasi,itc3,vn, 103 , 21.38 ,
-dio,,,y,y,n,n, ak ,us,namer,itc1,us111, -169 , 65.75 ,
-dip,,,y,y,n,n, ,bf,afric,itc2,bf, 1.783 , 12.05 ,
-diq,,,y,y,n,n, mg ,br,samer,itc1,br015, -52.17 , -10.88 ,
-dir,,,y,y,n,y, ,et,afric,itc2,et, 41.87 , 9.633 ,
-dis,,,y,y,n,n, ,cg,afric,itc2,cg, 12.5 , -4.217 ,
-diu,,,y,y,n,y, ,in,asia,itc3,in, 70.92 , 20.72 ,
-div,,,y,y,n,n, ,ci,afric,itc2,ci, -5.367 , 5.833 ,
-diw,,,y,y,n,n, ,lk,asia,itc3,lk187, 80.73 , 5.991 ,
-diy,,,y,y,n,y, ,tr,euras,itc2,tr101, 40.2 , 37.9 ,
-dja,,,y,y,n,n, ,bj,afric,itc2,bj, 1.667 , 9.7 ,
-djb,,,y,y,n,y, ,id,seasi,itc3,id061, 103.6 , -1.633 ,
-dje,,,y,y,n,y, ,tn,afric,itc2,tn100, 10.78 , 33.88 ,
-djg,,,y,y,n,y, ,dz,afric,itc2,dz, 9.5 , 24.45 ,
-djj,,,y,y,n,y, ,id,seasi,itc3,id063, 140.5 , -2.583 ,
-djm,,,y,y,n,n, ,cg,afric,itc2,cg, 14.75 , -2.533 ,
-djn,,,y,y,n,n, ak ,us,namer,itc1,us111, -145.7 , 64.03 ,
-djo,,,y,y,n,n, ,ci,afric,itc2,ci, -6.467 , 6.417 ,
-dju,,,y,y,n,n, ,is,europ,itc2,is, -14.17 , 64.67 ,
-dki,,,y,y,n,n, ql ,au,austl,itc3,au131, 146.2 , -17.93 ,
-dkk,,,y,y,n,n, ny ,us,namer,itc1,us105, -79.33 , 42.48 ,
-dkr,,,y,y,n,y, ,sn,afric,itc2,sn, -17.5 , 14.75 ,
-dks,,,y,y,n,n, ,ru,euras,itc2,ru143, 80.37 , 73.52 ,
+aaa,,,y,y,n,y, ,pf,pacif,itc3,pf087, -145.5 , -17.42 ,
+aab,,,y,y,n,y, ql ,au,austl,itc3,au131, 141 , -26.75 ,
+aac,,,y,y,n,n, ,eg,afric,itc2,eg044, 33.8 , 31.13 ,
+aad,,,y,y,n,n, ,sd,afric,itc2,sd172, 30.95 , 18.05 ,
+aae,,,y,y,n,y, ,dz,afric,itc2,dz, 7.817 , 36.83 ,
+aaf,,,y,y,n,n, fl ,us,namer,itc1,us105, -85.03 , 29.73 ,
+aag,,,y,y,n,n, pr ,br,samer,itc1,br015, -43.27 , -22.87 ,
+aah,,,y,y,n,n, ,de,europ,itc2,de040, 6.133 , 50.75 ,
+aai,,,y,y,n,n, to ,br,samer,itc1,br016, -46.93 , -12.92 ,
+aaj,,,y,y,n,n, ,sr,samer,itc1,sr, -55.37 , 3.9 ,
+aak,,,y,y,n,n, ,ki,austl,itc3,ki069, 174 , 0.2167 ,
+aal,,,y,y,n,y, ,dk,europ,itc2,dk041, 9.933 , 57.05 ,
+aam,,,y,y,n,y, ,za,afric,itc2,za, 31.53 , -24.8 ,
+aan,,,y,y,n,y, ,ae,meast,itc2,ae, 55.75 , 24.25 ,
+aao,,,y,y,n,n, ,ve,samer,itc1,ve194, -64.47 , 9.417 ,
+aap,hou,,y,n,n,n, tx ,us,namer,itc1,us107, -95.3 , 29.65 ,
+aaq,,,y,y,n,y, ,ru,euras,itc2,ru130, 37.32 , 44.9 ,
+aar,,,y,y,n,y, ,dk,europ,itc2,dk041, 10.62 , 56.3 ,
+aas,,,y,y,n,n, ,id,seasi,itc3,id063, 139.3 , -3.917 ,
+aat,,,y,y,n,y, ,cn,asia,itc3,cn035, 89.5 , 43.93 ,
+aau,,,y,y,n,n, ,ws,austl,itc3,ws, -172.6 , -13.45 ,
+aav,,,y,y,n,n, ,ph,pacif,itc3,ph, 124.8 , 6.333 ,
+aaw,,,y,y,n,n, ,pk,asia,itc3,pk163, 73.25 , 34.2 ,
+aax,,,y,y,n,y, mg ,br,samer,itc1,br015, -46.92 , -19.57 ,
+aay,,,y,y,n,y, ,ye,meast,itc2,ye, 52.18 , 16.2 ,
+aaz,,,y,y,n,n, ,gt,camer,itc1,gt119, -91.5 , 14.86 ,
+aba,,,y,y,n,y, ,ru,euras,itc2,ru143, 91.43 , 53.72 ,
+abb,,,y,y,n,n, ,gb,europ,itc2,gb053, -0.3 , 51.53 ,
+abc,,,y,y,n,y, ,es,europ,itc2,es045, -15.18 , 38.95 ,
+abd,,,y,y,n,y, ,ir,meast,itc2,ir120, 48.23 , 30.37 ,
+abe,,,y,y,n,y, pa ,us,namer,itc1,us105, -75.43 , 40.65 ,
+abf,,,y,y,n,n, ,ki,austl,itc3,ki069, 172.8 , 1.417 ,
+abg,,,y,y,n,n, ql ,au,austl,itc3,au131, 143.2 , -17.67 ,
+abh,,,y,y,n,n, ql ,au,austl,itc3,au131, 146.6 , -23.7 ,
+abi,,,y,y,n,y, tx ,us,namer,itc1,us107, -99.68 , 32.42 ,
+abj,,,y,y,n,y, ,ci,afric,itc2,ci, -3.933 , 5.25 ,
+abk,,,y,y,n,y, ,et,afric,itc2,et, 44.27 , 6.733 ,
+abl,,,y,y,n,y, ak ,us,namer,itc1,us111, -157.8 , 67.1 ,
+abm,,,y,y,n,y, ql ,au,austl,itc3,au131, 142.4 , -10.87 ,
+abn,,,y,y,n,n, ,sr,samer,itc1,sr, -54.05 , 5.483 ,
+abo,,,y,y,n,n, ,ci,afric,itc2,ci, -3.2 , 5.467 ,
+abp,,,y,y,n,n, ,pg,austl,itc3,pg, 141.1 , -6.067 ,
+abq,,,y,y,n,y, nm ,us,namer,itc1,us108, -106.6 , 35.05 ,
+abr,,,y,y,n,y, sd ,us,namer,itc1,us107, -98.43 , 45.45 ,
+abs,,,y,y,n,y, ,eg,afric,itc2,eg044, 31.62 , 22.37 ,
+abt,,,y,y,n,y, ,sa,meast,itc2,sa, 42.22 , 22.83 ,
+abu,,,y,y,n,n, ,id,seasi,itc3,id062, 124.9 , -9.333 ,
+abv,,,y,y,n,y, ,ng,afric,itc2,ng, 7.183 , 9.2 ,
+abw,,,y,y,n,n, ,pg,austl,itc3,pg, 148.7 , -10.17 ,
+abx,,,y,y,n,y, ns ,au,austl,itc3,au007, 146.9 , -36.05 ,
+aby,,,y,y,n,y, ga ,us,namer,itc1,us105, -84.2 , 31.53 ,
+abz,,,y,y,n,y, ,gb,europ,itc2,gb053, -2.2 , 57.2 ,
+aca,,,y,y,n,y, ,mx,namer,itc1,mx168, -99.8 , 16.78 ,
+acb,,,y,y,n,n, mi ,us,namer,itc1,us105, -85.2 , 44.98 ,
+acc,,,y,y,n,y, ,gh,afric,itc2,gh, -0.1667 , 5.6 ,
+acd,,,y,y,n,n, ,co,samer,itc1,co132, -77.3 , 8.517 ,
+ace,,,y,y,n,y, ,es,europ,itc2,es046, -13.6 , 28.95 ,
+ach,,,y,y,n,y, ,ch,europ,itc2,ch032, 9.55 , 47.48 ,
+aci,,,y,y,n,y, ,gb,europ,itc2,gb053, -2.217 , 49.7 ,
+acj,,,y,y,n,n, ,lk,asia,itc3,lk187, 80.43 , 8.3 ,
+ack,,,y,y,n,y, ma ,us,namer,itc1,us105, -70.07 , 41.27 ,
+acl,,,y,y,n,n, ,co,samer,itc1,co132, -73 , 4.75 ,
+acm,,,y,y,n,n, ,co,samer,itc1,co132, -71.78 , -2.133 ,
+acn,,,y,y,n,n, ,mx,namer,itc1,mx168, -100.9 , 29.3 ,
+aco,,,y,y,n,n, ,ch,europ,itc2,ch032, 8.767 , 46.15 ,
+acp,,,y,y,n,y, ,ir,meast,itc2,ir120, 46.15 , 37.35 ,
+acr,,,y,y,n,n, ,co,samer,itc1,co132, -72.3 , -0.3833 ,
+acs,,,y,y,n,n, ,ru,euras,itc2,ru143, 90.57 , 56.27 ,
+act,,,y,y,n,y, tx ,us,namer,itc1,us107, -97.23 , 31.62 ,
+acu,,,y,y,n,n, ,pa,camer,itc1,pa, -77.97 , 8.433 ,
+acv,,,y,y,n,y, ca ,us,namer,itc1,us110, -124.1 , 40.98 ,
+acx,,,y,y,n,y, ,cn,asia,itc3,cn035, 104.9 , 25.08 ,
+acy,aiy,,y,n,n,y, nj ,us,namer,itc1,us105, -74.58 , 39.47 ,
+acz,,,y,y,n,y, ,ir,meast,itc2,ir120, 61.54 , 31.09 ,
+ada,,,y,y,n,y, ,tr,euras,itc2,tr101, 35.28 , 36.98 ,
+adb,izm,,y,n,n,y, ,tr,euras,itc2,tr101, 27.17 , 38.28 ,
+adc,,,n,y,n,n, ,pg,austl,itc3,pg, 154.7 , -7.141 ,
+add,,,y,y,n,y, ,et,afric,itc2,et, 38.8 , 8.983 ,
+ade,,,y,y,n,y, ,ye,meast,itc2,ye, 45.03 , 12.83 ,
+adf,,,y,y,n,y, ,tr,euras,itc2,tr101, 38.46 , 37.73 ,
+adg,,,y,y,n,n, mi ,us,namer,itc1,us105, -84.03 , 41.9 ,
+adh,,,y,y,n,n, ,ru,euras,itc2,ru145, 125.4 , 58.6 ,
+adi,,,y,y,n,n, ,na,afric,itc2,na004, 15 , -22.4 ,
+adj,amm,,y,n,n,y, ,jo,meast,itc2,jo068, 35.98 , 31.97 ,
+adk,,,y,y,n,y, ak ,us,namer,itc1,us112, -176.7 , 51.87 ,
+adl,,,y,y,n,y, sa ,au,austl,itc3,au009, 138.5 , -34.95 ,
+adm,,,y,y,n,n, ok ,us,namer,itc1,us107, -97.02 , 34.3 ,
+adn,,,y,y,n,n, ,co,samer,itc1,co132, -75.88 , 5.667 ,
+ado,,,y,y,n,n, sa ,au,austl,itc3,au009, 137.2 , -31.02 ,
+adp,,,y,y,n,n, ,lk,asia,itc3,lk187, 81.63 , 7.336 ,
+adq,,,y,y,n,y, ak ,us,namer,itc1,us111, -152.4 , 57.8 ,
+adr,,,y,y,n,n, sc ,us,namer,itc1,us105, -79.57 , 33.45 ,
+ads,dfw,,y,n,n,n, tx ,us,namer,itc1,us107, -96.85 , 32.85 ,
+adt,,,y,y,n,n, ok ,us,namer,itc1,us107, -96.68 , 34.77 ,
+adu,,,y,y,n,y, ,ir,meast,itc2,ir120, 48.3 , 30.25 ,
+adv,,,y,y,n,n, ,gb,europ,itc2,gb053, -1.467 , 51.22 ,
+adw,,,y,y,n,n, md ,us,namer,itc1,us105, -76.92 , 38.8 ,
+adx,,,y,y,n,y, ,gb,europ,itc2,gb053, -2.867 , 56.37 ,
+ady,,,y,y,n,n, ,za,afric,itc2,za, 29.1 , -22.67 ,
+adz,,,y,y,n,y, ,co,samer,itc1,co132, -81.7 , 12.58 ,
+aea,,,y,y,n,n, ,ki,austl,itc3,ki069, 173.9 , 0.4833 ,
+aeb,,,y,y,n,n, ,cn,asia,itc3,cn035, 107 , 23.72 ,
+aed,,,y,y,n,n, ak ,us,namer,itc1,us111, -152.9 , 58.03 ,
+aee,,,y,y,n,n, ,sd,afric,itc2,sd172, 32.95 , 10.06 ,
+aeg,,,y,y,n,n, ,id,seasi,itc3,id061, 99.45 , 1.383 ,
+aeh,,,y,y,n,y, ,td,afric,itc2,td, 20.85 , 13.85 ,
+aei,,,y,y,n,n, ,es,europ,itc2,es045, -5.45 , 36.18 ,
+aek,,,y,y,n,n, ,pg,austl,itc3,pg, 146.3 , -7.367 ,
+ael,,,y,y,n,n, mn ,us,namer,itc1,us107, -93.37 , 43.68 ,
+aeo,,,y,y,n,n, ,mr,afric,itc2,mr, -9.65 , 16.7 ,
+aep,bue,,y,n,n,y, ba ,ar,samer,itc1,ar003, -58.37 , -34.57 ,
+aer,,,y,y,n,y, ,ru,euras,itc2,ru130, 39.93 , 43.45 ,
+aes,,,y,y,n,y, ,no,europ,itc2,no083, 6.1 , 62.55 ,
+aet,,,y,y,n,y, ak ,us,namer,itc1,us111, -152.7 , 66.55 ,
+aeu,,,y,y,n,n, ,ir,meast,itc2,ir120, 55.03 , 25.88 ,
+aex,,,y,y,n,y, la ,us,namer,itc1,us107, -92.3 , 31.4 ,
+aey,,,y,y,n,y, ,is,europ,itc2,is, -18.08 , 65.65 ,
+afa,,,y,y,n,y, md ,ar,samer,itc1,ar003, -68.4 , -34.58 ,
+afd,,,y,y,n,n, ,za,afric,itc2,za, 26.88 , -33.58 ,
+aff,cos,,y,n,n,n, co ,us,namer,itc1,us108, -105.9 , 37.43 ,
+afi,,,y,y,n,n, ,co,samer,itc1,co132, -75.07 , 6.917 ,
+afk,adp,,y,n,n,n, ,lk,asia,itc3,lk187, 81.64 , 7.292 ,
+afl,,,y,y,n,y, mt ,br,samer,itc1,br018, -56.1 , -9.85 ,
+afn,,,y,y,n,n, nh ,us,namer,itc1,us105, -72 , 42.8 ,
+afo,,,y,y,n,n, wy ,us,namer,itc1,us108, -110.9 , 42.72 ,
+afr,,,y,y,n,n, ,pg,austl,itc3,pg, 148.4 , -9.133 ,
+afs,,,y,y,n,y, ,uz,euras,itc3,uz138, 64.23 , 41.61 ,
+aft,,,y,y,n,y, ,sb,austl,itc3,sb, 160.9 , -9.183 ,
+afw,dfw,,y,n,n,n, tx ,us,namer,itc1,us107, -97.03 , 32.95 ,
+afy,,,y,y,n,n, ,tr,euras,itc2,tr101, 30.6 , 38.73 ,
+afz,,,y,y,n,y, ,ir,meast,itc2,ir120, 57.67 , 36.21 ,
+aga,,,y,y,n,y, ,ma,afric,itc2,ma196, -9.55 , 30.38 ,
+agb,muc,,y,n,n,n, ,de,europ,itc2,de040, 10.9 , 48.38 ,
+agc,pit,,y,n,n,n, pa ,us,namer,itc1,us105, -79.93 , 40.35 ,
+agd,,,y,y,n,n, ,id,seasi,itc3,id063, 133.9 , -1.383 ,
+age,,,y,y,n,n, ,de,europ,itc2,de040, 7.917 , 53.78 ,
+agf,,,y,y,n,y, ,fr,europ,itc2,fr052, 0.6 , 44.18 ,
+agg,,,y,y,n,n, ,pg,austl,itc3,pg, 144.1 , -4.067 ,
+agh,,,y,y,n,y, ,se,europ,itc2,se095, 12.85 , 56.3 ,
+agi,,,y,y,n,n, ,sr,samer,itc1,sr, -56.68 , 5.767 ,
+agj,,,y,y,n,n, ,jp,asia,itc3,jp, 127.2 , 26.83 ,
+agk,,,y,y,n,n, ,pg,austl,itc3,pg, 143.8 , -6.333 ,
+agl,,,y,y,n,n, ,pg,austl,itc3,pg, 149.2 , -9.333 ,
+agm,,,y,y,n,y, ,gl,europ,itc1,gl055, -38 , 65.58 ,
+agn,,,y,y,n,y, ak ,us,namer,itc1,us111, -134.6 , 57.5 ,
+ago,,,y,y,n,n, ar ,us,namer,itc1,us107, -93.22 , 33.23 ,
+agp,,,y,y,n,y, ,es,europ,itc2,es045, -4.5 , 36.67 ,
+agq,,,y,y,n,n, ,gr,europ,itc2,gr058, 21.38 , 38.6 ,
+agr,,,y,y,n,y, ,in,asia,itc3,in, 77.97 , 27.15 ,
+ags,,,y,y,n,y, ga ,us,namer,itc1,us105, -81.97 , 33.37 ,
+agt,,,y,y,n,y, ,py,samer,itc1,py093, -54.52 , -25.52 ,
+agu,,,y,y,n,y, ,mx,namer,itc1,mx168, -102.3 , 21.87 ,
+agv,,,y,y,n,y, ,ve,samer,itc1,ve194, -69.23 , 9.55 ,
+agw,,,y,y,n,n, ql ,au,austl,itc3,au131, 142.2 , -12.15 ,
+agx,,,y,y,n,y, ,in,asia,itc3,in, 72.2 , 10.83 ,
+agy,,,y,y,n,n, wa ,au,austl,itc3,au011, 128.8 , -16.35 ,
+agz,,,y,y,n,n, ,za,afric,itc2,za, 18.85 , -29.05 ,
+aha,oka,,y,n,n,n, ,jp,asia,itc3,jp, 127.7 , 26.2 ,
+ahb,,,y,y,n,y, ,sa,meast,itc2,sa, 42.5 , 18.22 ,
+ahc,,,y,y,n,n, ca ,us,namer,itc1,us110, -120.2 , 40.27 ,
+ahd,adm,,y,n,n,n, ok ,us,namer,itc1,us107, -97.15 , 34.15 ,
+ahe,,,y,y,n,y, ,pf,pacif,itc3,pf087, -146.3 , -14.43 ,
+ahf,,,y,y,n,n, ne ,us,namer,itc1,us107, -99.9 , 40.3 ,
+ahh,,,y,y,n,n, wi ,us,namer,itc1,us107, -92.37 , 45.28 ,
+ahi,,,y,y,n,n, ,id,seasi,itc3,id063, 128.9 , -3.333 ,
+ahl,,,y,y,n,n, ,gy,samer,itc1,gy, -59.32 , 2.483 ,
+ahm,,,y,y,n,n, or ,us,namer,itc1,us110, -122.7 , 42.19 ,
+ahn,,,y,y,n,n, ga ,us,namer,itc1,us105, -83.33 , 33.95 ,
+aho,,,y,y,n,y, ,it,europ,itc2,it067, 8.283 , 40.63 ,
+ahs,,,y,y,n,y, ,hn,camer,itc1,hn, -84.42 , 15.43 ,
+aht,,,y,y,n,n, ak ,us,namer,itc1,us112, 179 , 51.5 ,
+ahu,,,y,y,n,y, ,ma,afric,itc2,ma196, -3.833 , 35.18 ,
+ahy,,,y,y,n,n, ,mg,afric,itc2,mg, 45.53 , -20.02 ,
+ahz,,,y,y,n,n, ,fr,europ,itc2,fr052, 6.083 , 45.08 ,
+aia,,,y,y,n,y, ne ,us,namer,itc1,us108, -102.8 , 42.07 ,
+aib,,,y,y,n,n, ak ,us,namer,itc1,us111, -132.4 , 56.23 ,
+aic,,,y,y,n,n, ,mh,pacif,itc3,mh075, 171.2 , 7.1 ,
+aid,,,y,y,n,n, in ,us,namer,itc1,us105, -85.68 , 40.17 ,
+aie,,,y,y,n,n, ,pg,austl,itc3,pg, 144.7 , -5.133 ,
+aif,,,y,y,n,n, sp ,br,samer,itc1,br015, -50.42 , -22.67 ,
+aig,,,y,y,n,n, ,cf,afric,itc2,cf, 23.25 , 6.517 ,
+aih,,,n,y,n,n, ,pg,austl,itc3,pg, 141.3 , -7.349 ,
+aii,,,y,y,n,n, ,dj,afric,itc2,dj, 42.72 , 11.15 ,
+aik,,,y,y,n,n, sc ,us,namer,itc1,us105, -81.68 , 33.65 ,
+ail,,,y,y,n,n, ,pa,camer,itc1,pa, -78.02 , 9.233 ,
+aim,,,y,y,n,n, ,mh,pacif,itc3,mh075, 170 , 10.2 ,
+ain,,,y,y,n,y, ak ,us,namer,itc1,us111, -160 , 70.63 ,
+aio,,,y,y,n,n, ia ,us,namer,itc1,us107, -95.02 , 41.4 ,
+aip,,,y,y,n,n, ,mh,pacif,itc3,mh075, 168.8 , 7.267 ,
+air,,,y,y,n,n, mt ,br,samer,itc1,br018, -56.45 , -14.42 ,
+ais,,,y,y,n,n, ,ki,austl,itc3,ki069, 176.8 , -2.633 ,
+ait,,,y,y,n,y, ,ck,austl,itc3,ck, -159.8 , -18.85 ,
+aiu,,,y,y,n,y, ,ck,austl,itc3,ck, -158.1 , -20.03 ,
+aiv,,,y,y,n,n, al ,us,namer,itc1,us107, -88.2 , 33.1 ,
+aiw,,,y,y,n,n, ,na,afric,itc2,na004, 17.58 , -27.98 ,
+aiy,,,y,y,n,n, nj ,us,namer,itc1,us105, -74.45 , 39.37 ,
+aiz,,,y,y,n,n, mo ,us,namer,itc1,us107, -92.55 , 38.1 ,
+aja,,,y,y,n,y, ,fr,europ,itc2,fr052, 8.8 , 41.92 ,
+ajf,,,y,y,n,y, ,sa,meast,itc2,sa, 40.2 , 29.93 ,
+aji,,,y,y,n,y, ,tr,euras,itc2,tr101, 43.03 , 39.65 ,
+ajj,,,y,y,n,n, ,mr,afric,itc2,mr, -14.38 , 19.73 ,
+ajk,,,y,y,n,n, ,ir,meast,itc2,ir120, 49.68 , 34.09 ,
+ajl,,,y,y,n,y, ,in,asia,itc3,in, 92.72 , 23.73 ,
+ajn,,,y,y,n,y, ,km,iocea,itc2,km, 44.43 , -12.13 ,
+ajo,,,y,y,n,n, ,ye,meast,itc2,ye, 44.25 , 15.72 ,
+ajr,,,y,y,n,y, ,se,europ,itc2,se095, 19.28 , 65.58 ,
+ajs,,,y,y,n,n, ,mx,namer,itc1,mx080, -113.6 , 26.73 ,
+aju,,,y,y,n,y, se ,br,samer,itc1,br016, -37.07 , -10.9 ,
+ajy,,,y,y,n,n, ,ne,afric,itc2,ne, 7.983 , 16.97 ,
+aka,,,y,y,n,y, ,cn,asia,itc3,cn035, 109 , 32.5 ,
+akb,,,y,y,n,y, ak ,us,namer,itc1,us112, -174.2 , 52.2 ,
+akc,cak,,y,n,n,n, oh ,us,namer,itc1,us105, -81.07 , 41.4 ,
+akd,,,y,y,n,n, ,in,asia,itc3,in, 77.08 , 20.67 ,
+ake,,,y,y,n,n, ,ga,afric,itc2,ga, 13.92 , -1.167 ,
+akf,,,y,y,n,y, ,ly,afric,itc2,ly122, 23.32 , 24.2 ,
+akg,,,y,y,n,n, ,pg,austl,itc3,pg, 142.3 , -3.583 ,
+akh,,,y,y,n,n, ,sa,meast,itc2,sa, 47.58 , 24.06 ,
+aki,,,y,y,n,y, ak ,us,namer,itc1,us111, -161.2 , 60.9 ,
+akj,,,y,y,n,y, ,jp,asia,itc3,jp, 142.5 , 43.5 ,
+akk,,,y,y,n,y, ak ,us,namer,itc1,us111, -154.2 , 56.95 ,
+akl,,,y,y,n,y, ,nz,austl,itc3,nz084, 174.8 , -37.02 ,
+akm,,,y,y,n,n, ,td,afric,itc2,td, 19.82 , 10.88 ,
+akn,,,y,y,n,y, ak ,us,namer,itc1,us111, -156.6 , 58.52 ,
+ako,,,y,y,n,n, co ,us,namer,itc1,us108, -103.2 , 40.17 ,
+akp,,,y,y,n,y, ak ,us,namer,itc1,us111, -151.7 , 68.13 ,
+akq,,,y,y,n,n, ,id,seasi,itc3,id061, 105.2 , -4.617 ,
+akr,,,y,y,n,n, ,ng,afric,itc2,ng, 5.2 , 7.25 ,
+aks,,,y,y,n,y, ,sb,austl,itc3,sb, 160.7 , -8.667 ,
+akt,,,y,y,n,n, ,cy,europ,itc2,cy039, 32.95 , 35.57 ,
+aku,,,y,y,n,y, ,cn,asia,itc3,cn035, 75.67 , 38.67 ,
+akv,,,y,y,n,y, qc ,ca,namer,itc1,ca025, -78.58 , 60.73 ,
+akw,,,y,y,n,n, ,ir,meast,itc2,ir120, 49.68 , 30.75 ,
+akx,,,y,y,n,y, ,kz,euras,itc3,kz162, 57.22 , 50.25 ,
+aky,,,y,y,n,y, ,mm,seasi,itc3,mm, 92.87 , 20.12 ,
+ala,,,y,y,n,y, ,kz,euras,itc3,kz164, 76.92 , 43.32 ,
+alb,,,y,y,n,y, ny ,us,namer,itc1,us105, -73.8 , 42.73 ,
+alc,,,y,y,n,y, ,es,europ,itc2,es045, -0.5 , 38.38 ,
+ald,,,y,y,n,n, ,pe,samer,itc1,pe155, -69.35 , -11.7 ,
+ale,,,y,y,n,n, tx ,us,namer,itc1,us107, -103.7 , 30.38 ,
+alf,,,y,y,n,y, ,no,europ,itc2,no083, 23.37 , 69.98 ,
+alg,,,y,y,n,y, ,dz,afric,itc2,dz, 3.217 , 36.7 ,
+alh,,,y,y,n,y, wa ,au,austl,itc3,au011, 117.8 , -34.95 ,
+ali,,,y,y,n,n, tx ,us,namer,itc1,us107, -98.02 , 27.73 ,
+alj,,,y,y,n,n, ,za,afric,itc2,za, 16.53 , -28.62 ,
+alk,,,y,y,n,n, ,et,afric,itc2,et, 39.12 , 7.967 ,
+all,,,y,y,n,n, ,it,europ,itc2,it067, 8.117 , 44.03 ,
+alm,,,y,y,n,y, nm ,us,namer,itc1,us108, -106 , 32.83 ,
+aln,,,y,y,n,n, il ,us,namer,itc1,us107, -90.17 , 38.88 ,
+alo,,,y,y,n,y, ia ,us,namer,itc1,us107, -92.38 , 42.55 ,
+alp,,,y,y,n,y, ,sy,meast,itc2,sy098, 37.23 , 36.18 ,
+alq,,,y,y,n,n, rs ,br,samer,itc1,br015, -55.73 , -29.8 ,
+alr,,,y,y,n,n, ,nz,austl,itc3,nz084, 169.4 , -45.22 ,
+als,,,y,y,n,y, co ,us,namer,itc1,us108, -105.9 , 37.43 ,
+alt,,,y,y,n,n, pa ,br,samer,itc1,br018, -54.73 , -1.933 ,
+alu,,,y,y,n,n, ,so,afric,itc2,so, 50.67 , 11.88 ,
+alv,,,y,y,n,n, ,ad,europ,itc2,ad001, 0.45 , 40.98 ,
+alw,,,y,y,n,y, wa ,us,namer,itc1,us110, -118.3 , 46.1 ,
+alx,,,y,y,n,n, al ,us,namer,itc1,us107, -85.95 , 32.93 ,
+aly,,,y,y,n,y, ,eg,afric,itc2,eg044, 29.95 , 31.18 ,
+alz,,,y,y,n,y, ak ,us,namer,itc1,us111, -154.2 , 56.88 ,
+ama,,,y,y,n,y, tx ,us,namer,itc1,us107, -101.7 , 35.23 ,
+amb,,,y,y,n,n, ,mg,afric,itc2,mg, 48.98 , -13.18 ,
+amc,,,y,y,n,n, ,td,afric,itc2,td, 20.28 , 11.03 ,
+amd,,,y,y,n,y, ,in,asia,itc3,in, 72.63 , 23.07 ,
+ame,,,y,y,n,n, ,mz,afric,itc2,mz, 37.68 , -15.65 ,
+amf,,,y,y,n,n, ,pg,austl,itc3,pg, 141.7 , -4.167 ,
+amg,,,y,y,n,n, ,pg,austl,itc3,pg, 143.5 , -4.6 ,
+amh,,,y,y,n,y, ,et,afric,itc2,et, 37.5 , 6 ,
+ami,,,y,y,n,y, ,id,seasi,itc3,id062, 116.1 , -8.567 ,
+amj,,,y,y,n,n, mg ,br,samer,itc1,br015, -40.68 , -16.18 ,
+amk,dro,,y,n,n,n, co ,us,namer,itc1,us108, -107.8 , 37.15 ,
+aml,,,y,y,n,n, ,pa,camer,itc1,pa, -82.87 , 8.3 ,
+amm,,,y,y,n,y, ,jo,meast,itc2,jo068, 35.98 , 31.97 ,
+amn,,,y,y,n,n, mi ,us,namer,itc1,us105, -84.65 , 43.38 ,
+amo,,,y,y,n,n, ,td,afric,itc2,td, 15.32 , 14.12 ,
+amp,,,y,y,n,n, ,mg,afric,itc2,mg, 44.73 , -24.7 ,
+amq,,,y,y,n,y, ,id,seasi,itc3,id063, 128.1 , -3.7 ,
+amr,,,y,y,n,n, ,mh,pacif,itc3,mh075, 171.7 , 7.083 ,
+ams,,,y,y,n,y, ,nl,europ,itc2,nl082, 4.9 , 52.35 ,
+amt,,,y,y,n,n, nt ,au,austl,itc3,au010, 131.1 , -26.2 ,
+amu,,,y,y,n,n, ,pg,austl,itc3,pg, 141.3 , -3.517 ,
+amv,,,y,y,n,y, ,ru,euras,itc2,ru130, 61.55 , 69.77 ,
+amw,,,y,y,n,n, ia ,us,namer,itc1,us107, -93.62 , 42 ,
+amx,,,y,y,n,n, nt ,au,austl,itc3,au010, 135.2 , -21.73 ,
+amy,,,y,y,n,y, ,mg,afric,itc2,mg, 45.67 , -17.68 ,
+amz,,,y,y,n,n, ,nz,austl,itc3,nz084, 175 , -37.03 ,
+ana,,,y,y,n,n, ca ,us,namer,itc1,us110, -118 , 33.85 ,
+anb,,,y,y,n,n, al ,us,namer,itc1,us107, -85.85 , 33.58 ,
+anc,,,y,y,n,y, ak ,us,namer,itc1,us111, -150 , 61.17 ,
+and,,,y,y,n,n, sc ,us,namer,itc1,us105, -82.72 , 34.5 ,
+ane,,,y,y,n,y, ,fr,europ,itc2,fr052, -0.55 , 47.47 ,
+anf,,,y,y,n,y, ,cl,samer,itc1,cl033, -70.43 , -23.43 ,
+ang,,,y,y,n,n, ,fr,europ,itc2,fr052, 0.2 , 45.67 ,
+anh,,,y,y,n,n, ,sb,austl,itc3,sb, 160.5 , -8.983 ,
+ani,,,y,y,n,y, ak ,us,namer,itc1,us111, -159.5 , 61.58 ,
+anj,,,y,y,n,n, ,cg,afric,itc2,cg, 13.83 , -2.85 ,
+ank,,,y,y,n,n, ,tr,euras,itc2,tr101, 33 , 40.13 ,
+anl,,,y,y,n,n, ,ao,afric,itc2,ao, 16.75 , -11.5 ,
+anm,,,y,y,n,y, ,mg,afric,itc2,mg, 50.33 , -15 ,
+ann,,,y,y,n,n, ak ,us,namer,itc1,us111, -131.6 , 55.03 ,
+ano,,,y,y,n,n, ,mz,afric,itc2,mz, 39.93 , -16.17 ,
+anp,,,y,y,n,n, md ,us,namer,itc1,us105, -76.5 , 38.98 ,
+anq,,,y,y,n,n, in ,us,namer,itc1,us105, -85 , 41.63 ,
+anr,bru,,y,n,n,y, ,be,europ,itc2,be012, 4.467 , 51.18 ,
+ans,,,y,y,n,y, ,pe,samer,itc1,pe155, -73.42 , -13.65 ,
+ant,,,y,y,n,n, ,at,europ,itc2,at005, 10.28 , 47.15 ,
anu,,,y,y,n,y, ,ag,carib,itc1,ag, -61.75 , 17.33 ,
anv,,,y,y,n,y, ak ,us,namer,itc1,us111, -160.2 , 62.65 ,
anw,,,y,y,n,n, ne ,us,namer,itc1,us107, -99.98 , 42.58 ,
-cey,,,y,y,n,n, ky ,us,namer,itc1,us107, -88.37 , 36.67 ,
-cez,,,y,y,n,y, co ,us,namer,itc1,us108, -108.6 , 37.32 ,
-cfa,,,y,y,n,y, ak ,us,namer,itc1,us111, -157.5 , 58.22 ,
-cfb,,,y,y,n,y, rj ,br,samer,itc1,br015, -42.08 , -22.93 ,
-cfc,,,y,y,n,n, sc ,br,samer,itc1,br015, -50.94 , -26.79 ,
-cfd,,,y,y,n,n, tx ,us,namer,itc1,us107, -96.37 , 30.67 ,
-cfe,,,y,y,n,y, ,fr,europ,itc2,fr052, 3.167 , 45.78 ,
-cff,,,y,y,n,n, ,ao,afric,itc2,ao, 15.72 , -12.78 ,
-cfg,,,y,y,n,n, ,cu,carib,itc1,cu038, -80.52 , 22.17 ,
-cfh,,,y,y,n,n, sa ,au,austl,itc3,au009, 139.5 , -26.52 ,
-cfi,,,y,y,n,n, nt ,au,austl,itc3,au010, 131.4 , -17.15 ,
-cfk,,,y,y,n,y, ,dz,afric,itc2,dz, 1.332 , 36.28 ,
-cfn,,,y,y,n,y, ,ie,europ,itc2,ie064, -8.333 , 55.05 ,
-cfo,,,y,y,n,n, mt ,br,samer,itc1,br018, -51.57 , -10.63 ,
-cfp,,,y,y,n,n, ql ,au,austl,itc3,au131, 144.4 , -18.78 ,
-cfq,,,y,y,n,n, bc ,ca,namer,itc1,ca031, -116.5 , 49.04 ,
-cfr,,,y,y,n,y, ,fr,europ,itc2,fr052, -0.45 , 49.18 ,
-cfs,,,y,y,n,y, ns ,au,austl,itc3,au007, 153.1 , -30.32 ,
-cft,,,y,y,n,n, az ,us,namer,itc1,us109, -109.2 , 32.95 ,
-cfu,,,y,y,n,y, ,gr,europ,itc2,gr058, 19.87 , 39.62 ,
-cfv,,,y,y,n,n, ks ,us,namer,itc1,us107, -95.62 , 37.03 ,
-cga,,,y,y,n,y, ak ,us,namer,itc1,us111, -133.2 , 55.48 ,
-cgb,,,y,y,n,y, mt ,br,samer,itc1,br017, -56.12 , -15.65 ,
-cgc,,,y,y,n,n, ,pg,austl,itc3,pg, 148.4 , -5.45 ,
-cgd,,,y,y,n,y, ,cn,asia,itc3,cn035, 111.7 , 29.03 ,
-cge,,,y,y,n,n, md ,us,namer,itc1,us105, -76.03 , 38.55 ,
-cgg,,,y,y,n,n, ,ph,pacif,itc3,ph, 121 , 14.58 ,
-cgi,,,y,y,n,y, mo ,us,namer,itc1,us107, -89.57 , 37.22 ,
-cgj,,,y,y,n,n, ,zm,afric,itc2,zm, 27.87 , -12.53 ,
-cgm,,,y,y,n,y, ,ph,pacif,itc3,ph, 124.7 , 9.25 ,
-cgn,,,y,y,n,y, ,de,europ,itc2,de040, 7.15 , 50.87 ,
-cgo,,,y,y,n,y, ,cn,asia,itc3,cn035, 113.4 , 34.75 ,
-cgp,,,y,y,n,y, ,bd,asia,itc3,bd, 91.82 , 22.27 ,
-cgq,,,y,y,n,y, ,cn,asia,itc3,cn035, 125.3 , 43.92 ,
-cgr,,,y,y,n,y, ms ,br,samer,itc1,br017, -54.5 , -20.42 ,
-cgs,,,y,y,n,n, md ,us,namer,itc1,us105, -76.92 , 39 ,
-cgt,,,y,y,n,n, ,mr,afric,itc2,mr, -12.37 , 20.45 ,
-cgu,,,y,y,n,n, ,ve,samer,itc1,ve194, -64.22 , 8.583 ,
-cgv,,,y,y,n,n, wa ,au,austl,itc3,au011, 125.5 , -32.27 ,
-cgy,,,y,y,n,y, ,ph,pacif,itc3,ph, 124.6 , 8.417 ,
-cgz,,,y,y,n,n, az ,us,namer,itc1,us109, -111.8 , 32.88 ,
-cha,,,y,y,n,y, tn ,us,namer,itc1,us105, -85.2 , 35.03 ,
-chb,,,y,y,n,n, ,pk,asia,itc3,pk163, 74.08 , 35.42 ,
-chc,,,y,y,n,y, ,nz,austl,itc3,nz084, 172.5 , -43.48 ,
-che,,,y,y,n,n, ,ie,europ,itc2,ie064, -10.22 , 51.95 ,
-chf,,,y,y,n,n, ,kr,asia,itc3,kr, 128.7 , 35.13 ,
-chg,,,y,y,n,n, ,cn,asia,itc3,cn035, 120.4 , 41.6 ,
-chh,,,y,y,n,n, ,pe,samer,itc1,pe155, -78.03 , -6.05 ,
-chi,,,n,y,n,n, il ,us,namer,itc1,us107, -87.75 , 41.78 ,
-chj,,,y,y,n,n, ,zw,afric,itc2,zw, 32.63 , -20.2 ,
-chk,,,y,y,n,n, ok ,us,namer,itc1,us107, -97.97 , 35.03 ,
-chl,,,y,y,n,n, id ,us,namer,itc1,us108, -114.2 , 44.5 ,
-chm,,,y,y,n,n, ,pe,samer,itc1,pe155, -78.6 , -9.083 ,
-chn,,,y,y,n,n, ,kr,asia,itc3,kr, 127.7 , 35.93 ,
-cho,,,y,y,n,y, va ,us,namer,itc1,us105, -78.45 , 38.13 ,
-chp,,,y,y,n,n, ak ,us,namer,itc1,us111, -144.6 , 65.47 ,
-chq,,,y,y,n,y, ,gr,europ,itc2,gr058, 24.15 , 35.53 ,
-chr,,,y,y,n,y, ,fr,europ,itc2,fr052, 1.7 , 46.82 ,
-chs,,,y,y,n,y, sc ,us,namer,itc1,us105, -80.03 , 32.9 ,
-cht,,,y,y,n,y, ,nz,austl,itc3,nz085, 176.5 , -43.92 ,
-chu,,,y,y,n,y, ak ,us,namer,itc1,us111, -159.3 , 61.67 ,
-chv,,,y,y,n,n, ,pt,europ,itc2,pt092, -7.467 , 41.73 ,
-chw,,,y,y,n,n, ,cn,asia,itc3,cn035, 98.42 , 39.85 ,
-chx,,,y,y,n,n, ,pa,camer,itc1,pa, -82.47 , 9.45 ,
-chy,,,y,y,n,y, ,sb,austl,itc3,sb, 156.5 , -6.7 ,
-fkl,,,y,y,n,n, pa ,us,namer,itc1,us105, -79.87 , 41.38 ,
-fkn,,,y,y,n,n, va ,us,namer,itc1,us105, -76.92 , 36.68 ,
-efw,,,y,y,n,n, ia ,us,namer,itc1,us107, -94.38 , 42.02 ,
-ega,,,y,y,n,n, ,pg,austl,itc3,pg, 146.1 , -6.917 ,
-egc,,,y,y,n,y, ,fr,europ,itc2,fr052, 0.5167 , 44.83 ,
-ege,,,y,y,n,y, co ,us,namer,itc1,us108, -106.9 , 39.63 ,
-egl,,,y,y,n,n, ,et,afric,itc2,et, 39.7 , 5.283 ,
-egm,,,y,y,n,y, ,sb,austl,itc3,sb, 157.9 , -8.567 ,
-egn,,,y,y,n,y, ,sd,afric,itc2,sd172, 22.45 , 13.48 ,
-ego,,,y,y,n,y, ,ru,euras,itc2,ru130, 36.65 , 50.63 ,
-egp,,,y,y,n,n, tx ,us,namer,itc1,us107, -100.5 , 28.87 ,
-egs,,,y,y,n,y, ,is,europ,itc2,is, -14.4 , 65.28 ,
-egv,,,y,y,n,y, wi ,us,namer,itc1,us107, -89.27 , 45.93 ,
-egx,,,y,y,n,y, ak ,us,namer,itc1,us111, -157.4 , 58.22 ,
-ehd,,,y,y,n,n, ,zz,none,itc2,zz, -122 , 34.98 ,
-ehl,,,y,y,n,n, rn ,ar,samer,itc1,ar003, -71.52 , -41.97 ,
-ehm,,,y,y,n,n, ak ,us,namer,itc1,us111, -162.1 , 58.63 ,
-eht,,,y,y,n,n, ct ,us,namer,itc1,us105, -72.65 , 41.77 ,
-eia,,,y,y,n,n, ,pg,austl,itc3,pg, 147.9 , -8.2 ,
-eib,,,y,y,n,y, ,de,europ,itc2,de040, 10.48 , 50.98 ,
-eie,,,y,y,n,n, ,ru,euras,itc2,ru143, 92.12 , 58.47 ,
-eih,,,y,y,n,n, ql ,au,austl,itc3,au131, 144.1 , -18.5 ,
-eik,,,y,y,n,y, ,ru,euras,itc2,ru130, 38.21 , 63.2 ,
-ein,,,y,y,n,y, ,nl,europ,itc2,nl082, 5.383 , 51.45 ,
-eis,,,y,y,n,y, ,vg,carib,itc1,vg, -64.55 , 18.45 ,
-eiy,,,y,y,n,n, ,il,meast,itc2,il065, 35.17 , 30.63 ,
-eja,,,y,y,n,y, ,co,samer,itc1,co132, -73.77 , 7.017 ,
-ejh,,,y,y,n,y, ,sa,meast,itc2,sa, 36.75 , 26.42 ,
-ejt,,,y,y,n,n, ,mh,pacif,itc3,mh075, 172 , 6.083 ,
-ekb,,,y,y,n,n, ,kz,euras,itc3,kz164, 75.22 , 51.58 ,
-ekd,,,y,y,n,n, nt ,au,austl,itc3,au010, 135.3 , -21.03 ,
-eke,,,y,y,n,n, ,gy,samer,itc1,gy, -60.85 , 6.667 ,
-eki,,,y,y,n,n, in ,us,namer,itc1,us105, -85.98 , 41.72 ,
-ekn,,,y,y,n,n, wv ,us,namer,itc1,us105, -79.85 , 38.88 ,
-eko,,,y,y,n,y, nv ,us,namer,itc1,us110, -115.8 , 40.83 ,
-eks,,,y,y,n,y, ,ru,euras,itc2,ru146, 142.1 , 49.18 ,
-ekt,,,y,y,n,n, ,se,europ,itc2,se095, 16.45 , 59.38 ,
-ekx,,,y,y,n,n, ky ,us,namer,itc1,us105, -85.87 , 37.7 ,
-ela,,,y,y,n,n, tx ,us,namer,itc1,us107, -96.33 , 29.58 ,
-elb,,,y,y,n,n, ,co,samer,itc1,co132, -73.97 , 9.05 ,
-elc,,,y,y,n,y, nt ,au,austl,itc3,au010, 135.6 , -12.02 ,
-eld,,,y,y,n,y, ar ,us,namer,itc1,us107, -92.82 , 33.22 ,
-ele,,,y,y,n,n, ,pa,camer,itc1,pa, -77.72 , 8.117 ,
-elf,,,y,y,n,y, ,sd,afric,itc2,sd172, 25.32 , 13.62 ,
-elg,,,y,y,n,y, ,dz,afric,itc2,dz, 2.867 , 30.57 ,
-elh,,,y,y,n,y, ,bs,carib,itc1,bs021, -76.68 , 25.48 ,
-eli,,,y,y,n,y, ak ,us,namer,itc1,us111, -162.3 , 64.62 ,
-elj,,,y,y,n,n, ,co,samer,itc1,co132, -74.13 , 2 ,
-elk,,,y,y,n,n, ok ,us,namer,itc1,us107, -99.42 , 35.4 ,
-ell,,,y,y,n,n, ,za,afric,itc2,za, 27.62 , -23.67 ,
-elm,,,y,y,n,y, ny ,us,namer,itc1,us105, -76.9 , 42.17 ,
-eln,,,y,y,n,n, wa ,us,namer,itc1,us110, -120.5 , 47.03 ,
-elo,,,y,y,n,n, mi ,ar,samer,itc1,ar003, -54.63 , -26.4 ,
-elp,,,y,y,n,y, tx ,us,namer,itc1,us108, -106.4 , 31.8 ,
-elq,,,y,y,n,y, ,sa,meast,itc2,sa, 43.82 , 26.3 ,
-elr,,,y,y,n,n, ,id,seasi,itc3,id063, 140.1 , -3.817 ,
-els,,,y,y,n,y, ,za,afric,itc2,za, 27.82 , -33.05 ,
-elt,,,y,y,n,n, ,eg,afric,itc2,eg044, 33.65 , 28.2 ,
-elu,,,y,y,n,y, ,dz,afric,itc2,dz, 6.783 , 33.52 ,
-elv,,,y,y,n,y, ak ,us,namer,itc1,us111, -136.3 , 58.18 ,
-elw,,,y,y,n,n, ak ,us,namer,itc1,us111, -146.6 , 60.88 ,
-elx,,,y,y,n,n, ,ve,samer,itc1,ve194, -64.27 , 8.883 ,
-ely,,,y,y,n,n, nv ,us,namer,itc1,us110, -114.9 , 39.3 ,
-elz,,,y,y,n,n, ny ,us,namer,itc1,us105, -77.93 , 42.12 ,
-emd,,,y,y,n,y, ql ,au,austl,itc3,au131, 148.1 , -23.63 ,
-eme,,,y,y,n,y, ,de,europ,itc2,de040, 7.2 , 53.37 ,
-emg,,,y,y,n,n, ,za,afric,itc2,za, 31.9 , -28.73 ,
-emi,,,y,y,n,n, ,pg,austl,itc3,pg, 150 , -1.65 ,
-emk,,,y,y,n,y, ak ,us,namer,itc1,us111, -164.5 , 62.77 ,
-eml,,,y,y,n,n, ,ch,europ,itc2,ch032, 8.305 , 47.09 ,
-emm,,,y,y,n,n, wy ,us,namer,itc1,us108, -110.6 , 41.85 ,
-gog,,,y,y,n,n, ,na,afric,itc2,na004, 18.97 , -22.5 ,
-goh,,,y,y,n,y, ,gl,europ,itc1,gl055, -51.72 , 64.17 ,
-goi,,,y,y,n,y, ,in,asia,itc3,in, 73.83 , 15.5 ,
-goj,,,y,y,n,y, ,ru,euras,itc2,ru130, 44 , 56.33 ,
-gok,,,y,y,n,n, ok ,us,namer,itc1,us107, -97.42 , 35.88 ,
-gol,,,y,y,n,n, or ,us,namer,itc1,us110, -124.4 , 42.42 ,
-gom,,,y,y,n,y, ,cd,afric,itc2,cd167, 29.23 , -1.667 ,
-gon,,,y,y,n,n, ct ,us,namer,itc1,us105, -72.05 , 41.33 ,
-goo,,,y,y,n,n, ql ,au,austl,itc3,au131, 150.3 , -28.52 ,
-gop,,,y,y,n,y, ,in,asia,itc3,in, 83.45 , 26.73 ,
-goq,,,y,y,n,y, ,cn,asia,itc3,cn035, 98.87 , 34.63 ,
-gor,,,y,y,n,n, ,et,afric,itc2,et, 35.55 , 8.167 ,
-gos,,,y,y,n,n, ns ,au,austl,itc3,au007, 151.4 , -33.43 ,
-got,,,y,y,n,y, ,se,europ,itc2,se095, 12.28 , 57.65 ,
-gou,,,y,y,n,y, ,cm,afric,itc2,cm, 13.37 , 9.333 ,
-gov,,,y,y,n,y, nt ,au,austl,itc3,au010, 136.7 , -12.17 ,
-goy,,,y,y,n,n, ,lk,asia,itc3,lk187, 81.62 , 7.333 ,
-goz,,,y,y,n,n, ,bg,eeuro,itc2,bg013, 25.62 , 42.33 ,
-gpa,,,y,y,n,y, ,gr,europ,itc2,gr058, 21.73 , 38.25 ,
-gpb,,,y,y,n,n, pr ,br,samer,itc1,br015, -51.45 , -25.38 ,
-gpi,,,y,y,n,y, ,co,samer,itc1,co132, -77.9 , 2.583 ,
-gpl,,,y,y,n,n, ,cr,camer,itc1,cr036, -83.77 , 10.22 ,
-gpn,,,y,y,n,n, nt ,au,austl,itc3,au010, 130.4 , -11.4 ,
-gpo,,,y,y,n,n, lp ,ar,samer,itc1,ar003, -63.75 , -35.7 ,
-gps,,,y,y,n,y, ,ec,samer,itc1,ec043, -90.27 , -0.4333 ,
-gpt,,,y,y,n,y, ms ,us,namer,itc1,us107, -89.07 , 30.4 ,
-gpz,,,y,y,n,n, mn ,us,namer,itc1,us107, -93.52 , 47.22 ,
-gqj,,,y,y,n,n, ,gb,europ,itc2,gb053, -5.667 , 55.43 ,
-gqq,,,y,y,n,n, oh ,us,namer,itc1,us105, -82.8 , 40.73 ,
-gra,,,y,y,n,n, ,co,samer,itc1,co132, -73.78 , 8.2 ,
-grb,,,y,y,n,y, wi ,us,namer,itc1,us107, -88.13 , 44.48 ,
-grc,,,y,y,n,n, ,lr,afric,itc2,lr, -8.167 , 4.6 ,
-grd,,,y,y,n,n, sc ,us,namer,itc1,us105, -82.15 , 34.25 ,
-gre,,,y,y,n,n, il ,us,namer,itc1,us107, -89.42 , 38.88 ,
-grg,,,y,y,n,n, ,af,meast,itc3,af, 69.12 , 33.62 ,
-grh,,,y,y,n,n, ,pg,austl,itc3,pg, 150.7 , -10.32 ,
-gri,,,y,y,n,y, ne ,us,namer,itc1,us107, -98.32 , 40.97 ,
-grj,,,y,y,n,y, ,za,afric,itc2,za, 22.42 , -33.97 ,
-grl,,,y,y,n,n, ,pg,austl,itc3,pg, 147.2 , -7.95 ,
-grm,,,y,y,n,n, mn ,us,namer,itc1,us107, -91.33 , 47.75 ,
-grn,,,y,y,n,n, ne ,us,namer,itc1,us108, -102.2 , 42.8 ,
-gro,,,y,y,n,y, ,es,europ,itc2,es045, 2.783 , 41.97 ,
-grp,,,y,y,n,n, go ,br,samer,itc1,br015, -49.22 , -11.67 ,
-grq,,,y,y,n,y, ,nl,europ,itc2,nl082, 6.583 , 53.13 ,
-grr,,,y,y,n,y, mi ,us,namer,itc1,us105, -85.53 , 42.88 ,
-grs,,,y,y,n,n, ,it,europ,itc2,it067, 11.07 , 42.75 ,
-grt,,,y,y,n,n, ,pk,asia,itc3,pk163, 74.08 , 32.57 ,
-grv,,,y,y,n,y, ,ru,euras,itc2,ru130, 45.7 , 43.33 ,
-grw,,,y,y,n,y, ,pt,europ,itc2,pt158, -28 , 39.07 ,
-grx,,,y,y,n,y, ,es,europ,itc2,es045, -3.617 , 37.13 ,
-gry,,,y,y,n,y, ,is,europ,itc2,is, -18.02 , 66.57 ,
-grz,,,y,y,n,y, ,at,europ,itc2,at005, 15.45 , 47 ,
-gsa,,,y,y,n,n, ,my,seasi,itc3,my, 117.2 , 5.333 ,
-gsb,,,y,y,n,n, nc ,us,namer,itc1,us105, -77.96 , 35.34 ,
-gsc,,,y,y,n,n, wa ,au,austl,itc3,au011, 115.2 , -25.05 ,
-gsh,,,y,y,n,n, in ,us,namer,itc1,us105, -85.83 , 41.58 ,
-gsi,,,y,y,n,n, ,sb,austl,itc3,sb, -5.817 , 38.1 ,
-gsl,,,n,y,n,n, nt ,ca,namer,itc1,ca029, -111.5 , 35.85 ,
-gsm,,,y,y,n,y, ,ir,meast,itc2,ir120, 56.28 , 26.95 ,
-gsn,,,y,y,n,n, sa ,au,austl,itc3,au009, 138.2 , -31.87 ,
-gso,,,y,y,n,y, nc ,us,namer,itc1,us105, -79.83 , 36.05 ,
-gsp,,,y,y,n,y, sc ,us,namer,itc1,us105, -82.2 , 34.9 ,
-gsq,,,y,y,n,n, ,eg,afric,itc2,eg044, 28.72 , 22.58 ,
-gsr,,,y,y,n,n, ,so,afric,itc2,so, 49.08 , 9.517 ,
-gss,,,y,y,n,n, ,za,afric,itc2,za, 30.8 , -25.12 ,
-gst,,,y,y,n,y, ak ,us,namer,itc1,us111, -135.7 , 58.42 ,
-gsu,,,y,y,n,n, ,sd,afric,itc2,sd172, 35.32 , 14.13 ,
-gsy,,,y,y,n,y, ,gb,europ,itc2,gb053, 0.03333 , 51.33 ,
-gta,,,y,y,n,y, ,sb,austl,itc3,sb, 158.2 , -8.75 ,
-gtb,,,y,y,n,n, ,my,seasi,itc3,my, 101.8 , 3.417 ,
anx,,,y,y,n,y, ,no,europ,itc2,no083, 16.12 , 69.32 ,
any,,,y,y,n,n, ks ,us,namer,itc1,us107, -98.03 , 37.15 ,
anz,,,y,y,n,n, nt ,au,austl,itc3,au010, 132.2 , -25.08 ,
@@ -640,6 +315,7 @@
aob,,,y,y,n,n, ,pg,austl,itc3,pg, 144.7 , -4.917 ,
aoc,,,y,y,n,n, ,de,europ,itc2,de040, 12.47 , 50.98 ,
aod,,,y,y,n,n, ,td,afric,itc2,td, 19.28 , 11.47 ,
+aoe,esk,,y,n,n,y, ,tr,euras,itc2,tr101, 30.53 , 39.8 ,
aog,,,y,y,n,n, ,cn,asia,itc3,cn035, 123 , 41.17 ,
aoh,,,y,y,n,n, oh ,us,namer,itc1,us105, -84.1 , 40.72 ,
aoi,,,y,y,n,y, ,it,europ,itc2,it067, 13.5 , 43.63 ,
@@ -652,6 +328,7 @@
aos,,,y,y,n,y, ak ,us,namer,itc1,us111, -153.8 , 57.47 ,
aot,,,y,y,n,n, ,it,europ,itc2,it067, 7.363 , 45.74 ,
aou,,,y,y,n,n, ,la,seasi,itc3,la, 106.8 , 14.8 ,
+apa,den,,y,n,n,n, co ,us,namer,itc1,us108, -104.8 , 39.57 ,
apb,,,y,y,n,n, ,bo,samer,itc1,bo, -68.5 , -14.72 ,
apc,,,y,y,n,n, ca ,us,namer,itc1,us110, -122.2 , 38.45 ,
ape,,,y,y,n,n, ,pe,samer,itc1,pe155, -75.17 , -15.35 ,
@@ -696,6 +373,7 @@
ark,,,y,y,n,y, ,tz,afric,itc2,tz, 36.68 , -3.367 ,
arl,,,y,y,n,n, ,bf,afric,itc2,bf, 1.25 , 11.58 ,
arm,,,y,y,n,y, ns ,au,austl,itc3,au007, 151.6 , -30.53 ,
+arn,sto,,y,n,n,y, ,se,europ,itc2,se095, 17.92 , 59.65 ,
aro,,,y,y,n,n, ,co,samer,itc1,co132, -76.43 , 8.867 ,
arp,,,y,y,n,n, ,pg,austl,itc3,pg, 149.5 , -9.9 ,
arq,,,y,y,n,n, ,co,samer,itc1,co132, -71.43 , 7.033 ,
@@ -703,491 +381,9 @@
ars,,,y,y,n,n, go ,br,samer,itc1,br015, -52.25 , -15.92 ,
art,,,y,y,n,y, ny ,us,namer,itc1,us105, -76.02 , 43.98 ,
aru,,,y,y,n,y, sp ,br,samer,itc1,br015, -50.42 , -21.18 ,
-hus,,,y,y,n,y, ak ,us,namer,itc1,us111, -154.2 , 66.03 ,
-hut,,,y,y,n,n, ks ,us,namer,itc1,us107, -97.87 , 38.07 ,
-huu,,,y,y,n,n, ,pe,samer,itc1,pe155, -76.2 , -9.9 ,
-fkq,,,y,y,n,y, ,id,seasi,itc3,id063, 132.3 , -2.933 ,
-fks,,,y,y,n,y, ,jp,asia,itc3,jp, 140.4 , 37.22 ,
-fla,,,y,y,n,y, ,co,samer,itc1,co132, -75.53 , 1.583 ,
-flb,,,y,y,n,n, pi ,br,samer,itc1,br016, -43 , -6.833 ,
-flc,,,y,y,n,n, vi ,au,austl,itc3,au007, 150.6 , -34.98 ,
-fld,,,y,y,n,n, wi ,us,namer,itc1,us107, -88.48 , 43.77 ,
-flf,,,y,y,n,n, ,de,europ,itc2,de040, 9.383 , 54.78 ,
-flh,,,y,y,n,n, ,gb,europ,itc2,gb053, -3 , 58.5 ,
-fli,,,y,y,n,n, ,is,europ,itc2,is, -23.7 , 65.98 ,
-flj,,,y,y,n,n, ak ,us,namer,itc1,us111, -148 , 60.02 ,
-fll,,,y,y,n,y, fl ,us,namer,itc1,us105, -80.17 , 26.07 ,
-flm,,,y,y,n,n, ,py,samer,itc1,py093, -60.03 , -22.35 ,
-fln,,,y,y,n,y, sc ,br,samer,itc1,br015, -48.55 , -27.67 ,
-flo,,,y,y,n,y, sc ,us,namer,itc1,us105, -79.72 , 34.18 ,
-flp,,,y,y,n,n, ar ,us,namer,itc1,us107, -92.58 , 36.3 ,
-flr,,,y,y,n,y, ,it,europ,itc2,it067, 11.2 , 43.8 ,
-fls,,,y,y,n,n, ts ,au,austl,itc3,au008, 148 , -40.08 ,
-flt,,,y,y,n,n, ak ,us,namer,itc1,us111, -158 , 62.45 ,
-flv,,,y,y,n,n, ks ,us,namer,itc1,us107, -94.91 , 39.37 ,
-flw,,,y,y,n,y, ,pt,europ,itc2,pt158, -31.15 , 39.47 ,
-fly,,,y,y,n,n, ns ,au,austl,itc3,au007, 145.6 , -35.65 ,
-fma,,,y,y,n,y, fo ,ar,samer,itc1,ar003, -58.18 , -26.17 ,
-fmc,,,y,y,n,n, ak ,us,namer,itc1,us111, -149.8 , 65.92 ,
-fme,,,y,y,n,n, md ,us,namer,itc1,us105, -76.76 , 39.09 ,
-fmg,,,y,y,n,n, ,cr,camer,itc1,cr036, -85.78 , 10.42 ,
-fmh,,,y,y,n,n, ma ,us,namer,itc1,us105, -70.63 , 41.57 ,
-fmi,,,y,y,n,n, ,cd,afric,itc2,cd167, 29.25 , -5.883 ,
-fmm,,,y,y,n,y, ,de,europ,itc2,de040, 10.24 , 47.99 ,
-fmn,,,y,y,n,y, nm ,us,namer,itc1,us108, -108.2 , 36.75 ,
-fmo,,,y,y,n,y, ,de,europ,itc2,de040, 7.683 , 52.13 ,
-fms,,,y,y,n,n, ia ,us,namer,itc1,us107, -91.32 , 40.65 ,
-fmu,,,y,y,n,n, or ,us,namer,itc1,us110, -124.1 , 43.98 ,
-fmy,,,y,y,n,n, fl ,us,namer,itc1,us105, -81.87 , 26.58 ,
-fna,,,y,y,n,y, ,sl,afric,itc2,sl, -13.2 , 8.617 ,
-fnb,,,y,y,n,n, ,de,europ,itc2,de040, 13.31 , 53.6 ,
-fnc,,,y,y,n,y, ,pt,europ,itc2,pt092, -16.9 , 32.63 ,
-fne,,,y,y,n,n, ,pg,austl,itc3,pg, 147.2 , -8.6 ,
-fng,,,y,y,n,n, ,bf,afric,itc2,bf, 0.35 , 12.07 ,
-fnh,,,y,y,n,n, ,et,afric,itc2,et, 37.35 , 9.667 ,
-fni,,,y,y,n,n, ,fr,europ,itc2,fr052, 4.417 , 43.85 ,
-fnj,,,y,y,n,y, ,kp,asia,itc3,kp, 125.3 , 39 ,
-fnk,,,y,y,n,n, ak ,us,namer,itc1,us111, -147.6 , 69.5 ,
-fnl,,,y,y,n,y, co ,us,namer,itc1,us108, -105.1 , 40.58 ,
-fnr,,,y,y,n,n, ak ,us,namer,itc1,us111, -134.9 , 58.25 ,
-fnt,,,y,y,n,y, mi ,us,namer,itc1,us105, -83.75 , 42.97 ,
-foa,,,y,y,n,n, ,gb,europ,itc2,gb053, -1.15 , 60.15 ,
-fob,,,y,y,n,n, ca ,us,namer,itc1,us110, -123.8 , 39.43 ,
-foc,,,y,y,n,y, ,cn,asia,itc3,cn035, 119.3 , 26.1 ,
-fod,,,y,y,n,y, ia ,us,namer,itc1,us107, -94.18 , 42.55 ,
-fog,,,y,y,n,y, ,it,europ,itc2,it067, 15.53 , 41.42 ,
-fok,,,y,y,n,n, ny ,us,namer,itc1,us105, -72.62 , 40.83 ,
-fom,,,y,y,n,n, ,cm,afric,itc2,cm, 10.75 , 5.633 ,
-fon,,,y,y,n,n, ,cr,camer,itc1,cr036, -84.48 , 10.4 ,
-foo,,,y,y,n,n, ,id,seasi,itc3,id063, 134.9 , -0.9333 ,
-fop,,,y,y,n,n, ga ,us,namer,itc1,us105, -82.14 , 33.61 ,
-for,,,y,y,n,y, ce ,br,samer,itc1,br016, -38.53 , -3.767 ,
-fos,,,y,y,n,n, wa ,au,austl,itc3,au011, 128.1 , -30.83 ,
-fot,,,y,y,n,n, ns ,au,austl,itc3,au007, 152.5 , -32.18 ,
-fou,,,y,y,n,n, ,ga,afric,itc2,ga, 10.78 , -1.2 ,
-fox,,,y,y,n,n, ak ,us,namer,itc1,us111, -147.8 , 64.85 ,
-foy,,,y,y,n,n, ,lr,afric,itc2,lr, -10.22 , 8.367 ,
-fpo,,,y,y,n,y, ,bs,carib,itc1,bs021, -78.67 , 26.53 ,
-fpr,,,y,y,n,n, fl ,us,namer,itc1,us105, -80.37 , 27.48 ,
-fpy,,,y,y,n,n, fl ,us,namer,itc1,us105, -83.58 , 30.12 ,
-bcw,,,y,y,n,n, ,mz,afric,itc2,mz, 40.35 , -11.35 ,
-bcx,,,y,y,n,n, ,ru,euras,itc2,ru141, 58.33 , 53.93 ,
-bcy,,,y,y,n,n, ,et,afric,itc2,et, 36.67 , 6.217 ,
-lar,,,y,y,n,y, wy ,us,namer,itc1,us108, -105.7 , 41.32 ,
-las,,,y,y,n,y, nv ,us,namer,itc1,us110, -115.2 , 36.08 ,
-lat,,,y,y,n,n, ,co,samer,itc1,co132, -72.28 , 11.7 ,
-lau,,,y,y,n,y, ,ke,afric,itc2,ke, 40.85 , -2.233 ,
-lav,,,y,y,n,n, ,ws,austl,itc3,ws, -172 , -13.92 ,
-law,,,y,y,n,y, ok ,us,namer,itc1,us107, -98.42 , 34.57 ,
-lax,,,y,y,n,y, ca ,us,namer,itc1,us110, -118.4 , 33.93 ,
-lay,,,y,y,n,n, ,za,afric,itc2,za, 29.75 , -28.58 ,
-laz,,,y,y,n,n, ba ,br,samer,itc1,br016, -43.42 , -13.27 ,
-lba,,,y,y,n,y, ,gb,europ,itc2,gb053, -1.65 , 53.87 ,
-lbb,,,y,y,n,y, tx ,us,namer,itc1,us107, -101.8 , 33.67 ,
-lbd,,,y,y,n,y, ,tj,euras,itc3,tj136, 69.7 , 40.22 ,
-lbe,,,y,y,n,y, pa ,us,namer,itc1,us105, -79.4 , 40.28 ,
-lbf,,,y,y,n,y, ne ,us,namer,itc1,us107, -100.7 , 41.13 ,
-lbi,,,y,y,n,n, ,fr,europ,itc2,fr052, 2.15 , 43.93 ,
-lbj,,,y,y,n,n, ,id,seasi,itc3,id062, 119.9 , -8.517 ,
-lbk,,,y,y,n,n, ,ke,afric,itc2,ke, 40.95 , 0.4 ,
-lbl,,,y,y,n,y, ks ,us,namer,itc1,us107, -101 , 37.05 ,
-lbm,,,y,y,n,n, ,mz,afric,itc2,mz, 36.17 , -18.5 ,
-lbn,,,y,y,n,n, ,ke,afric,itc2,ke, 36.08 , 0.6667 ,
-lbo,,,y,y,n,n, ,cd,afric,itc2,cd167, 23.38 , -4.967 ,
-lbp,,,y,y,n,y, ,my,seasi,itc3,my, 115.4 , 3.2 ,
-lbq,,,y,y,n,n, ,ga,afric,itc2,ga, 10.23 , -0.7167 ,
-lbr,,,y,y,n,n, am ,br,samer,itc1,br018, -64.78 , -7.25 ,
-lbs,,,y,y,n,y, ,fj,austl,itc3,fj169, 179.3 , -16.47 ,
-lbt,,,y,y,n,n, nc ,us,namer,itc1,us105, -79.07 , 34.6 ,
-lbu,,,y,y,n,y, ,my,seasi,itc3,my, 115.3 , 5.3 ,
-lbv,,,y,y,n,y, ,ga,afric,itc2,ga, 9.417 , 0.45 ,
-lbw,,,y,y,n,n, ,id,seasi,itc3,id062, 115.7 , 3.883 ,
-lbx,,,y,y,n,n, ,ph,pacif,itc3,ph, 120.3 , 13.75 ,
-lby,,,y,y,n,n, ,fr,europ,itc2,fr052, -2.233 , 47.25 ,
-lbz,,,y,y,n,n, ,ao,afric,itc2,ao, 20.67 , -8.383 ,
-lca,,,y,y,n,y, ,cy,europ,itc2,cy039, 33.62 , 34.87 ,
-lcb,,,y,y,n,n, mt ,br,samer,itc1,br018, -59.92 , -13.8 ,
-lcc,,,y,y,n,n, ,it,europ,itc2,it067, 18.13 , 40.25 ,
-lcd,,,y,y,n,n, ,za,afric,itc2,za, 29.72 , -23.02 ,
-lce,,,y,y,n,y, ,hn,camer,itc1,hn, -86.83 , 15.75 ,
-lcf,,,y,y,n,n, ,gt,camer,itc1,gt119, -88.95 , 15.67 ,
-lcg,,,y,y,n,y, ,es,europ,itc2,es045, -8.383 , 43.37 ,
-lch,,,y,y,n,y, la ,us,namer,itc1,us107, -93.22 , 30.12 ,
-lci,,,y,y,n,n, nh ,us,namer,itc1,us105, -71.42 , 43.57 ,
-lcj,,,y,y,n,y, ,pl,eeuro,itc2,pl089, 19.4 , 51.72 ,
-lcl,,,y,y,n,n, ,cu,carib,itc1,cu038, -83.62 , 22.28 ,
-lcm,,,y,y,n,n, cd ,ar,samer,itc1,ar003, -64.53 , -31 ,
-lcn,,,y,y,n,n, sa ,au,austl,itc3,au009, 139.3 , -30.53 ,
-lco,,,y,y,n,n, ,cg,afric,itc2,cg, 14.87 , -1.8 ,
-lcp,,,y,y,n,n, ne ,ar,samer,itc1,ar003, -70.67 , -38.08 ,
-lcr,,,y,...
[truncated message content] |
|
From: <den...@us...> - 2009-10-04 13:49:00
|
Revision: 196
http://opentrep.svn.sourceforge.net/opentrep/?rev=196&view=rev
Author: denis_arnaud
Date: 2009-10-04 13:48:47 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Data] Updated the coordonates for Manila Municipal, AR, US (MXA) and the alternate names of Manila, PH (MNL).
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_details.csv
trunk/opentrep/db/data/ref_place_names.csv
Modified: trunk/opentrep/db/data/ref_place_details.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 12:07:57 UTC (rev 195)
+++ trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 13:48:47 UTC (rev 196)
@@ -5214,7 +5214,7 @@
mwx,,,y,y,n,y, ,kr,asia,itc3,kr, 126.4 , 34.99 ,
mwy,,,y,y,n,n, ql ,au,austl,itc3,au131, 141.9 , -17.37 ,
mwz,,,y,y,n,y, ,tz,afric,itc2,tz, 32.93 , -2.45 ,
-mxa,,,y,y,n,n, ar ,us,namer,itc1,us107, -109.7 , 40.98 ,
+mxa,,,y,y,n,n, ar ,us,namer,itc1,us107, -90.154735 , 35.893384 ,
mxb,,,y,y,n,n, ,id,seasi,itc3,id062, 120.3 , -2.533 ,
mxc,,,y,y,n,n, ut ,us,namer,itc1,us108, -109.4 , 37.87 ,
mxd,,,y,y,n,n, ql ,au,austl,itc3,au131, 139.7 , -23.5 ,
Modified: trunk/opentrep/db/data/ref_place_names.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_names.csv 2009-10-04 12:07:57 UTC (rev 195)
+++ trunk/opentrep/db/data/ref_place_names.csv 2009-10-04 13:48:47 UTC (rev 196)
@@ -8431,7 +8431,7 @@
en,mni,montserrat,montserrat/ms:geralds airport
en,mnj,mananjary,mananjary/mg
en,mnk,maiana,maiana/ki
-en,mnl,manila n aquino,manila/ph:ninoy aquino intl
+en,mnl,manila n aquino,manila/ph:ninoy aquino intl,manila
en,mnm,menominee,menominee/mi/us
en,mnn,marion,marion/oh/us:municipal
en,mno,manono,manono/cd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-04 12:08:08
|
Revision: 195
http://opentrep.svn.sourceforge.net/opentrep/?rev=195&view=rev
Author: denis_arnaud
Date: 2009-10-04 12:07:57 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Data] Updated the coordinates of Cagnes sur Mer, France (XCG).
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_details.csv
Modified: trunk/opentrep/db/data/ref_place_details.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 11:42:18 UTC (rev 194)
+++ trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 12:07:57 UTC (rev 195)
@@ -8795,7 +8795,7 @@
umi,,,y,y,n,n, ,pe,samer,itc1,pe155, -70.63 , -13.27 ,
umm,,,y,y,n,n, ak ,us,namer,itc1,us111, -149.1 , 63.33 ,
xcf,,,n,y,n,n, ,fr,europ,itc2,fr052, , ,
-xcg,,,n,y,n,n, ,fr,europ,itc2,fr052, , ,
+xcg,,,n,y,n,n, ,fr,europ,itc2,fr052, 7.15 , 43.67 ,
xch,,,y,y,n,y, ,cx,iocea,itc3,cx, 105.7 , -10.5 ,
xci,,,y,y,n,y, qc ,ca,namer,itc1,ca025, -72.1 , 48.42 ,
xck,,,n,y,n,n, ,fr,europ,itc2,fr052, , ,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-10-04 11:42:31
|
Revision: 194
http://opentrep.svn.sourceforge.net/opentrep/?rev=194&view=rev
Author: denis_arnaud
Date: 2009-10-04 11:42:18 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
[Data] Updated the coordinates of Bialystok, Poland (QYY).
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_details.csv
Modified: trunk/opentrep/db/data/ref_place_details.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_details.csv 2009-09-26 21:42:53 UTC (rev 193)
+++ trunk/opentrep/db/data/ref_place_details.csv 2009-10-04 11:42:18 UTC (rev 194)
@@ -5056,7 +5056,7 @@
rzs,,,y,y,n,y, ,pk,asia,itc3,pk163, 68.87 , 26.97 ,
qyv,,,y,y,n,n, ,nl,europ,itc2,nl082, 6.167 , 52.25 ,
qyx,,,y,y,n,y, ,se,europ,itc2,se095, 0.2942 , 59.85 ,
-qyy,,,y,y,n,n, ,pl,eeuro,itc2,pl089, 22.08 , 53.18 ,
+qyy,,,y,y,n,n, ,pl,eeuro,itc2,pl089, 23.18 , 53.10 ,
qyz,,,y,y,n,n, ,nl,europ,itc2,nl082, 5.917 , 52.95 ,
qza,,,n,y,n,n, ,jo,meast,itc2,jo068, , ,
qzb,,,y,y,n,n, ,ch,europ,itc2,ch032, 7.75 , 46.03 ,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-09-26 21:43:08
|
Revision: 193
http://opentrep.svn.sourceforge.net/opentrep/?rev=193&view=rev
Author: denis_arnaud
Date: 2009-09-26 21:42:53 +0000 (Sat, 26 Sep 2009)
Log Message:
-----------
[i18n] Added a working Python Unicode sample, transforming a user input string into lowercases.
Added Paths:
-----------
trunk/opentrep/test/i18n/icu/pytolower.py
Added: trunk/opentrep/test/i18n/icu/pytolower.py
===================================================================
--- trunk/opentrep/test/i18n/icu/pytolower.py (rev 0)
+++ trunk/opentrep/test/i18n/icu/pytolower.py 2009-09-26 21:42:53 UTC (rev 193)
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+query = u'ЙЦУКЕНГШЩЗХЪ ФЫВАПРОЛДЖЭ ЯЧСМИТЬБЮ Ё ЇІЄ'
+query_input = raw_input()
+if query_input != '':
+ query = unicode(query_input,encoding='utf-8')
+
+print 'Original query: ' + query
+print 'Lower-cased query: ' + query.lower()
+print 'Upper-cased query: ' + query.upper() + '\n'
+
Property changes on: trunk/opentrep/test/i18n/icu/pytolower.py
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-09-06 19:15:27
|
Revision: 192
http://opentrep.svn.sourceforge.net/opentrep/?rev=192&view=rev
Author: denis_arnaud
Date: 2009-09-06 19:15:19 +0000 (Sun, 06 Sep 2009)
Log Message:
-----------
[Planning] Added a few change requests.
Modified Paths:
--------------
trunk/opentrep/TODO
Modified: trunk/opentrep/TODO
===================================================================
--- trunk/opentrep/TODO 2009-09-03 18:21:23 UTC (rev 191)
+++ trunk/opentrep/TODO 2009-09-06 19:15:19 UTC (rev 192)
@@ -1,6 +1,29 @@
Todo list for the OpenTrep project
----------------------------------
+* [06/09/2009] Add the data type (e.g., "GEO", "TIM", "AIR", "PAX")
+ in front of the Xapian document data (when indexing).
+
+* [06/09/2009] Create a new table for time-related data (e.g.,
+ "tue" for the code, and "en, tuesday" or "fr, mardi" for
+ the names).
+ Write the C++ code to take that new data into account.
+
+* [06/06/2009] Alter the parser so that when a suggestion is made for
+ a string, and when the suggestion for the same string minus a word
+ is different, the Levenshtein distance between the original suppresed
+ word and the "suggested" one (defined as the difference between the
+ suggestions for the two strings) is something like nb_of_letters/3.
+
+* [06/09/2009] To allow searches like "ru" or "france", just add the
+ corresponding (country) keywords to the main airport of that country
+ (e.g., "par" for "fr"/"france" and "lon" for "uk"/"gb").
+
+* [06/09/2009] Create a table with the states and countries.
+ Write the C++ code adding all the state- and country-related keywords
+ to the geogrphical index (e.g., add the "texas" keyword to the "paris, tx"
+ element).
+
* [01/08/2009] Write a (Python-based) PSP page, in order to test the
different locales of the browsers.
The Python (PSP) page has been created, but there is still some work
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-09-03 18:21:38
|
Revision: 191
http://opentrep.svn.sourceforge.net/opentrep/?rev=191&view=rev
Author: denis_arnaud
Date: 2009-09-03 18:21:23 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
Typo
Modified Paths:
--------------
trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
Modified: trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2009-09-03 18:17:18 UTC (rev 190)
+++ trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2009-09-03 18:21:23 UTC (rev 191)
@@ -1,4 +1,4 @@
-database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
+database=../../test/traveldb
log=opentrep_indexer.log
user=opentrep
passwd=opentrep
Modified: trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2009-09-03 18:17:18 UTC (rev 190)
+++ trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2009-09-03 18:21:23 UTC (rev 191)
@@ -1,4 +1,4 @@
-database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
+database=../../test/traveldb
log=opentrep_searcher.log
user=opentrep
passwd=opentrep
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-09-03 18:17:27
|
Revision: 190
http://opentrep.svn.sourceforge.net/opentrep/?rev=190&view=rev
Author: denis_arnaud
Date: 2009-09-03 18:17:18 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
[DB+Python] Better qualified LHR. Improved the Python script for the proxy.
Modified Paths:
--------------
trunk/opentrep/configure.ac
trunk/opentrep/db/data/ref_place_names.csv
trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
trunk/opentrep/opentrep/python/pyopentrep.py
Modified: trunk/opentrep/configure.ac
===================================================================
--- trunk/opentrep/configure.ac 2009-08-24 23:11:36 UTC (rev 189)
+++ trunk/opentrep/configure.ac 2009-09-03 18:17:18 UTC (rev 190)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2009 Denis Arnaud <den...@us...>])
-AC_INIT([OPENTREP],[0.4.0],[den...@us...],[opentrep])
+AC_INIT([OPENTREP],[99.99.99],[den...@us...],[opentrep])
AC_CONFIG_HEADER([opentrep/config.h])
AC_CONFIG_SRCDIR([opentrep/basic/BasConst.cpp])
AC_CONFIG_AUX_DIR([config])
Modified: trunk/opentrep/db/data/ref_place_names.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_names.csv 2009-08-24 23:11:36 UTC (rev 189)
+++ trunk/opentrep/db/data/ref_place_names.csv 2009-09-03 18:17:18 UTC (rev 190)
@@ -7832,7 +7832,7 @@
en,lhk,guanghua,guanghua/cn
en,lhn,lishan,lishan/tw
en,lhp,lehu,lehu/pg
-en,lhr,london lhr,london/gb:heathrow
+en,lhr,london lhr,london/gb:heathrow,london,london,london
en,lhs,las heras,las heras/sc/ar
en,lhu,caprivi,caprivi/na:lianshulu airport
en,lhv,lock haven,lock haven/pa/us:w t piper mem
Modified: trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2009-08-24 23:11:36 UTC (rev 189)
+++ trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2009-09-03 18:17:18 UTC (rev 190)
@@ -1,4 +1,4 @@
-database=/tmp/opentrep/share/opentrep/traveldb
+database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
log=opentrep_indexer.log
user=opentrep
passwd=opentrep
Modified: trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2009-08-24 23:11:36 UTC (rev 189)
+++ trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2009-09-03 18:17:18 UTC (rev 190)
@@ -1,4 +1,4 @@
-database=/tmp/opentrep/share/opentrep/traveldb
+database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
log=opentrep_searcher.log
user=opentrep
passwd=opentrep
Modified: trunk/opentrep/opentrep/python/pyopentrep.py
===================================================================
--- trunk/opentrep/opentrep/python/pyopentrep.py 2009-08-24 23:11:36 UTC (rev 189)
+++ trunk/opentrep/opentrep/python/pyopentrep.py 2009-09-03 18:17:18 UTC (rev 190)
@@ -1,16 +1,54 @@
#!/usr/bin/env python
-import sys
+import sys, getopt
sys.path.append('.libs')
# Default search string
defaultSearchString = 'sna francicso rio de janero lso angles reykyavki'
-needDetails = True
# Parser helpers
-def getMain(locations):
- return locations[:3]
+def getMain(locations): return locations[:3]
+# Usage
+def usage(script_name):
+ print
+ print "Usage: ./%s [options] search string" % script_name
+ print
+ print "The default output is short."
+ print
+ print "Options:"
+ print " -h, --help : outputs this help and exits"
+ print " -l, --long : long output version"
+ print
+
+# Handle opt
+def handle_opt():
+ try:
+ opts, args = getopt.getopt(sys.argv[1:], "hl", ["help", "long"])
+ except getopt.GetoptError, err:
+ # print help information and exit:
+ print str(err) # will print something like "option -a not recognized"
+ usage()
+ sys.exit(2)
+
+ # search string
+ searchString = "" # default
+ if len(args) >= 1: searchString = ' '.join(args)
+
+ # options
+ needDetails = False # default
+ for o, a in opts:
+ if o in ("-l", "--long"):
+ needDetails = True
+ elif o in ("-h", "--help"):
+ usage(sys.argv[0])
+ sys.exit()
+ else:
+ assert False, "unhandled option"
+ return needDetails, searchString
+
+needDetails, searchString = handle_opt()
+
# Initialise the OpenTrep C++ library
import libpyopentrep
openTrepLibrary = libpyopentrep.OpenTrepSearcher()
@@ -18,12 +56,14 @@
# If no search string was supplied as arguments of the command-line,
# ask the user for some
-searchString = ' '.join(sys.argv[1:])
if searchString == '':
# Ask for the user input
searchString = raw_input('Enter a search string, or just Enter for the default one (' + defaultSearchString + '): ')
if searchString == '' : searchString = defaultSearchString
+# DEBUG
+print "searchString: " + searchString
+
# Call the OpenTrep C++ library
if needDetails == True:
result = openTrepLibrary.searchWithFullDetails (searchString)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
