From 7faddfdaa0db5b956d079a9a6e968a087f832a27 Mon Sep 17 00:00:00 2001 From: JOSEPHINE STOLLE Date: Wed, 7 Jun 2023 15:41:32 +0200 Subject: [PATCH 1/5] add label and unit to choropleth --- django_mapengine/setup.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/django_mapengine/setup.py b/django_mapengine/setup.py index 24237ad..8893367 100644 --- a/django_mapengine/setup.py +++ b/django_mapengine/setup.py @@ -104,6 +104,8 @@ class Choropleth: """Choropleth class used to set up choropleths in project settings""" name: str + label: str + unit: str layers: List[str] use_feature_state: bool = True @@ -116,7 +118,12 @@ def as_dict(self) -> dict: dict holding choropleth values needed in map setups """ - return {"layers": self.layers, "useFeatureState": self.use_feature_state} + return { + "label": self.label, + "unit": self.unit, + "layers": self.layers, + "useFeatureState": self.use_feature_state, + } @dataclass From c93d955f15fe1eff73cad06de6e3f2b03da1c890 Mon Sep 17 00:00:00 2001 From: JOSEPHINE STOLLE Date: Wed, 7 Jun 2023 15:53:07 +0200 Subject: [PATCH 2/5] rename label --- django_mapengine/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django_mapengine/setup.py b/django_mapengine/setup.py index 8893367..614eeca 100644 --- a/django_mapengine/setup.py +++ b/django_mapengine/setup.py @@ -104,7 +104,7 @@ class Choropleth: """Choropleth class used to set up choropleths in project settings""" name: str - label: str + title: str unit: str layers: List[str] use_feature_state: bool = True @@ -119,7 +119,7 @@ def as_dict(self) -> dict: holding choropleth values needed in map setups """ return { - "label": self.label, + "title": self.title, "unit": self.unit, "layers": self.layers, "useFeatureState": self.use_feature_state, From be4987d916d15aabf9badfcf51d3cca3cc5cda36 Mon Sep 17 00:00:00 2001 From: "RL-INSTITUT\\hendrik.huyskens" Date: Fri, 9 Jun 2023 12:59:26 +0200 Subject: [PATCH 3/5] Read title and unit for choropleth from map store --- django_mapengine/static/django_mapengine/js/legend.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django_mapengine/static/django_mapengine/js/legend.js b/django_mapengine/static/django_mapengine/js/legend.js index 090ee1d..762772b 100644 --- a/django_mapengine/static/django_mapengine/js/legend.js +++ b/django_mapengine/static/django_mapengine/js/legend.js @@ -38,7 +38,8 @@ const createLegend = (title, unit, colors, valueRanges, nextColumnStartIndex = 3 function loadLegend(msg, choroplethName){ - const unit = "unit"; //need value! + const title = map_store.cold.choropleths[choroplethName]["title"]; + const unit = map_store.cold.choropleths[choroplethName]["unit"]; const paintPropertiesPerLayer = map_store.cold.storedChoroplethPaintProperties[choroplethName]; /* Find active layer */ @@ -75,6 +76,6 @@ function loadLegend(msg, choroplethName){ } } const entriesPerColumn = Math.floor(values.length / 2); - legendElement.innerHTML = createLegend(choroplethName, unit, colors, values, entriesPerColumn); + legendElement.innerHTML = createLegend(title, unit, colors, values, entriesPerColumn); return logMessage(msg); } From 7836f7a2dd238a381a46b53b3c1bc2932977c5d0 Mon Sep 17 00:00:00 2001 From: "RL-INSTITUT\\hendrik.huyskens" Date: Fri, 9 Jun 2023 12:59:48 +0200 Subject: [PATCH 4/5] Add root url conf for testing --- tests/django_test_settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/django_test_settings.py b/tests/django_test_settings.py index a2f28eb..799fe09 100644 --- a/tests/django_test_settings.py +++ b/tests/django_test_settings.py @@ -4,6 +4,8 @@ INSTALLED_APPS = ["django_mapengine", "tests.test_app.apps.TestConf"] +ROOT_URLCONF = "django_mapengine.urls" + MAP_ENGINE_CENTER_AT_STARTUP = [1, 2] MAP_ENGINE_ZOOM_AT_STARTUP = 8 From d5f625897b045254dea4e7868056c38bfaf528b1 Mon Sep 17 00:00:00 2001 From: "RL-INSTITUT\\hendrik.huyskens" Date: Fri, 9 Jun 2023 13:26:13 +0200 Subject: [PATCH 5/5] Add CHANGELOG.md entry for choropleth legend --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87c66bb..a22d405 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and the versioning aim to respect [Semantic Versioning](http://semver.org/spec/v Here is a template for new release sections +## [Unreleased] +### Added +- title and unit for choropleths in legend + ## [0.8.0] - 2023-05-02 ### Added - default choropleth config