Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimized error handling and fixed deprecation in EP version 3 #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Optimized error handling and fixed deprecation in EP version 3 #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de7c6b8
Fixed ep_register_feature deprecation warning and error when ElasticP…
DanWin May 15, 2019
173fd3c
Introduced admin notice when ElasticPress is missing
DanWin May 15, 2019
45f943d
Bump version
DanWin May 15, 2019
dc2eb6e
Changed mappings for ElasticSearch version 7
DanWin Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 83 additions & 26 deletions ep-geo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Author URI: https://thinkshout.com/
* Text Domain: ep-geo
* Domain Path: /languages
* Version: 0.1.0
* Version: 0.1.2
*
* @package Ep_Geo
*/
Expand All @@ -29,26 +29,47 @@ function ep_geo_setup() {
* @return array
*/
function ep_geo_config_mapping( $mapping ) {
// Index geo_point:
$mapping['mappings']['post']['properties']['geo_point'] = array(
'properties' => array(
'location' => array(
'type' => 'geo_point',
'ignore_malformed' => true,
if ( !class_exists('ElasticPress\\Elasticsearch') || version_compare( \ElasticPress\Elasticsearch::factory()->get_elasticsearch_version(), '7.0', '<' ) ) {
// Index geo_point:
$mapping[ 'mappings' ]['post']['properties']['geo_point'] = array(
'properties' => array(
'location' => array(
'type' => 'geo_point',
'ignore_malformed' => true,
),
),
),
);

// Index geo_shape:
$mapping['mappings']['post']['properties']['geo_shape'] = array(
'properties' => array(
'location' => array(
'type' => 'geo_shape',
'ignore_malformed' => true,
);

// Index geo_shape:
$mapping[ 'mappings' ]['post']['properties']['geo_shape'] = array(
'properties' => array(
'location' => array(
'type' => 'geo_shape',
'ignore_malformed' => true,
),
),
),
);

);
} else {
// Index geo_point:
$mapping[ 'mappings' ]['properties']['geo_point'] = array(
'properties' => array(
'location' => array(
'type' => 'geo_point',
'ignore_malformed' => true,
),
),
);

// Index geo_shape:
$mapping[ 'mappings' ]['properties']['geo_shape'] = array(
'properties' => array(
'location' => array(
'type' => 'geo_shape',
'ignore_malformed' => true,
),
),
);
}
return $mapping;
}

Expand Down Expand Up @@ -180,10 +201,46 @@ function ep_geo_box_long() {
echo '<p>' . esc_html_e( 'If your latitude and longitude data is stored somewhere else, or if you need to calculate or preprocess the geo_point location, it\'s configurable with a WordPress hook.', 'ep-geo' ) . '</p>';
}

ep_register_feature( 'ep_geo', array(
'title' => 'Geo',
'setup_cb' => 'ep_geo_setup',
'feature_box_summary_cb' => 'ep_geo_box_summary',
'feature_box_long_cb' => 'ep_geo_box_long',
'requires_install_reindex' => true,
) );
if(class_exists('ElasticPress\\Feature')) {
class EP_Geo extends ElasticPress\Feature {

public function __construct() {
$this->slug = 'ep_geo';
$this->requires_install_reindex = true;
$this->title = 'Geo';
parent::__construct();
}

public function setup() {
ep_geo_setup();
}

public function output_feature_box_summary() {
ep_geo_box_summary();
}

public function output_feature_box_long() {
ep_geo_box_long();
}
}

ElasticPress\Features::factory()->register_feature(
new EP_Geo()
);
}elseif(function_exists('ep_register_feature')){
ep_register_feature( 'ep_geo', array(
'title' => 'Geo',
'setup_cb' => 'ep_geo_setup',
'feature_box_summary_cb' => 'ep_geo_box_summary',
'feature_box_long_cb' => 'ep_geo_box_long',
'requires_install_reindex' => true,
) );
} else {
add_action('admin_notices', function() { ?>

<div class="notice notice-error">
<p><?php _e('ElasticPress Geo is enabled but not effective. It requires <a href="https://wordpress.org/plugins/elasticpress/" target="_blank" rel="noopener">ElasticPress</a> in order to work.', 'ep-geo'); ?></p>
</div>

<?php });
}