Changeset 5098

Timestamp:

03/07/2017 12:57:51 AM (10 years ago)

Author:

iandunn

Message:

Events API: Try to match country names if the city match failed

Location:

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

Files:

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

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

@@ -179 +179 @@
         if ( isset( $args['location_name'] ) ) {
                 $guess = guess_location_from_geonames( $args['location_name'], $args['timezone'] ?? '', $country_code );
+                $location_word_count = str_word_count( $args['location_name'] );
+
+                /*
+                 * Check if they entered only the country name, e.g. "Germany" or "New Zealand"
+                 *
+                 * This isn't perfect because some of the country names in the database are in a format that regular
+                 * people wouldn't type -- e.g., "Venezuela, Bolvarian Republic Of" -- but this will still match a
+                 * majority of them.
+                 *
+                 * Currently, this only works with English names because that's the only data we have.
+                 */
+                if ( ! $guess ) {
+                        $location_country_code = get_country_code_from_name( $args['location_name'] );
+
+                        if ( $location_country_code ) {
+                                return array(
+                                        'country' => $location_country_code,
+                                );
+                        }
+                }
+
                 if ( $guess ) {
                         return array(
@@ -221 +242 @@
         // No specific location details.
         return array();
+}
+
+/**
+ * Get the country code that corresponds to the given country name
+ *
+ * @param string $country_name
+ *
+ * @return false|string
+ */
+function get_country_code_from_name( $country_name ) {
+        global $wpdb;
+
+        $country_code = $wpdb->get_var( $wpdb->prepare( "
+                SELECT country_short
+                FROM ip2location
+                WHERE country_long = %s
+                LIMIT 1",
+                $country_name
+        ) );
+
+
+        // Convert all errors to boolean false for consistency
+        if ( empty( $country_code ) ) {
+                $country_code = false;
+        }
+
+        return $country_code;
 }
 

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

@@ -99 +99 @@
          $cases = array(
                 /*
-                 * Only the country is given
-                 */
-                'country-australia' => array(
+                 * Only the country code is given
+                 */
+                'country-code-australia' => array(
                         'input' => array(
                                 'country' => 'AU',
@@ -107 +107 @@
                         'expected' => array(
                                 'country' => 'AU'
+                        ),
+                ),
+
+
+                /*
+                 * The country name, locale, and timezone are given
+                 */
+                'country-exonym-1-word' => array(
+                        'input' => array(
+                                'location_name' => 'Indonesia',
+                                'locale'        => 'id_ID',
+                                'timezone'      => 'Asia/Jakarta',
+                        ),
+                        'expected' => array(
+                                'country' => 'ID'
+                        ),
+                ),
+
+                'country-exonym-2-words' => array(
+                        'input' => array(
+                                'location_name' => 'Bosnia and Herzegovina',
+                                'locale'        => 'bs_BA',
+                                'timezone'      => 'Europe/Sarajevo',
+                        ),
+                        'expected' => array(
+                                'country' => 'BA'
                         ),
                 ),