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

Run composer require checker and solve issues.

Browse Source
This commit is contained in:
David Molineus
2018-08-23 14:35:25 +02:00
parent e73a4d4bdf
commit 3d45f6b2eb
29 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Frontend/AbstractMapHybrid.php
View File

@@ -18,6 +18,7 @@ use Contao\Database\Result;
use Contao\Input;
use Contao\Model;
use Contao\Model\Collection;
use Contao\StringUtil;
use Netzmacht\Contao\Leaflet\MapProvider;
use Netzmacht\Contao\Leaflet\Model\MapModel;
use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid;
@@ -127,8 +128,8 @@ abstract class AbstractMapHybrid extends AbstractHybrid
$data['mapId'] = $mapId;
$style = '';
$height = deserialize($this->get('leaflet_height'), true);
$width = deserialize($this->get('leaflet_width'), true);
$height = StringUtil::deserialize($this->get('leaflet_height'), true);
$width = StringUtil::deserialize($this->get('leaflet_width'), true);
if (!empty($width['value'])) {
$style .= 'width:' . $width['value'] . $width['unit'] . ';';

4
src/Frontend/RequestUrl.php
View File

@@ -12,6 +12,8 @@
namespace Netzmacht\Contao\Leaflet\Frontend;
use Contao\Config;
use Contao\Frontend;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\Request;
@@ -72,7 +74,7 @@ class RequestUrl implements \JsonSerializable
$query .= '&f=' . $filter->getName() . '&v=' . $filter->toRequest();
}
$url = \Config::get('websitePath') . '/' . \Frontend::addToUrl($query, false);
$url = Config::get('websitePath') . '/' . Frontend::addToUrl($query, false);
return new static($url, $hash, $request);
}