M app/package-lock.json → app/package-lock.json

@@ -8091,11 +8091,6 @@ "requires": {
         "invert-kv": "^2.0.0"
       }
     },
-    "leaflet": {
-      "version": "1.6.0",
-      "resolved": "https://npm-8ee.hidora.com/leaflet/-/leaflet-1.6.0.tgz",
-      "integrity": "sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ=="
-    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://npm-8ee.hidora.com/left-pad/-/left-pad-1.3.0.tgz",
@@ -10981,17 +10976,6 @@ "version": "16.13.1",
       "resolved": "https://npm-8ee.hidora.com/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "react-leaflet": {
-      "version": "2.7.0",
-      "resolved": "https://npm-8ee.hidora.com/react-leaflet/-/react-leaflet-2.7.0.tgz",
-      "integrity": "sha512-pMf5eRyWU8RH9HohM2i0NZymcWHraJA1m6iMFYu94/01PAaBJpOyxORZJmN6cV9dBzkVWaLjAAHTNmxbwIpcfw==",
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "fast-deep-equal": "^3.1.1",
-        "hoist-non-react-statics": "^3.3.2",
-        "warning": "^4.0.3"
-      }
-    },
     "react-router": {
       "version": "5.2.0",
       "resolved": "https://npm-8ee.hidora.com/react-router/-/react-router-5.2.0.tgz",
@@ -13334,14 +13318,6 @@ "resolved": "https://npm-8ee.hidora.com/walker/-/walker-1.0.7.tgz",
       "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
       "requires": {
         "makeerror": "1.0.x"
-      }
-    },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://npm-8ee.hidora.com/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "requires": {
-        "loose-envify": "^1.0.0"
       }
     },
     "watchpack": {

M app/package.json → app/package.json

@@ -12,14 +12,12 @@ "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
     "fontsource-roboto": "^2.1.4",
     "i18next": "^19.5.1",
-    "leaflet": "^1.6.0",
     "marked": "^1.1.0",
     "moment": "^2.27.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-helmet": "^6.1.0",
     "react-i18next": "^11.7.0",
-    "react-leaflet": "^2.7.0",
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.1",
     "react-slick": "^0.26.1",

D app/src/components/Map/index.js

@@ -1,25 +0,0 @@ 
-import React from 'react';
-import 'leaflet/dist/leaflet.css';
-import {Map as LeafletMap, Marker, TileLayer} from 'react-leaflet';
-import L from 'leaflet';
-delete L.Icon.Default.prototype._getIconUrl;
-
-L.Icon.Default.mergeOptions({
-  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
-  iconUrl: require('leaflet/dist/images/marker-icon.png'),
-  shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
-});
-
-const Map = ({width = '100%', height = '20rem', position}) => {
-  return (
-    <LeafletMap center={position} zoom={13} style={{width, height}}>
-      <TileLayer
-        url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-        attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
-      />
-      <Marker position={position}></Marker>
-    </LeafletMap>
-  );
-};
-
-export default Map;

M app/src/containers/EventDetails/index.js → app/src/containers/EventDetails/index.js

@@ -8,7 +8,6 @@ import {makeStyles, createMuiTheme, ThemeProvider} from '@material-ui/core';
 import {useTranslation} from 'react-i18next';
 import moment from 'moment';
 import {useEvent} from '../../contexts/Event';
-import Map from '../../components/Map';
 import {caroster} from '../../theme';
 
 const theme = createMuiTheme({
@@ -93,12 +92,12 @@ ) : (
             <Typography variant="body1" id={`${idPrefix}Address`}>
               {event.address ? (
                 <Link
-                  href={`https://maps.google.com/?q=${encodeURI(
+                  target="_blank"
+                  rel="noreferrer"
+                  href={`https://www.google.com/maps/search/?api=1&query=${encodeURIComponent(
                     event.address
                   )}`}
-                  rel="noopener noreferrer"
-                  component="a"
-                  target="_blank"
+                  onClick={e => e.preventDefault}
                 >
                   {event.address}
                 </Link>
@@ -113,11 +112,6 @@ <Button onClick={toggleDetails} variant="contained" id={`CarFindBtn`}>
             {t('event.actions.find_car')}
           </Button>
         </div>
-        {event.position && (
-          <div className={classes.map} id={`${idPrefix}AddressMap`}>
-            <Map position={event.position} />
-          </div>
-        )}
       </div>
     </ThemeProvider>
   );