<!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>[6179] sites/trunk/api.wordpress.org/public_html/events/1.0/index.php: Events: Remove dead code for fuzzy locations because no longer needed.</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/6179">6179</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/6179","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-27 20:47:41 +0000 (Mon, 27 Nov 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: Remove dead code for fuzzy locations because no longer needed.</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-11-27 20:14:55 UTC (rev 6178)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2017-11-27 20:47:41 UTC (rev 6179)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,32 +149,8 @@
</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"> $events = add_regional_wordcamps( $events, $_SERVER['HTTP_USER_AGENT'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * There are two conditions which can cause a location to not have a description:
- * 1) When the request only passed latitude/longtude coordinates. We don't lookup
- * a location here because it's too expensive. See r5497.
- * 2) When the location was determined by geolocating the IP. We don't return the
- * location here because it would violate the ip2location EULA. See r5491.
- *
- * For WP 4.8-beta1 those conditions were handled by setting "fuzzy" locations
- * instead; the location of the first upcoming event was used, since it will be
- * within driving distance of the location that was geolocated.
- *
- * After beta1 was released, though, there was a lot of feedback about the locations
- * being too inaccurate, so we're going to try a different approach for beta2. See
- * #40702-core.
- *
- * @todo Update the user-agent strings if 40702-geoip.2.diff doesn't make it into beta2
- * @todo Remove this back-compat code after 4.8.0 has been out for a few days, to avoid
- * impacting the feature plugin in 4.7 installs. rebuild_location_from_event_source()
- * can probably be removed at that time too.
- */
- $use_fuzzy_locations = false !== strpos( $_SERVER['HTTP_USER_AGENT'], '4.7' ) || false !== strpos( $_SERVER['HTTP_USER_AGENT'], '4.8-beta1' );
- if ( $use_fuzzy_locations ) {
- if ( empty( $location['description'] ) || ( isset( $location['internal'] ) && $location['internal'] ) ) {
- $location = rebuild_location_from_event_source( $events );
- }
- } elseif ( isset( $location['internal'] ) && $location['internal'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Internal location data cannot be exposed in the response, see get_location().
+ if ( isset( $location['internal'] ) && $location['internal'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Let the client know that a location was successfully determined based on their IP
</span><span class="cx" style="display: block; padding: 0 10px"> $location = array( 'ip' => $location_args['ip'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,52 +393,6 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Rebuild the location given to the client from the event source data
- *
- * We cannot publicly expose location data that we retrieve from the `ip2location` database, because that would
- * violate their licensing terms. We can only use the information internally, for the purposes of completing the
- * program's business logic (determining nearby events).
- *
- * Once we have nearby events, though, we can take advantage of the data that's available in the `wporg_events` table.
- * That table contains the locations details for the event's venue, which was sourced from the respective APIs
- * (WordCamp.org, Meetup.com, etc). We can return the venue's location data without violating any terms.
- *
- * See https://meta.trac.wordpress.org/ticket/2823#comment:15
- * See https://meta.trac.wordpress.org/ticket/2823#comment:21
- *
- * This isn't ideal, since the location it picks is potentially an hour's driving time from the user. If we get a
- * lot of complaints, we could potentially change this to search the `geonames` database for the name of the city
- * that was returned by the `ip2location` database. That should be more accurate, but it would require an extra
- * database lookup, and could potentially fail to return any results.
- *
- * @param array $events
- *
- * @return array|false
- */
-function rebuild_location_from_event_source( $events ) {
- $location = false;
-
- foreach ( $events as $event ) {
- if ( ! empty( $event['location']['location'] ) && ! empty( $event['location']['latitude'] ) ) {
- $location = $event['location'];
- $location['description'] = $location['location'];
- unset( $location['location'] );
-
- /*
- * If the event is a WordCamp, continue searching until a meetup is found. Meetups have a much smaller
- * search radius in `get_events()`, so they'll be closer to the user's location. Some cities will only
- * have WordCamps scheduled at the moment, though, so we can fall back to those.
- */
- if ( 'meetup' === $event['type'] ) {
- break;
- }
- }
- }
-
- return $location;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Determine a location for the given parameters
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +483,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => $guess->ip_latitude,
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => $guess->ip_longitude,
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => $guess->country_short,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'internal' => true, // this location cannot be shared publicly, see `rebuild_location_from_geonames()`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /*
+ * ip2location's EULA forbids exposing the derived location publicly, so flag the
+ * data for internal use only.
+ */
+ 'internal' => true,
</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></pre>
</div>
</div>
</body>
</html>