diff --git a/README.md b/README.md index 062b2ca1..9af6b3b7 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ This repository contains the original data for the Berliner Weihnachtsmarktkarte Original data sources -The informations on the [christmas marktes is based on an open dataset](https://daten.berlin.de/datensaetze/berliner-weihnachtsmärkte-2022) at the berlin open data portal, which is annually updated by the Senatsverwaltung für Wirtschaft, Energie und Betriebe. The information on design cristmas markets is currently only available as a list via Berlin.de. They were transferred into a geodata set by means of webscraping. The locations of the public toilets can also be found in the berlin open data portal, which is regularly updated by the Senatsverwaltung für Umwelt, Mobilität, Verbraucher- und Klimaschutz. +The informations on the [christmas marktes is based on an open dataset](https://daten.berlin.de/datensaetze/berliner-weihnachtsmärkte) at the berlin open data portal, which is annually updated by the Senatsverwaltung für Wirtschaft, Energie und Betriebe. The information on design cristmas markets is currently only available as a list via Berlin.de. They were transferred into a geodata set by means of webscraping. The locations of the public toilets can also be found in the berlin open data portal, which is regularly updated by the Senatsverwaltung für Umwelt, Mobilität, Verbraucher- und Klimaschutz. ## Tech stack @@ -222,10 +222,10 @@ The Christmas market data used is under CC-BY license. We have processed and enr - Supported by: + Supported by:

- +
diff --git a/package-lock.json b/package-lock.json index 96e1333c..213e39fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@headlessui/react": "1.7.3", "classnames": "2.3.2", - "date-fns": "2.29.3", + "date-fns": "^2.30.0", "mapbox-gl": "npm:empty-npm-package@1.0.0", "maplibre-gl": "2.4.0", "next": "13.0.0", @@ -35,12 +35,11 @@ } }, "node_modules/@babel/runtime": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz", - "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", - "dev": true, + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", + "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", "dependencies": { - "regenerator-runtime": "^0.13.10" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" @@ -59,6 +58,11 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/runtime/node_modules/regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + }, "node_modules/@eslint/eslintrc": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", @@ -1123,9 +1127,12 @@ "dev": true }, "node_modules/date-fns": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", - "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", + "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", + "dependencies": { + "@babel/runtime": "^7.21.0" + }, "engines": { "node": ">=0.11" }, @@ -1134,6 +1141,14 @@ "url": "https://opencollective.com/date-fns" } }, + "node_modules/date-fns-tz": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.0.tgz", + "integrity": "sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==", + "peerDependencies": { + "date-fns": ">=2.0.0" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4053,12 +4068,18 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz", - "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", - "dev": true, + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", + "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", "requires": { - "regenerator-runtime": "^0.13.10" + "regenerator-runtime": "^0.14.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + } } }, "@babel/runtime-corejs3": { @@ -4777,9 +4798,18 @@ "dev": true }, "date-fns": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", - "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==" + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", + "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", + "requires": { + "@babel/runtime": "^7.21.0" + } + }, + "date-fns-tz": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.0.tgz", + "integrity": "sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==", + "requires": {} }, "debug": { "version": "4.3.4", diff --git a/package.json b/package.json index cc2a32cf..6d286c30 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "@headlessui/react": "1.7.3", "classnames": "2.3.2", - "date-fns": "2.29.3", + "date-fns": "^2.30.0", "mapbox-gl": "npm:empty-npm-package@1.0.0", "maplibre-gl": "2.4.0", "next": "13.0.0", diff --git a/pages/index.tsx b/pages/index.tsx index 80a8ef20..62060524 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -20,6 +20,8 @@ import { SnowNav } from '@components/SnowNav' import { AudioPlayer } from '@components/AudioPlayer' import { IntroModal } from '@components/IntroModal' +import { WeatherOverlay } from '@components/WeatherOverlay' + import { getMapData } from '@lib/loadMapData' import { filterMarkets } from '@lib/filterMarkets' @@ -56,6 +58,8 @@ const MapSite: NextPage = (mapData: any) => { const [marketData, setMarketData] = useState() const [marketFilterInternational, setMarketFilterInternational] = useState(false) + const [marketFilterAccessible, setMarketFilterAccessible] = + useState(false) const [marketFilterCosts, setMarketFilterCosts] = useState(false) const [marketFilterDate, setMarketFilterDate] = useState( false @@ -124,6 +128,7 @@ const MapSite: NextPage = (mapData: any) => { const newData = filterMarkets( marketsData, marketFilterInternational, + marketFilterAccessible, marketFilterCosts, marketFilterDate, marketFilterAction, @@ -134,6 +139,7 @@ const MapSite: NextPage = (mapData: any) => { setMarketsData(JSON.parse(JSON.stringify(newData))) }, [ marketFilterInternational, + marketFilterAccessible, marketFilterCosts, marketFilterDate, marketFilterAction, @@ -185,6 +191,8 @@ const MapSite: NextPage = (mapData: any) => { { setMarketId={setMarketId} /> + + { 'fixed bottom-0 p-4 ease-in-out duration-300 z-10 right-0 top-12 h-min' } > -