From 827c746b0db836631bf41cecb244031b35bc49cc Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 14:16:56 +0200 Subject: [PATCH] Switch to PSR-4. --- composer.json | 10 ++++------ .../Contao/Leaflet => }/Alias/DefaultAliasFilter.php | 0 src/{Netzmacht/Contao/Leaflet => }/Backend/About.php | 0 src/{Netzmacht/Contao/Leaflet => }/Boot.php | 0 src/{Netzmacht/Contao/Leaflet => }/ContaoAssets.php | 0 .../Contao/Leaflet => }/Dca/ControlCallbacks.php | 0 .../Contao/Leaflet => }/Dca/FrontendIntegration.php | 0 .../Contao/Leaflet => }/Dca/LayerCallbacks.php | 0 .../Contao/Leaflet => }/Dca/LeafletCallbacks.php | 0 .../Contao/Leaflet => }/Dca/MapCallbacks.php | 0 .../Contao/Leaflet => }/Dca/MarkerCallbacks.php | 0 src/{Netzmacht/Contao/Leaflet => }/Dca/Validator.php | 0 .../Contao/Leaflet => }/Dca/VectorCallbacks.php | 0 .../Leaflet => }/Definition/Layer/OverpassLayer.php | 0 .../Contao/Leaflet => }/Definition/Style.php | 0 .../Leaflet => }/Definition/Style/FixedStyle.php | 0 .../DependencyInjection/LeafletServices.php | 0 .../Contao/Leaflet => }/Event/BuildDefinitionEvent.php | 0 .../Leaflet => }/Event/ConvertToGeoJsonEvent.php | 0 .../Contao/Leaflet => }/Event/GetHashEvent.php | 0 .../Contao/Leaflet => }/Event/GetJavascriptEvent.php | 0 .../Event/InitializeDefinitionMapperEvent.php | 0 .../Event/InitializeEventDispatcherEvent.php | 0 .../Event/InitializeLeafletBuilderEvent.php | 0 .../Contao/Leaflet => }/Filter/BboxFilter.php | 0 .../Contao/Leaflet => }/Filter/DistanceFilter.php | 0 src/{Netzmacht/Contao/Leaflet => }/Filter/Filter.php | 0 .../Contao/Leaflet => }/Frontend/AbstractMapHybrid.php | 0 .../Contao/Leaflet => }/Frontend/DataController.php | 0 .../Frontend/InsertTag/LeafletInsertTagParser.php | 0 .../Contao/Leaflet => }/Frontend/MapElement.php | 0 .../Contao/Leaflet => }/Frontend/MapModule.php | 0 .../Contao/Leaflet => }/Frontend/RequestUrl.php | 0 .../Contao/Leaflet => }/Frontend/ValueFilter.php | 0 src/{Netzmacht/Contao/Leaflet => }/MapProvider.php | 0 .../Contao/Leaflet => }/Mapper/AbstractMapper.php | 0 .../Contao/Leaflet => }/Mapper/AbstractTypeMapper.php | 0 .../Mapper/Control/AbstractControlMapper.php | 0 .../Mapper/Control/AttributionControlMapper.php | 0 .../Mapper/Control/FullscreenControlMapper.php | 0 .../Mapper/Control/LayersControlMapper.php | 0 .../Mapper/Control/LoadingControlMapper.php | 0 .../Leaflet => }/Mapper/Control/ScaleControlMapper.php | 0 .../Leaflet => }/Mapper/Control/ZoomControlMapper.php | 0 .../Contao/Leaflet => }/Mapper/DefinitionMapper.php | 0 .../Contao/Leaflet => }/Mapper/GeoJsonMapper.php | 0 .../Leaflet => }/Mapper/Layer/AbstractLayerMapper.php | 0 .../Leaflet => }/Mapper/Layer/GroupLayerMapper.php | 0 .../Mapper/Layer/MarkerClusterLayerMapper.php | 0 .../Leaflet => }/Mapper/Layer/MarkersLayerMapper.php | 0 .../Leaflet => }/Mapper/Layer/OverpassLayerMapper.php | 0 .../Leaflet => }/Mapper/Layer/ProviderLayerMapper.php | 0 .../Leaflet => }/Mapper/Layer/ReferenceLayerMapper.php | 0 .../Leaflet => }/Mapper/Layer/TileLayerMapper.php | 0 .../Leaflet => }/Mapper/Layer/VectorsLayerMapper.php | 0 .../Contao/Leaflet => }/Mapper/MapMapper.php | 0 src/{Netzmacht/Contao/Leaflet => }/Mapper/Mapper.php | 0 .../Contao/Leaflet => }/Mapper/OptionsBuilder.php | 0 .../Leaflet => }/Mapper/Style/AbstractStyleMapper.php | 0 .../Leaflet => }/Mapper/Style/FixedStyleMapper.php | 0 .../Leaflet => }/Mapper/Type/AbstractIconMapper.php | 0 .../Contao/Leaflet => }/Mapper/Type/DivIconMapper.php | 0 .../Mapper/Type/ExtraMarkersIconMapper.php | 0 .../Leaflet => }/Mapper/Type/ImageIconMapper.php | 0 .../Contao/Leaflet => }/Mapper/UI/MarkerMapper.php | 0 .../Contao/Leaflet => }/Mapper/UI/PopupMapper.php | 0 .../Mapper/Vector/AbstractVectorMapper.php | 0 .../Contao/Leaflet => }/Mapper/Vector/CircleMapper.php | 0 .../Leaflet => }/Mapper/Vector/CircleMarkerMapper.php | 0 .../Leaflet => }/Mapper/Vector/MultiPolygonMapper.php | 0 .../Leaflet => }/Mapper/Vector/MultiPolylineMapper.php | 0 .../Leaflet => }/Mapper/Vector/PolygonMapper.php | 0 .../Leaflet => }/Mapper/Vector/PolylineMapper.php | 0 .../Leaflet => }/Mapper/Vector/RectangleMapper.php | 0 .../Contao/Leaflet => }/Model/AbstractActiveModel.php | 0 .../Contao/Leaflet => }/Model/ControlModel.php | 0 src/{Netzmacht/Contao/Leaflet => }/Model/IconModel.php | 0 .../Contao/Leaflet => }/Model/LayerModel.php | 0 src/{Netzmacht/Contao/Leaflet => }/Model/MapModel.php | 0 .../Contao/Leaflet => }/Model/MarkerModel.php | 0 .../Contao/Leaflet => }/Model/PopupModel.php | 0 .../Contao/Leaflet => }/Model/StyleModel.php | 0 .../Contao/Leaflet => }/Model/VectorModel.php | 0 .../Contao/Leaflet => }/Subscriber/BootSubscriber.php | 0 .../Leaflet => }/Subscriber/EncoderSubscriber.php | 0 .../Leaflet => }/Subscriber/GeoJsonSubscriber.php | 0 .../Contao/Leaflet => }/Subscriber/HashSubscriber.php | 0 87 files changed, 4 insertions(+), 6 deletions(-) rename src/{Netzmacht/Contao/Leaflet => }/Alias/DefaultAliasFilter.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Backend/About.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Boot.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/ContaoAssets.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/ControlCallbacks.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/FrontendIntegration.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/LayerCallbacks.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/LeafletCallbacks.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/MapCallbacks.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/MarkerCallbacks.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/Validator.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Dca/VectorCallbacks.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Definition/Layer/OverpassLayer.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Definition/Style.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Definition/Style/FixedStyle.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/DependencyInjection/LeafletServices.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Event/BuildDefinitionEvent.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Event/ConvertToGeoJsonEvent.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Event/GetHashEvent.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Event/GetJavascriptEvent.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Event/InitializeDefinitionMapperEvent.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Event/InitializeEventDispatcherEvent.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Event/InitializeLeafletBuilderEvent.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Filter/BboxFilter.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Filter/DistanceFilter.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Filter/Filter.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Frontend/AbstractMapHybrid.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Frontend/DataController.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Frontend/InsertTag/LeafletInsertTagParser.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Frontend/MapElement.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Frontend/MapModule.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Frontend/RequestUrl.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Frontend/ValueFilter.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/MapProvider.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/AbstractMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/AbstractTypeMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Control/AbstractControlMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Control/AttributionControlMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Control/FullscreenControlMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Control/LayersControlMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Control/LoadingControlMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Control/ScaleControlMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Control/ZoomControlMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/DefinitionMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/GeoJsonMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/AbstractLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/GroupLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/MarkerClusterLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/MarkersLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/OverpassLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/ProviderLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/ReferenceLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/TileLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Layer/VectorsLayerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/MapMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Mapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/OptionsBuilder.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Style/AbstractStyleMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Style/FixedStyleMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Type/AbstractIconMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Type/DivIconMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Type/ExtraMarkersIconMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Type/ImageIconMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/UI/MarkerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/UI/PopupMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/AbstractVectorMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/CircleMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/CircleMarkerMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/MultiPolygonMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/MultiPolylineMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/PolygonMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/PolylineMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Mapper/Vector/RectangleMapper.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/AbstractActiveModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/ControlModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/IconModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/LayerModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/MapModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/MarkerModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/PopupModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/StyleModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Model/VectorModel.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Subscriber/BootSubscriber.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Subscriber/EncoderSubscriber.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Subscriber/GeoJsonSubscriber.php (100%) rename src/{Netzmacht/Contao/Leaflet => }/Subscriber/HashSubscriber.php (100%) diff --git a/composer.json b/composer.json index d01387b..3658cf0 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,12 @@ "source":"https://github.com/netzmacht/contao-leaflet-maps" }, "require":{ - "php":">=5.4", - "contao/core":"^3.5", - "contao-community-alliance/dependency-container":"^1.0", - "contao-community-alliance/event-dispatcher":"^1.0", + "php":">=7.1", + "contao/core-bundle":"^4.4", "netzmacht/contao-leaflet-libraries": "^1.0", "netzmacht/php-javascript-builder": "^1.0", "netzmacht/php-leaflet": "^1.0", - "netzmacht/contao-toolkit":"^2.0", + "netzmacht/contao-toolkit":"^3.0@dev", "contao-community-alliance/meta-palettes": "^1.5", "menatwork/contao-multicolumnwizard": "^3.2", "doctrine/cache": "^1.0" @@ -34,7 +32,7 @@ "netzmacht/contao-build-tools": "^1.1" }, "autoload": { - "psr-0": { + "psr-4": { "Netzmacht\\Contao\\Leaflet\\": "src/" } }, diff --git a/src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php b/src/Alias/DefaultAliasFilter.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php rename to src/Alias/DefaultAliasFilter.php diff --git a/src/Netzmacht/Contao/Leaflet/Backend/About.php b/src/Backend/About.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Backend/About.php rename to src/Backend/About.php diff --git a/src/Netzmacht/Contao/Leaflet/Boot.php b/src/Boot.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Boot.php rename to src/Boot.php diff --git a/src/Netzmacht/Contao/Leaflet/ContaoAssets.php b/src/ContaoAssets.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/ContaoAssets.php rename to src/ContaoAssets.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/ControlCallbacks.php b/src/Dca/ControlCallbacks.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/ControlCallbacks.php rename to src/Dca/ControlCallbacks.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php b/src/Dca/FrontendIntegration.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php rename to src/Dca/FrontendIntegration.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/LayerCallbacks.php b/src/Dca/LayerCallbacks.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/LayerCallbacks.php rename to src/Dca/LayerCallbacks.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/LeafletCallbacks.php b/src/Dca/LeafletCallbacks.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/LeafletCallbacks.php rename to src/Dca/LeafletCallbacks.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/MapCallbacks.php b/src/Dca/MapCallbacks.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/MapCallbacks.php rename to src/Dca/MapCallbacks.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/MarkerCallbacks.php b/src/Dca/MarkerCallbacks.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/MarkerCallbacks.php rename to src/Dca/MarkerCallbacks.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Validator.php b/src/Dca/Validator.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/Validator.php rename to src/Dca/Validator.php diff --git a/src/Netzmacht/Contao/Leaflet/Dca/VectorCallbacks.php b/src/Dca/VectorCallbacks.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Dca/VectorCallbacks.php rename to src/Dca/VectorCallbacks.php diff --git a/src/Netzmacht/Contao/Leaflet/Definition/Layer/OverpassLayer.php b/src/Definition/Layer/OverpassLayer.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Definition/Layer/OverpassLayer.php rename to src/Definition/Layer/OverpassLayer.php diff --git a/src/Netzmacht/Contao/Leaflet/Definition/Style.php b/src/Definition/Style.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Definition/Style.php rename to src/Definition/Style.php diff --git a/src/Netzmacht/Contao/Leaflet/Definition/Style/FixedStyle.php b/src/Definition/Style/FixedStyle.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Definition/Style/FixedStyle.php rename to src/Definition/Style/FixedStyle.php diff --git a/src/Netzmacht/Contao/Leaflet/DependencyInjection/LeafletServices.php b/src/DependencyInjection/LeafletServices.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/DependencyInjection/LeafletServices.php rename to src/DependencyInjection/LeafletServices.php diff --git a/src/Netzmacht/Contao/Leaflet/Event/BuildDefinitionEvent.php b/src/Event/BuildDefinitionEvent.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Event/BuildDefinitionEvent.php rename to src/Event/BuildDefinitionEvent.php diff --git a/src/Netzmacht/Contao/Leaflet/Event/ConvertToGeoJsonEvent.php b/src/Event/ConvertToGeoJsonEvent.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Event/ConvertToGeoJsonEvent.php rename to src/Event/ConvertToGeoJsonEvent.php diff --git a/src/Netzmacht/Contao/Leaflet/Event/GetHashEvent.php b/src/Event/GetHashEvent.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Event/GetHashEvent.php rename to src/Event/GetHashEvent.php diff --git a/src/Netzmacht/Contao/Leaflet/Event/GetJavascriptEvent.php b/src/Event/GetJavascriptEvent.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Event/GetJavascriptEvent.php rename to src/Event/GetJavascriptEvent.php diff --git a/src/Netzmacht/Contao/Leaflet/Event/InitializeDefinitionMapperEvent.php b/src/Event/InitializeDefinitionMapperEvent.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Event/InitializeDefinitionMapperEvent.php rename to src/Event/InitializeDefinitionMapperEvent.php diff --git a/src/Netzmacht/Contao/Leaflet/Event/InitializeEventDispatcherEvent.php b/src/Event/InitializeEventDispatcherEvent.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Event/InitializeEventDispatcherEvent.php rename to src/Event/InitializeEventDispatcherEvent.php diff --git a/src/Netzmacht/Contao/Leaflet/Event/InitializeLeafletBuilderEvent.php b/src/Event/InitializeLeafletBuilderEvent.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Event/InitializeLeafletBuilderEvent.php rename to src/Event/InitializeLeafletBuilderEvent.php diff --git a/src/Netzmacht/Contao/Leaflet/Filter/BboxFilter.php b/src/Filter/BboxFilter.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Filter/BboxFilter.php rename to src/Filter/BboxFilter.php diff --git a/src/Netzmacht/Contao/Leaflet/Filter/DistanceFilter.php b/src/Filter/DistanceFilter.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Filter/DistanceFilter.php rename to src/Filter/DistanceFilter.php diff --git a/src/Netzmacht/Contao/Leaflet/Filter/Filter.php b/src/Filter/Filter.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Filter/Filter.php rename to src/Filter/Filter.php diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Frontend/AbstractMapHybrid.php rename to src/Frontend/AbstractMapHybrid.php diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/DataController.php b/src/Frontend/DataController.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Frontend/DataController.php rename to src/Frontend/DataController.php diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/InsertTag/LeafletInsertTagParser.php b/src/Frontend/InsertTag/LeafletInsertTagParser.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Frontend/InsertTag/LeafletInsertTagParser.php rename to src/Frontend/InsertTag/LeafletInsertTagParser.php diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php b/src/Frontend/MapElement.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php rename to src/Frontend/MapElement.php diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php b/src/Frontend/MapModule.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php rename to src/Frontend/MapModule.php diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/RequestUrl.php b/src/Frontend/RequestUrl.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Frontend/RequestUrl.php rename to src/Frontend/RequestUrl.php diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/ValueFilter.php b/src/Frontend/ValueFilter.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Frontend/ValueFilter.php rename to src/Frontend/ValueFilter.php diff --git a/src/Netzmacht/Contao/Leaflet/MapProvider.php b/src/MapProvider.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/MapProvider.php rename to src/MapProvider.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php rename to src/Mapper/AbstractMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/AbstractTypeMapper.php b/src/Mapper/AbstractTypeMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/AbstractTypeMapper.php rename to src/Mapper/AbstractTypeMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/AbstractControlMapper.php b/src/Mapper/Control/AbstractControlMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Control/AbstractControlMapper.php rename to src/Mapper/Control/AbstractControlMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/AttributionControlMapper.php b/src/Mapper/Control/AttributionControlMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Control/AttributionControlMapper.php rename to src/Mapper/Control/AttributionControlMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/FullscreenControlMapper.php b/src/Mapper/Control/FullscreenControlMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Control/FullscreenControlMapper.php rename to src/Mapper/Control/FullscreenControlMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Control/LayersControlMapper.php rename to src/Mapper/Control/LayersControlMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php rename to src/Mapper/Control/LoadingControlMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/ScaleControlMapper.php b/src/Mapper/Control/ScaleControlMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Control/ScaleControlMapper.php rename to src/Mapper/Control/ScaleControlMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/ZoomControlMapper.php b/src/Mapper/Control/ZoomControlMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Control/ZoomControlMapper.php rename to src/Mapper/Control/ZoomControlMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php b/src/Mapper/DefinitionMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php rename to src/Mapper/DefinitionMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/GeoJsonMapper.php b/src/Mapper/GeoJsonMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/GeoJsonMapper.php rename to src/Mapper/GeoJsonMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/AbstractLayerMapper.php b/src/Mapper/Layer/AbstractLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/AbstractLayerMapper.php rename to src/Mapper/Layer/AbstractLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/GroupLayerMapper.php rename to src/Mapper/Layer/GroupLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php rename to src/Mapper/Layer/MarkerClusterLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php rename to src/Mapper/Layer/MarkersLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/OverpassLayerMapper.php b/src/Mapper/Layer/OverpassLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/OverpassLayerMapper.php rename to src/Mapper/Layer/OverpassLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php rename to src/Mapper/Layer/ProviderLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ReferenceLayerMapper.php b/src/Mapper/Layer/ReferenceLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/ReferenceLayerMapper.php rename to src/Mapper/Layer/ReferenceLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/TileLayerMapper.php b/src/Mapper/Layer/TileLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/TileLayerMapper.php rename to src/Mapper/Layer/TileLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php rename to src/Mapper/Layer/VectorsLayerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php b/src/Mapper/MapMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php rename to src/Mapper/MapMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Mapper.php b/src/Mapper/Mapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Mapper.php rename to src/Mapper/Mapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/OptionsBuilder.php b/src/Mapper/OptionsBuilder.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/OptionsBuilder.php rename to src/Mapper/OptionsBuilder.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Style/AbstractStyleMapper.php b/src/Mapper/Style/AbstractStyleMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Style/AbstractStyleMapper.php rename to src/Mapper/Style/AbstractStyleMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Style/FixedStyleMapper.php b/src/Mapper/Style/FixedStyleMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Style/FixedStyleMapper.php rename to src/Mapper/Style/FixedStyleMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Type/AbstractIconMapper.php b/src/Mapper/Type/AbstractIconMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Type/AbstractIconMapper.php rename to src/Mapper/Type/AbstractIconMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Type/DivIconMapper.php b/src/Mapper/Type/DivIconMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Type/DivIconMapper.php rename to src/Mapper/Type/DivIconMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Type/ExtraMarkersIconMapper.php b/src/Mapper/Type/ExtraMarkersIconMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Type/ExtraMarkersIconMapper.php rename to src/Mapper/Type/ExtraMarkersIconMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Type/ImageIconMapper.php rename to src/Mapper/Type/ImageIconMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/UI/MarkerMapper.php rename to src/Mapper/UI/MarkerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/UI/PopupMapper.php b/src/Mapper/UI/PopupMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/UI/PopupMapper.php rename to src/Mapper/UI/PopupMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/AbstractVectorMapper.php b/src/Mapper/Vector/AbstractVectorMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/AbstractVectorMapper.php rename to src/Mapper/Vector/AbstractVectorMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php b/src/Mapper/Vector/CircleMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php rename to src/Mapper/Vector/CircleMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMarkerMapper.php b/src/Mapper/Vector/CircleMarkerMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMarkerMapper.php rename to src/Mapper/Vector/CircleMarkerMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolygonMapper.php b/src/Mapper/Vector/MultiPolygonMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolygonMapper.php rename to src/Mapper/Vector/MultiPolygonMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php b/src/Mapper/Vector/MultiPolylineMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/MultiPolylineMapper.php rename to src/Mapper/Vector/MultiPolylineMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolygonMapper.php b/src/Mapper/Vector/PolygonMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolygonMapper.php rename to src/Mapper/Vector/PolygonMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/PolylineMapper.php rename to src/Mapper/Vector/PolylineMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/RectangleMapper.php b/src/Mapper/Vector/RectangleMapper.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Mapper/Vector/RectangleMapper.php rename to src/Mapper/Vector/RectangleMapper.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/AbstractActiveModel.php b/src/Model/AbstractActiveModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/AbstractActiveModel.php rename to src/Model/AbstractActiveModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/ControlModel.php b/src/Model/ControlModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/ControlModel.php rename to src/Model/ControlModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/IconModel.php b/src/Model/IconModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/IconModel.php rename to src/Model/IconModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/LayerModel.php b/src/Model/LayerModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/LayerModel.php rename to src/Model/LayerModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/MapModel.php b/src/Model/MapModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/MapModel.php rename to src/Model/MapModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/MarkerModel.php b/src/Model/MarkerModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/MarkerModel.php rename to src/Model/MarkerModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/PopupModel.php b/src/Model/PopupModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/PopupModel.php rename to src/Model/PopupModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/StyleModel.php b/src/Model/StyleModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/StyleModel.php rename to src/Model/StyleModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Model/VectorModel.php b/src/Model/VectorModel.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Model/VectorModel.php rename to src/Model/VectorModel.php diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php b/src/Subscriber/BootSubscriber.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php rename to src/Subscriber/BootSubscriber.php diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php b/src/Subscriber/EncoderSubscriber.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php rename to src/Subscriber/EncoderSubscriber.php diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php b/src/Subscriber/GeoJsonSubscriber.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Subscriber/GeoJsonSubscriber.php rename to src/Subscriber/GeoJsonSubscriber.php diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/HashSubscriber.php b/src/Subscriber/HashSubscriber.php similarity index 100% rename from src/Netzmacht/Contao/Leaflet/Subscriber/HashSubscriber.php rename to src/Subscriber/HashSubscriber.php