Merge branch 'release/1.10.0'

Author: Htbaa

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-datainmap",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,25 +17,25 @@
   "license": "EUPL v1.2",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "classnames": "^2.2.6",
-    "core-js": "^3.9.0",
+    "classnames": "^2.3.1",
+    "core-js": "^3.16.3",
     "lodash": "^4.17.21",
-    "ol": "^6.5.0",
-    "proj4": "^2.7.0",
+    "ol": "^6.6.1",
+    "proj4": "^2.7.5",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-redux": "^7.2.2",
-    "react-transition-group": "^4.4.1",
-    "redux": "^4.0.4",
+    "react-transition-group": "^4.4.2",
+    "redux": "^4.1.1",
     "redux-debounced": "^0.5.0",
-    "redux-devtools-extension": "^2.13.8",
+    "redux-devtools-extension": "^2.13.9",
     "redux-thunk": "^2.3.0",
     "whatwg-fetch": "^3.6.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.1",
-    "@babel/preset-env": "^7.13.5",
-    "@babel/preset-react": "^7.12.13",
+    "@babel/core": "^7.15.0",
+    "@babel/preset-env": "^7.15.0",
+    "@babel/preset-react": "^7.14.5",
     "archiver": "^4.0.2",
     "babel-loader": "^8.2.2",
     "babel-preset-react": "^6.24.1",
@@ -44,7 +44,7 @@
     "markdown-it": "^12.0.4",
     "node-sass": "^4.14.1",
     "remote-redux-devtools": "^0.5.16",
-    "sass": "^1.32.8",
+    "sass": "^1.35.1",
     "sass-loader": "^8.0.0",
     "style-loader": "^1.3.0",
     "webpack": "^4.46.0",

plugins/gh-datainmap/CHANGELOG.md

@@ -1,3 +1,8 @@
+**1.10.0 (2021-08-25)**
+
+- Nieuwe versies van ondersteunende software bibliotheken in gebruik genomen.
+- Mogelijkheid toegevoegd om lagen in/uit te schakelen door gebruik van shortcode instellingen `enable_toggler`, `toggle_layers`, `toggle_types`, `untoggled_layers` en `untoggled_types`. Met `filter_description="Uw eigen tekst"` is het mogelijk om per kaart de begeleidende tekst te wijzigen of onderdrukken. **Let op!** Bij gebruik eigen stylesheet moet de toggler van opmaak voorzien worden. Standaard staat de toggler uit. Meer informatie is te vinden in de shortcode documentatie.
+
 **1.9.3 (2021-05-27)**
 
 - Het `canvas`-element waar de kaart op wordt getekend voorzien van een `aria-label` en een `role=img` voor verbeterde toegankelijkheid.

plugins/gh-datainmap/SHORTCODE.md

@@ -34,4 +34,16 @@ De functionaliteiten van de kaart kunnen ook met de shortcode in- of uitgeschake
 
 `[datainmap layers=1 types=1 enable_search=0 enable_feature_dialog=0 enable_tooltip=1]`
 
+De layer toggler (voor het in- en uitschakelen van kaartlagen en locatielagen) is in te schakelen met `enable_toggler`. Standaard kunnen alle kaart- en locatielagen in/uitgeschakeld worden. Met `toggle_layers` en `toggle_types` is het mogelijk om dit te beperken.
+
+`[datainmap layers=1,2 types=1,2 enable_toggler=1 toggle_layers=2 toggle_types=ALL]`
+
+Om schakelen tussen lagen mogelijk te maken zonder dat alle lagen standaard staan ingeschakeld kan er gebruik gemaakt worden van `untoggled_layers` en `untoggled_types`. Kaart- en locatielagen die hierin zijn opgenomen worden bij het inladen van de kaart uitgeschakeld waardoor ze niet zichtbaar zijn, totdat de gebruiker ze inschakeld.
+
+`[datainmap layers=1,2 types=1,2,3,4 enable_toggler=1 toggle_layers=2 toggle_types=ALL untoggled_layers=2 untoggled_types=1,4]`
+
+Met `toggler_description` is het mogelijk om de standaard tekst (DataInMap -> Instellingen) te wijzigen, of door deze leeg te maken `toggler_description=""` wordt deze niet meer getoond.
+
+`[datainmap layers=1,2 types=1,2,3,4 enable_toggler=1 toggler_description="U kunt hier kaartlagen in- of uitschakelen."]`
+
 Om de container waar DataInMap wordt geplaatst te voorzien van een of meerdere CSS classes kan gebruik gemaakt worden van `css_class`, bijv. `[datainmap css_class="kaart-groot"]`. Deze CSS classes dienen in de stylesheet van het gebruikte thema te staan.

