Merge branch 'release/1.12.0' into develop

Htbaa · Htbaa · commit 74660071f6de · 2025-03-20T11:23:30.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,13 @@
-- De shortcode ondersteund nu de instellingen `enable_controls=0` en `enable_interactions=0` om een kaart te fixeren. Door `enable_controls` op `0` te zetten verdwijnen de buttons voor zoomen. Met `enable_interactions=0` verdwijnt de mogelijkheid om met touch, muis of toetsenbord te navigeren door de kaart. Standaard staan deze instellingen op `1` (dit komt overeen met de vorige versies). Hiermee kan een kaart gefixeerd worden.
+**1.12.0 (2025-03-20)**
+
+- De shortcode ondersteunt nu de instellingen `enable_controls=0` en `enable_interactions=0` om een kaart te fixeren. Door `enable_controls` op `0` te zetten verdwijnen de buttons voor zoomen. Met `enable_interactions=0` verdwijnt de mogelijkheid om met touch, muis of toetsenbord te navigeren door de kaart. Standaard staan deze instellingen op `1` (dit komt overeen met de vorige versies). Hiermee kan een kaart gefixeerd worden.
 - Update naar OpenLayers 10.
 - Update naar React 18.
 - De kaart krijgt nu niet meer automatisch focus wanneer de muis er overheen gaat. Op schermen waar de kaart niet volledig paste gaf dit een hinderlijke gebruikerservaring.
 - Tooling geüpdatet naar Node v22.
 - Composer voorzien van name om unieke `autoload.php` te garanderen.
-- Diverse dependencies bijgewerkt naar een nieuwere versie.
+- Nieuwe versies van ondersteunende software bibliotheken in gebruik genomen.
+- Minimum PHP versie aangepast van 7.2 -> 8.1.
 
 **1.11.1 (2024-05-01)**
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gh-datainmap",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/plugins/gh-datainmap/DESCRIPTION.md b/plugins/gh-datainmap/DESCRIPTION.md
@@ -16,7 +16,7 @@ Met de zoekfunctie, welke gebruik maakt van de API van PDOK, is het mogelijk om
 
 # Licentie
 
-Copyright 2020-2023 Gemeente Heerenveen
+Copyright 2020-2025 Gemeente Heerenveen
 
 Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/gh-datainmap.php b/plugins/gh-datainmap/gh-datainmap.php
@@ -3,16 +3,16 @@
 Plugin Name: Data In Map
 Plugin URI: https://github.com/OpenWebconcept/plugin-datainmap
 Description: Data In Map is a plugin for displaying maps.
-Version: 1.11.1
+Version: 1.12.0
 Requires at least: 5.0
-Requires PHP: 7.2
+Requires PHP: 8.1
 Author: Gemeente Heerenveen
 Author URI: https://www.heerenveen.nl/
 Text Domain: gh-datainmap
 License URI: https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
 License: EUPL v1.2
 
-Copyright 2020-2023 Gemeente Heerenveen
+Copyright 2020-2025 Gemeente Heerenveen
 
 Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 You may not use this work except in compliance with the Licence.
@@ -26,7 +26,7 @@
 */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
-if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.11.1');
+if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.12.0');
 if ( ! defined('GH_DIM_FILE')) define('GH_DIM_FILE', __FILE__);
 if ( ! defined('GH_DIM_DIR')) define('GH_DIM_DIR', dirname(__FILE__));
 if ( ! defined('GH_DIM_DEBUG')) define('GH_DIM_DEBUG', false);
diff --git a/plugins/gh-datainmap/includes/ajax.php b/plugins/gh-datainmap/includes/ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/menus.php b/plugins/gh-datainmap/includes/menus.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/metaboxes.php b/plugins/gh-datainmap/includes/metaboxes.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/post-type.php b/plugins/gh-datainmap/includes/post-type.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/settings.php b/plugins/gh-datainmap/includes/settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/shortcode.php b/plugins/gh-datainmap/includes/shortcode.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/tax-meta-image.php b/plugins/gh-datainmap/includes/tax-meta-image.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/taxonomy.php b/plugins/gh-datainmap/includes/taxonomy.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/utils.php b/plugins/gh-datainmap/includes/utils.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/actions.js b/src/actions.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/admin-layers.js b/src/admin-layers.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/admin-location.js b/src/admin-location.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/admin-locationpicker.js b/src/admin-locationpicker.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/feature.js b/src/components/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/featureslistbox.js b/src/components/featureslistbox.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/filter.js b/src/components/filter.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/map.js b/src/components/map.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/search.js b/src/components/search.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/toggler.js b/src/components/toggler.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/featurelink.js b/src/containers/featurelink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/filterlink.js b/src/containers/filterlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/maplink.js b/src/containers/maplink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/searchlink.js b/src/containers/searchlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/togglerlink.js b/src/containers/togglerlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/datainmap.js b/src/datainmap.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/reducers/feature.js b/src/reducers/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/reducers/filter.js b/src/reducers/filter.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/reducers/map.js b/src/reducers/map.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/util/browser.js b/src/util/browser.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/util/feature.js b/src/util/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/util/map-animations.js b/src/util/map-animations.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2024 Gemeente Heerenveen
+* Copyright 2020-2025 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/webpack.config.js b/webpack.config.js
@@ -82,7 +82,7 @@ module.exports = {
     devtool: 'cheap-source-map'
 };
 
-function licenseText() { return `Copyright 2020-2023 Gemeente Heerenveen
+function licenseText() { return `Copyright 2020-2025 Gemeente Heerenveen
 
 Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 You may not use this work except in compliance with the Licence.

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gh-datainmap",`
`3`		`- "version": "1.11.1",`
	`3`	`+ "version": "1.12.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/*`
`3`		`-* Copyright 2020-2024 Gemeente Heerenveen`
	`3`	`+* Copyright 2020-2025 Gemeente Heerenveen`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");`
`6`	`6`	`* You may not use this work except in compliance with the Licence.`