Changeset 10557

Timestamp:

01/07/2021 10:25:00 PM (4 years ago)

Author:

iandunn

Message:

Events: Weight country over preferred name when ordering.

See #5562.

Location:

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

Files:

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

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

@@ -370 +370 @@
         WHERE name = %s
         ORDER BY
+            FIELD( %s, country ) DESC,
             alt ASC,
             population > 0 DESC,
-            FIELD( %s, country  ) DESC,
             FIELD( %s, timezone ) DESC,
             LEFT( type, 1 ) = "P" DESC,
@@ -394 +394 @@
             WHERE name LIKE %s
             ORDER BY
+                FIELD( %s, country ) DESC,
                 alt ASC,
                 population > 0 DESC,
-                FIELD( %s, country  ) DESC,
                 FIELD( %s, timezone ) DESC,
                 LEFT( type, 1 ) = "P" DESC,
@@ -415 +415 @@
     return $row;
 }
-
 
 /**

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

@@ -683 +683 @@
             ),
 
-            'usa-city-altname-disambiguation-by-population' => array(
+            'usa-city-disambiguation-by-preferred-name' => array(
                 'input' => array(
                     'location_name' => 'Chicago',
@@ -696 +696 @@
                 ),
             ),
-            'usa-city-altname-disambiguation-by-population-2' => array(
+            'usa-city-disambiguation-by-preferred-name-2' => array(
                 'input' => array(
                     'location_name' => 'Chicago',
@@ -707 +707 @@
                     'longitude'   => '-87.650',
                     'country'     => 'US',
+                ),
+            ),
+
+            // Calcutta, Ohio, USA is a preferred name, but the country is more relevant here.
+            'city-disambiguation-by-country' => array(
+                'input' => array(
+                    'location_name' => 'Calcutta',
+                    'locale'        => 'hi_IN',
+                    'timezone'      => 'Asia/Kolkata',
+                ),
+                'expected' => array(
+                    'description' => 'calcutta',
+                    'latitude'    => '22.563',
+                    'longitude'   => '88.363',
+                    'country'     => 'IN',
                 ),
             ),