mirror of
https://github.com/netzmacht/contao-leaflet-maps.git
synced 2025-12-02 04:53:56 +01:00
Convert array syntax and other minor code style adjustments.
This commit is contained in:
@@ -62,9 +62,9 @@ class GroupLayerMapper extends AbstractLayerMapper
|
||||
}
|
||||
|
||||
$collection = LayerModel::findBy(
|
||||
array('pid=?', 'active=1'),
|
||||
array($model->id),
|
||||
array('order' => 'sorting')
|
||||
['pid=?', 'active=1'],
|
||||
[$model->id],
|
||||
['order' => 'sorting']
|
||||
);
|
||||
|
||||
if ($collection) {
|
||||
|
||||
@@ -108,9 +108,9 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper
|
||||
}
|
||||
|
||||
$collection = LayerModel::findBy(
|
||||
array('pid=?', 'active=1'),
|
||||
array($model->id),
|
||||
array('order' => 'sorting')
|
||||
['pid=?', 'active=1'],
|
||||
[$model->id],
|
||||
['order' => 'sorting']
|
||||
);
|
||||
|
||||
if ($collection) {
|
||||
|
||||
@@ -71,18 +71,18 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
|
||||
$layer->setOption('boundsMode', $model->boundsMode);
|
||||
}
|
||||
|
||||
return array(
|
||||
return [
|
||||
$this->getElementId($model, $elementId),
|
||||
RequestUrl::create($model->id, null, null, $request),
|
||||
array(),
|
||||
$layer
|
||||
);
|
||||
[],
|
||||
$layer,
|
||||
];
|
||||
}
|
||||
|
||||
return array(
|
||||
return [
|
||||
$this->getElementId($model, $elementId),
|
||||
RequestUrl::create($model->id, null, null, $request)
|
||||
);
|
||||
RequestUrl::create($model->id, null, null, $request),
|
||||
];
|
||||
}
|
||||
|
||||
return parent::buildConstructArguments($model, $mapper, $request, $elementId);
|
||||
|
||||
@@ -92,10 +92,10 @@ class ProviderLayerMapper extends AbstractLayerMapper
|
||||
Request $request = null,
|
||||
$elementId = null
|
||||
) {
|
||||
return array(
|
||||
return [
|
||||
$model->alias ?: ('layer_' . $model->id),
|
||||
$model->tile_provider,
|
||||
$model->tile_provider_variant ?: null
|
||||
);
|
||||
$model->tile_provider_variant ?: null,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
|
||||
$elementId = null
|
||||
) {
|
||||
if ($model->deferred) {
|
||||
$options = array();
|
||||
$options = [];
|
||||
|
||||
if ($model->pointToLayer) {
|
||||
$options['pointToLayer'] = new Expression($model->pointToLayer);
|
||||
@@ -79,18 +79,18 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
|
||||
$layer = new GeoJson($this->getElementId($model, $elementId));
|
||||
$layer->setOptions($options);
|
||||
|
||||
return array(
|
||||
return [
|
||||
$this->getElementId($model, $elementId),
|
||||
RequestUrl::create($model->id, null, null, $request),
|
||||
array(),
|
||||
$layer
|
||||
);
|
||||
[],
|
||||
$layer,
|
||||
];
|
||||
}
|
||||
|
||||
return array(
|
||||
return [
|
||||
$this->getElementId($model, $elementId),
|
||||
RequestUrl::create($model->id, null, null, $request)
|
||||
);
|
||||
RequestUrl::create($model->id, null, null, $request),
|
||||
];
|
||||
}
|
||||
|
||||
return parent::buildConstructArguments($model, $mapper, $request, $elementId);
|
||||
|
||||
Reference in New Issue
Block a user