Add leaflet v1.4.0 js/css for backwards compatibility; Delete unneces…

…sary sourcemap path from leaflet 1.9.4 css; Rename leaflet 1.9.4 js/css files and images path; Enable map wizard under TYPO3 13

Classes/FormEngine/FieldControl/LocationMapWizard.php

@@ -71,7 +71,7 @@ public function render(): array
         $resultArray['linkAttributes']['data-namelat-active'] = htmlspecialchars($nameLatitudeActive);
         $resultArray['linkAttributes']['data-tiles'] = htmlspecialchars('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png');
         $resultArray['linkAttributes']['data-copy'] = '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
-        $resultArray['stylesheetFiles'][] = 'EXT:tt_address/Resources/Public/Contrib/leaflet-core-1.9.4.css';
+        $resultArray['stylesheetFiles'][] = 'EXT:tt_address/Resources/Public/Contrib/leaflet-1.9.4.css';
         $resultArray['stylesheetFiles'][] = 'EXT:tt_address/Resources/Public/Backend/LocationMapWizard/leafletBackend.css';
 
         $pageRenderer = GeneralUtility::makeInstance('TYPO3\CMS\Core\Page\PageRenderer');

Configuration/TCA/tt_address.php

@@ -575,9 +575,9 @@
                 'eval' => \FriendsOfTYPO3\TtAddress\Evaluation\LongitudeEvaluation::class,
                 'default' => null,
                 'fieldControl' => [
-                    'locationMap' => ((new \TYPO3\CMS\Core\Information\Typo3Version())->getMajorVersion() < 13) ? [
+                    'locationMap' => [
                         'renderType' => 'locationMapWizard',
-                    ] : [],
+                    ],
                 ],
                 'behaviour' => [
                     'allowLanguageSynchronization' => true,

Resources/Private/Partials/Maps.html

@@ -4,9 +4,9 @@
 
     <f:render section="rendering" arguments="{_all}"/>
 
-    <f:asset.css identifier="ttaddress-leaflet" href="EXT:tt_address/Resources/Public/Contrib/leaflet-core-1.9.4.css" />
+    <f:asset.css identifier="ttaddress-leaflet" href="EXT:tt_address/Resources/Public/Contrib/leaflet-1.9.4.css" />
     <f:asset.css identifier="ttaddress" href="EXT:tt_address/Resources/Public/Styles/basic.css" />
-    <f:asset.script identifier="ttaddress-leaflet-core" src="EXT:tt_address/Resources/Public/JavaScript/leaflet-core-1.9.4.js" />
+    <f:asset.script identifier="ttaddress-leaflet-core" src="EXT:tt_address/Resources/Public/JavaScript/leaflet-1.9.4.min.js" />
     <f:asset.script identifier="ttaddress-leaflet" src="EXT:tt_address/Resources/Public/JavaScript/Frontend/Leaflet.js" />
 </f:section>
 

Resources/Public/Contrib/leaflet-core-1.9.4.css → Resources/Public/Contrib/leaflet-1.9.4.css

@@ -121,7 +121,7 @@
 	height: 1px;
 	}
 .lvml {
-	behavior: url(image/#default#VML);
+	behavior: url(images/#default#VML);
 	display: inline-block;
 	position: absolute;
 	}
@@ -356,12 +356,12 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	border-radius: 5px;
 	}
 .leaflet-control-layers-toggle {
-	background-image: url(image/layers.png);
+	background-image: url(images/layers.png);
 	width: 36px;
 	height: 36px;
 	}
 .leaflet-retina .leaflet-control-layers-toggle {
-	background-image: url(image/layers-2x.png);
+	background-image: url(images/layers-2x.png);
 	background-size: 26px 26px;
 	}
 .leaflet-touch .leaflet-control-layers-toggle {
@@ -404,7 +404,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 /* Default icon URLs */
 .leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
-	background-image: url(image/marker-icon.png);
+	background-image: url(images/marker-icon.png);
 	}