From 19199833b024deed040dee5327db90fe2de611fa Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 27 Jan 2015 12:41:11 +0100 Subject: [PATCH] Move LatLng and LatLngBounds to new Value namespace. --- src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php | 2 +- src/Netzmacht/Contao/Leaflet/Event/BuildDefinitionEvent.php | 2 +- src/Netzmacht/Contao/Leaflet/Filter/BboxFilter.php | 4 ++-- src/Netzmacht/Contao/Leaflet/Filter/DistanceFilter.php | 4 ++-- src/Netzmacht/Contao/Leaflet/MapService.php | 4 ++-- src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php | 2 +- src/Netzmacht/Contao/Leaflet/Mapper/Layer/TileLayerMapper.php | 2 +- src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php | 2 +- .../Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php | 2 +- src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolylineMapper.php | 2 +- .../Contao/Leaflet/Mapper/Vector/RectangleMapper.php | 4 ++-- src/Netzmacht/Contao/Leaflet/Model/MarkerModel.php | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php b/src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php index 9be0154..730ffc1 100644 --- a/src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php +++ b/src/Netzmacht/Contao/Leaflet/Dca/Leaflet.php @@ -15,7 +15,7 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\MapMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\MapModel; -use Netzmacht\LeafletPHP\Definition\Type\LatLng; +use Netzmacht\LeafletPHP\Value\LatLng; /** * Class Leaflet is the base helper providing different methods. diff --git a/src/Netzmacht/Contao/Leaflet/Event/BuildDefinitionEvent.php b/src/Netzmacht/Contao/Leaflet/Event/BuildDefinitionEvent.php index 1ce2149..cf2597e 100644 --- a/src/Netzmacht/Contao/Leaflet/Event/BuildDefinitionEvent.php +++ b/src/Netzmacht/Contao/Leaflet/Event/BuildDefinitionEvent.php @@ -12,7 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Event; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; +use Netzmacht\LeafletPHP\Value\LatLngBounds; use Symfony\Component\EventDispatcher\Event; /** diff --git a/src/Netzmacht/Contao/Leaflet/Filter/BboxFilter.php b/src/Netzmacht/Contao/Leaflet/Filter/BboxFilter.php index 9effc35..4cc1a33 100644 --- a/src/Netzmacht/Contao/Leaflet/Filter/BboxFilter.php +++ b/src/Netzmacht/Contao/Leaflet/Filter/BboxFilter.php @@ -11,7 +11,7 @@ namespace Netzmacht\Contao\Leaflet\Filter; -use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; +use Netzmacht\LeafletPHP\Value\LatLngBounds; /** * The Bounds box filter. @@ -30,7 +30,7 @@ class BboxFilter implements Filter /** * Construct. * - * @param LatLngBounds $bounds The bounds. + * @param \Netzmacht\LeafletPHP\Value\LatLngBounds $bounds The bounds. */ public function __construct(LatLngBounds $bounds) { diff --git a/src/Netzmacht/Contao/Leaflet/Filter/DistanceFilter.php b/src/Netzmacht/Contao/Leaflet/Filter/DistanceFilter.php index 1e06706..b711715 100644 --- a/src/Netzmacht/Contao/Leaflet/Filter/DistanceFilter.php +++ b/src/Netzmacht/Contao/Leaflet/Filter/DistanceFilter.php @@ -11,7 +11,7 @@ namespace Netzmacht\Contao\Leaflet\Filter; -use Netzmacht\LeafletPHP\Definition\Type\LatLng; +use Netzmacht\LeafletPHP\Value\LatLng; /** * Class DistanceFilter filters by a coordinate the the distance from it. @@ -23,7 +23,7 @@ class DistanceFilter implements Filter /** * The center coordinates. * - * @var LatLng + * @var \Netzmacht\LeafletPHP\Value\LatLng */ private $center; diff --git a/src/Netzmacht/Contao/Leaflet/MapService.php b/src/Netzmacht/Contao/Leaflet/MapService.php index d6ca02b..0d81859 100644 --- a/src/Netzmacht/Contao/Leaflet/MapService.php +++ b/src/Netzmacht/Contao/Leaflet/MapService.php @@ -19,7 +19,7 @@ use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\LeafletPHP\Assets; use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Map; -use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; +use Netzmacht\LeafletPHP\Value\LatLngBounds; use Netzmacht\LeafletPHP\Leaflet; use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; @@ -109,7 +109,7 @@ class MapService * Get map javascript. * * @param MapModel|int $mapId The map database id. MapModel accepted as well. - * @param LatLngBounds $bounds Optional bounds where elements should be in. + * @param \Netzmacht\LeafletPHP\Value\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 $template The template being used for generating. * @param string $style Optional style attributes. diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php index 2d32d37..f601629 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php @@ -20,7 +20,7 @@ use Netzmacht\LeafletPHP\Definition\GeoJson\ConvertsToGeoJsonFeature; use Netzmacht\LeafletPHP\Definition\GeoJson\Feature; use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\GeoJson\GeoJsonFeature; -use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; +use Netzmacht\LeafletPHP\Value\LatLngBounds; use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; /** diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/TileLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/TileLayerMapper.php index ef23c6a..5dfa8d6 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/TileLayerMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/TileLayerMapper.php @@ -15,7 +15,7 @@ use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Raster\TileLayer; -use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; +use Netzmacht\LeafletPHP\Value\LatLngBounds; /** * Class TileLayerMapper maps the database model to the tile layer definition. diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php index fd7e1a3..0c28633 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\Type\LatLng; +use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Definition\Vector\Circle; /** diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php index 73f7222..a744b7a 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\Type\LatLng; +use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Definition\Vector\MultiPolyline; /** diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolylineMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolylineMapper.php index 0b017a3..adcd5c2 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolylineMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolylineMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\Type\LatLng; +use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Definition\Vector\Polyline; /** diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/RectangleMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/RectangleMapper.php index b5332bc..d8e8010 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/RectangleMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/RectangleMapper.php @@ -14,8 +14,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\Type\LatLng; -use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; +use Netzmacht\LeafletPHP\Value\LatLng; +use Netzmacht\LeafletPHP\Value\LatLngBounds; /** * Class RectangleMapper maps a database model to its rectangle vector definition. diff --git a/src/Netzmacht/Contao/Leaflet/Model/MarkerModel.php b/src/Netzmacht/Contao/Leaflet/Model/MarkerModel.php index 3631efc..8457dea 100644 --- a/src/Netzmacht/Contao/Leaflet/Model/MarkerModel.php +++ b/src/Netzmacht/Contao/Leaflet/Model/MarkerModel.php @@ -13,7 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Model; use Netzmacht\Contao\Leaflet\Filter\BboxFilter; use Netzmacht\Contao\Leaflet\Filter\Filter; -use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds; +use Netzmacht\LeafletPHP\Value\LatLngBounds; /** * Class MarkerModel for the tl_leaflet_marker table.