Changeset 10554

Timestamp:

01/07/2021 04:29:54 AM (4 years ago)

Author:

dd32

Message:

Events API: When determining a location, preference non-alternate names and populated areas over alternate names / unpopulated locations.

Fixes #5562.

Location:

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

Files:

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

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

@@ -1 +1 @@
 <?php
-
 namespace Dotorg\API\Events;
 use stdClass;
@@ -356 +355 @@
     global $wpdb;
     // Look for a location that matches the name.
+    // The asc ordering provides preference to the oreferred name of the locations.
+    // The population ordering provides preference to the populated areas over unpopulated/unknown.
     // The FIELD() orderings give preference to rows that match the country and/or timezone, without excluding rows that don't match.
-    // And we sort by population desc, assuming that the biggest matching location is the most likely one.
+    // And we sort by population desc, assuming that the biggest matching location is the most likely one within the above matching groups.
 
     // Exact match
@@ -365 +366 @@
         WHERE name = %s
         ORDER BY
+            alt ASC,
+            population > 0 DESC,
             FIELD( %s, country  ) DESC,
             FIELD( %s, timezone ) DESC,
@@ -387 +390 @@
             WHERE name LIKE %s
             ORDER BY
+                alt ASC,
+                population > 0 DESC,
                 FIELD( %s, country  ) DESC,
                 FIELD( %s, timezone ) DESC,

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

@@ -594 +594 @@
                 'expected' => array(
                     'description' => 'ciudad de méxico',
-                    'latitude'    => '19.428',
-                    'longitude'   => '-99.128',
+                    'latitude'    => '19.283',
+                    'longitude'   => '-99.133',
                     'country'     => 'MX',
                 ),