From 1f218da339c513d582f8c37884186d9a33dea5f2 Mon Sep 17 00:00:00 2001 From: Andreas Stassivik <andreas@stassi.net> Date: Fri, 4 Oct 2024 03:45:22 -0700 Subject: [PATCH 1/2] nested ternary replaced with conditionals --- .../tutorial/choropleth/script/choropleth.js | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/public/tutorial/choropleth/script/choropleth.js b/public/tutorial/choropleth/script/choropleth.js index 6e57483..8f2c0ff 100644 --- a/public/tutorial/choropleth/script/choropleth.js +++ b/public/tutorial/choropleth/script/choropleth.js @@ -1,5 +1,3 @@ -/* eslint-disable no-nested-ternary -- copied from tutorial */ - import DOMPurify from '../../../dompurify/purify.es.mjs' import { DomUtility } from '../../../leaflet-adapter/document-object-model/dom-utility.js' import { control } from '../../../leaflet-adapter/control/control.js' @@ -24,21 +22,14 @@ tileLayer({ }) function getColor(density) { - return density > grades[7] - ? '#800026' - : density > grades[6] - ? '#BD0026' - : density > grades[5] - ? '#E31A1C' - : density > grades[4] - ? '#FC4E2A' - : density > grades[3] - ? '#FD8D3C' - : density > grades[2] - ? '#FEB24C' - : density > grades[1] - ? '#FED976' - : '#FFEDA0' + if (density > grades[7]) return '#800026' + else if (density > grades[6]) return '#BD0026' + else if (density > grades[5]) return '#E31A1C' + else if (density > grades[4]) return '#FC4E2A' + else if (density > grades[3]) return '#FD8D3C' + else if (density > grades[2]) return '#FEB24C' + else if (density > grades[1]) return '#FED976' + return '#FFEDA0' } control({ From d0426e81bc266c821ecbe997ffd08fd014d34fb2 Mon Sep 17 00:00:00 2001 From: Andreas Stassivik <andreas@stassi.net> Date: Fri, 4 Oct 2024 03:45:40 -0700 Subject: [PATCH 2/2] 0.0.39 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index df6db0d..a52b136 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@stassi/leaf", - "version": "0.0.38", + "version": "0.0.39", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@stassi/leaf", - "version": "0.0.38", + "version": "0.0.39", "cpu": [ "arm64", "x64" diff --git a/package.json b/package.json index 5490f77..88939ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@stassi/leaf", - "version": "0.0.38", + "version": "0.0.39", "description": "Leaflet adapter.", "keywords": [ "cartography",