From ae5fe11d2070a9b0412b48ef247719cd2fdc5de3 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 18:03:42 +0200 Subject: [PATCH] Move Request to Mapper namespace. --- src/Event/BuildDefinitionEvent.php | 7 ++++--- src/Frontend/RequestUrl.php | 2 +- src/MapProvider.php | 2 +- src/Mapper/AbstractMapper.php | 1 - src/Mapper/AbstractTypeMapper.php | 2 -- src/Mapper/Control/AttributionControlMapper.php | 2 +- src/Mapper/Control/LayersControlMapper.php | 2 +- src/Mapper/Control/LoadingControlMapper.php | 2 +- src/Mapper/DefinitionMapper.php | 1 - src/Mapper/GeoJsonMapper.php | 1 - src/Mapper/Layer/FileLayerMapper.php | 2 +- src/Mapper/Layer/GroupLayerMapper.php | 2 +- src/Mapper/Layer/MarkerClusterLayerMapper.php | 2 +- src/Mapper/Layer/MarkersLayerMapper.php | 2 +- src/Mapper/Layer/OverpassLayerMapper.php | 2 +- src/Mapper/Layer/ProviderLayerMapper.php | 2 +- src/Mapper/Layer/ReferenceLayerMapper.php | 2 +- src/Mapper/Layer/TileLayerMapper.php | 2 +- src/Mapper/Layer/VectorsLayerMapper.php | 2 +- src/Mapper/MapMapper.php | 1 - src/Mapper/Mapper.php | 1 - src/{Request => Mapper}/Request.php | 2 +- src/Mapper/Type/DivIconMapper.php | 2 +- src/Mapper/Type/ExtraMarkersIconMapper.php | 2 +- src/Mapper/Type/ImageIconMapper.php | 2 +- src/Mapper/UI/MarkerMapper.php | 2 +- src/Mapper/UI/PopupMapper.php | 2 +- src/Mapper/Vector/AbstractVectorMapper.php | 2 +- src/Mapper/Vector/CircleMapper.php | 2 +- src/Mapper/Vector/MultiPolygonMapper.php | 2 +- src/Mapper/Vector/MultiPolylineMapper.php | 2 +- src/Mapper/Vector/PolylineMapper.php | 2 +- src/Mapper/Vector/RectangleMapper.php | 2 +- 33 files changed, 30 insertions(+), 36 deletions(-) rename src/{Request => Mapper}/Request.php (96%) diff --git a/src/Event/BuildDefinitionEvent.php b/src/Event/BuildDefinitionEvent.php index c840a6a..e0aa7f3 100644 --- a/src/Event/BuildDefinitionEvent.php +++ b/src/Event/BuildDefinitionEvent.php @@ -12,7 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Event; -use Netzmacht\Contao\Leaflet\Request\Request; +use Contao\Model; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Symfony\Component\EventDispatcher\Event; @@ -50,10 +51,10 @@ class BuildDefinitionEvent extends Event * Construct. * * @param Definition $definition The leaflet definition. - * @param \Model $model The definition model. + * @param Model $model The definition model. * @param Request|null $request Building request. */ - public function __construct(Definition $definition, \Model $model, Request $request = null) + public function __construct(Definition $definition, Model $model, Request $request = null) { $this->definition = $definition; $this->model = $model; diff --git a/src/Frontend/RequestUrl.php b/src/Frontend/RequestUrl.php index f08cc96..4a6f038 100644 --- a/src/Frontend/RequestUrl.php +++ b/src/Frontend/RequestUrl.php @@ -13,7 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Frontend; use Netzmacht\Contao\Leaflet\Filter\Filter; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; /** * Class RequestUrl creates the request url. diff --git a/src/MapProvider.php b/src/MapProvider.php index dd3b74a..483ee32 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -19,9 +19,9 @@ use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Frontend\DataController; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\MapModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Leaflet; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; diff --git a/src/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php index cfc0096..308418c 100644 --- a/src/Mapper/AbstractMapper.php +++ b/src/Mapper/AbstractMapper.php @@ -13,7 +13,6 @@ namespace Netzmacht\Contao\Leaflet\Mapper; use Contao\Model; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; /** diff --git a/src/Mapper/AbstractTypeMapper.php b/src/Mapper/AbstractTypeMapper.php index 1c60591..e2deb54 100644 --- a/src/Mapper/AbstractTypeMapper.php +++ b/src/Mapper/AbstractTypeMapper.php @@ -12,8 +12,6 @@ namespace Netzmacht\Contao\Leaflet\Mapper; -use Netzmacht\Contao\Leaflet\Request\Request; - /** * Class AbstractTypeMapper is the base mapper for tables containing different types of definitins. * diff --git a/src/Mapper/Control/AttributionControlMapper.php b/src/Mapper/Control/AttributionControlMapper.php index 76e80c8..c06f0a0 100644 --- a/src/Mapper/Control/AttributionControlMapper.php +++ b/src/Mapper/Control/AttributionControlMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Control\Attribution; use Netzmacht\LeafletPHP\Definition\Map; diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index 92f9561..6ef2b0e 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -14,8 +14,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\ControlModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition\Control\Layers; /** diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php index 5e40222..f6a2986 100644 --- a/src/Mapper/Control/LoadingControlMapper.php +++ b/src/Mapper/Control/LoadingControlMapper.php @@ -14,8 +14,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\ControlModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Control\Zoom; use Netzmacht\LeafletPHP\Plugins\Loading\LoadingControl; diff --git a/src/Mapper/DefinitionMapper.php b/src/Mapper/DefinitionMapper.php index 4ebb38c..e3e544f 100644 --- a/src/Mapper/DefinitionMapper.php +++ b/src/Mapper/DefinitionMapper.php @@ -15,7 +15,6 @@ namespace Netzmacht\Contao\Leaflet\Mapper; use Netzmacht\Contao\Leaflet\Event\BuildDefinitionEvent; use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Event\GetHashEvent; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Value\GeoJson\ConvertsToGeoJsonFeature; use Netzmacht\LeafletPHP\Value\GeoJson\Feature; diff --git a/src/Mapper/GeoJsonMapper.php b/src/Mapper/GeoJsonMapper.php index f98516a..f7cf7f7 100644 --- a/src/Mapper/GeoJsonMapper.php +++ b/src/Mapper/GeoJsonMapper.php @@ -13,7 +13,6 @@ namespace Netzmacht\Contao\Leaflet\Mapper; use Contao\Model; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonFeature; /** diff --git a/src/Mapper/Layer/FileLayerMapper.php b/src/Mapper/Layer/FileLayerMapper.php index e1f619a..f54d8ad 100644 --- a/src/Mapper/Layer/FileLayerMapper.php +++ b/src/Mapper/Layer/FileLayerMapper.php @@ -17,7 +17,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\FilesModel; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\FeatureGroup; diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php index 6fccc9f..8292aa2 100644 --- a/src/Mapper/Layer/GroupLayerMapper.php +++ b/src/Mapper/Layer/GroupLayerMapper.php @@ -14,8 +14,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\FeatureGroup; use Netzmacht\LeafletPHP\Definition\Group\LayerGroup; diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index 52a2a14..b5ca318 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -15,8 +15,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\AnonymousFunction; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index 9cde83c..5bea0ea 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -16,8 +16,8 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\MarkerModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; diff --git a/src/Mapper/Layer/OverpassLayerMapper.php b/src/Mapper/Layer/OverpassLayerMapper.php index ffa0cf6..3f44bd7 100644 --- a/src/Mapper/Layer/OverpassLayerMapper.php +++ b/src/Mapper/Layer/OverpassLayerMapper.php @@ -15,8 +15,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; use Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\IconModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; diff --git a/src/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php index 3520dc4..7a98417 100644 --- a/src/Mapper/Layer/ProviderLayerMapper.php +++ b/src/Mapper/Layer/ProviderLayerMapper.php @@ -15,7 +15,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\OptionsBuilder; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Plugins\LeafletProviders\Provider; diff --git a/src/Mapper/Layer/ReferenceLayerMapper.php b/src/Mapper/Layer/ReferenceLayerMapper.php index 3c2fc37..4d11fe4 100644 --- a/src/Mapper/Layer/ReferenceLayerMapper.php +++ b/src/Mapper/Layer/ReferenceLayerMapper.php @@ -13,8 +13,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; /** diff --git a/src/Mapper/Layer/TileLayerMapper.php b/src/Mapper/Layer/TileLayerMapper.php index a9ae14f..c695c9e 100644 --- a/src/Mapper/Layer/TileLayerMapper.php +++ b/src/Mapper/Layer/TileLayerMapper.php @@ -15,7 +15,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; use Contao\StringUtil; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Raster\TileLayer; use Netzmacht\LeafletPHP\Value\LatLngBounds; diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index 9f632cc..ab79f4f 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -17,8 +17,8 @@ use Contao\Model\Collection; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\VectorModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 4a193e1..05eb513 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -15,7 +15,6 @@ namespace Netzmacht\Contao\Leaflet\Mapper; use Contao\Model; use Netzmacht\Contao\Leaflet\Model\ControlModel; use Netzmacht\Contao\Leaflet\Model\MapModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Control; use Netzmacht\LeafletPHP\Definition\Layer; diff --git a/src/Mapper/Mapper.php b/src/Mapper/Mapper.php index 5f8ad7b..cdfd9d3 100644 --- a/src/Mapper/Mapper.php +++ b/src/Mapper/Mapper.php @@ -13,7 +13,6 @@ namespace Netzmacht\Contao\Leaflet\Mapper; use Contao\Model; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; /** diff --git a/src/Request/Request.php b/src/Mapper/Request.php similarity index 96% rename from src/Request/Request.php rename to src/Mapper/Request.php index 66260ed..e19bad6 100644 --- a/src/Request/Request.php +++ b/src/Mapper/Request.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet\Request; +namespace Netzmacht\Contao\Leaflet\Mapper; use Netzmacht\Contao\Leaflet\Filter\Filter; diff --git a/src/Mapper/Type/DivIconMapper.php b/src/Mapper/Type/DivIconMapper.php index 9de8214..783fea2 100644 --- a/src/Mapper/Type/DivIconMapper.php +++ b/src/Mapper/Type/DivIconMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\DivIcon; diff --git a/src/Mapper/Type/ExtraMarkersIconMapper.php b/src/Mapper/Type/ExtraMarkersIconMapper.php index 6de2267..d5608b5 100644 --- a/src/Mapper/Type/ExtraMarkersIconMapper.php +++ b/src/Mapper/Type/ExtraMarkersIconMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\DivIcon; use Netzmacht\LeafletPHP\Plugins\ExtraMarkers\ExtraMarkersIcon; diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index f9d708a..134b1e9 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -14,8 +14,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\IconModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php index c92ae64..20a37b7 100644 --- a/src/Mapper/UI/MarkerMapper.php +++ b/src/Mapper/UI/MarkerMapper.php @@ -16,10 +16,10 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Frontend\ValueFilter; use Netzmacht\Contao\Leaflet\Mapper\AbstractMapper; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\MarkerModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; use Netzmacht\LeafletPHP\Definition\UI\Marker; diff --git a/src/Mapper/UI/PopupMapper.php b/src/Mapper/UI/PopupMapper.php index 7debb13..24e1778 100644 --- a/src/Mapper/UI/PopupMapper.php +++ b/src/Mapper/UI/PopupMapper.php @@ -15,8 +15,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\UI; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\AbstractMapper; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\PopupModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\UI\Popup; diff --git a/src/Mapper/Vector/AbstractVectorMapper.php b/src/Mapper/Vector/AbstractVectorMapper.php index 1eea233..824f2b3 100644 --- a/src/Mapper/Vector/AbstractVectorMapper.php +++ b/src/Mapper/Vector/AbstractVectorMapper.php @@ -17,10 +17,10 @@ use Netzmacht\Contao\Leaflet\Definition\Style; use Netzmacht\Contao\Leaflet\Frontend\ValueFilter; use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\PopupModel; use Netzmacht\Contao\Leaflet\Model\StyleModel; use Netzmacht\Contao\Leaflet\Model\VectorModel; -use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Popup; diff --git a/src/Mapper/Vector/CircleMapper.php b/src/Mapper/Vector/CircleMapper.php index 8407b27..6ccb12f 100644 --- a/src/Mapper/Vector/CircleMapper.php +++ b/src/Mapper/Vector/CircleMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Vector\Circle; use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker; diff --git a/src/Mapper/Vector/MultiPolygonMapper.php b/src/Mapper/Vector/MultiPolygonMapper.php index 9bcdd3c..881209a 100644 --- a/src/Mapper/Vector/MultiPolygonMapper.php +++ b/src/Mapper/Vector/MultiPolygonMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Vector\Polygon; diff --git a/src/Mapper/Vector/MultiPolylineMapper.php b/src/Mapper/Vector/MultiPolylineMapper.php index 1549cfe..5147ccf 100644 --- a/src/Mapper/Vector/MultiPolylineMapper.php +++ b/src/Mapper/Vector/MultiPolylineMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Vector\Polyline; use Netzmacht\LeafletPHP\Value\LatLng; diff --git a/src/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php index f7ef6b3..8526cb9 100644 --- a/src/Mapper/Vector/PolylineMapper.php +++ b/src/Mapper/Vector/PolylineMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Vector\Polyline; use Netzmacht\LeafletPHP\Value\LatLng; diff --git a/src/Mapper/Vector/RectangleMapper.php b/src/Mapper/Vector/RectangleMapper.php index 82da1cb..13307d4 100644 --- a/src/Mapper/Vector/RectangleMapper.php +++ b/src/Mapper/Vector/RectangleMapper.php @@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\LeafletPHP\Definition\Vector\Rectangle; use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Value\LatLngBounds;