<!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>[10475] sites/trunk/api.wordpress.org/public_html/events/1.0: Events API: Don't strip commas when performing location lookups.</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/10475">10475</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/10475","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-11-30 05:40:43 +0000 (Mon, 30 Nov 2020)</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 API: Don't strip commas when performing location lookups. This allows for disambiguation to occur better by treating commas as separators.

See <a href="http://meta.trac.wordpress.org/ticket/3367">#3367</a>.</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    2020-11-30 03:59:30 UTC (rev 10474)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php      2020-11-30 05:40:43 UTC (rev 10475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Simplified parameters for lookup by location (city) name, with optional timezone and locale params for extra context.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $_REQUEST['location'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $location_args['location_name'] = trim( str_replace( ',', ' ', $_REQUEST['location'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $location_args['location_name'] = trim( $_REQUEST['location'] );
</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 ( isset( $_REQUEST['timezone'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</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><span class="cx" style="display: block; padding: 0 10px">         * delimiter.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $location_name_parts = preg_split( '/\s+/u', $location_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $location_name_parts = preg_split( '/[,\s]+/u', $location_name );
</ins><span class="cx" style="display: block; padding: 0 10px">         $location_word_count = count( $location_name_parts );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Catch input like "Portland Maine" and "Sao Paulo Brazil"
</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 2020-11-30 03:59:30 UTC (rev 10474)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php   2020-11-30 05:40:43 UTC (rev 10475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,6 +621,61 @@
</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">+                // https://meta.trac.wordpress.org/ticket/3367
+               // The following tests ensure that West/East portlands return correctly with inversed timezones.
+               'usa-city-disambiguation' => array(
+                       'input' => array(
+                               'location_name' => 'Portland',
+                               'locale'        => 'en_US',
+                               'timezone'      => 'America/Los_Angeles',
+                       ),
+                       'expected' => array(
+                               'description' => 'portland',
+                               'latitude'    => '45.523',
+                               'longitude'   => '-122.676',
+                               'country'     => 'US',
+                       ),
+               ),
+               'usa-city-disambiguation-2' => array(
+                       'input' => array(
+                               'location_name' => 'Portland, OR',
+                               'locale'        => 'en_US',
+                               'timezone'      => 'America/New_York',
+                       ),
+                       'expected' => array(
+                               'description' => 'portland, or',
+                               'latitude'    => '45.523',
+                               'longitude'   => '-122.676',
+                               'country'     => 'US',
+                       ),
+               ),
+               'usa-city-disambiguation-3' => array(
+                       'input' => array(
+                               'location_name' => 'Portland',
+                               'locale'        => 'en_US',
+                               'timezone'      => 'America/New_York',
+                       ),
+                       'expected' => array(
+                               'description' => 'portland',
+                               'latitude'    => '43.657',
+                               'longitude'   => '-70.259',
+                               'country'     => 'US',
+                       ),
+               ),
+               'usa-city-disambiguation-4' => array(
+                       'input' => array(
+                               'location_name' => 'Portland, ME',
+                               'locale'        => 'en_US',
+                               'timezone'      => 'America/Los_Angeles',
+                       ),
+                       'expected' => array(
+                               'description' => 'portland, me',
+                               'latitude'    => '43.657',
+                               'longitude'   => '-70.259',
+                               'country'     => 'US',
+                       ),
+               ),
+
</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>