From 50cf8312d263124fbdf892117feb02e1d71b0035 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 27 Jan 2015 14:52:20 +0100 Subject: [PATCH] Move GeoJson features to new namespace. --- .../Contao/Leaflet/Event/ConvertToGeoJsonEvent.php | 2 +- src/Netzmacht/Contao/Leaflet/MapService.php | 2 +- src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php | 8 ++++---- src/Netzmacht/Contao/Leaflet/Mapper/GeoJsonMapper.php | 2 +- .../Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php | 2 +- .../Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php | 2 +- .../Contao/Leaflet/Subscriber/GeoJsonSubscriber.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Netzmacht/Contao/Leaflet/Event/ConvertToGeoJsonEvent.php b/src/Netzmacht/Contao/Leaflet/Event/ConvertToGeoJsonEvent.php index f1d7e50..90b0731 100644 --- a/src/Netzmacht/Contao/Leaflet/Event/ConvertToGeoJsonEvent.php +++ b/src/Netzmacht/Contao/Leaflet/Event/ConvertToGeoJsonEvent.php @@ -12,7 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Event; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\GeoJson\GeoJsonObject; +use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonObject; use Symfony\Component\EventDispatcher\Event; /** diff --git a/src/Netzmacht/Contao/Leaflet/MapService.php b/src/Netzmacht/Contao/Leaflet/MapService.php index 0d81859..7d72736 100644 --- a/src/Netzmacht/Contao/Leaflet/MapService.php +++ b/src/Netzmacht/Contao/Leaflet/MapService.php @@ -17,7 +17,7 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\LeafletPHP\Assets; -use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection; +use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Value\LatLngBounds; use Netzmacht\LeafletPHP\Leaflet; diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php index f601629..3db5a02 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php @@ -16,10 +16,10 @@ use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Event\GetHashEvent; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\LeafletPHP\Definition; -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\Value\GeoJson\ConvertsToGeoJsonFeature; +use Netzmacht\LeafletPHP\Value\GeoJson\Feature; +use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; +use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonFeature; use Netzmacht\LeafletPHP\Value\LatLngBounds; use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/GeoJsonMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/GeoJsonMapper.php index b0c477c..bbb5681 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/GeoJsonMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/GeoJsonMapper.php @@ -12,7 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper; use Netzmacht\Contao\Leaflet\Filter\Filter; -use Netzmacht\LeafletPHP\Definition\GeoJson\GeoJsonFeature; +use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonFeature; /** * Interface GeoJsonMapper describes mappers which can convert their definition to a GeoJSON representation. diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php index 27936d3..c827189 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php @@ -18,7 +18,7 @@ use Netzmacht\Contao\Leaflet\Model\MarkerModel; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection; +use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; /** diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php index 53c9551..1ada35d 100644 --- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php @@ -18,7 +18,7 @@ use Netzmacht\Contao\Leaflet\Model\VectorModel; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection; +use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; use Netzmacht\LeafletPHP\Definition\Vector; diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php b/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php index 0d005bd..809e6a0 100644 --- a/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php +++ b/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Subscriber; use Netzmacht\Contao\Leaflet\Dca\Vector; use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\LeafletPHP\Definition\GeoJson\Feature; +use Netzmacht\LeafletPHP\Value\GeoJson\Feature; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Marker; use Netzmacht\LeafletPHP\Definition\Vector\Circle;