Ongoing development.

src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php

@@ -20,6 +20,9 @@ use Netzmacht\LeafletPHP\Definition;
  */
 abstract class AbstractMapper implements Mapper
 {
+    const VALUE_NOT_EMPTY = '__value_not_empty__';
+    const VALUE_EMPTY = '__value_empty__';
+
     /**
      * Class of the model being build.
      *
@@ -109,8 +112,10 @@ abstract class AbstractMapper implements Mapper
      *
      * @return $this
      */
-    public function addConditionalOption($column, $option, $mapping = null, $value = '1')
+    public function addConditionalOption($column, $option = null, $mapping = null, $value = self::VALUE_NOT_EMPTY)
     {
+        $option = $option ?: $column;
+
         if (!isset($this->conditional[$column][$value][$option])) {
             $this->conditional[$column][$value][$option] = $this->getMapping($option, $mapping);
         }
@@ -127,7 +132,7 @@ abstract class AbstractMapper implements Mapper
      *
      * @return $this
      */
-    public function addConditionalOptions($column, array $options, $value = '1')
+    public function addConditionalOptions($column, array $options, $value = self::VALUE_NOT_EMPTY)
     {
         foreach ($options as $key => $option) {
             if (is_numeric($key)) {
@@ -214,7 +219,7 @@ abstract class AbstractMapper implements Mapper
     protected function buildConstructArguments(\Model $model, DefinitionMapper $mapper)
     {
         return array(
-            $model->alias ?: $model->id
+            $model->alias ?: (str_replace('tl_leaflet_', '', $model->getTable()) . '_' . $model->id)
         );
     }
 
@@ -243,7 +248,11 @@ abstract class AbstractMapper implements Mapper
     {
         foreach ($this->conditional as $column => $conditions) {
             foreach ($conditions as $value => $options) {
-                if ($model->$column == $value) {
+                if ($value === static::VALUE_EMPTY && empty($model->$column)) {
+                    $this->applyOptions($options, $definition, $model);
+                } elseif ($value === static::VALUE_NOT_EMPTY && !empty($model->$column)) {
+                    $this->applyOptions($options, $definition, $model);
+                } elseif ($model->$column == $value) {
                     $this->applyOptions($options, $definition, $model);
                 }
             }

src/Netzmacht/Contao/Leaflet/Mapper/AbstractTypeMapper.php

@@ -12,7 +12,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper;
 
 
-abstract class AbstractLayerMapper extends AbstractMapper
+abstract class AbstractTypeMapper extends AbstractMapper
 {
     protected static $type;
 

src/Netzmacht/Contao/Leaflet/Mapper/Control/AbstractControlMapper.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @package    dev
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2015 netzmacht creative David Molineus
+ * @license    LGPL 3.0
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Mapper\Control;
+
+use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper;
+
+class AbstractControlMapper extends AbstractTypeMapper
+{
+    /**
+     * Class of the model being build.
+     *
+     * @var string
+     */
+    protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\ControlModel';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function initialize()
+    {
+        $this->addOption('position');
+    }
+}

src/Netzmacht/Contao/Leaflet/Mapper/Control/LayersControlMapper.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @package    dev
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2015 netzmacht creative David Molineus
+ * @license    LGPL 3.0
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Mapper\Control;
+
+
+class LayersControlMapper extends AbstractControlMapper
+{
+    /**
+     * Class of the definition being created.
+     *
+     * @var string
+     */
+    protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Control\Layers';
+
+    /**
+     * Layer type.
+     *
+     * @var string
+     */
+    protected static $type = 'layers';
+}

src/Netzmacht/Contao/Leaflet/Mapper/Control/ScaleControlMapper.php

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @package    dev
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2015 netzmacht creative David Molineus
+ * @license    LGPL 3.0
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Mapper\Control;
+
+/**
+ * Class ScaleControlMapper maps the database item of the type "scale" to the scale control.
+ *
+ * @package Netzmacht\Contao\Leaflet\Mapper\Control
+ */
+class ScaleControlMapper extends AbstractControlMapper
+{
+    /**
+     * Class of the definition being created.
+     *
+     * @var string
+     */
+    protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Control\Scale';
+
+    /**
+     * Layer type.
+     *
+     * @var string
+     */
+    protected static $type = 'scale';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function initialize()
+    {
+        parent::initialize();
+
+        $this->addOptions('maxWidth', 'metric', 'imperial', 'updateWhenIdle');
+    }
+}

src/Netzmacht/Contao/Leaflet/Mapper/Control/ZoomControlMapper.php

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package    dev
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2015 netzmacht creative David Molineus
+ * @license    LGPL 3.0
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Mapper\Control;
+
+/**
+ * Class ZoomControlMapper maps the zoom database definition to the zoom control.
+ *
+ * @package Netzmacht\Contao\Leaflet\Mapper\Control
+ */
+class ZoomControlMapper extends AbstractControlMapper
+{
+    /**
+     * Class of the definition being created.
+     *
+     * @var string
+     */
+    protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Control\Zoom';
+
+    /**
+     * Layer type.
+     *
+     * @var string
+     */
+    protected static $type = 'zoom';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function initialize()
+    {
+        parent::initialize();
+
+        $this
+            ->addConditionalOption('zoomInText')
+            ->addConditionalOption('zoomOutText')
+            ->addConditionalOption('zoomInTitle')
+            ->addConditionalOption('zoomOutTitle');
+    }
+}

src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php

@@ -12,11 +12,11 @@
 namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
 
 
-use Netzmacht\Contao\Leaflet\Mapper\AbstractLayerMapper;
+use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\LeafletPHP\Definition;
 
-class ProviderLayerMapper extends AbstractLayerMapper
+class ProviderLayerMapper extends AbstractTypeMapper
 {
     /**
      * Class of the model being build.

src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php

@@ -11,6 +11,7 @@
 
 namespace Netzmacht\Contao\Leaflet\Mapper;
 
+use Netzmacht\Contao\Leaflet\Model\ControlModel;
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Leaflet\Model\MapModel;
 use Netzmacht\LeafletPHP\Definition;
@@ -93,6 +94,18 @@ class MapMapper extends AbstractMapper
      */
     private function buildControls(Map $map, MapModel$model, DefinitionMapper $mapper)
     {
+        $collection = ControlModel::findBy(
+            array('pid=?', 'active=1'),
+            array($model->id),
+            array('order' => 'sorting')
+        );
+
+        if ($collection) {
+            foreach ($collection as $control) {
+                $control = $mapper->handle($control);
+                $map->addControl($control);
+            }
+        }
     }
 
     /**