Changeset 10474

Timestamp:

11/30/2020 03:59:30 AM (6 years ago)

Author:

dd32

Message:

Events API: Update the API to accept the new type DB field to disambiguate actual places from States/Countries/others.

As part of this the table now includes non-city locations such as countries too, and so if the best match is a country it's still handled properly (returning country-wide events rather than just distance around the central point of the country).

Updates the tests to take into account the new database changes, but these are likely to become out-of-date as the data will be updated daily going forward.

See #3728.

Location:

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

Files:

• index.php (modified) (5 diffs)
• tests/test-index.php (modified) (7 diffs)

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

@@ -348 +348 @@
         // Exact match
         $query = '
-                SELECT name, latitude, longitude, country
+                SELECT name, latitude, longitude, country, type
                 FROM geoname_summary
                 WHERE name = %s
@@ -354 +354 @@
                         FIELD( %s, country  ) DESC,
                         FIELD( %s, timezone ) DESC,
+                        LEFT( type, 1 ) = "P" DESC,
                         population DESC,
                         BINARY LOWER( %s ) = BINARY LOWER( name ) DESC
@@ -369 +370 @@
         if ( ! $row && $wildcard && 'ASCII' !== mb_detect_encoding( $location_name ) ) {
                 $query = '
-                        SELECT name, latitude, longitude, country
+                        SELECT name, latitude, longitude, country, type
                         FROM geoname_summary
                         WHERE name LIKE %s
@@ -375 +376 @@
                                 FIELD( %s, country  ) DESC,
                                 FIELD( %s, timezone ) DESC,
+                                LEFT( type, 1 ) = "P" DESC,
                                 population DESC,
                                 BINARY LOWER( %s ) = BINARY LOWER( LEFT( name, %d ) ) DESC
@@ -547 +549 @@
                 $guess        = guess_location_from_city( $args['location_name'], $args['timezone'] ?? '', $country_code );
 
-                if ( $guess ) {
+                $country_types = array(
+                        // See http://download.geonames.org/export/dump/featureCodes_en.txt
+
+                        'A.PCL',   // political entity  
+                        'A.PCLD',  // dependent political entity        
+                        'A.PCLF',  // freely associated state   
+                        'A.PCLH',  // historical political entity       a former political entity
+                        'A.PCLI',  // independent political entity      
+                        'A.PCLIX', // section of independent political entity   
+                        'A.PCLS',  // semi-independent political entity
+                        'A.PRSH',  // parish an ecclesiastical district
+                        'A.TERR',  // territory
+                        'A.ZN',    // zone
+                );
+
+                if ( $guess && in_array( $guess->type, $country_types, true ) ) {
+                        $location = array(
+                                'country'     => $guess->country,
+                                'description' => $guess->name,
+                        );
+                } elseif ( $guess ) {
                         $location = array(
                                 'description' => $guess->name,

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

@@ -189 +189 @@
                 'city-invalid-private-ip' => array(
                         'input' => array(
-                                'location_name' => 'Rivendell',
+                                'location_name' => 'InvalidCity',
                                 'ip'            => '127.0.0.1',
                         ),
@@ -409 +409 @@
                 /*
                  * The city endonym, locale, and timezone are given
-                 *
-                 * @todo
-                 * This is currently failing. A query from PHP shows row id 2220957 has "Yaound?" instead of
-                 * "Yaoundé", but it's correct in the database itself.
                  */
                 'city-endonym-accents-africa' => array(
@@ -421 +417 @@
                         ),
                         'expected' => array(
-                                'description' => 'yaounde',
+                                'description' => 'yaoundé',
                                 'latitude'    => '3.867',
                                 'longitude'   => '11.517',
@@ -563 +559 @@
                         'expected' => array(
                                 'description' => 'Санкт-Петербург',
-                                'latitude'    => '59.894',
-                                'longitude'   => '30.264',
+                                'latitude'    => '59.939',
+                                'longitude'   => '30.314',
                                 'country'     => 'RU',
                         ),
@@ -578 +574 @@
                         'expected' => array(
                                 'description' => 'Санкт-Петербург',
-                                'latitude'    => '59.894',
-                                'longitude'   => '30.264',
+                                'latitude'    => '59.939',
+                                'longitude'   => '30.314',
                                 'country'     => 'RU',
                         ),
@@ -639 +635 @@
                         'expected' => array(
                                 'description' => 'portland',
-                                'latitude'    => '43.661',
-                                'longitude'   => '-70.255',
+                                'latitude'    => '43.657',
+                                'longitude'   => '-70.259',
                                 'country'     => 'US',
                         ),
@@ -652 +648 @@
                         ),
                         'expected' => array(
-                                'description' => 'sao',
+                                'description' => 'são paulo',
                                 'latitude'    => '-23.548',
                                 'longitude'   => '-46.636',