<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[4862] sites/trunk/api.wordpress.org/public_html/events/1.0/index.php: Events: Add the ability to return events within a reasonable distance from some given co-ordinates.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/4862">4862</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/4862","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-02-03 16:20:04 +0000 (Fri, 03 Feb 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Events: Add the ability to return events within a reasonable distance from some given co-ordinates. A city -> co-ordinates method is yet to come.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2017-02-03 16:17:52 UTC (rev 4861)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2017-02-03 16:20:04 UTC (rev 4862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $events = get_events( $event_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: application/json; charset=UTF-8' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-echo wp_json_encode( compact( 'location', 'events', 'ttl' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+echo wp_json_encode( compact( 'location', 'events', 'ttl', 'debug' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function get_location( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,13 +67,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // $args['location_data']['locale']
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !empty( $args['latitude'] ) && ! empty( $args['longitude'] ) ) {
+ // TODO: Ensure that the data here is rounded to city-level and return the name of the city/region.
+ return array(
+ 'description' => "{$args['latitude']}, {$args['longitude']}",
+ 'latitude' => $args['latitude'],
+ 'longitude' => $args['longitude']
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // TODO add the human readable description for locations. Perhaps only for POST requests?
</del><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Global',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // TODO ensure we only return rounded/city-level co-ords here
- 'latitude' => $location_args['latitude'] ?? 0,
- 'longitude' => $location_args['longtitude'] ?? 0,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'latitude' => 0,
+ 'longitude' => 0,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,14 +104,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sql_values[] = $args['type'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we want nearby events, create a WHERE based on a bounded box of lat/long co-ordinates.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $args['nearby'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // TODO locate events nearby to these co-ords only.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $event_distances = array(
+ 'meetup' => 100,
+ 'wordcamp' => 350,
+ );
+ $nearby_where = array();
+ $nearby_vals = '';
+ foreach ( $event_distances as $type => $distance ) {
+ if ( !empty( $args['type'] ) && $type != $args['type'] ) {
+ continue;
+ }
+ $bounded_box = get_bounded_coordinates( $args['nearby']['latitude'], $args['nearby']['longitude'], $distance );
+ $nearby_where[] = '( type = %s AND latitude BETWEEN %f AND %f AND longitude BETWEEN %f AND %f )';
+ $sql_values[] = $type;
+ $sql_values[] = $bounded_box['latitude']['min'];
+ $sql_values[] = $bounded_box['latitude']['max'];
+ $sql_values[] = $bounded_box['longitude']['min'];
+ $sql_values[] = $bounded_box['longitude']['max'];
+ }
+ // Build the nearby where as a OR as different event types have different distances.
+ $wheres[] = '(' . implode( ' OR ', $nearby_where ) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow queries for limiting to specific countries.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $args['country'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wheres[] = 'country = %s';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // TODO: Sanitize to 2-character country code?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // TODO: Maybe: Sanitize to 2-character country code?
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql_values[] = $args['country'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,11 +171,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $event->url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup' => $event->meetup,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => $event->meetup_url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'date' => $event->date_utc, // TODO: Create a JS parsable date, including the timezone data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'date' => $event->date_utc, // TODO: DB stores a local date, not UTC.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => $event->location,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // TODO: Split this into a new DB field
- 'country' => $event->country ?? end( array_filter( array_map( 'trim', explode( ',', $event->location ) ) ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'country' => $event->country,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => $event->latitude,
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => $event->longitude,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,6 +185,65 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $events;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Create a bounded latitude/longitude box of x KM around specific coordinates.
+ *
+ * @param float $lat The latitude of the location.
+ * @param float $lon The longitude of the location.
+ * @param int $distance_in_km The distance of the bounded box, in KM.
+ * @return array of bounded box.
+ */
+function get_bounded_coordinates( $lat, $lon, $distance_in_km = 50 ) {
+ // Based on http://janmatuschek.de/LatitudeLongitudeBoundingCoordinates
+
+ $angular_distance = $distance_in_km / 6371; // 6371 = radius of the earth in KM.
+ $lat = deg2rad( $lat );
+ $lon = deg2rad( $lon );
+
+ $earth_min_lat = -1.5707963267949; // = deg2rad( -90 ) = -PI/2
+ $earth_max_lat = 1.5707963267949; // = deg2rad( 90 ) = PI/2
+ $earth_min_lon = -3.1415926535898; // = deg2rad( -180 ) = -PI
+ $earth_max_lon = 3.1415926535898; // = deg2rad( 180 ) = PI
+
+ $minimum_lat = $lat - $angular_distance;
+ $maximum_lat = $lat + $angular_distance;
+ $minimum_lon = $maximum_lon = 0;
+
+ // Ensure that we're not within a pole-area of the world, weirdness will ensure.
+ if ( $minimum_lat > $earth_min_lat && $maximum_lat < $earth_max_lat ) {
+
+ $lon_delta = asin( sin( $angular_distance ) / cos( $lat ) );
+
+ $minimum_lon = $lon - $lon_delta;
+ if ( $minimum_lon < $earth_min_lon ) {
+ $minimum_lon += 2 * pi();
+ }
+
+ $maximum_lon = $lon + $lon_delta;
+ if ( $maximum_lon > $earth_max_lon ) {
+ $maximum_lon -= 2 * pi();
+ }
+
+ } else {
+ // Use a much simpler range in polar regions.
+ $minimum_lat = max( $minimum_lat, $earth_min_lat );
+ $maximum_lat = min( $maximum_lat, $earth_max_lat );
+ $minimum_lon = $earth_min_lon;
+ $maximum_lon = $earth_max_lon;
+ }
+
+ return array(
+ 'latitude' => array(
+ 'min' => rad2deg( $minimum_lat ),
+ 'max' => rad2deg( $maximum_lat )
+ ),
+ 'longitude' => array(
+ 'min' => rad2deg( $minimum_lon ),
+ 'max' => rad2deg( $maximum_lon )
+ )
+ );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE `wporg_events` (
</span><span class="cx" style="display: block; padding: 0 10px"> `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
</span></span></pre>
</div>
</div>
</body>
</html>