<!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>[9749] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Replace individual countries with continents for clarity.</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 { white-space: pre-line; 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/9749">9749</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/9749","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>2020-04-20 22:28:17 +0000 (Mon, 20 Apr 2020)</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: Replace individual countries with continents for clarity.
This is essentially the same data as before, but much more self-documenting.</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>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-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 2020-04-20 22:27:59 UTC (rev 9748)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2020-04-20 22:28:17 UTC (rev 9749)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,15 +957,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // WordCamp Asia.
</span><span class="cx" style="display: block; padding: 0 10px"> 'asia' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'promo_start' => strtotime( '2019-12-20 00:00:00' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'regional_countries' => array(
- 'cn', 'hk', 'jp', 'kp', 'kr', 'mn', 'mo', 'tw', 'af', 'bd',
- 'bt', 'in', 'ir', 'lk', 'mv', 'np', 'pk', 'bn', 'id', 'kh',
- 'la', 'mm', 'my', 'ph', 'sg', 'th', 'tl', 'vn', 'au', 'nf',
- 'nz', 'fj', 'nc', 'pg', 'sb', 'vu', 'fm', 'gu', 'ki', 'mh',
- 'mp', 'nr', 'pw', 'as', 'ck', 'nu', 'pf', 'pn', 'tk', 'to',
- 'tv', 'wf', 'ws', 'tm', 'tj', 'kg', 'kz', 'uz', 'ae', 'am',
- 'az', 'bh', 'cy', 'ge', 'il', 'iq', 'jo', 'kw', 'lb', 'om',
- 'ps', 'qa', 'sa', 'sy', 'tr', 'ye'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'regional_countries' => array_merge(
+ get_iso_3166_2_country_codes( 'asia' ),
+ get_iso_3166_2_country_codes( 'oceania' ),
+
+ // Russia is often considered to be part of Asia geographically, and part of Europe politically.
+ array( 'RU' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'event' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -986,8 +984,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // WordCamp Europe.
</span><span class="cx" style="display: block; padding: 0 10px"> 'europe' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'promo_start' => strtotime( '2020-04-04 00:00:00' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'regional_countries' => array(
- // todo
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'regional_countries' => array_merge(
+ get_iso_3166_2_country_codes( 'africa' ),
+ get_iso_3166_2_country_codes( 'europe' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'event' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,11 +1007,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // WordCamp US.
</span><span class="cx" style="display: block; padding: 0 10px"> 'us' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'promo_start' => strtotime( '2020-08-27 00:00:00' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'regional_countries' => array(
- 'us', 'ca', 'bz', 'cr', 'sv', 'gt', 'hn', 'mx', 'ni', 'pa',
- 'ar', 'bo', 'br', 'cl', 'co', 'ec', 'gf', 'gy', 'py', 'pe',
- 'sr', 'uy', 've', 'ag', 'aw', 'bs', 'bb', 'ky', 'cu', 'dm',
- 'do', 'gd', 'ht', 'jm', 'kn', 'lc', 'vc', 'tt',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'regional_countries' => array_merge(
+ get_iso_3166_2_country_codes( 'south america' ),
+ get_iso_3166_2_country_codes( 'north america' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'event' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,6 +1033,65 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get a list of ISO-3166-2 countries by continent.
+ *
+ * Data was sourced from https://dev.maxmind.com/geoip/legacy/codes/country_continent/ on 2020-04-17.
+ *
+ * @param string $continent
+ *
+ * @return array
+ */
+function get_iso_3166_2_country_codes( $continent = '' ) {
+ $codes = array(
+ 'antarctica' => array( 'AQ', 'BV', 'GS', 'HM', 'TF' ),
+
+ 'africa' => array(
+ 'AO', 'BF', 'BI', 'BJ', 'BW', 'CD', 'CF', 'CG', 'CI', 'CM', 'CV', 'DJ', 'DZ', 'EG', 'EH', 'ER', 'ET',
+ 'GA', 'GH', 'GM', 'GN', 'GQ', 'GW', 'KE', 'KM', 'LR', 'LS', 'LY', 'MA', 'MG', 'ML', 'MR', 'MU', 'MW',
+ 'MZ', 'NA', 'NE', 'NG', 'RE', 'RW', 'SC', 'SD', 'SH', 'SL', 'SN', 'SO', 'ST', 'SZ', 'TD', 'TG', 'TN',
+ 'TZ', 'UG', 'YT', 'ZA', 'ZM', 'ZW',
+ ),
+
+ 'asia' => array(
+ // Includes the Middle East, Armenia, Azerbaijan, Cyprus, Georgia.
+ 'AE', 'AF', 'AM', 'AP', 'AZ', 'BD', 'BH', 'BN', 'BT', 'CC', 'CN', 'CX', 'CY', 'GE', 'HK', 'ID', 'IL',
+ 'IN', 'IO', 'IQ', 'IR', 'JO', 'JP', 'KG', 'KH', 'KP', 'KR', 'KW', 'KZ', 'LA', 'LB', 'LK', 'MM', 'MN',
+ 'MO', 'MV', 'MY', 'NP', 'OM', 'PH', 'PK', 'PS', 'QA', 'SA', 'SG', 'SY', 'TH', 'TJ', 'TL', 'TM', 'TW',
+ 'UZ', 'VN', 'YE',
+ ),
+
+ 'europe' => array(
+ // Includes Russia, Turkey.
+ 'AD', 'AL', 'AT', 'AX', 'BA', 'BE', 'BG', 'BY', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'EU', 'FI', 'FO',
+ 'FR', 'FX', 'GB', 'GG', 'GI', 'GR', 'HR', 'HU', 'IE', 'IM', 'IS', 'IT', 'JE', 'LI', 'LT', 'LU', 'LV',
+ 'MC', 'MD', 'ME', 'MK', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'RU', 'SE', 'SI', 'SJ', 'SK', 'SM',
+ 'TR', 'UA', 'VA',
+ ),
+
+ 'north america' => array(
+ 'AG', 'AI', 'AN', 'AW', 'BB', 'BL', 'BM', 'BS', 'BZ', 'CA', 'CR', 'CU', 'DM', 'DO', 'GD', 'GL', 'GP',
+ 'GT', 'HN', 'HT', 'JM', 'KN', 'KY', 'LC', 'MF', 'MQ', 'MS', 'MX', 'NI', 'PA', 'PM', 'PR', 'SV', 'TC',
+ 'TT', 'US', 'VC', 'VG', 'VI',
+ ),
+
+ 'oceania' => array(
+ 'AS', 'AU', 'CK', 'FJ', 'FM', 'GU', 'KI', 'MH', 'MP', 'NC', 'NF', 'NR', 'NU', 'NZ', 'PF', 'PG', 'PN',
+ 'PW', 'SB', 'TK', 'TO', 'TV', 'UM', 'VU', 'WF', 'WS',
+ ),
+
+ 'south america' => array(
+ 'AR', 'BO', 'BR', 'CL', 'CO', 'EC', 'FK', 'GF', 'GY', 'PE', 'PY', 'SR', 'UY', 'VE',
+ ),
+ );
+
+ if ( $continent ) {
+ return $codes[ $continent ];
+ } else {
+ return $codes;
+ }
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add time- and location-relevant regional WordCamps to the Events Widget in Core.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $local_events
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1069,12 +1126,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $regional_wordcamps[] = $data['event'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_within_date_range( $current_time, strtotime( '+ 2 weeks', $start ), strtotime( '+ 4 weeks', $start ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Phase 2: Show within regional countries for next two weeks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $location['country'] ) && in_array( strtolower( $location['country'] ), $data['regional_countries'], true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $location['country'] ) && in_array( strtoupper( $location['country'] ), $data['regional_countries'], true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $regional_wordcamps[] = $data['event'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_within_date_range( $current_time, strtotime( '+ 4 weeks', $start ), strtotime( '+ 6 weeks', $start ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Phase 3: Show only within the event country for the last two weeks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $location['country'] ) && strtolower( $data['event']['location']['country'] ) === strtolower( $location['country'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $location['country'] ) && strtoupper( $data['event']['location']['country'] ) === strtoupper( $location['country'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $regional_wordcamps[] = $data['event'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp"></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/tests/test-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/tests/test-index.php 2020-04-20 22:27:59 UTC (rev 9748)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2020-04-20 22:28:17 UTC (rev 9749)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_maybe_add_wp15_promo();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_build_response();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_is_client_core();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tests_failed += test_get_iso_3166_2_country_codes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query_count = count( $wpdb->queries );
</span><span class="cx" style="display: block; padding: 0 10px"> $query_time = array_sum( array_column( $wpdb->queries, 1 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1181,11 +1182,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $region_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'us' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'promo_start' => strtotime( '2019-08-16 00:00:00' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'regional_countries' => array(
- 'us', 'ca', 'bz', 'cr', 'sv', 'gt', 'hn', 'mx', 'ni', 'pa',
- 'ar', 'bo', 'br', 'cl', 'co', 'ec', 'gf', 'gy', 'py', 'pe',
- 'sr', 'uy', 've', 'ag', 'aw', 'bs', 'bb', 'ky', 'cu', 'dm',
- 'do', 'gd', 'ht', 'jm', 'kn', 'lc', 'vc', 'tt',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'regional_countries' => array_merge(
+ get_iso_3166_2_country_codes( 'south america' ),
+ get_iso_3166_2_country_codes( 'north america' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'event' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1447,6 +1447,40 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test `get_iso_3166_2_country_codes()`.
+ */
+function test_get_iso_3166_2_country_codes() {
+ $failed = 0;
+ $cases = array(
+ 'antarctica' => 'HM',
+ 'africa' => 'KM',
+ 'asia' => 'SA',
+ 'europe' => 'IM',
+ 'north america' => 'MQ',
+ 'oceania' => 'MP',
+ 'south america' => 'GY',
+ );
+
+ printf( "\n\nRunning %d get_iso_3166_2_country_codes() tests\n", count( $cases ) );
+
+ foreach ( $cases as $continent => $sample_country ) {
+ $countries = get_iso_3166_2_country_codes( $continent );
+
+ $expected_result = true;
+ $actual_result = in_array( $sample_country, $countries, true );
+ $passed = $expected_result === $actual_result;
+
+ output_results( $continent, $passed, $expected_result, $actual_result );
+
+ if ( ! $passed ) {
+ $failed++;
+ }
+ }
+
+ return $failed;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Stub to simulate cache misses, so that the tests always get fresh results
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false
</span></span></pre>
</div>
</div>
</body>
</html>