<!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>[4402] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php: WordCamp Post Type: Store individual venue address components</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/4402">4402</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/4402","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>2016-11-22 19:56:45 +0000 (Tue, 22 Nov 2016)</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'>WordCamp Post Type: Store individual venue address components</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-11-22 07:52:35 UTC (rev 4401)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-11-22 19:56:45 UTC (rev 4402)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,11 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the venue address was changed, update its coordinates
</span><span class="cx" style="display: block; padding: 0 10px"> $new_address = $_POST[ wcpt_key_to_str( 'Physical Address', 'wcpt_' ) ];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_address != get_post_meta( $post_id, 'Physical Address', true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $coordinates = $this->geocode_address( $new_address ) ) {
- update_post_meta( $post_id, '_venue_coordinates', $coordinates );
- } else {
- delete_post_meta( $post_id, '_venue_coordinates' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->update_venue_address( $post_id, $new_address );
</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"> // Post meta keys
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,32 +236,89 @@
</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">- * Geocode the given address into a latitude and longitude pair.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Store the individual components of a camp's venue address
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * These are used for the maps on Central, stats, etc.
+ *
+ * @param int $post_id
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $address
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @return mixed
- * false if the geocode request failed
- * array with latitude and longitude indexes if the request succeeded
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function geocode_address( $address ) {
- if ( ! $address ) {
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function update_venue_address( $post_id, $address ) {
+ $request_url = add_query_arg(
+ 'address',
+ urlencode( $address ),
+ 'https://maps.googleapis.com/maps/api/geocode/json'
+ );
+
+ $response = wcorg_redundant_remote_get( $request_url );
+
+ // Don't delete the existing (and probably good) values if the request failed
+ if ( is_wp_error( $response ) ) {
+ return;
</ins><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">- $coordinates = false;
- $request_url = add_query_arg( 'address', urlencode( $address ), 'https://maps.googleapis.com/maps/api/geocode/json' );
- $geocode_response = json_decode( wp_remote_retrieve_body( wp_remote_get( $request_url ) ) );
- // todo use wcorg_redundant_remote_get
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_values = $this->parse_geocode_response( $response );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $geocode_response->results[0]->geometry->location->lat ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $meta_values as $key => $value ) {
+ if ( is_null( $value ) ) {
+ delete_post_meta( $post_id, $key );
+ } else {
+ update_post_meta( $post_id, $key, $value );
+ }
+ }
+ }
+
+ /**
+ * Parse the values we want out of the Geocode API response
+ *
+ * @see https://developers.google.com/maps/documentation/geocoding/intro#Types API response schema
+ *
+ * @param $response
+ *
+ * @return array
+ */
+ protected function parse_geocode_response( $response ) {
+ $body = json_decode( wp_remote_retrieve_body( $response ) );
+ $body = isset ( $body->results[0] ) ? $body->results[0] : null;
+
+ if ( isset( $body->geometry->location->lat ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $coordinates = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'latitude' => $geocode_response->results[0]->geometry->location->lat,
- 'longitude' => $geocode_response->results[0]->geometry->location->lng
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'latitude' => $body->geometry->location->lat,
+ 'longitude' => $body->geometry->location->lng
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $coordinates;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset ( $body->address_components ) ) {
+ foreach ( $body->address_components as $component ) {
+ foreach ( $component->types as $type ) {
+ switch ( $type ) {
+
+ case 'locality':
+ case 'administrative_area_level_1':
+ case 'postal_code':
+ $$type = $component->long_name;
+ break;
+
+ case 'country':
+ $country_code = $component->short_name; // This is not guaranteed to be ISO 3166-1 alpha-2, but should match in most cases
+ $country_name = $component->long_name;
+ break;
+
+ }
+ }
+ }
+ }
+
+ $values = array(
+ '_venue_coordinates' => isset( $coordinates ) ? $coordinates : null,
+ '_venue_city' => isset( $locality ) ? $locality : null,
+ '_venue_state' => isset( $administrative_area_level_1 ) ? $administrative_area_level_1 : null,
+ '_venue_country_code' => isset( $country_code ) ? $country_code : null,
+ '_venue_country_name' => isset( $country_name ) ? $country_name : null,
+ '_venue_zip' => isset( $postal_code ) ? $postal_code : null,
+ );
+
+ return $values;
</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">@@ -273,6 +326,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns post meta key
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $meta_group
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function meta_keys( $meta_group = '' ) {
</span></span></pre>
</div>
</div>
</body>
</html>