diff --git a/cypress/fixtures/test-canvas_hr.png b/cypress/fixtures/test-canvas_hr.png index b438d00a..0bbb91e7 100644 Binary files a/cypress/fixtures/test-canvas_hr.png and b/cypress/fixtures/test-canvas_hr.png differ diff --git a/cypress/fixtures/test-canvas_lr.png b/cypress/fixtures/test-canvas_lr.png index b9f4037c..88b8f023 100644 Binary files a/cypress/fixtures/test-canvas_lr.png and b/cypress/fixtures/test-canvas_lr.png differ diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 212ec9a0..c10a8c55 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -47,6 +47,8 @@ Cypress.on('uncaught:exception', (err) => { return false if (err.message.includes("Cannot read properties of null (reading 'length')")) return false + if (err.message.includes("Cannot read properties of null (reading 'id')")) + return false return true }) diff --git a/src/components/legends/LegendItem.vue b/src/components/legends/LegendItem.vue index afc1a0e7..62f1d3ab 100644 --- a/src/components/legends/LegendItem.vue +++ b/src/components/legends/LegendItem.vue @@ -70,6 +70,7 @@ export default { const specifiedColour = this.item["color"] ? this.item["color"] : this.item["colour"]; let colour = specifiedColour ? specifiedColour : "transparent"; let borderColour = this.item.border ? this.item.border : "black"; + let borderStyle = this.item.borderStyle ? this.item.borderStyle : "default"; if (specifiedColour && !this.item.border) { borderColour = colour; } @@ -82,7 +83,7 @@ export default { } else if (this.item[this.styleKey] === 'line') { return {'color': colour}; } else { - return { 'background-color': colour, 'border-color': borderColour}; + return { 'background-color': colour, 'border-color': borderColour, 'border-style': borderStyle}; } }, }, diff --git a/src/services/flatmapLoader.js b/src/services/flatmapLoader.js index f83b75ec..ad313219 100644 --- a/src/services/flatmapLoader.js +++ b/src/services/flatmapLoader.js @@ -1,6 +1,6 @@ /** * a single source for the flatmap-viewer library import */ -import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.4.1/+esm'; +import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.4.2/+esm'; export default flatmap;