Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Allow models being passed.

Browse Source
This commit is contained in:
David Molineus
2015-01-08 23:03:01 +01:00
parent 082ba4f568
commit 9c689b072d
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Netzmacht/Contao/Leaflet/MapService.php
View File

@@ -17,7 +17,6 @@ use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Leaflet\Model\MapModel;
use Netzmacht\LeafletPHP\Assets; use Netzmacht\LeafletPHP\Assets;
use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection;
use Netzmacht\LeafletPHP\Definition\GeoJson\ConvertsToGeoJson;
use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Definition\Map;
use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds;
use Netzmacht\LeafletPHP\Leaflet; use Netzmacht\LeafletPHP\Leaflet;
@@ -43,6 +42,7 @@ class MapService
* @var Leaflet * @var Leaflet
*/ */
private $leaflet; private $leaflet;
/** /**
* @var EventDispatcher * @var EventDispatcher
*/ */
@@ -65,7 +65,7 @@ class MapService
/** /**
* Get map definition. * Get map definition.
* *
* @param int $mapId The map database id. * @param MapModel|int $mapId The map database id. MapModel accepted as well.
* @param LatLngBounds $bounds Optional bounds where elements should be in. * @param LatLngBounds $bounds Optional bounds where elements should be in.
* @param string $elementId Optional element id. If none given the mapId or alias is used. * @param string $elementId Optional element id. If none given the mapId or alias is used.
* *
@@ -73,7 +73,11 @@ class MapService
*/ */
public function getDefinition($mapId, LatLngBounds $bounds = null, $elementId = null) public function getDefinition($mapId, LatLngBounds $bounds = null, $elementId = null)
{ {
$model = $this->getModel($mapId); if ($mapId instanceof MapModel) {
$model = $mapId;
} else {
$model = $this->getModel($mapId);
}
return $this->mapper->handle($model, $bounds, $elementId); return $this->mapper->handle($model, $bounds, $elementId);
} }
@@ -101,7 +105,7 @@ class MapService
/** /**
* Get map javascript. * Get map javascript.
* *
* @param int $mapId The map id. * @param MapModel|int $mapId The map database id. MapModel accepted as well.
* @param LatLngBounds $bounds Optional bounds where elements should be in. * @param LatLngBounds $bounds Optional bounds where elements should be in.
* @param string $elementId Optional element id. If none given the mapId or alias is used. * @param string $elementId Optional element id. If none given the mapId or alias is used.
* *
@@ -122,14 +126,18 @@ class MapService
/** /**
* Get feature collection of a layer. * Get feature collection of a layer.
* *
* @param int $layerId The layer id. * @param LayerModel|int $layerId The layer database id or layer model.
* @param LatLngBounds $bounds Filter features in the bounds. * @param LatLngBounds $bounds Filter features in the bounds.
* *
* @return FeatureCollection * @return FeatureCollection
*/ */
public function getFeatureCollection($layerId, LatLngBounds $bounds = null) public function getFeatureCollection($layerId, LatLngBounds $bounds = null)
{ {
$model = LayerModel::findByPK($layerId); if ($layerId instanceof LayerModel) {
$model = $layerId;
} else {
$model = LayerModel::findByPK($layerId);
}
if (!$model || !$model->active) { if (!$model || !$model->active) {
throw new \InvalidArgumentException(sprintf('Could not find layer "%s"', $layerId)); throw new \InvalidArgumentException(sprintf('Could not find layer "%s"', $layerId));