Merge remote-tracking branch 'upstream/pull/4964'

diff --git a/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg b/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg
deleted file mode 100644 (file)
index f4a498c..0000000
Binary files a/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg and /dev/null differ

diff --git a/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg b/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg
deleted file mode 100644 (file)
index b2bf062..0000000
Binary files a/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg and /dev/null differ

diff --git a/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg b/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg
deleted file mode 100644 (file)
index d7d362a..0000000
Binary files a/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg and /dev/null differ

diff --git a/app/assets/images/banners/sotm_2024.png b/app/assets/images/banners/sotm_2024.png
new file mode 100644 (file)
index 0000000..6e0af8e
Binary files /dev/null and b/app/assets/images/banners/sotm_2024.png differ

diff --git a/app/assets/images/banners/sotm_2024@2x.png b/app/assets/images/banners/sotm_2024@2x.png
new file mode 100644 (file)
index 0000000..e505e7f
Binary files /dev/null and b/app/assets/images/banners/sotm_2024@2x.png differ

diff --git a/config/banners.yml b/config/banners.yml
index 2c8e1338af32d432ab56a51a6d4b15a7f00dbe90..1f2056194af646f0d373dce1ce49275956f5bb6d 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -14,20 +14,13 @@ sotmeu_2024:
   link: https://openstreetmap.org.pl/2024/sotm-eu-2024-community-tickets-70/
   img: banners/StateoftheMapEurope_2024.png
   enddate: 2024-jul-18
-sotmasia_2023:
-  id: sotmasia_2023
-  alt: State of the Map Asia x Foss4G Thailand 2023
-  link: https://stateofthemap.asia/
-  img: banners/SOTMAsia_x_FOSS4G_2023.jpg
-  startdate: 2023-oct-18
-  enddate: 2023-nov-18
-sotmafrica_2023:
-  id: sotmafrica_2023
-  alt: State of the Map Africa 2023
-  link: https://2023.stateofthemap.africa
-  img: banners/StateOfTheMapAfrica_2023.jpg
+sotm_2024:
+  id: sotm_2024
+  alt: State of the Map 2024
+  link: https://2024.stateofthemap.org
+  img: banners/sotm_2024.png
   srcset:
-    - [banners/StateOfTheMapAfrica_2023.jpg, 1x]
-    - [banners/StateOfTheMapAfrica_2023@2x.jpg, 2x]
-  startdate: 2023-oct-30
-  enddate: 2023-nov-30
+    - [banners/sotm_2024.png, 1x]
+    - [banners/sotm_2024@2x.png, 2x]
+  startdate: 2024-jul-10
+  enddate: 2024-sep-05
\ No newline at end of file