diff --git a/composer.json b/composer.json index 7203a8e..9400e5a 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "dev-develop": "2.1.x-dev", "dev-release/3.0.0": "3.0.x-dev" }, - "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\ContaoManager\\Plugin", + "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin", "contao": { "transifex": { "project": "contao-leaflet-maps", diff --git a/src/ContaoManager/Plugin.php b/src/Bundle/ContaoManager/Plugin.php similarity index 87% rename from src/ContaoManager/Plugin.php rename to src/Bundle/ContaoManager/Plugin.php index 4a3c6f5..e278f18 100644 --- a/src/ContaoManager/Plugin.php +++ b/src/Bundle/ContaoManager/Plugin.php @@ -10,13 +10,15 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\ContaoManager; +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Bundle\ContaoManager; use Contao\CoreBundle\ContaoCoreBundle; use Contao\ManagerPlugin\Bundle\BundlePluginInterface; use Contao\ManagerPlugin\Bundle\Config\BundleConfig; use Contao\ManagerPlugin\Bundle\Parser\ParserInterface; -use Netzmacht\Contao\Leaflet\NetzmachtContaoLeafletBundle; +use Netzmacht\Contao\Leaflet\Bundle\NetzmachtContaoLeafletBundle; use Netzmacht\Contao\Toolkit\Bundle\NetzmachtContaoToolkitBundle; /** diff --git a/src/DependencyInjection/NetzmachtContaoLeafletExtension.php b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php similarity index 94% rename from src/DependencyInjection/NetzmachtContaoLeafletExtension.php rename to src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php index 0735618..98b88fb 100644 --- a/src/DependencyInjection/NetzmachtContaoLeafletExtension.php +++ b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php @@ -10,7 +10,9 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\DependencyInjection; +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php similarity index 95% rename from src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php rename to src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php index 16f73ae..86226d2 100644 --- a/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass; +namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/DependencyInjection/Pass/RegisterEncodersPass.php b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php similarity index 95% rename from src/DependencyInjection/Pass/RegisterEncodersPass.php rename to src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php index b3efa8a..af92cbb 100644 --- a/src/DependencyInjection/Pass/RegisterEncodersPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass; +namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/DependencyInjection/Pass/RegisterLibrariesPass.php b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php similarity index 96% rename from src/DependencyInjection/Pass/RegisterLibrariesPass.php rename to src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php index f8e275f..b05416b 100644 --- a/src/DependencyInjection/Pass/RegisterLibrariesPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass; +namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass; use Netzmacht\LeafletPHP\Assets; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/Bundle/NetzmachtContaoLeafletBundle.php similarity index 80% rename from src/NetzmachtContaoLeafletBundle.php rename to src/Bundle/NetzmachtContaoLeafletBundle.php index fd683ba..d3ebd7a 100644 --- a/src/NetzmachtContaoLeafletBundle.php +++ b/src/Bundle/NetzmachtContaoLeafletBundle.php @@ -12,11 +12,11 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet; +namespace Netzmacht\Contao\Leaflet\Bundle; -use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterLibrariesPass; -use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterDefinitionMapperPass; -use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterEncodersPass; +use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterLibrariesPass; +use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterDefinitionMapperPass; +use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterEncodersPass; use Netzmacht\Contao\Toolkit\Bundle\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Resources/config/amenities.yml b/src/Bundle/Resources/config/amenities.yml similarity index 100% rename from src/Resources/config/amenities.yml rename to src/Bundle/Resources/config/amenities.yml diff --git a/src/Resources/config/config.yml b/src/Bundle/Resources/config/config.yml similarity index 100% rename from src/Resources/config/config.yml rename to src/Bundle/Resources/config/config.yml diff --git a/src/Resources/config/encoders.yml b/src/Bundle/Resources/config/encoders.yml similarity index 100% rename from src/Resources/config/encoders.yml rename to src/Bundle/Resources/config/encoders.yml diff --git a/src/Resources/config/filters.yml b/src/Bundle/Resources/config/filters.yml similarity index 100% rename from src/Resources/config/filters.yml rename to src/Bundle/Resources/config/filters.yml diff --git a/src/Resources/config/layers.yml b/src/Bundle/Resources/config/layers.yml similarity index 100% rename from src/Resources/config/layers.yml rename to src/Bundle/Resources/config/layers.yml diff --git a/src/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml similarity index 100% rename from src/Resources/config/listeners.yml rename to src/Bundle/Resources/config/listeners.yml diff --git a/src/Resources/config/mappers.yml b/src/Bundle/Resources/config/mappers.yml similarity index 100% rename from src/Resources/config/mappers.yml rename to src/Bundle/Resources/config/mappers.yml diff --git a/src/Resources/config/providers.yml b/src/Bundle/Resources/config/providers.yml similarity index 100% rename from src/Resources/config/providers.yml rename to src/Bundle/Resources/config/providers.yml diff --git a/src/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml similarity index 100% rename from src/Resources/config/services.yml rename to src/Bundle/Resources/config/services.yml diff --git a/src/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php similarity index 100% rename from src/Resources/contao/config/config.php rename to src/Bundle/Resources/contao/config/config.php diff --git a/src/Resources/contao/dca/tl_content.php b/src/Bundle/Resources/contao/dca/tl_content.php similarity index 100% rename from src/Resources/contao/dca/tl_content.php rename to src/Bundle/Resources/contao/dca/tl_content.php diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_control.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_control.php diff --git a/src/Resources/contao/dca/tl_leaflet_control_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_control_layer.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_control_layer.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_control_layer.php diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_icon.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_icon.php diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_layer.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_layer.php diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_map.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_map.php diff --git a/src/Resources/contao/dca/tl_leaflet_map_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_map_layer.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_map_layer.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_map_layer.php diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_marker.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_marker.php diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_popup.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_popup.php diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_style.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_style.php diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php similarity index 100% rename from src/Resources/contao/dca/tl_leaflet_vector.php rename to src/Bundle/Resources/contao/dca/tl_leaflet_vector.php diff --git a/src/Resources/contao/dca/tl_module.php b/src/Bundle/Resources/contao/dca/tl_module.php similarity index 100% rename from src/Resources/contao/dca/tl_module.php rename to src/Bundle/Resources/contao/dca/tl_module.php diff --git a/src/Resources/contao/languages/de/leaflet.php b/src/Bundle/Resources/contao/languages/de/leaflet.php similarity index 100% rename from src/Resources/contao/languages/de/leaflet.php rename to src/Bundle/Resources/contao/languages/de/leaflet.php diff --git a/src/Resources/contao/languages/de/modules.php b/src/Bundle/Resources/contao/languages/de/modules.php similarity index 100% rename from src/Resources/contao/languages/de/modules.php rename to src/Bundle/Resources/contao/languages/de/modules.php diff --git a/src/Resources/contao/languages/de/tl_content.php b/src/Bundle/Resources/contao/languages/de/tl_content.php similarity index 100% rename from src/Resources/contao/languages/de/tl_content.php rename to src/Bundle/Resources/contao/languages/de/tl_content.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_control.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_control.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_icon.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_icon.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_layer.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_layer.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_map.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_map.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_marker.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_marker.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_popup.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_popup.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_style.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_style.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php diff --git a/src/Resources/contao/languages/de/tl_leaflet_vector.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_vector.php similarity index 100% rename from src/Resources/contao/languages/de/tl_leaflet_vector.php rename to src/Bundle/Resources/contao/languages/de/tl_leaflet_vector.php diff --git a/src/Resources/contao/languages/de/tl_module.php b/src/Bundle/Resources/contao/languages/de/tl_module.php similarity index 100% rename from src/Resources/contao/languages/de/tl_module.php rename to src/Bundle/Resources/contao/languages/de/tl_module.php diff --git a/src/Resources/contao/languages/en/leaflet.php b/src/Bundle/Resources/contao/languages/en/leaflet.php similarity index 100% rename from src/Resources/contao/languages/en/leaflet.php rename to src/Bundle/Resources/contao/languages/en/leaflet.php diff --git a/src/Resources/contao/languages/en/modules.php b/src/Bundle/Resources/contao/languages/en/modules.php similarity index 100% rename from src/Resources/contao/languages/en/modules.php rename to src/Bundle/Resources/contao/languages/en/modules.php diff --git a/src/Resources/contao/languages/en/tl_content.php b/src/Bundle/Resources/contao/languages/en/tl_content.php similarity index 100% rename from src/Resources/contao/languages/en/tl_content.php rename to src/Bundle/Resources/contao/languages/en/tl_content.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_control.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_control.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_icon.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_icon.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_icon.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_icon.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_layer.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_layer.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_map.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_map.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_marker.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_marker.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_popup.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_popup.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_style.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_style.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php diff --git a/src/Resources/contao/languages/en/tl_leaflet_vector.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php similarity index 100% rename from src/Resources/contao/languages/en/tl_leaflet_vector.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php diff --git a/src/Resources/contao/languages/en/tl_module.php b/src/Bundle/Resources/contao/languages/en/tl_module.php similarity index 100% rename from src/Resources/contao/languages/en/tl_module.php rename to src/Bundle/Resources/contao/languages/en/tl_module.php diff --git a/src/Resources/contao/public/.htaccess b/src/Bundle/Resources/contao/public/.htaccess similarity index 100% rename from src/Resources/contao/public/.htaccess rename to src/Bundle/Resources/contao/public/.htaccess diff --git a/src/Resources/contao/templates/be_leaflet_about.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 similarity index 100% rename from src/Resources/contao/templates/be_leaflet_about.html5 rename to src/Bundle/Resources/contao/templates/be_leaflet_about.html5 diff --git a/src/Resources/contao/templates/be_leaflet_geocode.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 similarity index 100% rename from src/Resources/contao/templates/be_leaflet_geocode.html5 rename to src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 diff --git a/src/Resources/contao/templates/ce_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5 similarity index 100% rename from src/Resources/contao/templates/ce_leaflet_map.html5 rename to src/Bundle/Resources/contao/templates/ce_leaflet_map.html5 diff --git a/src/Resources/contao/templates/leaflet_map_html.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 similarity index 100% rename from src/Resources/contao/templates/leaflet_map_html.html5 rename to src/Bundle/Resources/contao/templates/leaflet_map_html.html5 diff --git a/src/Resources/contao/templates/leaflet_map_js.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_js.html5 similarity index 100% rename from src/Resources/contao/templates/leaflet_map_js.html5 rename to src/Bundle/Resources/contao/templates/leaflet_map_js.html5 diff --git a/src/Resources/contao/templates/mod_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5 similarity index 100% rename from src/Resources/contao/templates/mod_leaflet_map.html5 rename to src/Bundle/Resources/contao/templates/mod_leaflet_map.html5 diff --git a/src/Resources/public/css/about.css b/src/Bundle/Resources/public/css/about.css similarity index 100% rename from src/Resources/public/css/about.css rename to src/Bundle/Resources/public/css/about.css diff --git a/src/Resources/public/css/backend.css b/src/Bundle/Resources/public/css/backend.css similarity index 100% rename from src/Resources/public/css/backend.css rename to src/Bundle/Resources/public/css/backend.css diff --git a/src/Resources/public/img/about.png b/src/Bundle/Resources/public/img/about.png similarity index 100% rename from src/Resources/public/img/about.png rename to src/Bundle/Resources/public/img/about.png diff --git a/src/Resources/public/img/cluster.png b/src/Bundle/Resources/public/img/cluster.png similarity index 100% rename from src/Resources/public/img/cluster.png rename to src/Bundle/Resources/public/img/cluster.png diff --git a/src/Resources/public/img/cluster_1.png b/src/Bundle/Resources/public/img/cluster_1.png similarity index 100% rename from src/Resources/public/img/cluster_1.png rename to src/Bundle/Resources/public/img/cluster_1.png diff --git a/src/Resources/public/img/control.png b/src/Bundle/Resources/public/img/control.png similarity index 100% rename from src/Resources/public/img/control.png rename to src/Bundle/Resources/public/img/control.png diff --git a/src/Resources/public/img/fol-placeholder.gif b/src/Bundle/Resources/public/img/fol-placeholder.gif similarity index 100% rename from src/Resources/public/img/fol-placeholder.gif rename to src/Bundle/Resources/public/img/fol-placeholder.gif diff --git a/src/Resources/public/img/group.png b/src/Bundle/Resources/public/img/group.png similarity index 100% rename from src/Resources/public/img/group.png rename to src/Bundle/Resources/public/img/group.png diff --git a/src/Resources/public/img/group_1.png b/src/Bundle/Resources/public/img/group_1.png similarity index 100% rename from src/Resources/public/img/group_1.png rename to src/Bundle/Resources/public/img/group_1.png diff --git a/src/Resources/public/img/icons.png b/src/Bundle/Resources/public/img/icons.png similarity index 100% rename from src/Resources/public/img/icons.png rename to src/Bundle/Resources/public/img/icons.png diff --git a/src/Resources/public/img/layers.png b/src/Bundle/Resources/public/img/layers.png similarity index 100% rename from src/Resources/public/img/layers.png rename to src/Bundle/Resources/public/img/layers.png diff --git a/src/Resources/public/img/logo.png b/src/Bundle/Resources/public/img/logo.png similarity index 100% rename from src/Resources/public/img/logo.png rename to src/Bundle/Resources/public/img/logo.png diff --git a/src/Resources/public/img/map.png b/src/Bundle/Resources/public/img/map.png similarity index 100% rename from src/Resources/public/img/map.png rename to src/Bundle/Resources/public/img/map.png diff --git a/src/Resources/public/img/markers.png b/src/Bundle/Resources/public/img/markers.png similarity index 100% rename from src/Resources/public/img/markers.png rename to src/Bundle/Resources/public/img/markers.png diff --git a/src/Resources/public/img/markers_1.png b/src/Bundle/Resources/public/img/markers_1.png similarity index 100% rename from src/Resources/public/img/markers_1.png rename to src/Bundle/Resources/public/img/markers_1.png diff --git a/src/Resources/public/img/overpass.png b/src/Bundle/Resources/public/img/overpass.png similarity index 100% rename from src/Resources/public/img/overpass.png rename to src/Bundle/Resources/public/img/overpass.png diff --git a/src/Resources/public/img/popup.png b/src/Bundle/Resources/public/img/popup.png similarity index 100% rename from src/Resources/public/img/popup.png rename to src/Bundle/Resources/public/img/popup.png diff --git a/src/Resources/public/img/provider.png b/src/Bundle/Resources/public/img/provider.png similarity index 100% rename from src/Resources/public/img/provider.png rename to src/Bundle/Resources/public/img/provider.png diff --git a/src/Resources/public/img/provider_1.png b/src/Bundle/Resources/public/img/provider_1.png similarity index 100% rename from src/Resources/public/img/provider_1.png rename to src/Bundle/Resources/public/img/provider_1.png diff --git a/src/Resources/public/img/reference.png b/src/Bundle/Resources/public/img/reference.png similarity index 100% rename from src/Resources/public/img/reference.png rename to src/Bundle/Resources/public/img/reference.png diff --git a/src/Resources/public/img/reference_1.png b/src/Bundle/Resources/public/img/reference_1.png similarity index 100% rename from src/Resources/public/img/reference_1.png rename to src/Bundle/Resources/public/img/reference_1.png diff --git a/src/Resources/public/img/style.png b/src/Bundle/Resources/public/img/style.png similarity index 100% rename from src/Resources/public/img/style.png rename to src/Bundle/Resources/public/img/style.png diff --git a/src/Resources/public/img/tile.png b/src/Bundle/Resources/public/img/tile.png similarity index 100% rename from src/Resources/public/img/tile.png rename to src/Bundle/Resources/public/img/tile.png diff --git a/src/Resources/public/img/tile_1.png b/src/Bundle/Resources/public/img/tile_1.png similarity index 100% rename from src/Resources/public/img/tile_1.png rename to src/Bundle/Resources/public/img/tile_1.png diff --git a/src/Resources/public/img/vectors.png b/src/Bundle/Resources/public/img/vectors.png similarity index 100% rename from src/Resources/public/img/vectors.png rename to src/Bundle/Resources/public/img/vectors.png diff --git a/src/Resources/public/img/vectors_1.png b/src/Bundle/Resources/public/img/vectors_1.png similarity index 100% rename from src/Resources/public/img/vectors_1.png rename to src/Bundle/Resources/public/img/vectors_1.png diff --git a/src/Resources/public/js/contao-leaflet.js b/src/Bundle/Resources/public/js/contao-leaflet.js similarity index 100% rename from src/Resources/public/js/contao-leaflet.js rename to src/Bundle/Resources/public/js/contao-leaflet.js diff --git a/src/DependencyInjection/LeafletServices.php b/src/DependencyInjection/LeafletServices.php deleted file mode 100644 index 2b300ec..0000000 --- a/src/DependencyInjection/LeafletServices.php +++ /dev/null @@ -1,108 +0,0 @@ - - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. - * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE - * @filesource - */ - -namespace Netzmacht\Contao\Leaflet\DependencyInjection; - -use Doctrine\Common\Cache\Cache; -use Netzmacht\Contao\Leaflet\Boot; -use Netzmacht\Contao\Leaflet\Frontend\ValueFilter; -use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\MapProvider; -use Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator; -use Netzmacht\LeafletPHP\Assets; -use Netzmacht\LeafletPHP\Leaflet; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; - -/** - * Class LeafletServices describes services provided by the leaflet package. - * - * @package Netzmacht\Contao\Leaflet\DependencyInjection - */ -class LeafletServices -{ - /** - * Service name for the alias generator which creates valid js aliases. - * - * @return AliasGenerator - */ - const ALIAS_GENERATOR = 'leaflet.alias-generator.default'; - - /** - * Service name of the boot handler. - * - * @return Boot - */ - const BOOT = 'leaflet.boot'; - - /** - * Leaflet cache - * - * @return Cache - */ - const CACHE = 'leaflet.cache'; - - /** - * Service name of the definition builder. - * - * @return Leaflet - */ - const DEFINITION_BUILDER = 'leaflet.definition.builder'; - - /** - * Service name of the encoder factory used inside of the definition builder. - * - * @return \callable - */ - const DEFINITION_ENCODER_FACTORY = 'leaflet.definition.builder.encoder-factory'; - - /** - * Service name of the internal used event dispatcher of the definition builder. - * - * @return EventDispatcherInterface - */ - const DEFINITION_BUILDER_EVENT_DISPATCHER = 'leaflet.definition.builder.event-dispatcher'; - - /** - * Service name of the definition mapper. - * - * @return DefinitionMapper - */ - const DEFINITION_MAPPER = 'leaflet.definition.mapper'; - - /** - * Service name of the leaflet map provider. - * - * @return MapProvider - */ - const MAP_PROVIDER = 'leaflet.map.provider'; - - /** - * Service name of the map assets handler. - * - * @return Assets - */ - const MAP_ASSETS = 'leaflet.map.assets'; - - /** - * Service name of the frontend value filter. - * - * @return ValueFilter - */ - const FRONTEND_VALUE_FILTER = 'leaflet.frontend.value-filter'; - - /** - * Service name for the alias generator uses for rows being unique in the pid. - * - * @return AliasGenerator - */ - const PARENT_ALIAS_GENERATOR = 'leaflet.alias-generator.parent'; -}