Skip to content

Show overlay for all maps2 plugins if activated #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 3, 2025
Merged

Show overlay for all maps2 plugins if activated #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47e0766
Prevent BE form storing when hitting ENTER after entering address for…
sfroemkenjw Apr 3, 2025
61e61ac
Show Overlay for all three plugins #318
sfroemkenjw Apr 3, 2025
1557169
Test on MariaDB 10.11
sfroemkenjw Apr 3, 2025
b0ffcb2
Rename LICENSE.md to LICENSE
sfroemkenjw Apr 3, 2025
a1cee52
Update version to 11.0.4
sfroemkenjw Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Build/Scripts/runTests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ handleDbmsOptions() {
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
exit 1
fi
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10.4"
if ! [[ ${DBMS_VERSION} =~ ^(10.4|10.5|10.6|10.7|10.8|10.9|10.10|10.11|11.0|11.1)$ ]]; then
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10.11"
if ! [[ ${DBMS_VERSION} =~ ^(10.5|10.6|10.7|10.8|10.9|10.10|10.11|11.0|11.1)$ ]]; then
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
echo >&2
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
Expand Down Expand Up @@ -178,7 +178,6 @@ Options:
-i version
Specify a specific database version
With "-d mariadb":
- 10.4 short-term, maintained until 2024-06-18 (default)
- 10.5 short-term, maintained until 2025-06-24
- 10.6 long-term, maintained until 2026-06
- 10.7 short-term, no longer maintained
Expand Down
3 changes: 2 additions & 1 deletion Configuration/TypoScript/GoogleMaps/setup.typoscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ page.includeJSFooterlibs.googleMapsForMaps2 >
}
[ELSE]
# Requests to Google Maps are not allowed. Inform the user about cookies and request permissions for 3rd party.
tt_content.list.20.maps2_maps2 = USER_INT
tt_content.list.20.maps2_maps2.pluginName = Overlay
tt_content.list.20.maps2_searchwithinradius.pluginName = Overlay
tt_content.list.20.maps2_citymap.pluginName = Overlay
[END]

plugin.tx_maps2 {
Expand Down
3 changes: 2 additions & 1 deletion Configuration/TypoScript/OpenStreetMap/setup.typoscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ plugin.tx_maps2.settings.markerClusterer >
}
[ELSE]
# Requests to OpenStreetMap are not allowed. Inform the user about cookies and request permissions for 3rd party.
tt_content.list.20.maps2_maps2 = USER_INT
tt_content.list.20.maps2_maps2.pluginName = Overlay
tt_content.list.20.maps2_searchwithinradius.pluginName = Overlay
tt_content.list.20.maps2_citymap.pluginName = Overlay
[END]

plugin.tx_maps2 {
Expand Down
8 changes: 8 additions & 0 deletions Documentation/ChangeLog/Index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
ChangeLog
=========

Version 11.0.4
==============

* BUGFIX: Show overlay for all maps2 plugins if activated
* BUGFIX: Prevent core storing in BE form, when hitting ENTER on OSM search
* TASK: Test on MariaDB 10.11
* TASK: Rename LICENSE.md to LICENSE

Version 11.0.3
==============

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[general]
project = maps2 (Maps2)
version = 11.0
release = 11.0.3
release = 11.0.4
copyright = since 2013 by jweiland.net
t3author = Stefan Froemken
description = This TYPO3 extension supports the rendering of a map based on Google Maps or
Expand Down
0 LICENSE.md → LICENSE
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Resources/Private/Build/JavaScript/OpenStreetMapModule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ class OpenStreetMapModule {
// Prevent submitting the BE form on enter
pacSearch.addEventListener("keydown", event => {
if (event.keyCode === 13 && event.target.value) {
event.preventDefault();
fetch("https://nominatim.openstreetmap.org/search?q=" + encodeURI(event.target.value) + "&format=json&addressdetails=1", {
method: "GET",
headers: {
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Follow these steps to build fresh JS files:
folder:

```
cd [pathOfMaps2]/Resouces/Private/Build
cd [pathOfMaps2]/Resources/Private/Build
```

- *Step 3: Install Necessary Tools*
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/JavaScript/OpenStreetMapModule.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Resources/Public/JavaScript/OpenStreetMapModule.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
$EM_CONF[$_EXTKEY] = [
'title' => 'Maps2',
'description' => 'Create maps with Marker, Area, Routes or Radius based on Google Maps or OpenStreetMap',
'version' => '11.0.3',
'version' => '11.0.4',
'category' => 'plugin',
'state' => 'stable',
'clearCacheOnLoad' => true,
Expand All @@ -19,7 +19,7 @@
'author_company' => 'jweiland.net',
'constraints' => [
'depends' => [
'typo3' => '12.4.11-12.4.99',
'typo3' => '12.4.25-12.4.99',
],
'conflicts' => [
],
Expand Down