Merge branch 'dev'

bahnzumberg · Sep 7, 2024 · df7ef60 · df7ef60
2 parents 2d422aa + fe80471
commit df7ef60
Show file tree

Hide file tree

Showing 42 changed files with 5,483 additions and 176 deletions.
diff --git a/public/img/background_start_tiny_at.jpeg b/public/img/background_start_tiny_at.jpeg
diff --git a/public/img/background_start_tiny_ch.jpeg b/public/img/background_start_tiny_ch.jpeg
diff --git a/public/img/background_start_tiny_de.jpeg b/public/img/background_start_tiny_de.jpeg
diff --git a/public/img/background_start_tiny_fr.jpeg b/public/img/background_start_tiny_fr.jpeg
diff --git a/public/img/background_start_tiny_it.jpeg b/public/img/background_start_tiny_it.jpeg
diff --git a/public/img/background_start_tiny_li.jpeg b/public/img/background_start_tiny_li.jpeg
diff --git a/public/img/background_start_tiny_si.jpeg b/public/img/background_start_tiny_si.jpeg
diff --git a/public/index.html b/public/index.html
@@ -1,15 +1,6 @@
 <!DOCTYPE html>
 <html lang="de" id="html-tag">
   <head>
-    <link rel="alternate" href="https://www.zuugle.si" hreflang="sl-si" />
-    <link rel="canonical" href="https://www.zuugle.at" hreflang="de-at" />
-    <link rel="alternate" href="https://www.zuugle.de" hreflang="de-de" />
-    <link rel="alternate" href="https://www.zuugle.it" hreflang="it-it" />
-    <link rel="alternate" href="https://www.zuugle.ch" hreflang="de-ch" />
-    <link rel="alternate" href="https://www.zuugle.li" hreflang="de-li" />
-    <link rel="alternate" href="https://www.zuugle.fr" hreflang="fr-fr" />  
-    <link rel="preconnect" href="https://www.bahn-zum-berg.at" />            
-
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
@@ -21,31 +12,10 @@
     <meta name="robots" content="index, follow"/>
 
     <!-- Primary Meta Tags -> now using react helmet -->
-
-    <!-- Open Graph / Facebook -->
-    <meta property="og:type" content="website">
-    <meta property="og:url" content="https://www.zuugle.at/">
-    <meta property="og:title" content="Zuugle - die Suchmaschine für Öffi-Bergtouren im österreichischen Alpenraum">
-    <meta 
-      property="og:description"
-      content="Zuugle zeigt dir geprüfte Verbindungen mit Bahn und Bus zu Bergtouren, Wanderungen, Skitouren, Schneeschuhwanderungen, etc. von deinem Wohnort aus an.">
-    <meta property="og:image" content="https://www.zuugle.at/app_static/img/Zuugle_Opengraph.jpg">
-
-    <!-- Twitter -->
-    <meta property="twitter:card" content="summary_large_image">
-    <meta property="twitter:url" content="https://www.zuugle.at/">
-    <meta property="twitter:title" content="Zuugle - die Suchmaschine für Öffi-Bergtouren im österreichischen Alpenraum">
-
-    <meta 
-      property="twitter:description"
-      content="Zuugle zeigt dir geprüfte Verbindungen mit Bahn und Bus zu Bergtouren, Wanderungen, Skitouren, Schneeschuhwanderungen, etc. von deinem Wohnort aus an.">
-    <meta property="twitter:image" content="https://www.zuugle.at/app_static/img/Zuugle_Opengraph.jpg">
   </head>
 
   <body>
     <noscript>Es scheint, dass du Javascript nicht aktiviert hast. Diese Suchmaschine für Öffi-Bergtouren benötigt aber Javascript um zu funktionieren. Bitte aktiviere Javacript in deinem Browser.</noscript>
-
     <div id="root"></div>
-
   </body>
 </html>
diff --git a/src/components/Filter/Filter.js b/src/components/Filter/Filter.js
@@ -287,14 +287,20 @@ function Filter({filter, doSubmit, resetFilter, searchParams, loadFilter, isLoad
         }
     }
 
-
 
     const submit = () => {
+        let swLat = !!coordinatesSouthWest?.lat && (coordinatesSouthWest?.lat).toFixed(6);
+        let swLng = !!coordinatesSouthWest?.lng && (coordinatesSouthWest?.lng).toFixed(6);
+        let neLat = !!coordinatesNorthEast?.lat && (coordinatesNorthEast?.lat).toFixed(6);
+        let neLng = !!coordinatesNorthEast?.lng && (coordinatesNorthEast?.lng).toFixed(6);
 
         const filterValues = {
             //coordinates: coordinates,  //Füg den Wert in die URL ein
-            coordinatesSouthWest: coordinatesSouthWest,
-            coordinatesNorthEast: coordinatesNorthEast,
+            // s: !!coordinatesSouthWest?.lat && (coordinatesSouthWest?.lat).toFixed(6),
+            s: swLat,
+            w: swLng,
+            n: neLat,
+            e: neLng,
             singleDayTour: mapPosNegValues(singleDayTour),
             multipleDayTour: mapPosNegValues(multipleDayTour),
             summerSeason: mapPosNegValues(summerSeason),

diff --git a/src/components/InteractiveMap.js b/src/components/InteractiveMap.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {useRef, useEffect, useMemo} from 'react';
-import { MapContainer, TileLayer, Marker, Polyline, useMap } from 'react-leaflet';
+import { MapContainer, TileLayer, Marker, Polyline, useMap, ZoomControl } from 'react-leaflet';
 import 'leaflet/dist/leaflet.css';
 import L, { divIcon } from 'leaflet';
 
@@ -81,6 +81,7 @@ useEffect(() => {
       center={[47.800499, 13.04441]}
       zoom={12}
       style={{ height: "100%", width: "100%" }}
+      zoomControl={false}
       // whenCreated={(mapInstance)=> { mapRef.current = mapInstance }}
     >
       <TileLayer url="https://opentopo.bahnzumberg.at/{z}/{x}/{y}.png.webp" />
@@ -108,6 +109,7 @@ useEffect(() => {
           positions={abreiseGpxPositions}
         />
       )}
+      <ZoomControl position="bottomright" />
     </MapContainer>
   )
 }