Changeset 10475

Timestamp:

11/30/2020 05:40:43 AM (6 years ago)

Author:

dd32

Message:

Events API: Don't strip commas when performing location lookups. This allows for disambiguation to occur better by treating commas as separators.

See #3367.

Location:

sites/trunk/api.wordpress.org/public_html/events/1.0

Files:

• index.php (modified) (2 diffs)
• tests/test-index.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -135 +135 @@
         // Simplified parameters for lookup by location (city) name, with optional timezone and locale params for extra context.
         if ( isset( $_REQUEST['location'] ) ) {
-                $location_args['location_name'] = trim( str_replace( ',', ' ', $_REQUEST['location'] ) );
+                $location_args['location_name'] = trim( $_REQUEST['location'] );
         }
 
@@ -311 +311 @@
          * delimiter.
          */
-        $location_name_parts = preg_split( '/\s+/u', $location_name );
+        $location_name_parts = preg_split( '/[,\s]+/u', $location_name );
         $location_word_count = count( $location_name_parts );
 

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

@@ -619 +619 @@
                                 'longitude'   => '-74.082',
                                 'country'     => 'CO',
+                        ),
+                ),
+
+                // 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',
                         ),
                 ),