diff --git a/apps/scandic-web/components/Maps/Markers/index.tsx b/apps/scandic-web/components/Maps/Markers/index.tsx
index 587b06870..838e169c6 100644
--- a/apps/scandic-web/components/Maps/Markers/index.tsx
+++ b/apps/scandic-web/components/Maps/Markers/index.tsx
@@ -13,40 +13,66 @@ import ScandicGoMarker from "./ScandicGo"
import ScandicGoSmallMarker from "./ScandicGoSmall"
import ScandicSmallMarker from "./ScandicSmall"
+import type { MarkerInfo } from "@/types/components/maps/marker"
import { HotelTypeEnum } from "@/types/enums/hotelType"
import { SignatureHotelEnum } from "@/types/enums/signatureHotel"
-interface HotelMarkerByTypeProps {
- hotelId: string
- hotelType: string
- smallSize?: boolean
+interface HotelMarkerByTypeProps
+ extends MarkerInfo,
+ React.SVGAttributes
{
+ size?: "large" | "small"
}
export default function HotelMarkerByType({
hotelId,
hotelType,
- smallSize = true,
+ size = "large",
+ ...props
}: HotelMarkerByTypeProps) {
if (hotelType === HotelTypeEnum.ScandicGo) {
- return smallSize ? :
+ return size === "small" ? (
+
+ ) : (
+
+ )
}
switch (hotelId) {
case SignatureHotelEnum.Haymarket:
- return smallSize ? :
- case SignatureHotelEnum.HotelNorge:
- return smallSize ? :
- case SignatureHotelEnum.DowntownCamper:
- return smallSize ? (
-
+ return size === "small" ? (
+
) : (
-
+
+ )
+ case SignatureHotelEnum.HotelNorge:
+ return size === "small" ? (
+
+ ) : (
+
+ )
+ case SignatureHotelEnum.DowntownCamper:
+ return size === "small" ? (
+
+ ) : (
+
)
case SignatureHotelEnum.GrandHotelOslo:
- return smallSize ? :
+ return size === "small" ? (
+
+ ) : (
+
+ )
case SignatureHotelEnum.Marski:
- return smallSize ? :
+ return size === "small" ? (
+
+ ) : (
+
+ )
default:
- return smallSize ? :
+ return size === "small" ? (
+
+ ) : (
+
+ )
}
}
diff --git a/apps/scandic-web/types/components/hotelPage/map/interactiveMap.ts b/apps/scandic-web/types/components/hotelPage/map/interactiveMap.ts
index 5b56392d4..77d3706e0 100644
--- a/apps/scandic-web/types/components/hotelPage/map/interactiveMap.ts
+++ b/apps/scandic-web/types/components/hotelPage/map/interactiveMap.ts
@@ -2,13 +2,15 @@ import type { ReactElement } from "react"
import type { HotelPin } from "@/types/components/hotelReservation/selectHotel/map"
import type { Coordinates } from "@/types/components/maps/coordinates"
+import type { MarkerInfo } from "@/types/components/maps/marker"
import type { PointOfInterest } from "@/types/hotel"
export interface InteractiveMapProps {
coordinates: Coordinates
- pointsOfInterest?: PointOfInterest[]
activePoi?: PointOfInterest["name"] | null
hotelPins?: HotelPin[]
+ pointsOfInterest?: PointOfInterest[]
+ markerInfo?: MarkerInfo
mapId: string
closeButton: ReactElement
fitBounds?: boolean
diff --git a/apps/scandic-web/types/components/hotelPage/map/staticMap.ts b/apps/scandic-web/types/components/hotelPage/map/staticMap.ts
index 800d06218..80bd15dd7 100644
--- a/apps/scandic-web/types/components/hotelPage/map/staticMap.ts
+++ b/apps/scandic-web/types/components/hotelPage/map/staticMap.ts
@@ -1,7 +1,9 @@
+import type { MarkerInfo } from "@/types/components/maps/marker"
import type { Coordinates } from "../../maps/coordinates"
export type StaticMapProps = {
coordinates: Coordinates
hotelName: string
zoomLevel?: number
+ markerInfo: MarkerInfo
}
diff --git a/apps/scandic-web/types/components/maps/marker.ts b/apps/scandic-web/types/components/maps/marker.ts
new file mode 100644
index 000000000..37e38c456
--- /dev/null
+++ b/apps/scandic-web/types/components/maps/marker.ts
@@ -0,0 +1,4 @@
+export type MarkerInfo = {
+ hotelId: string
+ hotelType: string
+}
diff --git a/apps/scandic-web/types/hotel.ts b/apps/scandic-web/types/hotel.ts
index 79b3e6643..7ba265fc8 100644
--- a/apps/scandic-web/types/hotel.ts
+++ b/apps/scandic-web/types/hotel.ts
@@ -1,5 +1,6 @@
import type { z } from "zod"
+import type { MarkerInfo } from "@/types/components/maps/marker"
import type {
destinationPagesHotelDataSchema,
hotelSchema,
@@ -70,6 +71,7 @@ export type PoiMapMarkersProps = {
coordinates: { lat: number; lng: number }
onActivePoiChange?: (poiName: string | null) => void
pointsOfInterest: PointOfInterest[]
+ markerInfo: MarkerInfo
}
export type HotelTripAdvisor =
| NonNullable["tripAdvisor"]