diff --git a/frontend/src/assets/cards-diamond-orange.png b/frontend/src/assets/cards-diamond-orange.png new file mode 100644 index 0000000..543092c Binary files /dev/null and b/frontend/src/assets/cards-diamond-orange.png differ diff --git a/frontend/src/assets/cards-diamond-red.png b/frontend/src/assets/cards-diamond-red.png index 35d727f..f7de0e8 100644 Binary files a/frontend/src/assets/cards-diamond-red.png and b/frontend/src/assets/cards-diamond-red.png differ diff --git a/frontend/src/assets/cards-diamond-shadow.png b/frontend/src/assets/cards-diamond-shadow.png new file mode 100644 index 0000000..88a6acd Binary files /dev/null and b/frontend/src/assets/cards-diamond-shadow.png differ diff --git a/frontend/src/assets/cards-diamond-violet.png b/frontend/src/assets/cards-diamond-violet.png index d3402af..beb887a 100644 Binary files a/frontend/src/assets/cards-diamond-violet.png and b/frontend/src/assets/cards-diamond-violet.png differ diff --git a/frontend/src/components/map/ZaehlstelleMap.vue b/frontend/src/components/map/ZaehlstelleMap.vue index e4871d7..2c73de4 100644 --- a/frontend/src/components/map/ZaehlstelleMap.vue +++ b/frontend/src/components/map/ZaehlstelleMap.vue @@ -175,9 +175,15 @@ import TooltipZaehlstelleDTO from "@/domain/dto/TooltipZaehlstelleDTO"; import markerIconRed from "@/assets/marker-icon-red.png"; import markerIconDiamondViolet from "@/assets/cards-diamond-violet.png"; import markerIconDiamondRed from "@/assets/cards-diamond-red.png"; +import markerIconDiamondOrange from "@/assets/cards-diamond-orange.png"; +import markerIconDiamondShadow from "@/assets/cards-diamond-shadow.png"; import TooltipMessstelleDTO from "@/domain/dto/TooltipMessstelleDTO"; import AnzeigeKarteDTO from "@/domain/dto/AnzeigeKarteDTO"; import MessstelleKarteDTO from "@/domain/dto/messstelle/MessstelleKarteDTO"; +import { + MessstelleStatus, + messstelleStatusText, +} from "@/domain/enums/MessstelleStatus"; /* eslint-enable no-unused-vars */ @Component({ @@ -544,8 +550,17 @@ export default class ZaehlstelleMap extends Vue { * Setzt die Optionen bezüglich verwendetes Icon für den Messstellenmarker. */ private markerOptionsMessstelle(messstelleKarte: MessstelleKarteDTO) { - let defaultIcon = new Icon.Default(); - defaultIcon.options.iconUrl = markerIconDiamondViolet; + let defaultIcon = new Icon({ + iconUrl: markerIconDiamondViolet, + shadowUrl: markerIconDiamondShadow, + shadowAnchor: [8, 25], + iconSize: [25, 41], + }); + + if (messstelleKarte.status === MessstelleStatus.IN_PLANUNG) { + defaultIcon.options.iconUrl = markerIconDiamondOrange; + } + if (this.zId) { if (this.zId === messstelleKarte.id) { defaultIcon.options.iconUrl = markerIconDiamondRed; diff --git a/frontend/src/domain/dto/messstelle/MessstelleKarteDTO.ts b/frontend/src/domain/dto/messstelle/MessstelleKarteDTO.ts index 57eb485..ee76e70 100644 --- a/frontend/src/domain/dto/messstelle/MessstelleKarteDTO.ts +++ b/frontend/src/domain/dto/messstelle/MessstelleKarteDTO.ts @@ -5,4 +5,6 @@ export default interface MessstelleKarteDTO extends AnzeigeKarteDTO { mstId: string; tooltip: TooltipMessstelleDTO; + + status: string; }