+
+
diff --git a/src/ajax/get-markers.php b/src/ajax/get-markers.php
index 9b60f67..409ed16 100644
--- a/src/ajax/get-markers.php
+++ b/src/ajax/get-markers.php
@@ -1,5 +1,5 @@
'initiatives',
@@ -28,50 +28,87 @@ function ajax_get_intiative_markers($params) {
$args['s'] = $_POST['value']['search'];
}
- $initiatives = get_posts($args);
+ $path = TEMPLATEPATH . '/cache/' . md5(serialize($args)) . '.json';
- if($initiatives) {
- $results = array();
- foreach($initiatives as $initiative) {
+ if(!file_exists($path) || filemtime($path) < time() - $cache_expiry ) {
+ $initiatives = get_posts($args);
+
+ if($initiatives) {
+ $results = array();
+ foreach($initiatives as $initiative) {
+
+ $map = get_field('map', $initiative->ID);
+
+ //only show those that aren't saved with the default coords
+ if($map['lat'] !== 51.4548627 && $map['lng'] !== -2.5977516) {
+ $results[$initiative->ID]['type'] = 'initiative';
+ $results[$initiative->ID]['lat'] = $map['lat'];
+ $results[$initiative->ID]['lng'] = $map['lng'];
+ $results[$initiative->ID]['permalink'] = parse_post_link($initiative->ID);
+ $results[$initiative->ID]['title'] = get_the_title($initiative->ID);
+ $results[$initiative->ID]['age'] = get_initiatve_age($initiative->ID);
+ }
+ }
- $map = get_field('map', $initiative->ID);
+ file_put_contents($path, json_encode($results));
- $results[$initiative->ID]['type'] = 'initative';
- $results[$initiative->ID]['lat'] = $map['lat'];
- $results[$initiative->ID]['lng'] = $map['lng'];
- $results[$initiative->ID]['permalink'] = parse_post_link($initiative->ID);
- $results[$initiative->ID]['title'] = get_the_title($initiative->ID);
- $results[$initiative->ID]['age'] = get_initiatve_age($initiative->ID);
-
+ return $results;
}
-
- return $results;
+
+ } else {
+ return json_decode(file_get_contents($path), true);
}
}
return array();
}
-function ajax_get_hub_markers($params) {
+function ajax_get_hub_markers($params, $cache_expiry) {
//hub queries second
if($params['type'] === "1" || $params['type'] === "3") {
- $args = array(
- 'hide_empty' => false
- );
- $hubs = get_terms('hub', $args);
+ if(array_key_exists('hub_name', $params)) {
+
+ $hub_term = get_term_by('slug', $params['hub_name'], 'hub');
+ $hubs = ($hub_term) ? array($hub_term) : null;
+
+ } else if(array_key_exists('country', $params)) {
+
+ $country_term = get_term_by('slug', $params['country'], 'country');
+
+ if($country_term) {
+ $country_term_id = $country_term->term_id;
+
+ $args = array(
+ 'hide_empty' => false,
+ 'meta_query' => array(
+ array(
+ 'key' => 'associated_countries',
+ 'value' => '\;i\:' . $country_term_id . '\;|\"' . $country_term_id . '\";',
+ 'compare' => 'REGEXP'
+ )
+ )
+ );
+
+ $hubs = get_terms('hub', $args);
+ }
+ } else {
+ $args = array(
+ 'hide_empty' => false
+ );
+
+ $hubs = get_terms('hub', $args);
+ }
if($hubs) {
$results = array();
-
+
foreach($hubs as $hub) {
if(
!array_key_exists('training', $params) ||
- (array_key_exists('training', $params) && get_field('training', $hub) === 1)
- ) {
-
- ///ADD FILTERING BY hub_name and country (if)
-
+ (array_key_exists('training', $params) && get_field('training', $hub) === TRUE)
+ ) {
+
$map = get_field('map', $hub);
$results[$hub->term_id]['type'] = 'hub';
@@ -91,13 +128,19 @@ function ajax_get_hub_markers($params) {
}
function ajax_get_map_markers() {
+ //create cache dir
+ if (!file_exists(TEMPLATEPATH . '/cache')) {
+ mkdir(TEMPLATEPATH . '/cache', 0755, true);
+ }
+
+ $cache_expiry = 24 * 60 * 60; //24hrs
+
if($_POST === 'getMarkers') {
return false;
}
$params = array_key_exists('params', $_POST['value']) ? $_POST['value']['params'] : array();
-
if(!array_key_exists('type', $params)) {
// ALL/BOTH = 1
// INITIATIVES = 2
@@ -107,9 +150,12 @@ function ajax_get_map_markers() {
}
$markers = array();
- $markers = array_merge(ajax_get_intiative_markers($params), ajax_get_hub_markers($params));
+ $markers = array(
+ 'initiatives' => ajax_get_intiative_markers($params, $cache_expiry),
+ 'hubs' => ajax_get_hub_markers($params, $cache_expiry)
+ );
- echo json_encode(array($params, $markers));
+ echo json_encode($markers);
wp_die();
}
diff --git a/src/ajax/map-requests.php b/src/ajax/map-requests.php
deleted file mode 100644
index df2ebff..0000000
--- a/src/ajax/map-requests.php
+++ /dev/null
@@ -1,164 +0,0 @@
- 'initiatives',
- 'posts_per_page' => -1,
- );
-
- if(!empty($_POST['value']['hub_name'])) {
- $args['tax_query'] = array(
- array (
- 'taxonomy' => 'hub',
- 'field' => 'slug',
- 'terms' => $_POST['value']['hub_name']
- )
- );
- }
-
- if(!empty($_POST['value']['country'])) {
- $args['tax_query'] = array(
- array (
- 'taxonomy' => 'country',
- 'field' => 'slug',
- 'terms' => $_POST['value']['country']
- )
- );
- }
-
- if(!empty($_POST['value']['search'])) {
- $args['s'] = $_POST['value']['search'];
- }
-
-
- $data = array();
-
- $posts = get_posts($args);
-
- if($posts) {
- $key = 0;
- foreach($posts as $initiative) {
- $map = get_field('map', $initiative->ID);
-
- if(!empty($map['markers'])) {
- $data[$key]['lat'] = $map['lat'];
- $data[$key]['lng'] = $map['lng'];
- $data[$key]['permalink'] = parse_post_link($initiative->ID);
- $data[$key]['title'] = get_the_title($initiative->ID);
- $data[$key]['age'] = get_initiatve_age($initiative->ID);
-
- $key ++;
- }
- }
- }
-
- return $data;
-}
-
-function get_h_data() {
- $hubs = get_terms('hub', array(
- 'hide_empty' => false
- ));
-
- if($_POST['value']['hub_name']) {
- $hubs = []; //must be array
- $hubs[] = get_term_by('slug', $_POST['value']['hub_name'], 'hub');
- }
-
- $key = 0;
- foreach($hubs as $hub) {
- $map = get_field('map', $hub);
- if(!empty($map['markers'])) {
- $data[$key]['lat'] = $map['lat'];
- $data[$key]['lng'] = $map['lng'];
- $data[$key]['permalink'] = get_term_link($hub);
- $data[$key]['title'] = $hub->name;
- $data[$key]['training'] = get_field('training', $hub);
-
- $key ++;
- }
- }
-
- return $data;
-}
-
-
-function return_map_markers() {
-
- if (!file_exists(TEMPLATEPATH . '/cache')) {
- mkdir(TEMPLATEPATH . '/cache', 0755, true);
- }
-
- $cache_expiry = 24 * 60 * 60; //24hrs
-
- $hub_name = $_POST['value']['hub_name'];
- if(is_array($hub_name)) {
- $hub_name = implode('_', $hub_name);
- }
-
- $i_filepath = TEMPLATEPATH . '/cache/i-cache_h' . $hub_name . '_c' . $_POST['value']['country'] . '.json';
- $h_filepath = TEMPLATEPATH . '/cache/h-cache_h' . $hub_name . '_c' . $_POST['value']['country'] . '.json';
-
- if(!file_exists($i_filepath) || filemtime($i_filepath) < time() - $cache_expiry ) {
- //file cache has expired
- $i_markers = get_i_data();
- file_put_contents($i_filepath, json_encode($i_markers));
- $data['i_status'] = 'queried';
- } else {
- $data['i_status'] = 'cached';
- $i_markers = json_decode(file_get_contents($i_filepath), true);
- }
-
- if(!file_exists($h_filepath) || filemtime($h_filepath) < time() - $cache_expiry) {
- //file cache has expired
- $h_markers = get_h_data();
- file_put_contents($h_filepath, json_encode($h_markers));
- $data['h_status'] = 'queried';
- } else {
- $h_markers = json_decode(file_get_contents($h_filepath), true);
- $data['h_status'] = 'cached';
- }
-
- if($i_markers) {
- $data['i_markers'] = $i_markers;
- }
-
- if($h_markers) {
- $data['h_markers'] = $h_markers;
- }
-
- $data['values_submitted'] = $_POST['value'];
-
- //debug
- // $data['i_filepath'] = $i_filepath;
- // $data['h_filepath'] = $h_filepath;
-
- echo json_encode($data);
- wp_die();
-}
-
-add_action('wp_ajax_nopriv_getMapMarkers', 'return_map_markers');
-add_action('wp_ajax_getMapMarkers', 'return_map_markers');
-
-
-function return_hub_markers() {
- $markers = get_h_data();
-
- if($_POST['value']['training'] === "true") {
- $training_markers = array();
- foreach($markers as $marker) {
- if($marker['training']) {
- $training_markers[] = $marker;
- }
- }
-
- $markers = $training_markers;
- }
-
- $data['h_markers'] = $markers;
- echo json_encode($data);
-
- wp_die();
-}
-
-add_action('wp_ajax_nopriv_getHubMarkers', 'return_hub_markers');
-add_action('wp_ajax_getHubMarkers', 'return_hub_markers');
diff --git a/src/lib/assets.php b/src/lib/assets.php
index 9c1d9e4..b431ed6 100644
--- a/src/lib/assets.php
+++ b/src/lib/assets.php
@@ -160,7 +160,9 @@ function localize_scripts() {
'cookieExpires' => (get_theme_mod('notification_expires') ? get_theme_mod('notification_expires'): 999),
'themeUrl' => get_template_directory_uri(),
'notificationJS' => (get_theme_mod('notification_use_js') ? 'true' : 'false'),
- 'homeUrl' => home_url()
+ 'homeUrl' => home_url(),
+ 'postId' => get_the_ID(),
+ 'postTitle' => get_the_title()
]);
}
}
diff --git a/templates/partials/key.php b/templates/partials/key.php
index 19e64f8..a5c3673 100644
--- a/templates/partials/key.php
+++ b/templates/partials/key.php
@@ -1,5 +1,5 @@
diff --git a/templates/partials/map-filter.php b/templates/partials/map-filter.php
new file mode 100644
index 0000000..e35d05e
--- /dev/null
+++ b/templates/partials/map-filter.php
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 . '/dist/img/icons/marker-icon-2x.png'; ?> "Initiatives"){kind=icon}
 . '/dist/img/icons/marker-icon-hub-2x.png'; ?> "Hubs"){kind=icon}