Merge tag '1.10.0' into develop

Htbaa · Htbaa · commit d19104cf435b · 2021-08-25T11:04:44.000+02:00
v1.10.0
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gh-datainmap",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/plugins/gh-datainmap/CHANGELOG.md b/plugins/gh-datainmap/CHANGELOG.md
@@ -1,3 +1,5 @@
+**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.
 
diff --git a/plugins/gh-datainmap/gh-datainmap.php b/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);
diff --git a/plugins/gh-datainmap/languages/gh-datainmap-nl_NL.mo b/plugins/gh-datainmap/languages/gh-datainmap-nl_NL.mo
diff --git a/plugins/gh-datainmap/languages/gh-datainmap-nl_NL.po b/plugins/gh-datainmap/languages/gh-datainmap-nl_NL.po
@@ -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)"
 
diff --git a/plugins/gh-datainmap/languages/gh-datainmap.pot b/plugins/gh-datainmap/languages/gh-datainmap.pot
@@ -1,17 +1,17 @@
 # Copyright (C) 2021 Gemeente Heerenveen
-# This file is distributed under the same license as the Data In Map plugin.
+# This file is distributed under the EUPL v1.2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Data In Map 1.8.7\n"
+"Project-Id-Version: Data In Map 1.9.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/gh-datainmap\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2021-02-25T10:48:02+00:00\n"
+"POT-Creation-Date: 2021-08-25T08:58:57+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.3.0\n"
+"X-Generator: WP-CLI 2.5.0\n"
 "X-Domain: gh-datainmap\n"
 
 #. Plugin Name of the plugin
@@ -48,7 +48,7 @@ msgstr ""
 
 #: includes/menus.php:37
 #: includes/menus.php:38
-#: includes/taxonomy.php:47
+#: includes/taxonomy.php:48
 msgid "Location Properties"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr ""
 msgid "Unknown type"
 msgstr ""
 
-#: includes/shortcode.php:169
+#: includes/shortcode.php:186
 #: views/metabox-location.php:59
 #: views/settings.php:131
 msgid "Loading..."
@@ -249,56 +249,56 @@ msgstr ""
 msgid "New Location Type Name"
 msgstr ""
 
-#: includes/taxonomy.php:48
-#: includes/taxonomy.php:57
+#: includes/taxonomy.php:49
+#: includes/taxonomy.php:58
 msgid "Location Property"
 msgstr ""
 
-#: includes/taxonomy.php:49
+#: includes/taxonomy.php:50
 msgid "Search Location Properties"
 msgstr ""
 
-#: includes/taxonomy.php:50
+#: includes/taxonomy.php:51
 msgid "All Location Properties"
 msgstr ""
 
-#: includes/taxonomy.php:51
+#: includes/taxonomy.php:52
 msgid "Parent Location Property"
 msgstr ""
 
-#: includes/taxonomy.php:52
+#: includes/taxonomy.php:53
 msgid "Parent Location Property:"
 msgstr ""
 
-#: includes/taxonomy.php:53
+#: includes/taxonomy.php:54
 msgid "Edit Location Property"
 msgstr ""
 
-#: includes/taxonomy.php:54
+#: includes/taxonomy.php:55
 msgid "Update Location Property"
 msgstr ""
 
-#: includes/taxonomy.php:55
+#: includes/taxonomy.php:56
 msgid "Add New Location Property"
 msgstr ""
 
-#: includes/taxonomy.php:56
+#: includes/taxonomy.php:57
 msgid "New Location Property Name"
 msgstr ""
 
-#: includes/taxonomy.php:81
+#: includes/taxonomy.php:83
 msgid "Cluster"
 msgstr ""
 
-#: includes/taxonomy.php:86
+#: includes/taxonomy.php:88
 msgid "Display locations as a cluster"
 msgstr ""
 
-#: includes/taxonomy.php:91
+#: includes/taxonomy.php:93
 msgid "Cluster distance"
 msgstr ""
 
-#: includes/taxonomy.php:95
+#: includes/taxonomy.php:97
 msgid "Minimum distance in pixels between clusters."
 msgstr ""
 
@@ -579,13 +579,21 @@ msgid "Optinally provide a default description to be shown when a user opens the
 msgstr ""
 
 #: views/settings.php:203
-msgid "Additional projections (proj4)"
+msgid "Toggler description"
 msgstr ""
 
 #: views/settings.php:207
+msgid "Optinally provide a default description to be shown when a user opens the toggler menu."
+msgstr ""
+
+#: views/settings.php:212
+msgid "Additional projections (proj4)"
+msgstr ""
+
+#: 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 ""
 
-#: views/settings.php:207
+#: views/settings.php:216
 msgid "Lookup projections (proj4)"
 msgstr ""

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gh-datainmap",`
`3`		`- "version": "1.9.3",`
	`3`	`+ "version": "1.10.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+1.10.0 (2021-08-25)`
	`2`	`+`
`1`	`3`	`- Nieuwe versies van ondersteunende software bibliotheken in gebruik genomen.`
`2`	`4`	- 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.
`3`	`5`