Merge master

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/@modal/(.)map/page.tsx

@@ -29,10 +29,6 @@ export default async function SelectHotelMapPage({
   params,
   searchParams,
 }: PageArgs<LangParams, SelectHotelSearchParams>) {
-  if (env.HIDE_FOR_NEXT_RELEASE) {
-    return notFound()
-  }
-
   setLang(params.lang)
   const locations = await getLocations()
 
@@ -93,7 +89,10 @@ export default async function SelectHotelMapPage({
 
   const hotelPins = getHotelPins(hotels)
   const filterList = getFiltersFromHotels(hotels)
-  const cityCoordinates = await getCityCoordinates({ city: city.name })
+  const cityCoordinates = await getCityCoordinates({
+    city: city.name,
+    hotel: { address: hotels[0].hotelData.address.streetAddress },
+  })
 
   return (
     <MapModal>

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/layout.tsx

@@ -1,7 +1,3 @@
-import { notFound } from "next/navigation"
-
-import { env } from "@/env/server"
-
 import styles from "./layout.module.css"
 
 import { LangParams, LayoutArgs } from "@/types/params"
@@ -12,9 +8,6 @@ export default function HotelReservationLayout({
 }: React.PropsWithChildren<
   LayoutArgs<LangParams> & { modal: React.ReactNode }
 >) {
-  if (env.HIDE_FOR_NEXT_RELEASE) {
-    return notFound()
-  }
   return (
     <div className={styles.layout}>
       {children}

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.module.css

@@ -72,7 +72,7 @@
   .header nav {
     display: block;
     max-width: var(--max-width-navigation);
-    padding-left: 0;
+    padding: 0;
   }
 
   .sorter {

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx

@@ -59,8 +59,12 @@ export default async function SelectHotelPage({
     (location) =>
       location.name.toLowerCase() === searchParams.city.toLowerCase()
   )
+
   if (!city) return notFound()
 
+  const isCityWithCountry = (city: any): city is { country: string } =>
+    "country" in city
+
   const intl = await getIntl()
   const selectHotelParams = new URLSearchParams(searchParams)
   const selectHotelParamsObject =
@@ -159,6 +163,7 @@ export default async function SelectHotelPage({
               <div className={styles.mapContainer}>
                 <StaticMap
                   city={searchParams.city}
+                  country={isCityWithCountry(city) ? city.country : undefined}
                   width={340}
                   height={180}
                   zoomLevel={11}