Merge pull request #459 from InfoAmazonia/develop

Release 2.12.6
InfoAmazonia · Dec 3, 2024 · 532bce5 · 532bce5
2 parents ecfca12 + f439e18
commit 532bce5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/README.txt b/src/README.txt
@@ -1,12 +1,12 @@
 === JEO ===
 Contributors: earthjournalism
 Tested up to: 6.6.2
-Stable tag: 2.12.5
+Stable tag: 2.12.6
 Requires PHP: 7.2
 Requires at least: 6.2
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
-Version: 2.12.5
+Version: 2.12.6
 
 The JEO plugin acts as a geojournalism platform that allows news organizations, bloggers and NGOs to publish news stories as layers of information on digital maps.
 
@@ -49,6 +49,9 @@ After activating the plugin, a new item will appear on the WordPress dashboard:
 
 == Changelog ==
 
+= 2.12.6 =
+* bugfix: Fix layer insertion bug when interactive style is not bottommost style layer
+
 = 2.12.5 =
 * bugfix: Fix position handling on storymap editor
 

diff --git a/src/jeo.php b/src/jeo.php
@@ -5,7 +5,7 @@
  * @wordpress-plugin
  * Plugin Name:       JEO WP
  * Description:       Interactive Map blocks for Wordpress Gutenberg
- * Version:           2.12.5
+ * Version:           2.12.6
  * License:           GPL-2.0+
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
  * Text Domain:       jeo
@@ -22,7 +22,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'JEO_VERSION', '2.12.5' );
+define( 'JEO_VERSION', '2.12.6' );
 
 define( 'JEO_BASEPATH', plugin_dir_path( __FILE__ ) );
 define( 'JEO_BASEURL', plugins_url('', __FILE__) );

diff --git a/src/js/src/jeo-map/class-jeo-map.js b/src/js/src/jeo-map/class-jeo-map.js
@@ -214,11 +214,7 @@ export default class JeoMap {
 
 							this.styleLoaded.then( () => {
 								layers.forEach( ( layer, index ) => {
-									const currentLayerSettings = mapLayersSettings.find(
-										( item ) => item.id === layer.attributes.layer_post_id
-									);
-
-									if ( currentLayerSettings.load_as_style ) {
+									if ( index === styleLayerIndex ) {
 										layer.addInteractions( map );
 									} else {
 										// If the current layer is below the style, add using fisrt syle layer reference

diff --git a/trunk/readme.txt b/trunk/readme.txt
@@ -1,12 +1,12 @@
 === JEO ===
 Contributors: earthjournalism
 Tested up to: 6.6.2
-Stable tag: 2.12.5
+Stable tag: 2.12.6
 Requires PHP: 7.2
 Requires at least: 6.2
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
-Version: 2.12.5
+Version: 2.12.6
 
 The JEO plugin acts as a geojournalism platform that allows news organizations, bloggers and NGOs to publish news stories as layers of information on digital maps.
 
@@ -49,6 +49,9 @@ After activating the plugin, a new item will appear on the WordPress dashboard:
 
 == Changelog ==
 
+= 2.12.6 =
+* bugfix: Fix layer insertion bug when interactive style is not bottommost style layer
+
 = 2.12.5 =
 * bugfix: Fix position handling on storymap editor