diff --git a/src/Mapper/Control/AttributionControlMapper.php b/src/Mapper/Control/AttributionControlMapper.php index 4a75922..76e80c8 100644 --- a/src/Mapper/Control/AttributionControlMapper.php +++ b/src/Mapper/Control/AttributionControlMapper.php @@ -31,7 +31,7 @@ class AttributionControlMapper extends AbstractControlMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Control\Attribution'; + protected static $definitionClass = Attribution::class; /** * Layer type. diff --git a/src/Mapper/Control/FullscreenControlMapper.php b/src/Mapper/Control/FullscreenControlMapper.php index a455031..c81d7ca 100644 --- a/src/Mapper/Control/FullscreenControlMapper.php +++ b/src/Mapper/Control/FullscreenControlMapper.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; +use Netzmacht\LeafletPHP\Plugins\FullScreen\FullScreenControl; + /** * Class FullscreenControlMapper. * @@ -24,7 +26,7 @@ class FullscreenControlMapper extends AbstractControlMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Plugins\FullScreen\FullScreenControl'; + protected static $definitionClass = FullScreenControl::class; /** * Layer type. diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index 4771285..92f9561 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -16,6 +16,7 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\ControlModel; use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\LeafletPHP\Definition\Control\Layers; /** * Class LayersControlMapper maps the control model to the layers control definition. @@ -29,7 +30,7 @@ class LayersControlMapper extends AbstractControlMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Control\Layers'; + protected static $definitionClass = Layers::class; /** * Layer type. diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php index b523083..5e40222 100644 --- a/src/Mapper/Control/LoadingControlMapper.php +++ b/src/Mapper/Control/LoadingControlMapper.php @@ -41,10 +41,10 @@ class LoadingControlMapper extends AbstractControlMapper protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->spinjs) { - return 'Netzmacht\LeafletPHP\Plugins\Loading\SpinJsLoadingControl'; + return SpinJsLoadingControl::class; } - return 'Netzmacht\LeafletPHP\Plugins\Loading\LoadingControl'; + return LoadingControl::class; } /** diff --git a/src/Mapper/Control/ScaleControlMapper.php b/src/Mapper/Control/ScaleControlMapper.php index 56268b3..0fc61a3 100644 --- a/src/Mapper/Control/ScaleControlMapper.php +++ b/src/Mapper/Control/ScaleControlMapper.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; +use Netzmacht\LeafletPHP\Definition\Control\Scale; + /** * Class ScaleControlMapper maps the database item of the type "scale" to the scale control. * @@ -24,7 +26,7 @@ class ScaleControlMapper extends AbstractControlMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Control\Scale'; + protected static $definitionClass = Scale::class; /** * Layer type. diff --git a/src/Mapper/Control/ZoomControlMapper.php b/src/Mapper/Control/ZoomControlMapper.php index 5d80f0b..9c1aeb5 100644 --- a/src/Mapper/Control/ZoomControlMapper.php +++ b/src/Mapper/Control/ZoomControlMapper.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; +use Netzmacht\LeafletPHP\Definition\Control\Zoom; + /** * Class ZoomControlMapper maps the zoom database definition to the zoom control. * @@ -24,7 +26,7 @@ class ZoomControlMapper extends AbstractControlMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Control\Zoom'; + protected static $definitionClass = Zoom::class; /** * Layer type. diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php index eedd003..6fccc9f 100644 --- a/src/Mapper/Layer/GroupLayerMapper.php +++ b/src/Mapper/Layer/GroupLayerMapper.php @@ -17,6 +17,7 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; 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; use Netzmacht\LeafletPHP\Definition\Layer; @@ -40,10 +41,10 @@ class GroupLayerMapper extends AbstractLayerMapper protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->groupType === 'feature') { - return 'Netzmacht\LeafletPHP\Definition\Group\FeatureGroup'; + return FeatureGroup::class; } - return 'Netzmacht\LeafletPHP\Definition\Group\LayerGroup'; + return LayerGroup::class; } /** diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index ec1a675..52a2a14 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -36,7 +36,7 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Plugins\MarkerCluster\MarkerClusterGroup'; + protected static $definitionClass = MarkerClusterGroup::class; /** * Layer type. diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index 1e81c22..453291f 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -20,6 +20,7 @@ use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson as OmnivoreGeoJson; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; @@ -43,10 +44,10 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->deferred) { - return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson'; + return OmnivoreGeoJson::class; } - return 'Netzmacht\LeafletPHP\Definition\Group\GeoJson'; + return GeoJson::class; } /** diff --git a/src/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php index 041e38f..3520dc4 100644 --- a/src/Mapper/Layer/ProviderLayerMapper.php +++ b/src/Mapper/Layer/ProviderLayerMapper.php @@ -17,6 +17,7 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\OptionsBuilder; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Plugins\LeafletProviders\Provider; /** * Class ProviderLayerMapper maps the layer model to the tile provider definition. @@ -60,7 +61,7 @@ class ProviderLayerMapper extends AbstractLayerMapper return $this->providers[$model->tile_provider]['class']; } - return 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\Provider'; + return Provider::class; } /** diff --git a/src/Mapper/Layer/TileLayerMapper.php b/src/Mapper/Layer/TileLayerMapper.php index 6288b31..a9ae14f 100644 --- a/src/Mapper/Layer/TileLayerMapper.php +++ b/src/Mapper/Layer/TileLayerMapper.php @@ -32,7 +32,7 @@ class TileLayerMapper extends AbstractLayerMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Raster\TileLayer'; + protected static $definitionClass = TileLayer::class; /** * The layer type. diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index 1155299..b2d4697 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -21,6 +21,7 @@ use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson as OmnivoreGeoJson; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; @@ -44,10 +45,10 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->deferred) { - return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson'; + return OmnivoreGeoJson::class; } - return 'Netzmacht\LeafletPHP\Definition\Group\GeoJson'; + return GeoJson::class; } /** diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 38d42c2..4a193e1 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -40,7 +40,7 @@ class MapMapper extends AbstractMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Map'; + protected static $definitionClass = Map::class; /** * {@inheritdoc} diff --git a/src/Mapper/Type/DivIconMapper.php b/src/Mapper/Type/DivIconMapper.php index 3fa0af5..9de8214 100644 --- a/src/Mapper/Type/DivIconMapper.php +++ b/src/Mapper/Type/DivIconMapper.php @@ -30,7 +30,7 @@ class DivIconMapper extends AbstractIconMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Type\DivIcon'; + protected static $definitionClass = DivIcon::class; /** * Layer type. diff --git a/src/Mapper/Type/ExtraMarkersIconMapper.php b/src/Mapper/Type/ExtraMarkersIconMapper.php index f94d751..6de2267 100644 --- a/src/Mapper/Type/ExtraMarkersIconMapper.php +++ b/src/Mapper/Type/ExtraMarkersIconMapper.php @@ -17,6 +17,7 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\DivIcon; +use Netzmacht\LeafletPHP\Plugins\ExtraMarkers\ExtraMarkersIcon; /** * Class DivIconMapper maps the icon model to the div icon definition. @@ -30,7 +31,7 @@ class ExtraMarkersIconMapper extends AbstractIconMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Plugins\ExtraMarkers\ExtraMarkersIcon'; + protected static $definitionClass = ExtraMarkersIcon::class; /** * Layer type. diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index 511bbce..f9d708a 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -31,7 +31,7 @@ class ImageIconMapper extends AbstractIconMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Type\ImageIcon'; + protected static $definitionClass = ImageIcon::class; /** * Layer type. diff --git a/src/Mapper/Vector/CircleMapper.php b/src/Mapper/Vector/CircleMapper.php index 7286cde..8407b27 100644 --- a/src/Mapper/Vector/CircleMapper.php +++ b/src/Mapper/Vector/CircleMapper.php @@ -16,6 +16,7 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Definition\Vector\Circle; use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker; use Netzmacht\LeafletPHP\Value\LatLng; @@ -31,7 +32,7 @@ class CircleMapper extends AbstractVectorMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Circle'; + protected static $definitionClass = Circle::class; /** * Layer type. diff --git a/src/Mapper/Vector/CircleMarkerMapper.php b/src/Mapper/Vector/CircleMarkerMapper.php index 9e1ade9..705de05 100644 --- a/src/Mapper/Vector/CircleMarkerMapper.php +++ b/src/Mapper/Vector/CircleMarkerMapper.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; +use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker; + /** * Class CircleMarkerMapper maps the database model to the circle marker definition. * @@ -24,7 +26,7 @@ class CircleMarkerMapper extends CircleMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\CircleMarker'; + protected static $definitionClass = CircleMarker::class; /** * Layer type. diff --git a/src/Mapper/Vector/MultiPolygonMapper.php b/src/Mapper/Vector/MultiPolygonMapper.php index d1ae9c3..9bcdd3c 100644 --- a/src/Mapper/Vector/MultiPolygonMapper.php +++ b/src/Mapper/Vector/MultiPolygonMapper.php @@ -30,7 +30,7 @@ class MultiPolygonMapper extends MultiPolylineMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Polygon'; + protected static $definitionClass = Polygon::class; /** * Layer type. diff --git a/src/Mapper/Vector/MultiPolylineMapper.php b/src/Mapper/Vector/MultiPolylineMapper.php index e97e6b2..1549cfe 100644 --- a/src/Mapper/Vector/MultiPolylineMapper.php +++ b/src/Mapper/Vector/MultiPolylineMapper.php @@ -31,7 +31,7 @@ class MultiPolylineMapper extends AbstractVectorMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Polyline'; + protected static $definitionClass = Polyline::class; /** * Layer type. diff --git a/src/Mapper/Vector/PolygonMapper.php b/src/Mapper/Vector/PolygonMapper.php index b695e11..0892a8d 100644 --- a/src/Mapper/Vector/PolygonMapper.php +++ b/src/Mapper/Vector/PolygonMapper.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; +use Netzmacht\LeafletPHP\Definition\Vector\Polygon; + /** * Class PolygonMapper maps the database model to the polygon definition. * @@ -24,7 +26,7 @@ class PolygonMapper extends PolylineMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Polygon'; + protected static $definitionClass = Polygon::class; /** * Layer type. diff --git a/src/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php index 2b6babd..7a5367f 100644 --- a/src/Mapper/Vector/PolylineMapper.php +++ b/src/Mapper/Vector/PolylineMapper.php @@ -31,7 +31,7 @@ class PolylineMapper extends AbstractVectorMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Polyline'; + protected static $definitionClass = Polyline::class; /** * Layer type. diff --git a/src/Mapper/Vector/RectangleMapper.php b/src/Mapper/Vector/RectangleMapper.php index 0cc7869..82da1cb 100644 --- a/src/Mapper/Vector/RectangleMapper.php +++ b/src/Mapper/Vector/RectangleMapper.php @@ -15,6 +15,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Request\Request; +use Netzmacht\LeafletPHP\Definition\Vector\Rectangle; use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Value\LatLngBounds; @@ -30,7 +31,7 @@ class RectangleMapper extends AbstractVectorMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Vector\Rectangle'; + protected static $definitionClass = Rectangle::class; /** * Layer type.