Skip to content

Commit 54d610e

Browse files
HtbaaHtbaa
committed
Merge branch 'release/1.9.0'
2 parents 4155b8f + d522878 commit 54d610e

39 files changed

Lines changed: 557 additions & 231 deletions

‎package.json‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gh-datainmap",
3-
"version": "1.8.7",
3+
"version": "1.9.0",
44
"description": "",
55
"main": "index.js",
66
"scripts": {
@@ -16,40 +16,38 @@
1616
"author": "Gemeente Heerenveen",
1717
"license": "EUPL v1.2",
1818
"dependencies": {
19-
"@babel/polyfill": "^7.7.0",
19+
"@babel/polyfill": "^7.12.1",
2020
"classnames": "^2.2.6",
21-
"core-js": "^3.6.4",
22-
"lodash": "^4.17.15",
23-
"ol": "^6.3.1",
24-
"proj4": "^2.6.1",
25-
"react": "^16.11.0",
26-
"react-dom": "^16.11.0",
27-
"react-redux": "^7.1.3",
28-
"react-transition-group": "^4.3.0",
21+
"core-js": "^3.9.0",
22+
"lodash": "^4.17.21",
23+
"ol": "^6.5.0",
24+
"proj4": "^2.7.0",
25+
"react": "^17.0.1",
26+
"react-dom": "^17.0.1",
27+
"react-redux": "^7.2.2",
28+
"react-transition-group": "^4.4.1",
2929
"redux": "^4.0.4",
3030
"redux-debounced": "^0.5.0",
3131
"redux-devtools-extension": "^2.13.8",
3232
"redux-thunk": "^2.3.0",
33-
"whatwg-fetch": "^3.0.0"
33+
"whatwg-fetch": "^3.6.1"
3434
},
3535
"devDependencies": {
36-
"@babel/core": "^7.7.2",
37-
"@babel/preset-env": "^7.9.5",
38-
"@babel/preset-react": "^7.7.0",
39-
"archiver": "^3.1.1",
40-
"babel-loader": "^8.0.6",
36+
"@babel/core": "^7.13.1",
37+
"@babel/preset-env": "^7.13.5",
38+
"@babel/preset-react": "^7.12.13",
39+
"archiver": "^4.0.2",
40+
"babel-loader": "^8.2.2",
4141
"babel-preset-react": "^6.24.1",
42-
"coffee-loader": "^0.9.0",
43-
"coffeescript": "^2.4.1",
44-
"css-loader": "^3.5.1",
42+
"css-loader": "^3.6.0",
4543
"html-loader": "^0.5.5",
46-
"markdown-it": "^10.0.0",
47-
"node-sass": "^4.13.0",
44+
"markdown-it": "^12.0.4",
45+
"node-sass": "^4.14.1",
4846
"remote-redux-devtools": "^0.5.16",
49-
"sass": "^1.23.7",
47+
"sass": "^1.32.8",
5048
"sass-loader": "^8.0.0",
51-
"style-loader": "^1.0.0",
52-
"webpack": "^4.41.2",
53-
"webpack-cli": "^3.3.10"
49+
"style-loader": "^1.3.0",
50+
"webpack": "^4.46.0",
51+
"webpack-cli": "^3.3.12"
5452
}
5553
}

‎plugins/gh-datainmap/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
**1.9.0 (2021-02-25)**
2+
3+
- Na kiezen van loocatie met toetsenbord wordt de focus nu direct op het feature modal gezet.
4+
- Focus blijft met tabben nu binnen feature modal totdat deze wordt gesloten.
5+
- Zoomknoppen zijn nu voorzien van een `aria-label`.
6+
- Het overzicht met layers geeft nu ook het type en de transparantie aan.
7+
- Opmaak standaard stylesheet aangepast, deze voldeed niet en liet niet alle elementen goed zien. Door nu een goede basis te bieden moet het eenvoudiger zijn om in een eigen stylesheet enkel aanpassingen door te voeren. Al wordt het nog steeds aangeraden om een eigen stylesheet te gebruiken. Zie de broncode voor een voorbeeld.
8+
- Gutenberg kan nu ook gebruikt worden voor de inhoud van de pop-ups.
9+
- Nieuwe versies van ondersteunende software bibliotheken in gebruik genomen (React 17, OpenLayers 6.5 etc.).
10+
111
**1.8.7 (2021-02-03)**
212

313
- Fix: inladen scripts nu in `init`-hook. Dit lost een probleem op bij sommige thema's waar de scripts tijdens het plaatsen van de shortcode niet werden geplaatst (Edwin Siebel).

‎plugins/gh-datainmap/DESCRIPTION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Met de zoekfunctie, welke gebruik maakt van de API van PDOK, is het mogelijk om
1616

