Add vector style management.

This commit is contained in:
David Molineus
2015-01-09 11:53:58 +01:00
parent 9c689b072d
commit 37851110b0
23 changed files with 955 additions and 218 deletions

View File

@@ -0,0 +1,24 @@
<?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\Style;
use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper;
abstract class AbstractStyleMapper extends AbstractTypeMapper
{
/**
* Class of the model being build.
*
* @var string
*/
protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\StyleModel';
}

View File

@@ -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\Style;
use Netzmacht\LeafletPHP\Definition;
class FixedStyleMapper extends AbstractStyleMapper
{
/**
* Definition class.
*
* @var string
*/
protected static $definitionClass = 'Netzmacht\Contao\Leaflet\Definition\Style\FixedStyle';
/**
* Style type.
*
* @var string
*/
protected static $type = 'fixed';
/**
* {@inheritdoc}
*/
protected function initialize()
{
parent::initialize();
$this
->addOptions('stroke', 'weight', 'opacity', 'clickable', 'className')
->addConditionalOption('color')
->addConditionalOption('lineCap')
->addConditionalOption('lineJoin')
->addConditionalOption('dashArray')
->addConditionalOptions('fill', array('fillColor', 'fillOpacity'))
->addOption('fill');
}
}

View File

@@ -12,10 +12,14 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Vector;
use Netzmacht\Contao\Leaflet\Definition\Style;
use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Model\StyleModel;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Definition\HasPopup;
use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds;
use Netzmacht\LeafletPHP\Definition\Vector\Path;
class AbstractVectorMapper extends AbstractTypeMapper
{
@@ -30,25 +34,37 @@ class AbstractVectorMapper extends AbstractTypeMapper
{
parent::initialize();
$this
->addOptions('stroke', 'weight', 'opacity', 'clickable', 'className')
->addConditionalOption('color')
->addConditionalOption('lineCap')
->addConditionalOption('lineJoin')
->addConditionalOption('dashArray')
->addConditionalOptions('fill', array('fill', 'fillColor', 'fillOpacity'))
;
// $this
// ->addOptions('stroke', 'weight', 'opacity', 'clickable', 'className')
// ->addConditionalOption('color')
// ->addConditionalOption('lineCap')
// ->addConditionalOption('lineJoin')
// ->addConditionalOption('dashArray')
// ->addConditionalOptions('fill', array('fill', 'fillColor', 'fillOpacity'))
// ;
}
protected function build(
Definition $definition,
\Model $model,
DefinitionMapper $builder,
DefinitionMapper $mapper,
LatLngBounds $bounds = null
) {
parent::build($definition, $model, $builder, $bounds);
parent::build($definition, $model, $mapper, $bounds);
if ($definition instanceof Definition\HasPopup && $model->addPopup) {
if ($definition instanceof Path && $model->style) {
$styleModel = StyleModel::findActiveByPk($model->style);
if ($styleModel) {
$style = $mapper->handle($styleModel);
if ($style instanceof Style) {
$style->apply($definition);
}
}
}
if ($definition instanceof HasPopup && $model->addPopup) {
$definition->bindPopup($model->popupContent);
}
}