Changeset 5311

Timestamp:

04/10/2017 09:28:19 PM (8 years ago)

Author:

iandunn

Message:

Events: Change search order so that coordinates take precedence over IPs

Location:

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

Files:

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

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

@@ -356 +356 @@
 }
 
+/**
+ * Determine a location for the given parameters
+ *
+ * @param array $args
+ *
+ * @return false|array
+ */
 function get_location( $args = array() ) {
     global $cache_life, $cache_group;
@@ -378 +385 @@
     }
 
-    // Location was provided by the user:
+    // Coordinates provided
+    if (
+        ! $location && (
+            ! empty( $args['latitude'] )  && is_numeric( $args['latitude'] ) &&
+            ! empty( $args['longitude'] ) && is_numeric( $args['longitude'] )
+        )
+    ) {
+        $city = get_city_from_coordinates( $args['latitude'], $args['longitude'] );
+
+        $location = array(
+            'description' => $city ? $city : "{$args['latitude']}, {$args['longitude']}",
+            'latitude'    => $args['latitude'],
+            'longitude'   => $args['longitude']
+        );
+    }
+
+    // City was provided by the user:
     if ( ! $location && isset( $args['location_name'] ) ) {
         $guess = guess_location_from_city( $args['location_name'], $args['timezone'] ?? '', $country_code  );
@@ -412 +435 @@
             );
         }
-    }
-
-    if (
-        ! $location && (
-            ! empty( $args['latitude'] )  && is_numeric( $args['latitude'] ) &&
-            ! empty( $args['longitude'] ) && is_numeric( $args['longitude'] )
-        )
-    ) {
-        $city = get_city_from_coordinates( $args['latitude'], $args['longitude'] );
-
-        $location = array(
-            'description' => $city ? $city : "{$args['latitude']}, {$args['longitude']}",
-            'latitude'  => $args['latitude'],
-            'longitude' => $args['longitude']
-        );
     }
 

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

@@ -534 +534 @@
         ),
 
+        /*
+         * Coordinates should take precedence over IP addresses
+         */
+        'coordinates-over-ip-us' => array(
+            'input' => array(
+                'latitude'  => '47.6062100',
+                'longitude' => '-122.3320700',
+                'ip'        => '192.0.70.251',  // San Francisco, USA
+                'timezone'  => 'America/Los_Angeles',
+                'locale'    => 'en_US',
+            ),
+            'expected' => array(
+                'description' => 'seattle',
+                'latitude'    => '47.606',
+                'longitude'   => '-122.332',
+            ),
+        ),
+
+        'coordinates-over-ip-africa' => array(
+            'input' => array(
+                'latitude'  => '-19.634233',
+                'longitude' => '17.331767',
+                'ip'        => '41.190.96.5',   // Tsumeb, Namibia
+                'timezone'  => 'Africa/Windhoek',
+                'locale'    => 'af',
+            ),
+            'expected' => array(
+                'description' => 'otavi',
+                'latitude'    => '-19.634',
+                'longitude'   => '17.332',
+            ),
+        ),
 
         /*