Changeset 5100

Timestamp:

03/07/2017 01:28:35 AM (9 years ago)

Author:

iandunn

Message:

Events API: Extract city names from multi-word inputs to improve matching

This allows inputs like "Portland Maine" or "Sao Paulo Brazil" to successfully match a location.

Location:

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

Files:

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

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

@@ -140 +140 @@
  * @param string $country_code
  *
- * @return false|array false on failure; an array on success
+ * @return false|object false on failure; an object on success
  */
 function guess_location_from_city( $location_name, $timezone, $country_code ) {
         $guess = guess_location_from_geonames( $location_name, $timezone, $country_code );
         $location_word_count = str_word_count( $location_name );
+        $location_name_parts = explode( ' ', $location_name );
+
+        /*
+         * Multi-word queries may contain cities, regions, and countries, so try to extract just the city
+         */
+        if ( ! $guess && $location_word_count >= 2 ) {
+                // Catch input like "Portland Maine"
+                $guess = guess_location_from_geonames( $location_name_parts[0], $timezone, $country_code );
+        }
+
+        if ( ! $guess && $location_word_count >= 3 ) {
+                // Catch input like "Sao Paulo Brazil"
+                $city_name = sprintf( '%s %s', $location_name_parts[0], $location_name_parts[1] );
+                $guess     = guess_location_from_geonames( $city_name, $timezone, $country_code );
+        }
 
         // Normalize all errors to boolean false for consistency

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

@@ -125 +125 @@
                 ),
 
+                /*
+                 * 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
+                 */
                 'country-exonym-2-words' => array(
                         'input' => array(
@@ -132 +136 @@
                         ),
                         'expected' => array(
-                                'country' => 'BA'
+                                'description' => 'pale',
+                                'latitude'    => '43.817',
+                                'longitude'   => '18.569',
+                                'country'     => 'BA'
                         ),
                 ),
@@ -419 +426 @@
 
                 /*
+                 * A combination of city, region, and country are given, along with the locale and timezone
+                 */
+                '1-word-city-region' => array(
+                        'input' => array(
+                                'location_name' => 'Portland Maine',
+                                'locale'        => 'en_US',
+                                'timezone'      => 'America/New_York',
+                        ),
+                        'expected' => array(
+                                'description' => 'portland',
+                                'latitude'    => '43.661',
+                                'longitude'   => '-70.255',
+                                'country'     => 'US',
+                        ),
+                ),
+
+                '2-word-city-region' => array(
+                        'input' => array(
+                                'location_name' => 'São Paulo Brazil',
+                                'locale'        => 'pt_BR',
+                                'timezone'      => 'America/Sao_Paulo',
+                        ),
+                        'expected' => array(
+                                'description' => 'são paulo',
+                                'latitude'    => '-23.548',
+                                'longitude'   => '-46.636',
+                                'country'     => 'BR',
+                        ),
+                ),
+
+
+                /*
                  * Only the IP is given
                  */