plugins/gh-datainmap/gh-datainmap.php

@@ -3,7 +3,7 @@
 Plugin Name: Data In Map
 Plugin URI: https://bitbucket.org/gemeenteheerenveen/datainmap-plugin/src/master/
 Description: Data In Map is a plugin for displaying maps.
-Version: 1.9.3
+Version: 1.10.0
 Requires at least: 5.0
 Requires PHP: 7.2
 Author: Gemeente Heerenveen
@@ -26,7 +26,7 @@
 */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
-if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.9.3');
+if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.10.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);

plugins/gh-datainmap/includes/settings.php

@@ -43,7 +43,8 @@ function gh_dim_sanitize_settings($input) {
         'maxZoom',
         'projection',
         'search_coord_system',
-        'filter_description'
+        'filter_description',
+        'toggler_description',
     ];
     foreach($text_fields as $k) {
         $input[$k] = sanitize_text_field( $input[$k] );

plugins/gh-datainmap/includes/shortcode.php

@@ -33,6 +33,12 @@ function gh_dim_shortcode($atts, $content = null) {
             'enable_tooltip' => 0,
             'enable_filter' => 0,
             'enable_features_listbox' => 1,
+            'enable_toggler' => 0,
+            'toggle_layers' => null,
+            'untoggled_layers' => null,
+            'toggle_types' => 'ALL',
+            'untoggled_types' => null,
+            'toggler_description' => $settings['toggler_description'],
             'dynamic_loading' => 0,
             'css_class' => null,
             'filter_properties' => null,
@@ -51,8 +57,18 @@ function gh_dim_shortcode($atts, $content = null) {
     $settings['enable_tooltip'] = $args['enable_tooltip'] == 1 ? true : false;
     $settings['enable_filter'] = $args['enable_filter'] == 1 ? true : false;
     $settings['enable_features_listbox'] = $args['enable_features_listbox'] == 1 ? true : false;
+    $settings['enable_toggler'] = $args['enable_toggler'] == 1 ? true : false;
+    $settings['toggler_description'] = $args['toggler_description'];
     $settings['dynamic_loading'] = $args['dynamic_loading'] == 1 ? true : false;
     $settings['filter_description'] = $args['filter_description'];
+    foreach(['toggle_layers', 'toggle_types', 'untoggled_layers', 'untoggled_types'] as $k) {
+        $settings[$k] = array_filter(
+            array_map('trim', explode(',', $args[$k])),
+            function($a) {
+                return strlen($a) > 0;
+            }
+        );
+    }
 
     // Compose map layers
     $layers = get_posts([
@@ -62,6 +78,7 @@ function gh_dim_shortcode($atts, $content = null) {
     ]);
     $map_layers = array_map(function($post) {
         return [
+            'id' => $post->ID,
             'title' => get_the_title( $post->ID ),
             'type' => get_post_meta($post->ID, '_gh_dim_layer_type', true),
             'url' => get_post_meta($post->ID, '_gh_dim_layer_url', true),

plugins/gh-datainmap/languages/gh-datainmap-nl_NL.mo

@@ -4,15 +4,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Data In Map 1.2.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/gh-datainmap\n"
-"POT-Creation-Date: 2021-02-25T10:48:02+00:00\n"
-"PO-Revision-Date: 2021-02-25 11:49+0100\n"
+"POT-Creation-Date: 2021-08-25T08:58:57+00:00\n"
+"PO-Revision-Date: 2021-08-25 11:02+0200\n"
 "Last-Translator: Christiaan Kras <christiaan@kras-it.nl>\n"
 "Language-Team: \n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 3.0\n"
 "X-Domain: gh-datainmap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Location Types"
 msgstr "Locatie Types"
 
-#: includes/menus.php:37 includes/menus.php:38 includes/taxonomy.php:47
+#: includes/menus.php:37 includes/menus.php:38 includes/taxonomy.php:48
 msgid "Location Properties"
 msgstr "Locatie Eigenschappen"
 
@@ -175,7 +175,7 @@ msgstr "Laag transparantie"
 msgid "Unknown type"
 msgstr "Onbekend type"
 
-#: includes/shortcode.php:169 views/metabox-location.php:59
+#: includes/shortcode.php:186 views/metabox-location.php:59
 #: views/settings.php:131
 msgid "Loading..."
 msgstr "Laden..."
@@ -228,55 +228,55 @@ msgstr "Nieuwe Locatie Type Toevoegen"
 msgid "New Location Type Name"
 msgstr "Nieuwe Locatie Type Naam"
 
-#: includes/taxonomy.php:48 includes/taxonomy.php:57
+#: includes/taxonomy.php:49 includes/taxonomy.php:58
 msgid "Location Property"
 msgstr "Locatie Eigenschap"
 
-#: includes/taxonomy.php:49
+#: includes/taxonomy.php:50
 msgid "Search Location Properties"
 msgstr "Zoek Locatie Eigenschappen"
 
-#: includes/taxonomy.php:50
+#: includes/taxonomy.php:51
 msgid "All Location Properties"
 msgstr "Alle Locatie Eigenschappen"
 
-#: includes/taxonomy.php:51
+#: includes/taxonomy.php:52
 msgid "Parent Location Property"
 msgstr "Bovenliggende Locatie Eigenschap"
 
-#: includes/taxonomy.php:52
+#: includes/taxonomy.php:53
 msgid "Parent Location Property:"
 msgstr "Bovenliggende Locatie Eigenschap:"
 
-#: includes/taxonomy.php:53
+#: includes/taxonomy.php:54
 msgid "Edit Location Property"
 msgstr "Wijzig Locatie Eigenschap"
 
-#: includes/taxonomy.php:54
+#: includes/taxonomy.php:55
 msgid "Update Location Property"
 msgstr "Update Locatie Eigenschap"
 
-#: includes/taxonomy.php:55
+#: includes/taxonomy.php:56
 msgid "Add New Location Property"
 msgstr "Nieuwe Locatie Eigenschap Toevoegen"
 
-#: includes/taxonomy.php:56
+#: includes/taxonomy.php:57
 msgid "New Location Property Name"
 msgstr "Nieuwe Locatie Eigenschap Naam"
 
-#: includes/taxonomy.php:81
+#: includes/taxonomy.php:83
 msgid "Cluster"
 msgstr "Cluster"
 
-#: includes/taxonomy.php:86
+#: includes/taxonomy.php:88
 msgid "Display locations as a cluster"
 msgstr "Weergeef locaties als een cluster"
 
-#: includes/taxonomy.php:91
+#: includes/taxonomy.php:93
 msgid "Cluster distance"
 msgstr "Cluster afstand"
 
-#: includes/taxonomy.php:95
+#: includes/taxonomy.php:97
 msgid "Minimum distance in pixels between clusters."
 msgstr "Minimale afstand in pixels tussen clusters."
 
@@ -578,18 +578,30 @@ msgstr ""
 "filter venster."
 
 #: views/settings.php:203
+msgid "Toggler description"
+msgstr "Lagen omschrijving"
+
+#: views/settings.php:207
+msgid ""
+"Optinally provide a default description to be shown when a user opens the "
+"toggler menu."
+msgstr ""
+"Optioneel: een standaard omschrijvende tekst die gebruikt wordt in het lagen "
+"venster."
+
+#: views/settings.php:212
 msgid "Additional projections (proj4)"
 msgstr "Aanvullende projecties (proj4)"
 
-#: views/settings.php:207
+#: views/settings.php:216
 msgid ""
 "Add extra projections for proj4. Format using CSV (column 1 is projection "
 "identifier, column 2 is the projection for proj4)."
 msgstr ""
 "Voeg extra projecties toe voor proj4. Verwachte formaat is CSV (kolom 1 is "
 "de projectienaam, kolom 2 is de projectie voor proj4)."
 
-#: views/settings.php:207
+#: views/settings.php:216
 msgid "Lookup projections (proj4)"
 msgstr "Projecties opzoeken (proj4)"