Merge pull request #450 from InfoAmazonia/develop

Release 2.11.2
InfoAmazonia · Oct 2, 2024 · 9367973 · 9367973
2 parents 4502d56 + 088537c
commit 9367973
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 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.11.1
+Stable tag: 2.11.2
 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.11.1
+Version: 2.11.2
 
 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.11.2 =
+*bugfix: Fix regression in interactions loading
+
 = 2.11.1 =
 * Improve rendering of maps and storymaps
 

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.11.1
+ * Version:           2.11.2
  * 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.11.1' );
+define( 'JEO_VERSION', '2.11.2' );
 
 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
@@ -209,27 +209,18 @@ export default class JeoMap {
 								}
 							} );
 
-							// Add interactions to style layers
-							layers.forEach( ( layer ) => {
-								const currentLayerSettings = mapLayersSettings.find(
-									( item ) => item.id === layer.attributes.layer_post_id
-								);
-								if ( currentLayerSettings.load_as_style ) {
-									layer.addInteractions( map );
-								}
-							} );
-
 							// Select reference pointers
 							firstStyleLayerId = map.style._order[ 0 ];
 
 							this.styleLoaded.then( () => {
-								// Add non-style layers to map (rasters)
 								layers.forEach( ( layer, index ) => {
 									const currentLayerSettings = mapLayersSettings.find(
 										( item ) => item.id === layer.attributes.layer_post_id
 									);
 
-									if ( ! currentLayerSettings.load_as_style ) {
+									if ( currentLayerSettings.load_as_style ) {
+										layer.addInteractions( map );
+									} else {
 										// If the current layer is below the style, add using fisrt syle layer reference
 										if ( index < styleLayerIndex ) {
 											layer.addLayer( map, [ firstStyleLayerId ] );

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.11.1
+Stable tag: 2.11.2
 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.11.1
+Version: 2.11.2
 
 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.11.2 =
+*bugfix: Fix regression in interactions loading
+
 = 2.11.1 =
 * Improve rendering of maps and storymaps