>
- netzmacht creative
+ netzmacht
David Molineus
@@ -51,12 +51,12 @@
There are many ways you can contribute. Translations, documentation or code contributions are welcome.
- +Fund a feature
Contao Leaflet is not feature complete. Have a look at the list of planned feature and support them.
- +
@@ -64,12 +64,12 @@
diff --git a/module/templates/be_leaflet_geocode.html5 b/module/templates/be_leaflet_geocode.html5
index ecdd8cd..842d1f5 100644
--- a/module/templates/be_leaflet_geocode.html5
+++ b/module/templates/be_leaflet_geocode.html5
@@ -4,7 +4,7 @@
-
+
'; ?>
diff --git a/module/templates/mod_leaflet_map.html5 b/module/templates/mod_leaflet_map.html5
index e88bc5b..e0138dd 100644
--- a/module/templates/mod_leaflet_map.html5
+++ b/module/templates/mod_leaflet_map.html5
@@ -6,12 +6,7 @@
-map): ?>
-
-
-
+' . $this->javascript .''; ?>
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..96a0656
--- /dev/null
+++ b/package.json
@@ -0,0 +1,31 @@
+{
+ "name": "contao-leaflet-maps",
+ "version": "1.0.0",
+ "description": "Leaflet maps for Contao",
+ "main": "gulpfile.js",
+ "dependencies": {
+ "del": "^2.2.2",
+ "gulp": "^3.9.1",
+ "gulp-concat": "^2.6.0",
+ "gulp-uglify": "^2.0.0"
+ },
+ "devDependencies": {},
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/netzmacht/contao-leaflet-maps.git"
+ },
+ "keywords": [
+ "Contao",
+ "Leaflet",
+ "Maps"
+ ],
+ "author": "netzmacht David Molineus",
+ "license": "LGPL-3.0",
+ "bugs": {
+ "url": "https://github.com/netzmacht/contao-leaflet-maps/issues"
+ },
+ "homepage": "https://github.com/netzmacht/contao-leaflet-maps#readme"
+}
diff --git a/src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php b/src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php
new file mode 100644
index 0000000..3fe9e70
--- /dev/null
+++ b/src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php
@@ -0,0 +1,61 @@
+
+ * @copyright 2016 netzmacht David Molineus. All rights reserved.
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Alias;
+
+use Netzmacht\Contao\Toolkit\Data\Alias\Filter\AbstractFilter;
+
+/**
+ * Class DefaultAliasFilter creates an prefix of the alias.
+ *
+ * @package Netzmacht\Contao\Leaflet\Alias
+ */
+class DefaultAliasFilter extends AbstractFilter
+{
+ /**
+ * Alias prefix.
+ *
+ * @var string
+ */
+ private $prefix;
+
+ /**
+ * DefaultAliasFilter constructor.
+ *
+ * @param string $dataContainerName Data container name.
+ * @param int $combine Combine strategy.
+ */
+ public function __construct($dataContainerName, $combine = self::COMBINE_REPLACE)
+ {
+ parent::__construct(true, $combine);
+
+ $this->prefix = str_replace('tl_leaflet_', '', $dataContainerName);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function repeatUntilValid()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function apply($model, $value, $separator)
+ {
+ if (!$value) {
+ return $this->prefix . $separator . $model->id;
+ }
+
+ return $value;
+ }
+}
diff --git a/src/Netzmacht/Contao/Leaflet/ContaoAssets.php b/src/Netzmacht/Contao/Leaflet/ContaoAssets.php
index bb46e29..4827f7a 100644
--- a/src/Netzmacht/Contao/Leaflet/ContaoAssets.php
+++ b/src/Netzmacht/Contao/Leaflet/ContaoAssets.php
@@ -11,6 +11,7 @@
namespace Netzmacht\Contao\Leaflet;
+use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager;
use Netzmacht\LeafletPHP\Assets;
/**
@@ -27,6 +28,34 @@ class ContaoAssets implements Assets
*/
private $map;
+ /**
+ * Assets manager.
+ *
+ * @var AssetsManager
+ */
+ private $assetsManager;
+
+ /**
+ * Cached assets.
+ *
+ * @var array
+ */
+ private $cache = [
+ 'stylesheets' => [],
+ 'javascripts' => [],
+ 'map' => []
+ ];
+
+ /**
+ * ContaoAssets constructor.
+ *
+ * @param AssetsManager $assetsManager Contao assets manager.
+ */
+ public function __construct(AssetsManager $assetsManager)
+ {
+ $this->assetsManager = $assetsManager;
+ }
+
/**
* {@inheritdoc}
*
@@ -34,20 +63,16 @@ class ContaoAssets implements Assets
*/
public function addJavascript($script, $type = self::TYPE_SOURCE)
{
+ $this->cache['javascripts'][] = [$script, $type];
+
switch ($type) {
case static::TYPE_SOURCE:
$GLOBALS['TL_HEAD'][] = sprintf('', $script);
break;
case static::TYPE_FILE:
- if (!\Config::get('debugMode') && TL_MODE === 'FE') {
- $script .= '|static';
- }
-
- // no break
-
default:
- $GLOBALS['TL_JAVASCRIPT'][] = $script;
+ $this->assetsManager->addJavascript($script);
}
}
@@ -58,19 +83,16 @@ class ContaoAssets implements Assets
*/
public function addStylesheet($stylesheet, $type = self::TYPE_FILE)
{
+ $this->cache['stylesheets'][] = [$stylesheet, $type];
+
switch ($type) {
case static::TYPE_SOURCE:
$GLOBALS['TL_HEAD'][] = sprintf('', $stylesheet);
break;
case static::TYPE_FILE:
- if (!\Config::get('debugMode')) {
- $stylesheet .= '|all|static';
- }
- // no break
-
default:
- $GLOBALS['TL_CSS'][] = $stylesheet;
+ $this->assetsManager->addStylesheet($stylesheet);
}
}
@@ -87,8 +109,39 @@ class ContaoAssets implements Assets
*/
public function setMap($map)
{
- $this->map = $map;
+ $this->cache['map'] = $map;
+ $this->map = $map;
return $this;
}
+
+ /**
+ * Export to array.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ return $this->cache;
+ }
+
+ /**
+ * From array.
+ *
+ * @param array $cache Cache.
+ *
+ * @return void
+ */
+ public function fromArray(array $cache)
+ {
+ foreach ($cache['javascripts'] as $javascript) {
+ $this->addJavascript($javascript[0], $javascript[1]);
+ }
+
+ foreach ($cache['stylesheets'] as $stylesheet) {
+ $this->addStylesheet($stylesheet[0], $stylesheet[1]);
+ }
+
+ $this->map = $cache['map'];
+ }
}
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Control.php b/src/Netzmacht/Contao/Leaflet/Dca/ControlCallbacks.php
similarity index 81%
rename from src/Netzmacht/Contao/Leaflet/Dca/Control.php
rename to src/Netzmacht/Contao/Leaflet/Dca/ControlCallbacks.php
index 28da0b3..a4c52cf 100644
--- a/src/Netzmacht/Contao/Leaflet/Dca/Control.php
+++ b/src/Netzmacht/Contao/Leaflet/Dca/ControlCallbacks.php
@@ -11,8 +11,9 @@
namespace Netzmacht\Contao\Leaflet\Dca;
+use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks;
+use Netzmacht\Contao\Toolkit\Dca\Manager;
use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
use Netzmacht\Contao\Leaflet\Model\ControlModel;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
@@ -21,9 +22,21 @@ use Netzmacht\Contao\Leaflet\Model\LayerModel;
*
* @package Netzmacht\Contao\Leaflet\Dca
*/
-class Control
+class ControlCallbacks extends Callbacks
{
- use ServiceContainerTrait;
+ /**
+ * Name of the data container.
+ *
+ * @var string
+ */
+ protected static $name = 'tl_leaflet_control';
+
+ /**
+ * Helper service name.
+ *
+ * @var string
+ */
+ protected static $serviceName = 'leaflet.dca.control-callbacks';
/**
* The database connection.
@@ -34,10 +47,15 @@ class Control
/**
* Construct.
+ *
+ * @param Manager $manager Data container manager.
+ * @param \Database $database Database connection.
*/
- public function __construct()
+ public function __construct(Manager $manager, \Database $database)
{
- $this->database = static::getServiceContainer()->getDatabaseConnection();
+ parent::__construct($manager);
+
+ $this->database = $database;
}
/**
@@ -63,16 +81,11 @@ class Control
*/
public function getLayers()
{
- $options = array();
- $collection = LayerModel::findBy('pid', '0', array('order' => 'title'));
+ $collection = LayerModel::findAll();
- if ($collection) {
- foreach ($collection as $model) {
- $options[$model->id] = $model->title;
- }
- }
-
- return $options;
+ return OptionsBuilder::fromCollection($collection, 'title')
+ ->asTree()
+ ->getOptions();
}
/**
@@ -84,7 +97,7 @@ class Control
{
$collection = ControlModel::findBy('type', 'zoom', array('order' => 'title'));
- return OptionsBuilder::fromCollection($collection, 'id', 'title')->getOptions();
+ return OptionsBuilder::fromCollection($collection, 'title')->getOptions();
}
/**
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php b/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php
index 1bf1ded..368b1c5 100644
--- a/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php
+++ b/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php
@@ -11,6 +11,8 @@
namespace Netzmacht\Contao\Leaflet\Dca;
+use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator;
+use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory;
use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
use Netzmacht\Contao\Leaflet\Model\MapModel;
@@ -21,6 +23,35 @@ use Netzmacht\Contao\Leaflet\Model\MapModel;
*/
class FrontendIntegration
{
+ /**
+ * Translator.
+ *
+ * @var Translator
+ */
+ private $translator;
+
+ /**
+ * FrontendIntegration constructor.
+ *
+ * @param Translator $translator Translator.
+ */
+ public function __construct(Translator $translator)
+ {
+ $this->translator = $translator;
+ }
+
+ /**
+ * Generate the callback definition.
+ *
+ * @param string $methodName Callback method name.
+ *
+ * @return callable
+ */
+ public static function callback($methodName)
+ {
+ return CallbackFactory::service('leaflet.dca.frontend-integration', $methodName);
+ }
+
/**
* Get all leaflet maps.
*
@@ -30,7 +61,7 @@ class FrontendIntegration
{
$collection = MapModel::findAll();
- return OptionsBuilder::fromCollection($collection, 'id', 'title')->getOptions();
+ return OptionsBuilder::fromCollection($collection, 'title')->getOptions();
}
/**
@@ -39,8 +70,6 @@ class FrontendIntegration
* @param \DataContainer $dataContainer The dataContainer driver.
*
* @return string
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function getEditMapLink($dataContainer)
{
@@ -53,23 +82,23 @@ class FrontendIntegration
return sprintf(
'%s',
- 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=',
+ 'contao/main.php?do=leaflet_map&table=tl_leaflet_map&act=edit&id=',
$dataContainer->value,
\RequestToken::get(),
sprintf(
$pattern,
- specialchars(sprintf($GLOBALS['TL_LANG']['tl_content']['editalias'][1], $dataContainer->value)),
+ specialchars($this->translator->translate('editalias.1', 'tl_content', [$dataContainer->value])),
specialchars(
str_replace(
"'",
"\\'",
- sprintf($GLOBALS['TL_LANG']['tl_content']['editalias'][1], $dataContainer->value)
+ sprintf($this->translator->translate('editalias.1', 'tl_content', [$dataContainer->value]))
)
)
),
\Image::getHtml(
'alias.gif',
- $GLOBALS['TL_LANG']['tl_content']['editalias'][0],
+ $this->translator->translate('editalias.0', 'tl_content', [$dataContainer->value]),
'style="vertical-align:top"'
)
);
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Helper.php b/src/Netzmacht/Contao/Leaflet/Dca/Helper.php
deleted file mode 100644
index 5d933e4..0000000
--- a/src/Netzmacht/Contao/Leaflet/Dca/Helper.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- * @copyright 2015 netzmacht creative David Molineus
- * @license LGPL 3.0
- * @filesource
- *
- */
-
-namespace Netzmacht\Contao\Leaflet\Dca;
-
-use Netzmacht\Contao\Toolkit\Dca;
-use Netzmacht\Contao\Toolkit\Dca\Callback\GenerateAliasCallback;
-
-/**
- * Helper class for dca functions.
- *
- * @package Netzmacht\Contao\Leaflet\Dca
- */
-class Helper
-{
- /**
- * Generate an alias callback which creates a valid javascript var name.
- *
- * @param string $table The table.
- * @param string $column The value column.
- *
- * @return GenerateAliasCallback
- */
- public static function createGenerateAliasCallback($table, $column)
- {
- $callback = Dca::createGenerateAliasCallback($table, $column);
- $callback->getGenerator()->addFilter(
- function ($value) {
- return str_replace('-', '_', $value);
- }
- );
-
- return $callback;
- }
-}
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Layer.php b/src/Netzmacht/Contao/Leaflet/Dca/LayerCallbacks.php
similarity index 81%
rename from src/Netzmacht/Contao/Leaflet/Dca/Layer.php
rename to src/Netzmacht/Contao/Leaflet/Dca/LayerCallbacks.php
index 0ce8782..54006df 100644
--- a/src/Netzmacht/Contao/Leaflet/Dca/Layer.php
+++ b/src/Netzmacht/Contao/Leaflet/Dca/LayerCallbacks.php
@@ -11,8 +11,10 @@
namespace Netzmacht\Contao\Leaflet\Dca;
+use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator;
+use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks;
+use Netzmacht\Contao\Toolkit\Dca\Manager;
use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
/**
@@ -20,9 +22,21 @@ use Netzmacht\Contao\Leaflet\Model\LayerModel;
*
* @package Netzmacht\Contao\Leaflet\Dca
*/
-class Layer
+class LayerCallbacks extends Callbacks
{
- use ServiceContainerTrait;
+ /**
+ * Name of the data container.
+ *
+ * @var string
+ */
+ protected static $name = 'tl_leaflet_layer';
+
+ /**
+ * Helper service name.
+ *
+ * @var string
+ */
+ protected static $serviceName = 'leaflet.dca.layer-callbacks';
/**
* Layers definition.
@@ -37,19 +51,46 @@ class Layer
* @var \Database
*/
private $database;
+
+ /**
+ * Tile providers configuration.
+ *
+ * @var array
+ */
+ private $tileProviders;
+
+ /**
+ * Translator.
+ *
+ * @var Translator
+ */
+ private $translator;
/**
* Construct.
*
- * @SuppressWarnings(PHPMD.Superglobals)
+ * @param Manager $manager Data container manager.
+ * @param \Database $database Database connection.
+ * @param Translator $translator Translator.
+ * @param array $layers Leaflet layer configuration.
+ * @param array $tileProviders Tile providers.
*/
- public function __construct()
- {
- $this->layers = &$GLOBALS['LEAFLET_LAYERS'];
- $this->database = static::getServiceContainer()->getDatabaseConnection();
+ public function __construct(
+ Manager $manager,
+ \Database $database,
+ Translator $translator,
+ array $layers,
+ array $tileProviders
+ ) {
+ parent::__construct($manager);
+
+ $this->database = $database;
+ $this->layers = $layers;
+ $this->tileProviders = $tileProviders;
\Controller::loadLanguageFile('leaflet_layer');
+ $this->translator = $translator;
}
/**
@@ -58,16 +99,14 @@ class Layer
* @param \DataContainer $dataContainer The dataContainer driver.
*
* @return array
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function getVariants($dataContainer)
{
if ($dataContainer->activeRecord
&& $dataContainer->activeRecord->tile_provider
- && !empty($GLOBALS['LEAFLET_TILE_PROVIDERS'][$dataContainer->activeRecord->tile_provider]['variants'])
+ && !empty($this->tileProviders[$dataContainer->activeRecord->tile_provider]['variants'])
) {
- return $GLOBALS['LEAFLET_TILE_PROVIDERS'][$dataContainer->activeRecord->tile_provider]['variants'];
+ return $this->tileProviders[$dataContainer->activeRecord->tile_provider]['variants'];
}
return array();
@@ -80,15 +119,9 @@ class Layer
* @param string $label Current row label.
*
* @return string
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function generateRow($row, $label)
{
- $alt = empty($GLOBALS['TL_LANG']['leaflet_layer'][$row['type']][0])
- ? $row['type']
- : $GLOBALS['TL_LANG']['leaflet_layer'][$row['type']][0];
-
if (!empty($this->layers[$row['type']]['icon'])) {
$src = $this->layers[$row['type']]['icon'];
@@ -100,6 +133,7 @@ class Layer
$src = preg_replace('/(\.[^\.]+)$/', '_1$1', $src);
}
+ $alt = $this->getFormatter()->formatValue('type', $row['type']);
$icon = \Image::getHtml($src, $alt, sprintf('title="%s"', strip_tags($alt)));
if (!empty($this->layers[$row['type']]['label'])) {
@@ -148,7 +182,6 @@ class Layer
*
* @return string
*
- * @SuppressWarnings(PHPMD.Superglobals)
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getPasteButtons($dataContainer, $row, $table, $whatever, $children)
@@ -161,10 +194,10 @@ class Layer
$buffer = sprintf(
'%s ',
$pasteAfterUrl,
- specialchars(sprintf($GLOBALS['TL_LANG'][$table]['pasteafter'][1], $row['id'])),
+ specialchars($this->translator->translate('pasteafter.1', $table, [$row['id']])),
\Image::getHtml(
'pasteafter.gif',
- sprintf($GLOBALS['TL_LANG'][$table]['pasteafter'][1], $row['id'])
+ $this->translator->translate('pasteafter.1', $table, [$row['id']])
)
);
@@ -181,10 +214,10 @@ class Layer
$buffer .= sprintf(
'%s ',
$pasteIntoUrl,
- specialchars(sprintf($GLOBALS['TL_LANG'][$table]['pasteinto'][1], $row['id'])),
+ specialchars($this->translator->translate('pasteinto.1', $table, [$row['id']])),
\Image::getHtml(
'pasteinto.gif',
- sprintf($GLOBALS['TL_LANG'][$table]['pasteinto'][1], $row['id'])
+ $this->translator->translate('pasteinto.1', $table, [$row['id']])
)
);
@@ -237,22 +270,6 @@ class Layer
return $this->generateButton($row, $href, $label, $title, $icon, $attributes);
}
- /**
- * Get all layers except of the current layer.
- *
- * @param \DataContainer $dataContainer The dataContainer driver.
- *
- * @return array
- */
- public function getLayers($dataContainer)
- {
- $collection = LayerModel::findBy('id !', $dataContainer->id);
-
- return OptionsBuilder::fromCollection($collection, 'id', 'title')
- ->asTree()
- ->getOptions();
- }
-
/**
* Delete the relations when the layer is deleted.
*
@@ -326,6 +343,22 @@ class Layer
return $options;
}
+ /**
+ * Get all layers except of the current layer.
+ *
+ * @param \DataContainer $dataContainer The dataContainer driver.
+ *
+ * @return array
+ */
+ public function getLayers($dataContainer)
+ {
+ $collection = LayerModel::findBy('id !', $dataContainer->id);
+
+ return OptionsBuilder::fromCollection($collection, 'title')
+ ->asTree()
+ ->getOptions();
+ }
+
/**
* Generate a button.
*
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php b/src/Netzmacht/Contao/Leaflet/Dca/LeafletCallbacks.php
similarity index 66%
rename from src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php
rename to src/Netzmacht/Contao/Leaflet/Dca/LeafletCallbacks.php
index 730ffc1..e9c5564 100644
--- a/src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php
+++ b/src/Netzmacht/Contao/Leaflet/Dca/LeafletCallbacks.php
@@ -11,10 +11,8 @@
namespace Netzmacht\Contao\Leaflet\Dca;
-use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
-use Netzmacht\Contao\Leaflet\Mapper\MapMapper;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
-use Netzmacht\Contao\Leaflet\Model\MapModel;
+use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory;
use Netzmacht\LeafletPHP\Value\LatLng;
/**
@@ -22,24 +20,35 @@ use Netzmacht\LeafletPHP\Value\LatLng;
*
* @package Netzmacht\Contao\Leaflet\Dca
*/
-class Leaflet
+class LeafletCallbacks
{
/**
- * Validate a coordinate.
+ * File system.
*
- * @param mixed $value The given value.
- *
- * @return mixed
+ * @var \Files
*/
- public function validateCoordinate($value)
+ private $fileSystem;
+
+ /**
+ * LeafletCallbacks constructor.
+ *
+ * @param \Files $fileSystem File system.
+ */
+ public function __construct(\Files $fileSystem)
{
- if (!empty($value)) {
- // Validate by creating latlng object. Throws an exception.
+ $this->fileSystem = $fileSystem;
+ }
- LatLng::fromString($value);
- }
-
- return $value;
+ /**
+ * Generate the callback definition.
+ *
+ * @param string $methodName Callback method name.
+ *
+ * @return callable
+ */
+ public static function callback($methodName)
+ {
+ return CallbackFactory::service('leaflet.dca.common', $methodName);
}
/**
@@ -93,4 +102,18 @@ class Leaflet
return $options;
}
+
+ /**
+ * Clear the leaflet cache.
+ *
+ * @param mixed $value Value when used as save_callback.
+ *
+ * @return mixed
+ */
+ public function clearCache($value = null)
+ {
+ $this->fileSystem->rrdir('system/cache/leaflet', true);
+
+ return $value;
+ }
}
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Map.php b/src/Netzmacht/Contao/Leaflet/Dca/MapCallbacks.php
similarity index 72%
rename from src/Netzmacht/Contao/Leaflet/Dca/Map.php
rename to src/Netzmacht/Contao/Leaflet/Dca/MapCallbacks.php
index 83ab048..215bfb7 100644
--- a/src/Netzmacht/Contao/Leaflet/Dca/Map.php
+++ b/src/Netzmacht/Contao/Leaflet/Dca/MapCallbacks.php
@@ -11,16 +11,31 @@
namespace Netzmacht\Contao\Leaflet\Dca;
-use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
+use Netzmacht\Contao\Leaflet\Model\LayerModel;
+use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks;
+use Netzmacht\Contao\Toolkit\Dca\Manager;
+use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
/**
* Class Map is the helper class for the tl_leaflet_map dca.
*
* @package Netzmacht\Contao\Leaflet\Dca
*/
-class Map
+class MapCallbacks extends Callbacks
{
- use ServiceContainerTrait;
+ /**
+ * Name of the data container.
+ *
+ * @var string
+ */
+ protected static $name = 'tl_leaflet_map';
+
+ /**
+ * Helper service name.
+ *
+ * @var string
+ */
+ protected static $serviceName = 'leaflet.dca.map-callbacks';
/**
* The database connection.
@@ -31,10 +46,15 @@ class Map
/**
* Construct.
+ *
+ * @param Manager $manager Data container manager.
+ * @param \Database $database Database connection.
*/
- public function __construct()
+ public function __construct(Manager $manager, \Database $database)
{
- $this->database = static::getServiceContainer()->getDatabaseConnection();
+ parent::__construct($manager);
+
+ $this->database = $database;
}
/**
@@ -120,4 +140,20 @@ class Map
return null;
}
+
+ /**
+ * Get all layers except of the current layer.
+ *
+ * @param \DataContainer $dataContainer The dataContainer driver.
+ *
+ * @return array
+ */
+ public function getLayers($dataContainer)
+ {
+ $collection = LayerModel::findBy('id !', $dataContainer->id);
+
+ return OptionsBuilder::fromCollection($collection, 'title')
+ ->asTree()
+ ->getOptions();
+ }
}
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Marker.php b/src/Netzmacht/Contao/Leaflet/Dca/MarkerCallbacks.php
similarity index 98%
rename from src/Netzmacht/Contao/Leaflet/Dca/Marker.php
rename to src/Netzmacht/Contao/Leaflet/Dca/MarkerCallbacks.php
index b5e697c..6df9083 100644
--- a/src/Netzmacht/Contao/Leaflet/Dca/Marker.php
+++ b/src/Netzmacht/Contao/Leaflet/Dca/MarkerCallbacks.php
@@ -20,7 +20,7 @@ use Netzmacht\Contao\Leaflet\Model\PopupModel;
*
* @package Netzmacht\Contao\Leaflet\Dca
*/
-class Marker
+class MarkerCallbacks
{
/**
* Generate the row label.
@@ -44,7 +44,6 @@ class Marker
$collection = IconModel::findAll(array('order' => 'title'));
$builder = OptionsBuilder::fromCollection(
$collection,
- 'id',
function ($model) {
return sprintf('%s [%s]', $model['title'], $model['type']);
}
@@ -61,7 +60,7 @@ class Marker
public function getPopups()
{
$collection = PopupModel::findAll(array('order' => 'title'));
- $builder = OptionsBuilder::fromCollection($collection, 'id', 'title');
+ $builder = OptionsBuilder::fromCollection($collection, 'title');
return $builder->getOptions();
}
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Validator.php b/src/Netzmacht/Contao/Leaflet/Dca/Validator.php
new file mode 100644
index 0000000..5da9c57
--- /dev/null
+++ b/src/Netzmacht/Contao/Leaflet/Dca/Validator.php
@@ -0,0 +1,133 @@
+
+ * @copyright 2016 netzmacht David Molineus. All rights reserved.
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Dca;
+
+use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator;
+use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory;
+use Netzmacht\LeafletPHP\Value\LatLng;
+
+/**
+ * Class Validator.
+ *
+ * @package Netzmacht\Contao\Leaflet\Dca
+ */
+class Validator
+{
+ /**
+ * Translator.
+ *
+ * @var Translator;
+ */
+ private $translator;
+
+ /**
+ * Validator constructor.
+ *
+ * @param Translator $translator Translator.
+ */
+ public function __construct(Translator $translator)
+ {
+ $this->translator = $translator;
+ }
+
+ /**
+ * Generate the callback definition.
+ *
+ * @param string $methodName Callback method name.
+ *
+ * @return callable
+ */
+ public static function callback($methodName)
+ {
+ return CallbackFactory::service('leaflet.dca.validator', $methodName);
+ }
+
+ /**
+ * Validate coordinates.
+ *
+ * @param mixed $value Given value.
+ *
+ * @return mixed
+ * @throws \InvalidArgumentException When invalid coordinates give.
+ */
+ public function validateCoordinates($value)
+ {
+ try {
+ LatLng::fromString($value);
+ } catch (\Exception $e) {
+ throw new \InvalidArgumentException(
+ $this->translator->translate('invalidCoordinates', 'leaflet', [$value]),
+ 0,
+ $e
+ );
+ }
+
+ return $value;
+ }
+
+ /**
+ * Validate multiple coordinates.
+ *
+ * @param mixed $values Given value.
+ *
+ * @return mixed
+ */
+ public function validateMultipleCoordinates($values)
+ {
+ if (!is_array($values)) {
+ $lines = explode("\n", $values);
+ } else {
+ $lines = $values;
+ }
+
+ foreach ($lines as $coordinate) {
+ $this->validateCoordinates($coordinate);
+ }
+
+ return $values;
+ }
+
+ /**
+ * Validate multiple coordinate sets.
+ *
+ * @param mixed $values Given value.
+ *
+ * @return mixed
+ */
+ public function validateMultipleCoordinateSets($values)
+ {
+ $sets = deserialize($values, true);
+ foreach ($sets as $lines) {
+ $this->validateMultipleCoordinates($lines);
+ }
+
+ return $values;
+ }
+
+ /**
+ * Validate an alias.
+ *
+ * @param string $value Given value.
+ *
+ * @return string
+ * @throws \InvalidArgumentException When invalid value given.
+ */
+ public function validateAlias($value)
+ {
+ if (preg_match('/^[A-Za-z_]+[A-Za-z0-9_]+$/', $value) !== 1) {
+ throw new \InvalidArgumentException(
+ $this->translator->translate('invalidAlias', 'leaflet')
+ );
+ }
+
+ return $value;
+ }
+}
diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Vector.php b/src/Netzmacht/Contao/Leaflet/Dca/VectorCallbacks.php
similarity index 56%
rename from src/Netzmacht/Contao/Leaflet/Dca/Vector.php
rename to src/Netzmacht/Contao/Leaflet/Dca/VectorCallbacks.php
index adeb619..c38b141 100644
--- a/src/Netzmacht/Contao/Leaflet/Dca/Vector.php
+++ b/src/Netzmacht/Contao/Leaflet/Dca/VectorCallbacks.php
@@ -11,6 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Dca;
+use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks;
use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
use Netzmacht\Contao\Leaflet\Model\StyleModel;
@@ -19,8 +20,22 @@ use Netzmacht\Contao\Leaflet\Model\StyleModel;
*
* @package Netzmacht\Contao\Leaflet\Dca
*/
-class Vector
+class VectorCallbacks extends Callbacks
{
+ /**
+ * Name of the data container.
+ *
+ * @var string
+ */
+ protected static $name = 'tl_leaflet_vector';
+
+ /**
+ * Helper service name.
+ *
+ * @var string
+ */
+ protected static $serviceName = 'leaflet.dca.vector-callbacks';
+
/**
* Generate the row label.
*
@@ -30,7 +45,11 @@ class Vector
*/
public function generateRow($row)
{
- return sprintf('%s [%s]', $row['title'], $row['type']);
+ return sprintf(
+ '%s (%s)',
+ $row['title'],
+ $this->getFormatter()->formatValue('type', $row['type'])
+ );
}
/**
@@ -42,6 +61,6 @@ class Vector
{
$collection = StyleModel::findAll(array('order' => 'title'));
- return OptionsBuilder::fromCollection($collection, 'id', 'title')->getOptions();
+ return OptionsBuilder::fromCollection($collection, 'title')->getOptions();
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/DependencyInjection/LeafletServices.php b/src/Netzmacht/Contao/Leaflet/DependencyInjection/LeafletServices.php
new file mode 100644
index 0000000..4d3b2a6
--- /dev/null
+++ b/src/Netzmacht/Contao/Leaflet/DependencyInjection/LeafletServices.php
@@ -0,0 +1,106 @@
+
+ * @copyright 2016 netzmacht David Molineus. All rights reserved.
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\DependencyInjection;
+
+use Doctrine\Common\Cache\Cache;
+use Netzmacht\Contao\Leaflet\Boot;
+use Netzmacht\Contao\Leaflet\Frontend\ValueFilter;
+use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
+use Netzmacht\Contao\Leaflet\MapProvider;
+use Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator;
+use Netzmacht\LeafletPHP\Assets;
+use Netzmacht\LeafletPHP\Leaflet;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * Class LeafletServices describes services provided by the leaflet package.
+ *
+ * @package Netzmacht\Contao\Leaflet\DependencyInjection
+ */
+class LeafletServices
+{
+ /**
+ * Service name for the alias generator which creates valid js aliases.
+ *
+ * @return AliasGenerator
+ */
+ const ALIAS_GENERATOR = 'leaflet.alias-generator.default';
+
+ /**
+ * Service name of the boot handler.
+ *
+ * @return Boot
+ */
+ const BOOT = 'leaflet.boot';
+
+ /**
+ * Leaflet cache
+ *
+ * @return Cache
+ */
+ const CACHE = 'leaflet.cache';
+
+ /**
+ * Service name of the definition builder.
+ *
+ * @return Leaflet
+ */
+ const DEFINITION_BUILDER = 'leaflet.definition.builder';
+
+ /**
+ * Service name of the encoder factory used inside of the definition builder.
+ *
+ * @return \callable
+ */
+ const DEFINITION_ENCODER_FACTORY = 'leaflet.definition.builder.encoder-factory';
+
+ /**
+ * Service name of the internal used event dispatcher of the definition builder.
+ *
+ * @return EventDispatcherInterface
+ */
+ const DEFINITION_BUILDER_EVENT_DISPATCHER = 'leaflet.definition.builder.event-dispatcher';
+
+ /**
+ * Service name of the definition mapper.
+ *
+ * @return DefinitionMapper
+ */
+ const DEFINITION_MAPPER = 'leaflet.definition.mapper';
+
+ /**
+ * Service name of the leaflet map provider.
+ *
+ * @return MapProvider
+ */
+ const MAP_PROVIDER = 'leaflet.map.provider';
+
+ /**
+ * Service name of the map assets handler.
+ *
+ * @return Assets
+ */
+ const MAP_ASSETS = 'leaflet.map.assets';
+
+ /**
+ * Service name of the frontend value filter.
+ *
+ * @return ValueFilter
+ */
+ const FRONTEND_VALUE_FILTER = 'leaflet.frontend.value-filter';
+
+ /**
+ * Service name for the alias generator uses for rows being unique in the pid.
+ *
+ * @return AliasGenerator
+ */
+ const PARENT_ALIAS_GENERATOR = 'leaflet.alias-generator.parent';
+}
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/AbstractMapHybrid.php b/src/Netzmacht/Contao/Leaflet/Frontend/AbstractMapHybrid.php
new file mode 100644
index 0000000..ad04a26
--- /dev/null
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/AbstractMapHybrid.php
@@ -0,0 +1,150 @@
+
+ * @copyright 2015 netzmacht creative David Molineus
+ * @license LGPL 3.0
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Frontend;
+
+use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator;
+use Database\Result;
+use Model\Collection;
+use Netzmacht\Contao\Leaflet\MapProvider;
+use Netzmacht\Contao\Leaflet\Model\MapModel;
+use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid;
+use Netzmacht\Contao\Toolkit\View\Template\TemplateFactory;
+
+/**
+ * Class HybridTrait provides method required by the frontend module and content element the same time.
+ *
+ * @package Netzmacht\Contao\Leaflet\Frontend
+ */
+abstract class AbstractMapHybrid extends AbstractHybrid
+{
+ /**
+ * The map provider.
+ *
+ * @var MapProvider
+ */
+ private $mapProvider;
+
+ /**
+ * The user input.
+ *
+ * @var \Input
+ */
+ private $input;
+
+ /**
+ * The Contao config.
+ *
+ * @var \Config
+ */
+ private $config;
+
+ /**
+ * HybridTrait constructor.
+ *
+ * @param Result|\Model|Collection $model Component model.
+ * @param TemplateFactory $templateFactory Template factory.
+ * @param Translator $translator Translator.
+ * @param MapProvider $mapProvider Map provider.
+ * @param \Input $input Request Input.
+ * @param \Config $config Config.
+ * @param string $column Column in which the element appears.
+ */
+ public function __construct(
+ $model,
+ TemplateFactory $templateFactory,
+ Translator $translator,
+ MapProvider $mapProvider,
+ \Input $input,
+ \Config $config,
+ $column = null
+ ) {
+ parent::__construct($model, $templateFactory, $translator, $column);
+
+ $this->mapProvider = $mapProvider;
+ $this->input = $input;
+ $this->config = $config;
+ }
+
+ /**
+ * Do the frontend integration generation.
+ *
+ * @return string
+ */
+ public function generate()
+ {
+ $this->mapProvider->handleAjaxRequest($this->getIdentifier());
+
+ if (TL_MODE === 'BE') {
+ $model = MapModel::findByPk($this->get('leaflet_map'));
+
+ $template = $this->getTemplateFactory()->createBackendTemplate('be_wildcard');
+
+ if ($model) {
+ $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id;
+
+ $template->set('wildcard', '### LEAFLET MAP ' . $model->title . ' ###');
+ $template->set('title', $this->get('headline'));
+ $template->set('id', $model->id);
+ $template->set('link', $model->title);
+ $template->set('href', $href);
+ }
+
+ return $template->parse();
+ }
+
+ return parent::generate();
+ }
+
+ /**
+ * Do the frontend integration compiling.
+ *
+ * @return void
+ *
+ * @throws \Exception If the map could not be created.
+ *
+ * @SuppressWarnings(PHPMD.Superglobals)
+ */
+ protected function compile()
+ {
+ try {
+ $template = $this->get('leaflet_template') ?: 'leaflet_map_js';
+ $mapId = $this->getIdentifier();
+ $map = $this->mapProvider->generate($this->get('leaflet_map'), null, $mapId, $template);
+
+ $this->template->set('javascript', $map);
+ $this->template->set('mapId', $mapId);
+
+ $style = '';
+ $height = deserialize($this->get('leaflet_height'), true);
+ $width = deserialize($this->get('leaflet_width'), true);
+
+ if (!empty($width['value'])) {
+ $style .= 'width:' . $width['value'] . $width['unit'] . ';';
+ }
+
+ if (!empty($height['value'])) {
+ $style .= 'height:' . $height['value'] . $height['unit'] . ';';
+ }
+
+ $this->template->set('mapStyle', $style);
+ } catch (\Exception $e) {
+ throw $e;
+ }
+ }
+
+ /**
+ * Get the component identifier which is used as unique name.
+ *
+ * @return string
+ */
+ abstract protected function getIdentifier();
+}
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/DataController.php b/src/Netzmacht/Contao/Leaflet/Frontend/DataController.php
index 1b9d67b..20b3d45 100644
--- a/src/Netzmacht/Contao/Leaflet/Frontend/DataController.php
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/DataController.php
@@ -12,7 +12,7 @@
namespace Netzmacht\Contao\Leaflet\Frontend;
use Netzmacht\Contao\Leaflet\Filter\Filter;
-use Netzmacht\Contao\Leaflet\MapService;
+use Netzmacht\Contao\Leaflet\MapProvider;
/**
* The data controller handles ajax request for sub data.
@@ -22,11 +22,11 @@ use Netzmacht\Contao\Leaflet\MapService;
class DataController
{
/**
- * The map service.
+ * The map provider.
*
- * @var MapService
+ * @var MapProvider
*/
- private $mapService;
+ private $mapProvider;
/**
* The user input data.
@@ -40,39 +40,59 @@ class DataController
'filter' => null,
'values' => null
);
+
+ /**
+ * Filters configuration.
+ *
+ * @var array
+ */
+ private $filters;
+
+ /**
+ * Display errors.
+ *
+ * @var bool
+ */
+ private $displayErrors;
/**
* Construct.
*
- * @param MapService $mapService The map service.
- * @param array $input The user input as array.
+ * @param MapProvider $mapProvider The map provider.
+ * @param array $filters Filters configuration.
+ * @param bool $displayErrors Display errors.
*/
- public function __construct(MapService $mapService, $input)
+ public function __construct(MapProvider $mapProvider, array $filters, $displayErrors)
{
- $this->mapService = $mapService;
- $this->input = array_merge($this->input, $input);
+ $this->mapProvider = $mapProvider;
+ $this->filters = $filters;
+ $this->displayErrors = $displayErrors;
}
/**
* Execute the controller and create the data response.
*
+ * @param array $input The user input as array.
+ *
* @return void
*
* @throws \Exception If anything went wrong.
*/
- public function execute()
+ public function execute(array $input)
{
+ $input = array_merge($this->input, $input);
+
try {
- if ($this->input['filter']) {
- $filter = $this->createFilter();
+ if ($input['filter']) {
+ $filter = $this->createFilter($input);
} else {
$filter = null;
}
- list($data, $error) = $this->loadData($this->input['type'], $this->input['id'], $filter);
- $this->encodeData($this->input['format'], $data);
+ list($data, $error) = $this->loadData($input['type'], $input['id'], $filter);
+ $this->encodeData($input['format'], $data);
} catch (\Exception $e) {
- if (\Config::get('debugMode') || \Config::get('displayErrors')) {
+ if ($this->displayErrors) {
throw $e;
}
$error = true;
@@ -120,7 +140,7 @@ class DataController
switch ($type) {
case 'layer':
- $data = $this->mapService->getFeatureCollection($dataId, $filter);
+ $data = $this->mapProvider->getFeatureCollection($dataId, $filter);
break;
default:
@@ -135,20 +155,22 @@ class DataController
/**
* Create a filter.
*
+ * @param array $input The user input as array.
+ *
* @return Filter
* @throws \RuntimeException If the filter is not defined.
*
* @SuppressWarnings(PHPMD.Superglobals)
*/
- private function createFilter()
+ private function createFilter($input)
{
- if (!isset($GLOBALS['LEAFLET_FILTERS'][$this->input['filter']])) {
- throw new \RuntimeException(sprintf('Undefined filter "%s".', $this->input['filter']));
+ if (!isset($this->filters[$input['filter']])) {
+ throw new \RuntimeException(sprintf('Undefined filter "%s".', $input['filter']));
}
/** @var Filter $filter */
- $filter = $GLOBALS['LEAFLET_FILTERS'][$this->input['filter']];
+ $filter = $this->filters[$input['filter']];
- return $filter::fromRequest($this->input['values']);
+ return $filter::fromRequest($input['values']);
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/HybridTrait.php b/src/Netzmacht/Contao/Leaflet/Frontend/HybridTrait.php
deleted file mode 100644
index d163004..0000000
--- a/src/Netzmacht/Contao/Leaflet/Frontend/HybridTrait.php
+++ /dev/null
@@ -1,129 +0,0 @@
-
- * @copyright 2015 netzmacht creative David Molineus
- * @license LGPL 3.0
- * @filesource
- *
- */
-
-namespace Netzmacht\Contao\Leaflet\Frontend;
-
-use Netzmacht\Contao\Leaflet\MapService;
-use Netzmacht\Contao\Leaflet\Model\MapModel;
-
-/**
- * Class HybridTrait provides method required by the frontend module and content element the same time.
- *
- * @package Netzmacht\Contao\Leaflet\Frontend
- */
-trait HybridTrait
-{
- /**
- * The map service.
- *
- * @var MapService
- */
- private $mapService;
-
- /**
- * The user input.
- *
- * @var \Input
- */
- private $input;
-
- /**
- * The Contao config.
- *
- * @var \Config
- */
- private $config;
-
- /**
- * Construct.
- *
- * @param \ContentModel $objElement Content element model.
- * @param string $strColumn Layout column.
- *
- * @return void
- */
- protected function construct($objElement, $strColumn = 'main')
- {
- parent::__construct($objElement, $strColumn);
-
- $this->mapService = static::getService('leaflet.map.service');
- $this->input = static::getService('input');
- $this->config = static::getService('config');
- }
-
- /**
- * Do the frontend integration generation.
- *
- * @return string
- */
- public function generate()
- {
- $this->mapService->handleAjaxRequest($this->getIdentifier());
-
- if (TL_MODE === 'BE') {
- $model = MapModel::findByPK($this->leaflet_map);
-
- $template = new \BackendTemplate('be_wildcard');
-
- if ($model) {
- $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id;
-
- $template->wildcard = '### LEAFLET MAP ' . $model->title . ' ###';
- $template->title = $this->headline;
- $template->id = $model->id;
- $template->link = $model->title;
- $template->href = $href;
- }
-
- return $template->parse();
- }
-
- return parent::generate();
- }
-
- /**
- * Do the frontend integration compiling.
- *
- * @return void
- *
- * @throws \Exception If the map could not be created.
- *
- * @SuppressWarnings(PHPMD.Superglobals)
- */
- protected function compile()
- {
- try {
- $template = $this->leaflet_template ?: 'leaflet_map_js';
- $mapId = $this->getIdentifier();
- $map = $this->mapService->generate($this->leaflet_map, null, $mapId, $template);
-
- $GLOBALS['TL_BODY'][] = '';
-
- $this->Template->mapId = $mapId;
-
- $style = '';
- $height = deserialize($this->leaflet_height, true);
- $width = deserialize($this->leaflet_width, true);
-
- if (!empty($width['value'])) {
- $style .= 'width:' . $width['value'] . $width['unit'] . ';';
- }
-
- if (!empty($height['value'])) {
- $style .= 'height:' . $height['value'] . $height['unit'] . ';';
- }
-
- $this->Template->mapStyle = $style;
- } catch (\Exception $e) {
- throw $e;
- }
- }
-}
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/InsertTag/LeafletInsertTagParser.php b/src/Netzmacht/Contao/Leaflet/Frontend/InsertTag/LeafletInsertTagParser.php
index 61f140f..8448e00 100644
--- a/src/Netzmacht/Contao/Leaflet/Frontend/InsertTag/LeafletInsertTagParser.php
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/InsertTag/LeafletInsertTagParser.php
@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Frontend\InsertTag;
-use Netzmacht\Contao\Leaflet\MapService;
+use Netzmacht\Contao\Leaflet\MapProvider;
use Netzmacht\Contao\Toolkit\InsertTag\Parser;
/**
@@ -31,9 +31,9 @@ class LeafletInsertTagParser implements Parser
/**
* The map service.
*
- * @var MapService
+ * @var MapProvider
*/
- private $mapService;
+ private $mapProvider;
/**
* Debug mode.
@@ -45,13 +45,13 @@ class LeafletInsertTagParser implements Parser
/**
* LeafletInsertTagParser constructor.
*
- * @param MapService $mapService Map service.
- * @param bool $debugMode Debug mode.
+ * @param MapProvider $mapProvider Map provider.
+ * @param bool $debugMode Debug mode.
*/
- public function __construct(MapService $mapService, $debugMode)
+ public function __construct(MapProvider $mapProvider, $debugMode)
{
- $this->mapService = $mapService;
- $this->debugMode = $debugMode;
+ $this->mapProvider = $mapProvider;
+ $this->debugMode = $debugMode;
}
/**
@@ -101,7 +101,7 @@ class LeafletInsertTagParser implements Parser
private function generateMap($mapId, $template, $style)
{
try {
- return $this->mapService->generate($mapId, null, $mapId, $template, $style);
+ return $this->mapProvider->generate($mapId, null, $mapId, $template, $style);
} catch (\Exception $e) {
if ($this->debugMode) {
throw $e;
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php b/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php
index 826cbc2..3ebaf40 100644
--- a/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php
@@ -11,34 +11,19 @@
namespace Netzmacht\Contao\Leaflet\Frontend;
-use ContentElement;
-use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
-use Netzmacht\Contao\Leaflet\MapService;
-
/**
* The content element for the leaflet map.
*
* @property int leaflet_map
*/
-class MapElement extends \ContentElement
+class MapElement extends AbstractMapHybrid
{
- use ServiceContainerTrait;
- use HybridTrait;
-
/**
* Template name.
*
* @var string
*/
- protected $strTemplate = 'ce_leaflet_map';
-
- /**
- * {@inheritdoc}
- */
- public function __construct($objElement, $strColumn = 'main')
- {
- $this->construct($objElement, $strColumn);
- }
+ protected $templateName = 'ce_leaflet_map';
/**
* Get the identifier.
@@ -47,14 +32,14 @@ class MapElement extends \ContentElement
*/
protected function getIdentifier()
{
- if ($this->leaflet_mapId) {
- return $this->leaflet_mapId;
+ if ($this->get('leaflet_mapId')) {
+ return $this->get('leaflet_mapId');
}
- if ($this->cssID[0]) {
- return 'map_' . $this->cssID[0];
+ if ($this->get('cssID')[0]) {
+ return 'map_' . $this->get('cssID')[0];
}
- return 'map_ce_' . $this->id;
+ return 'map_ce_' . $this->get('id');
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php b/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php
index 1e376ee..ad58ba1 100644
--- a/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php
@@ -11,33 +11,19 @@
namespace Netzmacht\Contao\Leaflet\Frontend;
-use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
-use Netzmacht\Contao\Leaflet\MapService;
-
/**
* The frontend module for the Leaflet map.
*
* @package Netzmacht\Contao\Leaflet\Frontend
*/
-class MapModule extends \Module
+class MapModule extends AbstractMapHybrid
{
- use ServiceContainerTrait;
- use HybridTrait;
-
/**
* Template name.
*
* @var string
*/
- protected $strTemplate = 'mod_leaflet_map';
-
- /**
- * {@inheritdoc}
- */
- public function __construct($objElement, $strColumn = 'main')
- {
- $this->construct($objElement, $strColumn);
- }
+ protected $templateName = 'mod_leaflet_map';
/**
* Get the identifier.
@@ -46,14 +32,14 @@ class MapModule extends \Module
*/
protected function getIdentifier()
{
- if ($this->leaflet_mapId) {
- return $this->leaflet_mapId;
+ if ($this->get('leaflet_mapId')) {
+ return $this->get('leaflet_mapId');
}
- if ($this->cssID[0]) {
- return 'map_' . $this->cssID[0];
+ if ($this->get('cssID')[0]) {
+ return 'map_' . $this->get('cssID')[0];
}
- return 'map_mod_' . $this->id;
+ return 'map_mod_' . $this->get('id');
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/MapService.php b/src/Netzmacht/Contao/Leaflet/MapProvider.php
similarity index 61%
rename from src/Netzmacht/Contao/Leaflet/MapService.php
rename to src/Netzmacht/Contao/Leaflet/MapProvider.php
index e82d535..4e14c6c 100644
--- a/src/Netzmacht/Contao/Leaflet/MapService.php
+++ b/src/Netzmacht/Contao/Leaflet/MapProvider.php
@@ -11,6 +11,7 @@
namespace Netzmacht\Contao\Leaflet;
+use Doctrine\Common\Cache\Cache;
use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Frontend\DataController;
@@ -18,18 +19,17 @@ use Netzmacht\Contao\Leaflet\Frontend\RequestUrl;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\Contao\Leaflet\Model\MapModel;
-use Netzmacht\LeafletPHP\Assets;
use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection;
use Netzmacht\LeafletPHP\Definition\Map;
use Netzmacht\LeafletPHP\Leaflet;
use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher;
/**
- * Class MapService.
+ * Class MapProvider.
*
* @package Netzmacht\Contao\Leaflet
*/
-class MapService
+class MapProvider
{
/**
* The definition mapper.
@@ -62,10 +62,31 @@ class MapService
/**
* Map assets collector.
*
- * @var Assets
+ * @var ContaoAssets
*/
private $assets;
+ /**
+ * Request filters configuration.
+ *
+ * @var array
+ */
+ private $filters;
+
+ /**
+ * Display errors setting.
+ *
+ * @var bool
+ */
+ private $displayErrors;
+
+ /**
+ * Cache.
+ *
+ * @var Cache
+ */
+ private $cache;
+
/**
* Construct.
*
@@ -73,20 +94,29 @@ class MapService
* @param Leaflet $leaflet The Leaflet instance.
* @param EventDispatcher $eventDispatcher The Contao event dispatcher.
* @param \Input $input Thw request input.
- * @param Assets $assets Assets handler.
+ * @param ContaoAssets $assets Assets handler.
+ * @param Cache $cache Cache.
+ * @param array $filters Request filters configuration.
+ * @param bool $displayErrors Display errors setting.
*/
public function __construct(
DefinitionMapper $mapper,
Leaflet $leaflet,
EventDispatcher $eventDispatcher,
\Input $input,
- Assets $assets
+ ContaoAssets $assets,
+ Cache $cache,
+ array $filters,
+ $displayErrors
) {
$this->mapper = $mapper;
$this->leaflet = $leaflet;
$this->eventDispatcher = $eventDispatcher;
$this->input = $input;
$this->assets = $assets;
+ $this->filters = $filters;
+ $this->displayErrors = $displayErrors;
+ $this->cache = $cache;
}
/**
@@ -145,9 +175,6 @@ class MapService
*
* @return string
* @throws \Exception If generating went wrong.
- *
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function generate(
$mapId,
@@ -156,23 +183,38 @@ class MapService
$template = 'leaflet_map_js',
$style = ''
) {
- $definition = $this->getDefinition($mapId, $filter, $elementId);
- $template = \Controller::getTemplate($template);
+ if ($mapId instanceof MapModel) {
+ $model = $mapId;
+ $mapId = $mapId->id;
+ } else {
+ $model = $this->getModel($mapId);
+ }
- // @codingStandardsIgnoreStart - Set for the template.
- $javascript = $this->leaflet->build($definition, $this->assets);
- $mapId = $definition->getId();
- // @codingStandardsIgnoreEnd
+ if ($model->cache) {
+ $cacheKey = $this->getCacheKey($mapId, $filter, $elementId, $template, $style);
- ob_start();
- include $template;
- $content = ob_get_contents();
- ob_end_clean();
+ if ($this->cache->contains($cacheKey)) {
+ $cached = $this->cache->fetch($cacheKey);
+ $this->assets->fromArray($cached['assets']);
- $event = new GetJavascriptEvent($definition, $content);
- $this->eventDispatcher->dispatch($event::NAME, $event);
+ return $cached['javascript'];
+ }
+ }
- return $event->getJavascript();
+ $buffer = $this->doGenerate($mapId, $filter, $elementId, $template, $model, $style);
+
+ if ($model->cache) {
+ $this->cache->save(
+ $cacheKey,
+ [
+ 'assets' => $this->assets->toArray(),
+ 'javascript' => $buffer
+ ],
+ (int) $model->cacheLifeTime
+ );
+ }
+
+ return $buffer;
}
/**
@@ -197,7 +239,23 @@ class MapService
throw new \InvalidArgumentException(sprintf('Could not find layer "%s"', $layerId));
}
- return $this->mapper->handleGeoJson($model, $filter);
+ if (!$model->cache) {
+ return $this->mapper->handleGeoJson($model, $filter);
+ }
+
+ $cacheKey = 'feature_layer_' . $model->id;
+ if ($filter) {
+ $cacheKey .= '.filter_' . md5($filter->toRequest());
+ }
+
+ if ($this->cache->contains($cacheKey)) {
+ return $this->cache->fetch($cacheKey);
+ }
+
+ $collection = $this->mapper->handleGeoJson($model, $filter);
+ $this->cache->save($cacheKey, $collection, $model->cacheLifeTime);
+
+ return $collection;
}
/**
@@ -232,12 +290,83 @@ class MapService
return;
}
- $controller = new DataController($this, $data);
- $controller->execute();
+ $controller = new DataController($this, $this->filters, $this->displayErrors);
+ $controller->execute($data);
if ($exit) {
exit;
}
}
}
+
+ /**
+ * Get the cache key.
+ *
+ * @param int $mapId The map database id.
+ * @param Filter|null $filter Optional request filter.
+ * @param string $elementId Optional element id. If none given the mapId or alias is used.
+ * @param string $template The template being used for generating.
+ * @param string $style Optional style attributes.
+ *
+ * @return string
+ */
+ protected function getCacheKey($mapId, $filter, $elementId, $template, $style)
+ {
+ $cacheKey = 'map_' . $mapId;
+
+ if ($filter) {
+ $cacheKey .= '.filter_' . md5($filter->toRequest());
+ }
+
+ if ($elementId) {
+ $cacheKey .= '.element_' . $elementId;
+ }
+
+ $cacheKey .= '.template_' . $template;
+
+ if ($style) {
+ $cacheKey .= '.style_' . md5($style);
+
+ return $cacheKey;
+ }
+
+ return $cacheKey;
+ }
+
+ /**
+ * Do the generating of the map.
+ *
+ * @param MapModel $model Map model.
+ * @param Filter|null $filter Optional request filter.
+ * @param string $elementId Optional element id. If none given the mapId or alias is used.
+ * @param string $template The template being used for generating.
+ * @param string $style Optional style attributes.
+ *
+ * @return string
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
+ protected function doGenerate($model, $filter, $elementId, $template, $style)
+ {
+ $definition = $this->getDefinition($model, $filter, $elementId);
+ $template = \Controller::getTemplate($template);
+
+ // @codingStandardsIgnoreStart - Set for the template.
+ $javascript = $this->leaflet->build($definition, $this->assets);
+ $mapId = $definition->getId();
+ // @codingStandardsIgnoreEnd
+
+ ob_start();
+ include $template;
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ $event = new GetJavascriptEvent($definition, $content);
+ $this->eventDispatcher->dispatch($event::NAME, $event);
+
+ $buffer = $event->getJavascript();
+
+ return $buffer;
+ }
}
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php
index 2024c81..cf36b8f 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php
@@ -11,9 +11,11 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
+use Netzmacht\Contao\Leaflet\ContaoAssets;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
+use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager;
use Netzmacht\JavascriptBuilder\Type\AnonymousFunction;
use Netzmacht\JavascriptBuilder\Type\Expression;
use Netzmacht\LeafletPHP\Definition;
@@ -42,6 +44,25 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper
*/
protected static $type = 'markercluster';
+ /**
+ * Assets manager.
+ *
+ * @var ContaoAssets
+ */
+ private $assets;
+
+ /**
+ * MarkerClusterLayerMapper constructor.
+ *
+ * @param ContaoAssets $assets Assets manager.
+ */
+ public function __construct(ContaoAssets $assets)
+ {
+ parent::__construct();
+
+ $this->assets = $assets;
+ }
+
/**
* {@inheritdoc}
*/
@@ -61,7 +82,6 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper
/**
* {@inheritdoc}
- * @SuppressWarnings(PHPMD.Superglobals)
*/
protected function build(
Definition $definition,
@@ -83,7 +103,7 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper
}
if (!$model->disableDefaultStyle) {
- $GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/leaflet-markercluster/MarkerCluster.Default.css||static';
+ $this->assets->addStylesheet('assets/leaflet/libs/leaflet-markercluster/MarkerCluster.Default.css');
}
$collection = LayerModel::findBy(
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php
index ee45ed2..9652ff4 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php
@@ -40,11 +40,11 @@ class ProviderLayerMapper extends AbstractLayerMapper
/**
* Construct.
*
- * @SuppressWarnings(PHPMD.Superglobals)
+ * @param array $providers Registered providers.
*/
- public function __construct()
+ public function __construct(array $providers)
{
- $this->providers = &$GLOBALS['LEAFLET_TILE_PROVIDERS'];
+ $this->providers = $providers;
parent::__construct();
}
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php
index 1741e40..e4d1bcb 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php
@@ -14,6 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Model\ControlModel;
use Netzmacht\Contao\Leaflet\Model\MapModel;
+use Netzmacht\JavascriptBuilder\Type\Expression;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Definition\Control;
use Netzmacht\LeafletPHP\Definition\Layer;
@@ -98,7 +99,11 @@ class MapMapper extends AbstractMapper
protected function buildCustomOptions(Map $map, MapModel $model)
{
if ($model->options) {
- $map->setOptions(json_decode($model->options, true));
+ $options = json_decode($model->options, true);
+
+ if (is_array($options)) {
+ $map->setOptions($options);
+ }
}
$map->setOption('dynamicLoad', (bool) $model->dynamicLoad);
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/OptionsBuilder.php b/src/Netzmacht/Contao/Leaflet/Mapper/OptionsBuilder.php
index 511f214..1d5458f 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/OptionsBuilder.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/OptionsBuilder.php
@@ -12,6 +12,7 @@
namespace Netzmacht\Contao\Leaflet\Mapper;
use Netzmacht\LeafletPHP\Definition;
+use Netzmacht\LeafletPHP\Definition\HasOptions;
/**
* Class OptionsBuilder handles the option mapping between the database model and the definition.
@@ -236,7 +237,7 @@ class OptionsBuilder
if (method_exists($definition, $setter)) {
$definition->$setter($value);
- } else {
+ } elseif ($definition instanceof HasOptions) {
$definition->setOption($option, $value);
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/AbstractVectorMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/AbstractVectorMapper.php
index 6eb04e8..513834f 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/AbstractVectorMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/AbstractVectorMapper.php
@@ -69,7 +69,7 @@ class AbstractVectorMapper extends AbstractTypeMapper
parent::build($definition, $model, $mapper, $filter);
if ($definition instanceof Path && $model->style) {
- $styleModel = StyleModel::findActiveByPk($model->style);
+ $styleModel = StyleModel::findActiveByPK($model->style);
if ($styleModel) {
$style = $mapper->handle($styleModel);
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php
index 0c28633..cb39ba7 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php
@@ -14,6 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\LeafletPHP\Definition;
+use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker;
use Netzmacht\LeafletPHP\Value\LatLng;
use Netzmacht\LeafletPHP\Definition\Vector\Circle;
@@ -60,7 +61,7 @@ class CircleMapper extends AbstractVectorMapper
) {
parent::build($definition, $model, $mapper, $filter);
- if ($definition instanceof Circle) {
+ if ($definition instanceof CircleMarker) {
$definition->setLatLng(LatLng::fromString($model->coordinates));
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMarkerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMarkerMapper.php
index 01d0718..61ad12f 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMarkerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMarkerMapper.php
@@ -11,8 +11,6 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Vector;
-use Netzmacht\LeafletPHP\Definition;
-
/**
* Class CircleMarkerMapper maps the database model to the circle marker definition.
*
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolygonMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolygonMapper.php
index 8f3e2a2..72fb405 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolygonMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolygonMapper.php
@@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\LeafletPHP\Definition;
-use Netzmacht\LeafletPHP\Definition\Vector\MultiPolygon;
+use Netzmacht\LeafletPHP\Definition\Vector\Polygon;
/**
* Class MultiPolygonMapper maps the multi polygon database model to its definition.
@@ -28,7 +28,7 @@ class MultiPolygonMapper extends MultiPolylineMapper
*
* @var string
*/
- protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\MultiPolygon';
+ protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Polygon';
/**
* Layer type.
@@ -49,7 +49,7 @@ class MultiPolygonMapper extends MultiPolylineMapper
) {
parent::build($definition, $model, $mapper, $filter);
- if ($definition instanceof MultiPolygon) {
+ if ($definition instanceof Polygon) {
$this->createLatLngs($definition, $model);
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php
index a744b7a..7ecbc82 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php
@@ -14,8 +14,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\LeafletPHP\Definition;
+use Netzmacht\LeafletPHP\Definition\Vector\Polyline;
use Netzmacht\LeafletPHP\Value\LatLng;
-use Netzmacht\LeafletPHP\Definition\Vector\MultiPolyline;
/**
* Class MultiPolylineMapper maps the databse model it the multi polyline definition.
@@ -29,7 +29,7 @@ class MultiPolylineMapper extends AbstractVectorMapper
*
* @var string
*/
- protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\MultiPolyline';
+ protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Polyline';
/**
* Layer type.
@@ -50,7 +50,7 @@ class MultiPolylineMapper extends AbstractVectorMapper
) {
parent::build($definition, $model, $mapper, $filter);
- if ($definition instanceof MultiPolyline) {
+ if ($definition instanceof Polyline) {
$this->createLatLngs($definition, $model);
}
}
@@ -58,24 +58,22 @@ class MultiPolylineMapper extends AbstractVectorMapper
/**
* Create lat lngs for the definition.
*
- * @param MultiPolyline $definition The multi polyline.
- * @param \Model $model The definition model.
+ * @param Polyline $definition The multi polyline.
+ * @param \Model $model The definition model.
*
* @return void
*/
- protected function createLatLngs(MultiPolyline $definition, \Model $model)
+ protected function createLatLngs(Polyline $definition, \Model $model)
{
- $latLngs = array();
-
- foreach (deserialize($model->multiData, true) as $data) {
- $latLngs[] = array_map(
+ foreach (deserialize($model->multiData, true) as $ring => $data) {
+ $latLngs = array_map(
function ($row) {
return LatLng::fromString($row);
},
explode("\n", $data)
);
- }
- $definition->setLatLngs($latLngs);
+ $definition->addLatLngs($latLngs, $ring);
+ }
}
}
diff --git a/src/Netzmacht/Contao/Leaflet/Model/MapModel.php b/src/Netzmacht/Contao/Leaflet/Model/MapModel.php
index a3795f1..a5b4288 100644
--- a/src/Netzmacht/Contao/Leaflet/Model/MapModel.php
+++ b/src/Netzmacht/Contao/Leaflet/Model/MapModel.php
@@ -17,6 +17,8 @@ use Model\Collection;
* Class MapModel for the tl_leaflet_map table.
*
* @property mixed|null locate
+ * @property mixed|null title
+ *
* @package Netzmacht\Contao\Leaflet\Model
*/
class MapModel extends \Model
diff --git a/src/Netzmacht/Contao/Leaflet/ServiceContainer.php b/src/Netzmacht/Contao/Leaflet/ServiceContainer.php
deleted file mode 100644
index 4396991..0000000
--- a/src/Netzmacht/Contao/Leaflet/ServiceContainer.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- * @copyright 2015 netzmacht creative David Molineus
- * @license LGPL 3.0
- * @filesource
- *
- */
-
-namespace Netzmacht\Contao\Leaflet;
-
-use Netzmacht\Contao\Leaflet\Frontend\ValueFilter;
-
-/**
- * Class ServiceContainer provides the services which are available for Contao leaflet.
- *
- * @package Netzmacht\Contao\Leaflet
- */
-class ServiceContainer
-{
- /**
- * The global service container.
- *
- * @var \Pimple
- */
- private $container;
-
- /**
- * Construct.
- *
- * @param \Pimple $container The global service container.
- */
- public function __construct(\Pimple $container)
- {
- $this->container = $container;
- }
-
- /**
- * Get the value filter service.
- *
- * @return ValueFilter
- */
- public function getFrontendValueFilter()
- {
- return $this->getService('leaflet.frontend.value-filter');
- }
-
- /**
- * Get a service from the container.
- *
- * @param string $name The service name.
- *
- * @return mixed
- */
- public function getService($name)
- {
- return $this->container[$name];
- }
-}
diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php b/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php
index 48bdd36..5809307 100644
--- a/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php
+++ b/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php
@@ -12,6 +12,8 @@
namespace Netzmacht\Contao\Leaflet\Subscriber;
use ContaoCommunityAlliance\Contao\EventDispatcher\EventDispatcherInitializer;
+use Netzmacht\Contao\Leaflet\ContaoAssets;
+use Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices;
use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent;
use Netzmacht\Contao\Leaflet\Event\InitializeDefinitionMapperEvent;
use Netzmacht\Contao\Leaflet\Event\InitializeEventDispatcherEvent;
@@ -20,7 +22,9 @@ use Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Mapper\Mapper;
use Netzmacht\Contao\Leaflet\Model\IconModel;
-use Netzmacht\Contao\Toolkit\Event\InitializeSystemEvent;
+use Netzmacht\Contao\Toolkit\Boot\Event\InitializeSystemEvent;
+use Netzmacht\Contao\Toolkit\DependencyInjection\Services;
+use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager;
use Netzmacht\LeafletPHP\Assets;
use Netzmacht\LeafletPHP\Definition\Type\ImageIcon;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -32,6 +36,61 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
*/
class BootSubscriber implements EventSubscriberInterface
{
+ /**
+ * Leaflet mapper configuration.
+ *
+ * @var array
+ */
+ private $mappers;
+
+ /**
+ * Leaflet encoder configuration.
+ *
+ * @var array
+ */
+ private $encoders;
+
+ /**
+ * Leaflet libraries configuration.
+ *
+ * @var array
+ */
+ private $libraries;
+
+ /**
+ * Assets manager.
+ *
+ * @var ContaoAssets
+ */
+ private $assets;
+
+ /**
+ * Definition mapper.
+ *
+ * @var DefinitionMapper
+ */
+ private $definitionMapper;
+
+ /**
+ * BootSubscriber constructor.
+ *
+ * @param ContaoAssets $assets Leaflet assets manager.
+ * @param array $mappers Leaflet mapper configuration.
+ * @param array $encoders Leaflet encoder configuration.
+ * @param array $libraries Leaflet libraries configuration.
+ */
+ public function __construct(
+ ContaoAssets $assets,
+ array $mappers,
+ array $encoders,
+ array $libraries
+ ) {
+ $this->assets = $assets;
+ $this->mappers = $mappers;
+ $this->encoders = $encoders;
+ $this->libraries = $libraries;
+ }
+
/**
* {@inheritdoc}
*/
@@ -55,12 +114,12 @@ class BootSubscriber implements EventSubscriberInterface
*/
public function initializeInsertTagParser(InitializeSystemEvent $event)
{
- $container = $event->getServiceContainer();
- $debugMode = $container->getConfig()->get('debugMode');
- $mapService = $container->getService('leaflet.map.service');
- $parser = new LeafletInsertTagParser($mapService, $debugMode);
+ $container = $event->getContainer();
+ $debugMode = $container->get(Services::CONFIG)->get('debugMode');
+ $mapProvider = $container->get(LeafletServices::MAP_PROVIDER);
+ $parser = new LeafletInsertTagParser($mapProvider, $debugMode);
- $container->getInsertTagReplacer()->registerParser($parser);
+ $container->get(Services::INSERT_TAG_REPLACER)->registerParser($parser);
}
/**
@@ -69,14 +128,13 @@ class BootSubscriber implements EventSubscriberInterface
* @param InitializeDefinitionMapperEvent $event The subscribed event.
*
* @return void
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function initializeDefinitionMapper(InitializeDefinitionMapperEvent $event)
{
- $mapper = $event->getDefinitionMapper();
+ $mapper = $event->getDefinitionMapper();
+ $this->definitionMapper = $mapper;
- foreach ($GLOBALS['LEAFLET_MAPPERS'] as $className) {
+ foreach ($this->mappers as $className) {
if (is_array($className)) {
$mapper->register($this->createMapper($className[0]), $className[1]);
} else {
@@ -91,15 +149,13 @@ class BootSubscriber implements EventSubscriberInterface
* @param InitializeEventDispatcherEvent $event The subscribed event.
*
* @return void
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function initializeEventDispatcher(InitializeEventDispatcherEvent $event)
{
$dispatcher = $event->getEventDispatcher();
$initializer = new EventDispatcherInitializer();
- $initializer->addSubscribers($dispatcher, $GLOBALS['LEAFLET_ENCODERS']);
+ $initializer->addSubscribers($dispatcher, $this->encoders);
}
/**
@@ -108,14 +164,12 @@ class BootSubscriber implements EventSubscriberInterface
* @param InitializeLeafletBuilderEvent $event The subscribed event.
*
* @return void
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function initializeLeafletBuilder(InitializeLeafletBuilderEvent $event)
{
$builder = $event->getBuilder();
- foreach ($GLOBALS['LEAFLET_LIBRARIES'] as $name => $assets) {
+ foreach ($this->libraries as $name => $assets) {
if (!empty($assets['css'])) {
list ($source, $type) = (array) $assets['css'];
$builder->registerStylesheet($name, $source, $type ?: Assets::TYPE_FILE);
@@ -132,34 +186,32 @@ class BootSubscriber implements EventSubscriberInterface
* Load Contao leaflet assets.
*
* @return void
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function loadAssets()
{
- $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/maps/contao-leaflet.js' . $this->staticFlag();
+ $this->assets->addJavascript('assets/leaflet/maps/contao-leaflet.js', ContaoAssets::TYPE_FILE);
}
/**
* Load icons.
*
* @return void
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function loadIcons()
{
+ if (!$this->definitionMapper) {
+ return;
+ }
+
$collection = IconModel::findBy('active', true);
if ($collection) {
- /** @var DefinitionMapper $mapper */
- $mapper = $GLOBALS['container']['leaflet.definition.mapper'];
$buffer = '';
$icons = array();
foreach ($collection as $model) {
/** @var ImageIcon $icon */
- $icon = $mapper->handle($model);
+ $icon = $this->definitionMapper->handle($model);
$icons[] = array(
'id' => $icon->getId(),
'type' => lcfirst($icon->getType()),
@@ -178,39 +230,21 @@ class BootSubscriber implements EventSubscriberInterface
// @codingStandardsIgnoreStart
// TODO: Cache it.
// codingStandardsIgnoreEnd
- $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/js/icons.js' . $this->staticFlag();
+ $this->assets->addJavascript('assets/leaflet/js/icons.js', ContaoAssets::TYPE_FILE);
}
}
- /**
- * Set the static flag.
- *
- * @return string
- */
- private function staticFlag()
- {
- if (\Config::get('debugMode') || TL_MODE !== 'FE') {
- return '';
- }
-
- return '|static';
- }
-
/**
* Create a new mapper.
*
* @param mixed $mapper The mapper class or callable factory.
*
* @return Mapper
- *
- * @SuppressWarnings(PHPMD.Superglobals)
*/
private function createMapper($mapper)
{
if (is_callable($mapper)) {
- $container = $GLOBALS['container']['leaflet.service-container'];
-
- return $mapper($container);
+ return $mapper();
}
return new $mapper;
diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php b/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php
index 03f5b78..5c61296 100644
--- a/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php
+++ b/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php
@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Subscriber;
-use Netzmacht\Contao\Leaflet\Dca\Vector;
+use Netzmacht\Contao\Leaflet\Dca\VectorCallbacks;
use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\LeafletPHP\Value\GeoJson\Feature;
@@ -28,6 +28,23 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
*/
class GeoJsonSubscriber implements EventSubscriberInterface
{
+ /**
+ * Property mapping between models and features.
+ *
+ * @var array
+ */
+ private $featureModelProperties;
+
+ /**
+ * GeoJsonSubscriber constructor.
+ *
+ * @param array $featureModelProperties Property mapping between models and features.
+ */
+ public function __construct(array $featureModelProperties)
+ {
+ $this->featureModelProperties = $featureModelProperties;
+ }
+
/**
* {@inheritdoc}
*/
@@ -83,7 +100,7 @@ class GeoJsonSubscriber implements EventSubscriberInterface
$definition = $event->getDefinition();
$model = $event->getModel();
- if (($definition instanceof Marker || $definition instanceof Vector)
+ if (($definition instanceof Marker || $definition instanceof VectorCallbacks)
&& $model instanceof \Model && $feature instanceof Feature) {
$this->setDataProperty($model, $feature);
$this->setBoundsInformation($model, $feature);
@@ -113,7 +130,6 @@ class GeoJsonSubscriber implements EventSubscriberInterface
* @param ConvertToGeoJsonEvent $event The subscribed events.
*
* @return void
- * @SuppressWarnings(PHPMD.Superglobals)
*/
public function setModelData(ConvertToGeoJsonEvent $event)
{
@@ -121,11 +137,11 @@ class GeoJsonSubscriber implements EventSubscriberInterface
$model = $event->getModel();
if (!$model instanceof \Model || !$feature instanceof Feature
- || empty($GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES'][$model->getTable()])) {
+ || empty($this->featureModelProperties[$model->getTable()])) {
return;
}
- $mapping = $GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES'][$model->getTable()];
+ $mapping = $this->featureModelProperties[$model->getTable()];
$data = (array) $feature->getProperty('model');
foreach ((array) $mapping as $property) {
Individual development
If you have special requirements you can hire me for an individual development.
- +Commercial license
If you want to remove the attribution in the attribution control, you can purchase a commercial license.
- +