Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Remove dependency of url builder.

Browse Source
This commit is contained in:
David Molineus
2015-01-14 17:59:18 +01:00
parent d54b5ddc3e
commit 922d02adff
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -22,7 +22,6 @@
"contao/core":">=3.2,<3.5-dev",
"contao-community-alliance/dependency-container":"~1.0",
"contao-community-alliance/event-dispatcher":"~1.0",
"contao-community-alliance/url-builder":"~1.1",
"netzmacht/contao-leaflet-libraries": "~0.7",
"netzmacht/php-javascript-builder": "~1.0",
"netzmacht/php-leaflet": "~0.7",

3
src/Netzmacht/Contao/Leaflet/Frontend/HybridTrait.php
View File

@@ -66,7 +66,6 @@ trait HybridTrait
*/
public function generate()
{
RequestUrl::setFor($this->getIdentifier());
$this->handleAjaxRequest();
if (TL_MODE === 'BE') {
@@ -102,8 +101,10 @@ trait HybridTrait
protected function compile()
{
try {
RequestUrl::setFor($this->getIdentifier());
$mapId = 'map_' . ($this->cssID[0] ?: ('ce_' . $this->id));
$map = $this->mapService->getJavascript($this->leaflet_map, null, $mapId);
RequestUrl::setFor(null);
$GLOBALS['TL_BODY'][] = '<script>' . $map .'</script>';

4
src/Netzmacht/Contao/Leaflet/Frontend/RequestUrl.php
View File

@@ -47,8 +47,8 @@ class RequestUrl
'format' => $format != 'geojson' ? $format: null
);
$param = base64_encode(implode(',', $params));
$param = rawurlencode(base64_encode(implode(',', $params)) . '==');
return \Config::get('websitePath') . '/' . \Frontend::addToUrl('leaflet=' . $param);
return \Config::get('websitePath') . '/' . \Frontend::addToUrl('leaflet=' . $param, false);
}
}