From 2ef8fca49336b5ed532213271dd9d247456feedc Mon Sep 17 00:00:00 2001 From: Matthieu Viry Date: Thu, 6 Apr 2023 20:29:12 +0200 Subject: [PATCH] Prepare for 0.15.0 release --- CHANGES.rst | 6 +++--- client/js/function.js | 2 +- client/package-lock.json | 4 ++-- client/package.json | 2 +- documentation/src/changelog_fr.md | 2 +- magrit_app/__init__.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 96e0dfc6f..e65f13de7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,8 +1,8 @@ Changes ======= -Unreleased ----------- +0.15.0 (2023-04-06) +------------------- - Fix bug with null / empty geometry introduced in commit 326e3c8 / version 0.13.2. @@ -10,7 +10,7 @@ Unreleased - Automatically stack labels for the same feature to avoid overlap (thanks to @robLittiere and @ArmelVidali / see PR #109). -- Update `smoomapy` dependency to fix some issue when bounds given by the user are very close to the min/max bounds of the data (and that could result in a class without value). +- Update ``smoomapy`` dependency to fix some issue when bounds given by the user are very close to the min/max bounds of the data (and that could result in a class without value). 0.14.1 (2023-03-29) ------------------- diff --git a/client/js/function.js b/client/js/function.js index 396ce0734..3a04a49c9 100755 --- a/client/js/function.js +++ b/client/js/function.js @@ -5195,7 +5195,7 @@ export function stack_labels(ref_layer_name) { // - the height of the other text labels * the number of labels ("i" counter) map_labels[i].childNodes[y].setAttribute( 'y', - y_label + pictogram_height + i * (label_font_size + 7.5), + y_label + pictogram_height + i * (label_font_size + 5), ); // Set a flag to know if this stack operation have already been made map_labels[i].childNodes[y].setAttribute( diff --git a/client/package-lock.json b/client/package-lock.json index 21c5fead8..1bf2eb84e 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "magrit-client", - "version": "0.14.1", + "version": "0.15.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "magrit-client", - "version": "0.14.1", + "version": "0.15.0", "dependencies": { "@turf/turf": "^6.5.0", "alertifyjs": "^1.13.1", diff --git a/client/package.json b/client/package.json index 7fbbb2268..33ff20933 100644 --- a/client/package.json +++ b/client/package.json @@ -4,7 +4,7 @@ "minify": "NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production ./node_modules/webpack/bin/webpack.js", "watch": "NODE_OPTIONS=--openssl-legacy-provider ./node_modules/webpack/bin/webpack.js --watch" }, - "version": "0.14.1", + "version": "0.15.0", "node": ">=18.0.0", "dependencies": { "@turf/turf": "^6.5.0", diff --git a/documentation/src/changelog_fr.md b/documentation/src/changelog_fr.md index 165796a42..dbf7835e3 100644 --- a/documentation/src/changelog_fr.md +++ b/documentation/src/changelog_fr.md @@ -1,6 +1,6 @@ # Historique des versions et des changements effectués -#### Unreleased +#### 0.15.0 (2023-04-06) - Correction d'un bug avec les géométries nulles / vides introduit dans le commit 326e3c8 / version 0.13.2. diff --git a/magrit_app/__init__.py b/magrit_app/__init__.py index 14d5adb32..f7f5ec6cd 100755 --- a/magrit_app/__init__.py +++ b/magrit_app/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version__ = '0.14.1' +__version__ = '0.15.0'