Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified cypress/fixtures/test-canvas_hr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cypress/fixtures/test-canvas_lr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})

Expand Down
3 changes: 2 additions & 1 deletion src/components/legends/LegendItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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};
}
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/services/flatmapLoader.js
Original file line number Diff line number Diff line change
@@ -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;