<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[5543] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Query new `geoname_summary` table to improve performance</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/5543">5543</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/5543","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-06-06 17:39:24 +0000 (Tue, 06 Jun 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Events: Query new `geoname_summary` table to improve performance
See <a href="http://meta.trac.wordpress.org/ticket/2823">#2823</a>
Props dd32</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2017-06-06 17:14:45 UTC (rev 5542)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2017-06-06 17:39:24 UTC (rev 5543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,32 +186,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function guess_location_from_city( $location_name, $timezone, $country_code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $guess = guess_location_from_geonames( $location_name, $timezone, $country_code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $location_word_count = str_word_count( $location_name );
- $location_name_parts = explode( ' ', $location_name );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $guess ) {
+ return $guess;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Multi-word queries may contain cities, regions, and countries, so try to extract just the city
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This won't work for most ideographic languages, because they don't use the space character as a word
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * delimiter. That's ok, though, because `guess_ideographic_location_from_geonames()` should cover those
- * cases.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * delimiter.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $location_name_parts = preg_split( '/\s+/u', $location_name );
+ $location_word_count = count( $location_name_parts );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $guess && $location_word_count >= 2 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Catch input like "Portland Maine"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $guess = guess_location_from_geonames( $location_name_parts[0], $timezone, $country_code );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $guess = guess_location_from_geonames( $location_name_parts[0], $timezone, $country_code, $wildcard = false );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $guess && $location_word_count >= 3 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Catch input like "Sao Paulo Brazil"
</span><span class="cx" style="display: block; padding: 0 10px"> $city_name = sprintf( '%s %s', $location_name_parts[0], $location_name_parts[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $guess = guess_location_from_geonames( $city_name, $timezone, $country_code );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $guess = guess_location_from_geonames( $city_name, $timezone, $country_code, $wildcard = false );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Normalize all errors to boolean false for consistency
- if ( empty ( $guess ) ) {
- $guess = false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $guess;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,163 +223,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return stdClass|null
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function guess_location_from_geonames( $location_name, $timezone, $country ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function guess_location_from_geonames( $location_name, $timezone, $country, $wildcard = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> // Look for a location that matches the name.
</span><span class="cx" style="display: block; padding: 0 10px"> // The FIELD() orderings give preference to rows that match the country and/or timezone, without excluding rows that don't match.
</span><span class="cx" style="display: block; padding: 0 10px"> // And we sort by population desc, assuming that the biggest matching location is the most likely one.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Strip all quotes from the search query, and then enclose it in double quotes, to force an exact literal search
- $quoted_location_name = sprintf(
- '"%s"',
- strtr( $location_name, [ '"' => '', "'" => '' ] )
- );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exact match
</ins><span class="cx" style="display: block; padding: 0 10px"> $row = $wpdb->get_row( $wpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT name, latitude, longitude, country
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM geoname
- WHERE
- MATCH( name, asciiname, alternatenames )
- AGAINST( %s IN BOOLEAN MODE )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM geoname_summary
+ WHERE name = %s
</ins><span class="cx" style="display: block; padding: 0 10px"> ORDER BY
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, country ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, timezone ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> population DESC
</span><span class="cx" style="display: block; padding: 0 10px"> LIMIT 1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $quoted_location_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $location_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $country,
</span><span class="cx" style="display: block; padding: 0 10px"> $timezone
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $row, 'stdClass' ) && 'ASCII' !== mb_detect_encoding( $location_name ) ) {
- $row = guess_location_from_geonames_fallback( $location_name, $country, $timezone, 'exact', 'ideographic' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Wildcard match
+ if ( ! $row && $wildcard && 'ASCII' !== mb_detect_encoding( $location_name ) ) {
+ $row = $wpdb->get_row( $wpdb->prepare( "
+ SELECT name, latitude, longitude, country
+ FROM geoname_summary
+ WHERE name LIKE %s
+ ORDER BY
+ FIELD( %s, country ) DESC,
+ FIELD( %s, timezone ) DESC,
+ population DESC
+ LIMIT 1",
+ $location_name . '%',
+ $country,
+ $timezone
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Suffix the "State", good in some countries (western countries) horrible in others
+ // (where geonames data is not as complete, or region names are similar (but not quite the same) to city names)
+ // LEFT JOIN admin1codes ac ON gs.statecode = ac.code
+ // if ( $row->state && $row->state != $row->name && $row->name NOT CONTAINED WITHIN $row->state? ) {
+ // $row->name .= ', ' . $row->state;
+ // }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $row;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Look for the given location in the Geonames database using a LIKE query
- *
- * This is a fallback for situations where the full-text search in `guess_location_from_geonames()` resulted
- * in a false-negative.
- *
- * One situation where this happens is with queries in ideographic languages, because MySQL < 5.7.6 doesn't
- * support full-text searches for them, because it can't determine where the word boundaries are.
- * See https://dev.mysql.com/doc/refman/5.7/en/fulltext-restrictions.html
- *
- * There are also edge cases where the exact query doesn't exist in the database, but a loose LIKE query will find
- * a similar alternate, like `Osakashi`.
- *
- * @param string $location_name
- * @param string $country
- * @param string $timezone
- * @param string $mode 'exact' to only return exact matches from the database;
- * 'loose' to return any match. This has a high chance of false positives.
- * @param string $restrict_counties 'ideographic' to only search in countries where ideographic languages are common;
- * 'none' to search all countries
- *
- * @return stdClass|null
- */
-function guess_location_from_geonames_fallback( $location_name, $country, $timezone, $mode = 'exact', $restrict_counties = 'ideographic' ) {
- global $wpdb;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = $ideographic_countries = $ideographic_country_placeholders = '';
-
- /*
- * The name is wrapped in commas in order to ensure that we're only matching the exact location, which is
- * delimited by commas. Otherwise, there would be false positives in situations where `$location_name`
- * appears in other rows, which happens sometimes.
- *
- * Because this will only match entries that are prefixed _and_ postfixed with a comma, it will never match the
- * first and last entries in the column. That's ok, though, because the first entry is often an airport code
- * in English, which is shorter than `ft_min_word_len` anyway. The last entry is often ideographic, so it'd be nice
- * to match it, but this is good enough for now.
- */
- $escaped_location_name = sprintf(
- 'loose' === $mode ? '%%%s%%' : '%%,%s,%%',
- $wpdb->esc_like( $location_name )
- );
-
- $prepare_args = array( $escaped_location_name, $country, $timezone );
-
- if ( 'ideographic' == $restrict_counties ) {
- $ideographic_countries = get_ideographic_counties();
- $ideographic_country_placeholders = get_prepare_placeholders( count( $ideographic_countries ), '%s' );
-
- $where .= "country IN ( $ideographic_country_placeholders ) AND";
-
- $prepare_args = array_merge( $ideographic_countries, $prepare_args );
- }
-
- /*
- * REPLACE() is used because sometimes the `alternatenames` column contains entries where the `asciiname` is
- * prefixed to an ideographic name; for example: `,Karachi - كراچى,`
- *
- * If that prefix is not removed, then the LIKE query will fail in those cases, because
- * `$escaped_location_name` is wrapped in commas.
- *
- * The query is restricted to countries where ideographic languages are common, in order to avoid a full-table
- * scan.
- */
- $query = "
- SELECT name, latitude, longitude, country
- FROM `geoname`
- WHERE
- $where
- REPLACE( alternatenames, CONCAT( asciiname, ' - ' ), '' ) LIKE %s
- ORDER BY
- FIELD( %s, country ) DESC,
- FIELD( %s, timezone ) DESC,
- population DESC
- LIMIT 1";
-
- $prepared_query = $wpdb->prepare( $query, $prepare_args );
-
- return $wpdb->get_row( $prepared_query );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Get an array of countries where ideographic languages are common
- *
- * Derived from https://en.wikipedia.org/wiki/List_of_writing_systems#List_of_writing_scripts_by_adoption
- *
- * @todo Some of these individual countries may be able to be removed, to further narrow the rows that need to be
- * scanned by `guess_ideographic_location_from_geonames()`. Some of the entire categories could possibly be
- * removed too, but let's err on the side of caution for now.
- */
-function get_ideographic_counties() {
- $middle_east = array( 'AE', 'BH', 'CY', 'EG', 'IL', 'IR', 'IQ', 'JO', 'KW', 'LB', 'OM', 'PS', 'QA', 'SA', 'SY', 'TR', 'YE' );
- $north_africa = array( 'DZ', 'EH', 'EG', 'LY', 'MA', 'SD', 'SS', 'TN' );
-
- $abjad_countries = array_merge( $middle_east, $north_africa, array( 'CN', 'IL', 'IN', 'MY', 'PK' ) );
- $abugida_countries = array( 'BD', 'BT', 'ER', 'ET', 'ID', 'IN', 'KH', 'LA', 'LK', 'MV', 'MY', 'MU', 'MM', 'NP', 'PK', 'SG', 'TH' );
- $logographic_countries = array( 'CN', 'JP', 'KR', 'MY', 'SG');
-
- $all_ideographic_countries = array_merge( $abjad_countries, $abugida_countries, $logographic_countries );
-
- return array_unique( $all_ideographic_countries );
-}
-
-/**
- * Build a string of placeholders to pass to `WPDB::prepare()`
- *
- * Sometimes it's convenient to be able to generate placeholders for `prepare()` dynamically. For example, when
- * looping through a multi-dimensional array where the sub-arrays have distinct counts; or when the total
- * number of items is too large to conveniently count by hand.
- *
- * See https://iandunn.name/2016/03/31/generating-dynamic-placeholders-for-wpdb-prepare/
- *
- * @param int $number The number of placeholders needed
- * @param string $format An sprintf()-like format accepted by WPDB::prepare()
- *
- * @return string
- */
-function get_prepare_placeholders( $number, $format ) {
- return implode( ', ', array_fill( 0, $number, $format ) );
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Determine a location for the given IPv4 address
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * NOTE: The location that is found here cannot be returned to the client.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,30 +474,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * If all else fails, cast a wide net and try to find something before giving up, even
- * if the chance of success if lower than normal. Returning false is guaranteed failure, so this improves things
- * even if it only works 10% of the time.
- *
- * This must be done as the very last thing before giving up, because the likelihood of false positives is high.
- */
- if ( ! $location && isset( $args['location_name'] ) ) {
- if ( 'ASCII' === mb_detect_encoding( $args['location_name'] ) ) {
- $guess = guess_location_from_geonames_fallback( $args['location_name'], $country_code, $args['timezone'] ?? '', 'loose', 'none' );
- } else {
- $guess = guess_location_from_geonames_fallback( $args['location_name'], $country_code, $args['timezone'] ?? '', 'loose', 'ideographic' );
- }
-
- if ( $guess ) {
- $location = array(
- 'description' => $guess->name,
- 'latitude' => $guess->latitude,
- 'longitude' => $guess->longitude,
- 'country' => $guess->country,
- );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! $location ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['location_name'] ) || isset( $args['ip'] ) || ! empty( $args['latitude'] ) || ! empty( $args['longitude'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If any of these are specified, and no localitity was guessed based on the above checks, bail with no location.
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2017-06-06 17:14:45 UTC (rev 5542)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2017-06-06 17:39:24 UTC (rev 5543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,10 +153,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * This is matching a city inside the country before it the country searches run, but that's ok since it's
- * good enough for our use cases
- */
</del><span class="cx" style="display: block; padding: 0 10px"> 'country-exonym-2-words' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location_name' => 'Bosnia and Herzegovina',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,10 +160,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Europe/Sarajevo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'pale',
- 'latitude' => '43.817',
- 'longitude' => '18.569',
- 'country' => 'BA'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'country' => 'BA',
+ 'description' => 'bosnia and herzegovina',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Sao_Paulo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'são paulo',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'sao paulo',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '-23.548',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-46.636',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'BR',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Tokyo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'osaka',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'osakashi',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '34.694',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '135.502',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'JP',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'ip' => '153.163.68.148', // Tokyo
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'osaka',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'osakashi',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '34.694',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '135.502',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'JP',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Denver',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => "doña ana",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => "dona ana",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '32.390',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-106.814',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +387,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Chicago',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => "st. louis",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => "st louis",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '38.627',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-90.198',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Africa/Addis_Ababa',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'addis ababa',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'አዲስ አበባ',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '9.025',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '38.747',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'ET',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +436,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Tokyo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'shirahamachō-usazakiminami',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => '白浜町宇佐崎南',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '34.783',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '134.717',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'JP',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Tehran',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'tehran',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'تهران',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '35.694',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '51.422',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'IR',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Karachi',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'karachi',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'كراچى',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '24.906',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '67.082',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'PK',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Tokyo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'kyoto',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => '京都',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '35.021',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '135.754',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'JP',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Tokyo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'tokyo',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => '東京',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '35.690',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '139.692',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'JP',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Tokyo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'osaka',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => '大阪市',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '34.694',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '135.502',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'JP',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +521,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Europe/Berlin',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'vienna',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'wien',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '48.208',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '16.372',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'AT',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,7 +535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Europe/Moscow',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'moscow',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'Москва',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '55.752',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '37.616',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'RU',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +549,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Mexico_City',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'mexico city',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'ciudad de méxico',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '19.428',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-99.128',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'MX',
</span></span></pre>
</div>
</div>
</body>
</html>