<!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>[12936] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Only search Geonames for places with populations `> 500`</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 { white-space: pre-line; 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/12936">12936</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/12936","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>2023-10-06 22:27:46 +0000 (Fri, 06 Oct 2023)</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: Only search Geonames for places with populations `> 500`
This ensures that searching for `Genova` will find the populated city with events, rather than the small village with no events.
It seems unlikely that they'll be a meetup in town with `< 500`, but we can revisit this if we run into that. The smallest place I saw with a meetup had a population of around `6,000`.</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 2023-10-06 09:07:22 UTC (rev 12935)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2023-10-06 22:27:46 UTC (rev 12936)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,8 +390,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function guess_location_from_geonames( $location_name, $timezone, $country, $wildcard = true ) {
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The asc ordering provides preference to the oreferred name of the locations.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The asc ordering provides preference to the preferred name of the locations.
</ins><span class="cx" style="display: block; padding: 0 10px"> // The population ordering provides preference to the populated areas over unpopulated/unknown.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // It's unlikely an area with less than ~500 people would hold an event, but sometimes those places rank
+ // higher than populated areas due to the alt vs primary name. See `Genova` unit tests
</ins><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 within the above matching groups.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +405,7 @@
</span><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"> alt ASC,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- population > 0 DESC,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ population > 500 DESC,
</ins><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, timezone ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT( type, 1 ) = "P" DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> population DESC,
</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 2023-10-06 09:07:22 UTC (rev 12935)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2023-10-06 22:27:46 UTC (rev 12936)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,6 +1076,53 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Genova, IT is the native name of a populated city, and it's English name is Genoa. There's also a
+ // small village in IT whose English name is Genova. Geonames considers the English name to be the
+ // primary one, and native names are considered alternate names. We rank primary names higher than
+ // alternate names, and that usually works, but in this case people are more likely to be looking for
+ // the city.
+ 'rural-match-less-likely-than-city-match' => array(
+ 'input' => array(
+ 'location_name' => 'Genova',
+ 'locale' => 'it_IT',
+ 'timezone' => 'Europe/Rome',
+ ),
+ 'expected' => array(
+ 'description' => 'genova',
+ 'latitude' => '44.413',
+ 'longitude' => '8.957',
+ 'country' => 'IT',
+ ),
+ ),
+
+ 'rural-match-less-likely-than-city-match-with-accent' => array(
+ 'input' => array(
+ 'location_name' => 'Gènova',
+ 'locale' => 'it_IT',
+ 'timezone' => 'Europe/Rome',
+ ),
+ 'expected' => array(
+ 'description' => 'genova',
+ 'latitude' => '44.413',
+ 'longitude' => '8.957',
+ 'country' => 'IT',
+ ),
+ ),
+
+ 'city-match-more-likely-than-rural-match' => array(
+ 'input' => array(
+ 'location_name' => 'Genoa',
+ 'locale' => 'it_IT',
+ 'timezone' => 'Europe/Rome',
+ ),
+ 'expected' => array(
+ 'description' => 'genoa',
+ 'latitude' => '44.405',
+ 'longitude' => '8.944',
+ 'country' => 'IT',
+ ),
+ ),
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * A combination of city, region, and country are given, along with the locale and timezone
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>