Rework element id generation.

This commit is contained in:
David Molineus
2015-01-09 13:41:09 +01:00
parent 37851110b0
commit efb36256c7
12 changed files with 128 additions and 88 deletions

View File

@@ -30,20 +30,9 @@ class AbstractVectorMapper extends AbstractTypeMapper
*/
protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\VectorModel';
protected function initialize()
{
parent::initialize();
// $this
// ->addOptions('stroke', 'weight', 'opacity', 'clickable', 'className')
// ->addConditionalOption('color')
// ->addConditionalOption('lineCap')
// ->addConditionalOption('lineJoin')
// ->addConditionalOption('dashArray')
// ->addConditionalOptions('fill', array('fill', 'fillColor', 'fillOpacity'))
// ;
}
/**
* {@inheritdoc}
*/
protected function build(
Definition $definition,
\Model $model,

View File

@@ -40,8 +40,12 @@ class RectangleMapper extends AbstractVectorMapper
parent::initialize();
}
protected function buildConstructArguments(\Model $model, DefinitionMapper $mapper, LatLngBounds $bounds = null)
{
protected function buildConstructArguments(
\Model $model,
DefinitionMapper $mapper,
LatLngBounds $bounds = null,
$elementId = null
) {
$latLngs = array_map(
function($latLng) {
return LatLng::fromString($latLng);
@@ -49,7 +53,7 @@ class RectangleMapper extends AbstractVectorMapper
deserialize($model->bounds, true)
);
$arguments = parent::buildConstructArguments($model, $mapper, $bounds);
$arguments = parent::buildConstructArguments($model, $mapper, $bounds, $elementId);
$arguments[] = new LatLngBounds($latLngs[0], $latLngs[1]);
return $arguments;