1717
# Licentie
1818

19-
Copyright 2020 Gemeente Heerenveen
19+
Copyright 2020-2021 Gemeente Heerenveen
2020

2121
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");
2222
You may not use this work except in compliance with the Licence.

‎plugins/gh-datainmap/gh-datainmap.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Plugin Name: Data In Map
44
Plugin URI: https://bitbucket.org/gemeenteheerenveen/datainmap-plugin/src/master/
55
Description: Data In Map is a plugin for displaying maps.
6-
Version: 1.8.7
6+
Version: 1.9.0
77
Requires at least: 5.0
88
Requires PHP: 7.2
99
Author: Gemeente Heerenveen
@@ -12,7 +12,7 @@
1212
License URI: https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
1313
License: EUPL v1.2
1414
15-
Copyright 2020 Gemeente Heerenveen
15+
Copyright 2020-2021 Gemeente Heerenveen
1616
1717
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");
1818
You may not use this work except in compliance with the Licence.
@@ -26,7 +26,7 @@
2626
*/
2727

2828
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
29-
if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.8.7');
29+
if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.9.0');
3030
if ( ! defined('GH_DIM_FILE')) define('GH_DIM_FILE', __FILE__);
3131
if ( ! defined('GH_DIM_DIR')) define('GH_DIM_DIR', dirname(__FILE__));
3232
if ( ! defined('GH_DIM_DEBUG')) define('GH_DIM_DEBUG', false);

‎plugins/gh-datainmap/includes/ajax.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2020 Gemeente Heerenveen
3+
* Copyright 2020-2021 Gemeente Heerenveen
44
*
55
* 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");
66
* You may not use this work except in compliance with the Licence.

‎plugins/gh-datainmap/includes/menus.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2020 Gemeente Heerenveen
3+
* Copyright 2020-2021 Gemeente Heerenveen
44
*
55
* 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");
66
* You may not use this work except in compliance with the Licence.

‎plugins/gh-datainmap/includes/metaboxes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2020 Gemeente Heerenveen
3+
* Copyright 2020-2021 Gemeente Heerenveen
44
*
55
* 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");
66
* You may not use this work except in compliance with the Licence.

‎plugins/gh-datainmap/includes/post-type.php‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2020 Gemeente Heerenveen
3+
* Copyright 2020-2021 Gemeente Heerenveen
44
*
55
* 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");
66
* You may not use this work except in compliance with the Licence.
@@ -46,6 +46,7 @@ function gh_dim_register_post_type() {
4646
'supports' => ['title', 'editor', 'custom-fields'],
4747
'exclude_from_search' => true,
4848
'publicly_queryable' => false,
49+
'show_in_rest' => true,
4950
]);
5051
$labels = array(
5152
'name' => __( 'Layers', 'gh-datainmap' ),
@@ -160,3 +161,30 @@ function gh_dim_register_post_type() {
160161
'value_field' => 'slug',
161162
));
162163
}, 10, 1);
164+
165+
// Extra kolommen voor gh-dim-layers
166+
add_filter( 'manage_gh-dim-layers_posts_columns', function($columns) {
167+
$date = $columns['date'];
168+
unset( $columns['date'] );
169+
$columns['type'] = __( 'Type', 'gh-datainmap' );
170+
$columns['opacity'] = __( 'Layer opacity', 'gh-datainmap');
171+
$columns['date'] = $date;
172+
return $columns;
173+
}, 10, 1);
174+
175+
// Weergave van de extra gh-dim-layers kolommen
176+
add_action( 'manage_gh-dim-layers_posts_custom_column', function($column, $post_id) {
177+
switch( $column ) {
178+
case 'type':
179+
$type = get_post_meta($post_id, '_gh_dim_layer_type', true);
180+
echo _e($type, 'gh-datainmap');
181+
break;
182+
case 'opacity':
183+
$opacity = get_post_meta($post_id, '_gh_dim_layer_opacity', true);
184+
echo _e($opacity, 'gh-datainmap');
185+
break;
186+
default:
187+
echo _e('Unknown type', 'gh-datainmap');
188+
break;
189+
}
190+
}, 10, 2);

‎plugins/gh-datainmap/includes/settings.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2020 Gemeente Heerenveen
3+
* Copyright 2020-2021 Gemeente Heerenveen
44
*
55
* 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");
66
* You may not use this work except in compliance with the Licence.

‎plugins/gh-datainmap/includes/shortcode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2020 Gemeente Heerenveen
3+
* Copyright 2020-2021 Gemeente Heerenveen
44
*
55
* 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");
66
* You may not use this work except in compliance with the Licence.

0 commit comments

Comments
 (0)