From e3344ffd4f1f224410412eace84cf3c07f4f3686 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 14:06:00 +0200 Subject: [PATCH 001/152] Update build and dot files. --- .gitattributes | 10 ++++++++++ .gitignore | 30 ++++++++++++++++++++++-------- build.default.properties | 5 +++++ build.properties | 2 -- 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 .gitattributes create mode 100644 build.default.properties delete mode 100644 build.properties diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..06d085f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +.check-author.yml export-ignore +.gitattributes export-ignore +.github export-ignore +.gitignore export-ignore +.travis.yml export-ignore +build.default.properties export-ignore +build.xml export-ignore +phpunit.xml.dist export-ignore +/tests export-ignore +/specs export-ignore diff --git a/.gitignore b/.gitignore index 7c9521e..a4e22b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,24 @@ -/vendor/ -/bin/ -/demo/ -/assets/js/*.js -/node_modules/ -/.tx/ +# OS +.DS_Store +Thumbs.db +.directory -coverage.xml +# IDEs +.buildpath +.project +.settings/ +.build/ +.external*/ +.idea/ +nbproject/ + +# composer related +vendor/ composer.lock -npm-debug.log + +# build +build/ +build.properties + +# Translations +.tx diff --git a/build.default.properties b/build.default.properties new file mode 100644 index 0000000..a3502c0 --- /dev/null +++ b/build.default.properties @@ -0,0 +1,5 @@ +phpcq.bin.dir = <${basedir}/bin +phpcs.standard = ${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml +phpmd.ruleset = ${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml +phpcs.excluded = src/Resources/contao/languages +phpcpd.excluded = contao diff --git a/build.properties b/build.properties deleted file mode 100644 index df1e841..0000000 --- a/build.properties +++ /dev/null @@ -1,2 +0,0 @@ - -phpcq.bin.dir = ${basedir}/bin From 827c746b0db836631bf41cecb244031b35bc49cc Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 14:16:56 +0200 Subject: [PATCH 002/152] 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 From eea70e3a51ee8671c8ae8c48e70092ada520e5f8 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 14:17:52 +0200 Subject: [PATCH 003/152] Move contao files. --- {module => src/Resources/contao}/assets/.htaccess | 0 .../Resources/contao}/assets/css/about.css | 0 .../Resources/contao}/assets/css/backend.css | 0 .../Resources/contao}/assets/img/about.png | Bin .../Resources/contao}/assets/img/cluster.png | Bin .../Resources/contao}/assets/img/cluster_1.png | Bin .../Resources/contao}/assets/img/control.png | Bin .../contao}/assets/img/fol-placeholder.gif | Bin .../Resources/contao}/assets/img/group.png | Bin .../Resources/contao}/assets/img/group_1.png | Bin .../Resources/contao}/assets/img/icons.png | Bin .../Resources/contao}/assets/img/layers.png | Bin .../Resources/contao}/assets/img/logo.png | Bin {module => src/Resources/contao}/assets/img/map.png | Bin .../Resources/contao}/assets/img/markers.png | Bin .../Resources/contao}/assets/img/markers_1.png | Bin .../Resources/contao}/assets/img/overpass.png | Bin .../Resources/contao}/assets/img/popup.png | Bin .../Resources/contao}/assets/img/provider.png | Bin .../Resources/contao}/assets/img/provider_1.png | Bin .../Resources/contao}/assets/img/reference.png | Bin .../Resources/contao}/assets/img/reference_1.png | Bin .../Resources/contao}/assets/img/style.png | Bin .../Resources/contao}/assets/img/tile.png | Bin .../Resources/contao}/assets/img/tile_1.png | Bin .../Resources/contao}/assets/img/vectors.png | Bin .../Resources/contao}/assets/img/vectors_1.png | Bin .../Resources/contao}/config/autoload.ini | 0 .../Resources/contao}/config/autoload.php | 0 {module => src/Resources/contao}/config/config.php | 0 .../Resources/contao}/config/event_subscribers.php | 0 .../Resources/contao}/config/leaflet_amenities.php | 0 .../Resources/contao}/config/leaflet_providers.php | 0 .../Resources/contao}/config/services.php | 0 {module => src/Resources/contao}/dca/tl_content.php | 0 .../Resources/contao}/dca/tl_leaflet_control.php | 0 .../contao}/dca/tl_leaflet_control_layer.php | 0 .../Resources/contao}/dca/tl_leaflet_icon.php | 0 .../Resources/contao}/dca/tl_leaflet_layer.php | 0 .../Resources/contao}/dca/tl_leaflet_map.php | 0 .../Resources/contao}/dca/tl_leaflet_map_layer.php | 0 .../Resources/contao}/dca/tl_leaflet_marker.php | 0 .../Resources/contao}/dca/tl_leaflet_popup.php | 0 .../Resources/contao}/dca/tl_leaflet_style.php | 0 .../Resources/contao}/dca/tl_leaflet_vector.php | 0 {module => src/Resources/contao}/dca/tl_module.php | 0 .../Resources/contao}/languages/de/leaflet.php | 0 .../Resources/contao}/languages/de/modules.php | 0 .../Resources/contao}/languages/de/tl_content.php | 0 .../contao}/languages/de/tl_leaflet_control.php | 0 .../contao}/languages/de/tl_leaflet_icon.php | 0 .../contao}/languages/de/tl_leaflet_layer.php | 0 .../contao}/languages/de/tl_leaflet_map.php | 0 .../contao}/languages/de/tl_leaflet_marker.php | 0 .../contao}/languages/de/tl_leaflet_popup.php | 0 .../contao}/languages/de/tl_leaflet_style.php | 0 .../contao}/languages/de/tl_leaflet_vector.php | 0 .../Resources/contao}/languages/de/tl_module.php | 0 .../Resources/contao}/languages/en/leaflet.php | 0 .../Resources/contao}/languages/en/modules.php | 0 .../Resources/contao}/languages/en/tl_content.php | 0 .../contao}/languages/en/tl_leaflet_control.php | 0 .../contao}/languages/en/tl_leaflet_icon.php | 0 .../contao}/languages/en/tl_leaflet_layer.php | 0 .../contao}/languages/en/tl_leaflet_map.php | 0 .../contao}/languages/en/tl_leaflet_marker.php | 0 .../contao}/languages/en/tl_leaflet_popup.php | 0 .../contao}/languages/en/tl_leaflet_style.php | 0 .../contao}/languages/en/tl_leaflet_vector.php | 0 .../Resources/contao}/languages/en/tl_module.php | 0 {module => src/Resources/contao}/public/.htaccess | 0 .../contao}/templates/be_leaflet_about.html5 | 0 .../contao}/templates/be_leaflet_geocode.html5 | 0 .../contao}/templates/ce_leaflet_map.html5 | 0 .../contao}/templates/leaflet_map_html.html5 | 0 .../contao}/templates/leaflet_map_js.html5 | 0 .../contao}/templates/mod_leaflet_map.html5 | 0 77 files changed, 0 insertions(+), 0 deletions(-) rename {module => src/Resources/contao}/assets/.htaccess (100%) rename {module => src/Resources/contao}/assets/css/about.css (100%) rename {module => src/Resources/contao}/assets/css/backend.css (100%) rename {module => src/Resources/contao}/assets/img/about.png (100%) rename {module => src/Resources/contao}/assets/img/cluster.png (100%) rename {module => src/Resources/contao}/assets/img/cluster_1.png (100%) rename {module => src/Resources/contao}/assets/img/control.png (100%) rename {module => src/Resources/contao}/assets/img/fol-placeholder.gif (100%) rename {module => src/Resources/contao}/assets/img/group.png (100%) rename {module => src/Resources/contao}/assets/img/group_1.png (100%) rename {module => src/Resources/contao}/assets/img/icons.png (100%) rename {module => src/Resources/contao}/assets/img/layers.png (100%) rename {module => src/Resources/contao}/assets/img/logo.png (100%) rename {module => src/Resources/contao}/assets/img/map.png (100%) rename {module => src/Resources/contao}/assets/img/markers.png (100%) rename {module => src/Resources/contao}/assets/img/markers_1.png (100%) rename {module => src/Resources/contao}/assets/img/overpass.png (100%) rename {module => src/Resources/contao}/assets/img/popup.png (100%) rename {module => src/Resources/contao}/assets/img/provider.png (100%) rename {module => src/Resources/contao}/assets/img/provider_1.png (100%) rename {module => src/Resources/contao}/assets/img/reference.png (100%) rename {module => src/Resources/contao}/assets/img/reference_1.png (100%) rename {module => src/Resources/contao}/assets/img/style.png (100%) rename {module => src/Resources/contao}/assets/img/tile.png (100%) rename {module => src/Resources/contao}/assets/img/tile_1.png (100%) rename {module => src/Resources/contao}/assets/img/vectors.png (100%) rename {module => src/Resources/contao}/assets/img/vectors_1.png (100%) rename {module => src/Resources/contao}/config/autoload.ini (100%) rename {module => src/Resources/contao}/config/autoload.php (100%) rename {module => src/Resources/contao}/config/config.php (100%) rename {module => src/Resources/contao}/config/event_subscribers.php (100%) rename {module => src/Resources/contao}/config/leaflet_amenities.php (100%) rename {module => src/Resources/contao}/config/leaflet_providers.php (100%) rename {module => src/Resources/contao}/config/services.php (100%) rename {module => src/Resources/contao}/dca/tl_content.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_control.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_control_layer.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_icon.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_layer.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_map.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_map_layer.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_marker.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_popup.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_style.php (100%) rename {module => src/Resources/contao}/dca/tl_leaflet_vector.php (100%) rename {module => src/Resources/contao}/dca/tl_module.php (100%) rename {module => src/Resources/contao}/languages/de/leaflet.php (100%) rename {module => src/Resources/contao}/languages/de/modules.php (100%) rename {module => src/Resources/contao}/languages/de/tl_content.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_control.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_icon.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_layer.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_map.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_marker.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_popup.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_style.php (100%) rename {module => src/Resources/contao}/languages/de/tl_leaflet_vector.php (100%) rename {module => src/Resources/contao}/languages/de/tl_module.php (100%) rename {module => src/Resources/contao}/languages/en/leaflet.php (100%) rename {module => src/Resources/contao}/languages/en/modules.php (100%) rename {module => src/Resources/contao}/languages/en/tl_content.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_control.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_icon.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_layer.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_map.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_marker.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_popup.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_style.php (100%) rename {module => src/Resources/contao}/languages/en/tl_leaflet_vector.php (100%) rename {module => src/Resources/contao}/languages/en/tl_module.php (100%) rename {module => src/Resources/contao}/public/.htaccess (100%) rename {module => src/Resources/contao}/templates/be_leaflet_about.html5 (100%) rename {module => src/Resources/contao}/templates/be_leaflet_geocode.html5 (100%) rename {module => src/Resources/contao}/templates/ce_leaflet_map.html5 (100%) rename {module => src/Resources/contao}/templates/leaflet_map_html.html5 (100%) rename {module => src/Resources/contao}/templates/leaflet_map_js.html5 (100%) rename {module => src/Resources/contao}/templates/mod_leaflet_map.html5 (100%) diff --git a/module/assets/.htaccess b/src/Resources/contao/assets/.htaccess similarity index 100% rename from module/assets/.htaccess rename to src/Resources/contao/assets/.htaccess diff --git a/module/assets/css/about.css b/src/Resources/contao/assets/css/about.css similarity index 100% rename from module/assets/css/about.css rename to src/Resources/contao/assets/css/about.css diff --git a/module/assets/css/backend.css b/src/Resources/contao/assets/css/backend.css similarity index 100% rename from module/assets/css/backend.css rename to src/Resources/contao/assets/css/backend.css diff --git a/module/assets/img/about.png b/src/Resources/contao/assets/img/about.png similarity index 100% rename from module/assets/img/about.png rename to src/Resources/contao/assets/img/about.png diff --git a/module/assets/img/cluster.png b/src/Resources/contao/assets/img/cluster.png similarity index 100% rename from module/assets/img/cluster.png rename to src/Resources/contao/assets/img/cluster.png diff --git a/module/assets/img/cluster_1.png b/src/Resources/contao/assets/img/cluster_1.png similarity index 100% rename from module/assets/img/cluster_1.png rename to src/Resources/contao/assets/img/cluster_1.png diff --git a/module/assets/img/control.png b/src/Resources/contao/assets/img/control.png similarity index 100% rename from module/assets/img/control.png rename to src/Resources/contao/assets/img/control.png diff --git a/module/assets/img/fol-placeholder.gif b/src/Resources/contao/assets/img/fol-placeholder.gif similarity index 100% rename from module/assets/img/fol-placeholder.gif rename to src/Resources/contao/assets/img/fol-placeholder.gif diff --git a/module/assets/img/group.png b/src/Resources/contao/assets/img/group.png similarity index 100% rename from module/assets/img/group.png rename to src/Resources/contao/assets/img/group.png diff --git a/module/assets/img/group_1.png b/src/Resources/contao/assets/img/group_1.png similarity index 100% rename from module/assets/img/group_1.png rename to src/Resources/contao/assets/img/group_1.png diff --git a/module/assets/img/icons.png b/src/Resources/contao/assets/img/icons.png similarity index 100% rename from module/assets/img/icons.png rename to src/Resources/contao/assets/img/icons.png diff --git a/module/assets/img/layers.png b/src/Resources/contao/assets/img/layers.png similarity index 100% rename from module/assets/img/layers.png rename to src/Resources/contao/assets/img/layers.png diff --git a/module/assets/img/logo.png b/src/Resources/contao/assets/img/logo.png similarity index 100% rename from module/assets/img/logo.png rename to src/Resources/contao/assets/img/logo.png diff --git a/module/assets/img/map.png b/src/Resources/contao/assets/img/map.png similarity index 100% rename from module/assets/img/map.png rename to src/Resources/contao/assets/img/map.png diff --git a/module/assets/img/markers.png b/src/Resources/contao/assets/img/markers.png similarity index 100% rename from module/assets/img/markers.png rename to src/Resources/contao/assets/img/markers.png diff --git a/module/assets/img/markers_1.png b/src/Resources/contao/assets/img/markers_1.png similarity index 100% rename from module/assets/img/markers_1.png rename to src/Resources/contao/assets/img/markers_1.png diff --git a/module/assets/img/overpass.png b/src/Resources/contao/assets/img/overpass.png similarity index 100% rename from module/assets/img/overpass.png rename to src/Resources/contao/assets/img/overpass.png diff --git a/module/assets/img/popup.png b/src/Resources/contao/assets/img/popup.png similarity index 100% rename from module/assets/img/popup.png rename to src/Resources/contao/assets/img/popup.png diff --git a/module/assets/img/provider.png b/src/Resources/contao/assets/img/provider.png similarity index 100% rename from module/assets/img/provider.png rename to src/Resources/contao/assets/img/provider.png diff --git a/module/assets/img/provider_1.png b/src/Resources/contao/assets/img/provider_1.png similarity index 100% rename from module/assets/img/provider_1.png rename to src/Resources/contao/assets/img/provider_1.png diff --git a/module/assets/img/reference.png b/src/Resources/contao/assets/img/reference.png similarity index 100% rename from module/assets/img/reference.png rename to src/Resources/contao/assets/img/reference.png diff --git a/module/assets/img/reference_1.png b/src/Resources/contao/assets/img/reference_1.png similarity index 100% rename from module/assets/img/reference_1.png rename to src/Resources/contao/assets/img/reference_1.png diff --git a/module/assets/img/style.png b/src/Resources/contao/assets/img/style.png similarity index 100% rename from module/assets/img/style.png rename to src/Resources/contao/assets/img/style.png diff --git a/module/assets/img/tile.png b/src/Resources/contao/assets/img/tile.png similarity index 100% rename from module/assets/img/tile.png rename to src/Resources/contao/assets/img/tile.png diff --git a/module/assets/img/tile_1.png b/src/Resources/contao/assets/img/tile_1.png similarity index 100% rename from module/assets/img/tile_1.png rename to src/Resources/contao/assets/img/tile_1.png diff --git a/module/assets/img/vectors.png b/src/Resources/contao/assets/img/vectors.png similarity index 100% rename from module/assets/img/vectors.png rename to src/Resources/contao/assets/img/vectors.png diff --git a/module/assets/img/vectors_1.png b/src/Resources/contao/assets/img/vectors_1.png similarity index 100% rename from module/assets/img/vectors_1.png rename to src/Resources/contao/assets/img/vectors_1.png diff --git a/module/config/autoload.ini b/src/Resources/contao/config/autoload.ini similarity index 100% rename from module/config/autoload.ini rename to src/Resources/contao/config/autoload.ini diff --git a/module/config/autoload.php b/src/Resources/contao/config/autoload.php similarity index 100% rename from module/config/autoload.php rename to src/Resources/contao/config/autoload.php diff --git a/module/config/config.php b/src/Resources/contao/config/config.php similarity index 100% rename from module/config/config.php rename to src/Resources/contao/config/config.php diff --git a/module/config/event_subscribers.php b/src/Resources/contao/config/event_subscribers.php similarity index 100% rename from module/config/event_subscribers.php rename to src/Resources/contao/config/event_subscribers.php diff --git a/module/config/leaflet_amenities.php b/src/Resources/contao/config/leaflet_amenities.php similarity index 100% rename from module/config/leaflet_amenities.php rename to src/Resources/contao/config/leaflet_amenities.php diff --git a/module/config/leaflet_providers.php b/src/Resources/contao/config/leaflet_providers.php similarity index 100% rename from module/config/leaflet_providers.php rename to src/Resources/contao/config/leaflet_providers.php diff --git a/module/config/services.php b/src/Resources/contao/config/services.php similarity index 100% rename from module/config/services.php rename to src/Resources/contao/config/services.php diff --git a/module/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php similarity index 100% rename from module/dca/tl_content.php rename to src/Resources/contao/dca/tl_content.php diff --git a/module/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php similarity index 100% rename from module/dca/tl_leaflet_control.php rename to src/Resources/contao/dca/tl_leaflet_control.php diff --git a/module/dca/tl_leaflet_control_layer.php b/src/Resources/contao/dca/tl_leaflet_control_layer.php similarity index 100% rename from module/dca/tl_leaflet_control_layer.php rename to src/Resources/contao/dca/tl_leaflet_control_layer.php diff --git a/module/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php similarity index 100% rename from module/dca/tl_leaflet_icon.php rename to src/Resources/contao/dca/tl_leaflet_icon.php diff --git a/module/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php similarity index 100% rename from module/dca/tl_leaflet_layer.php rename to src/Resources/contao/dca/tl_leaflet_layer.php diff --git a/module/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php similarity index 100% rename from module/dca/tl_leaflet_map.php rename to src/Resources/contao/dca/tl_leaflet_map.php diff --git a/module/dca/tl_leaflet_map_layer.php b/src/Resources/contao/dca/tl_leaflet_map_layer.php similarity index 100% rename from module/dca/tl_leaflet_map_layer.php rename to src/Resources/contao/dca/tl_leaflet_map_layer.php diff --git a/module/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php similarity index 100% rename from module/dca/tl_leaflet_marker.php rename to src/Resources/contao/dca/tl_leaflet_marker.php diff --git a/module/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php similarity index 100% rename from module/dca/tl_leaflet_popup.php rename to src/Resources/contao/dca/tl_leaflet_popup.php diff --git a/module/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php similarity index 100% rename from module/dca/tl_leaflet_style.php rename to src/Resources/contao/dca/tl_leaflet_style.php diff --git a/module/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php similarity index 100% rename from module/dca/tl_leaflet_vector.php rename to src/Resources/contao/dca/tl_leaflet_vector.php diff --git a/module/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php similarity index 100% rename from module/dca/tl_module.php rename to src/Resources/contao/dca/tl_module.php diff --git a/module/languages/de/leaflet.php b/src/Resources/contao/languages/de/leaflet.php similarity index 100% rename from module/languages/de/leaflet.php rename to src/Resources/contao/languages/de/leaflet.php diff --git a/module/languages/de/modules.php b/src/Resources/contao/languages/de/modules.php similarity index 100% rename from module/languages/de/modules.php rename to src/Resources/contao/languages/de/modules.php diff --git a/module/languages/de/tl_content.php b/src/Resources/contao/languages/de/tl_content.php similarity index 100% rename from module/languages/de/tl_content.php rename to src/Resources/contao/languages/de/tl_content.php diff --git a/module/languages/de/tl_leaflet_control.php b/src/Resources/contao/languages/de/tl_leaflet_control.php similarity index 100% rename from module/languages/de/tl_leaflet_control.php rename to src/Resources/contao/languages/de/tl_leaflet_control.php diff --git a/module/languages/de/tl_leaflet_icon.php b/src/Resources/contao/languages/de/tl_leaflet_icon.php similarity index 100% rename from module/languages/de/tl_leaflet_icon.php rename to src/Resources/contao/languages/de/tl_leaflet_icon.php diff --git a/module/languages/de/tl_leaflet_layer.php b/src/Resources/contao/languages/de/tl_leaflet_layer.php similarity index 100% rename from module/languages/de/tl_leaflet_layer.php rename to src/Resources/contao/languages/de/tl_leaflet_layer.php diff --git a/module/languages/de/tl_leaflet_map.php b/src/Resources/contao/languages/de/tl_leaflet_map.php similarity index 100% rename from module/languages/de/tl_leaflet_map.php rename to src/Resources/contao/languages/de/tl_leaflet_map.php diff --git a/module/languages/de/tl_leaflet_marker.php b/src/Resources/contao/languages/de/tl_leaflet_marker.php similarity index 100% rename from module/languages/de/tl_leaflet_marker.php rename to src/Resources/contao/languages/de/tl_leaflet_marker.php diff --git a/module/languages/de/tl_leaflet_popup.php b/src/Resources/contao/languages/de/tl_leaflet_popup.php similarity index 100% rename from module/languages/de/tl_leaflet_popup.php rename to src/Resources/contao/languages/de/tl_leaflet_popup.php diff --git a/module/languages/de/tl_leaflet_style.php b/src/Resources/contao/languages/de/tl_leaflet_style.php similarity index 100% rename from module/languages/de/tl_leaflet_style.php rename to src/Resources/contao/languages/de/tl_leaflet_style.php diff --git a/module/languages/de/tl_leaflet_vector.php b/src/Resources/contao/languages/de/tl_leaflet_vector.php similarity index 100% rename from module/languages/de/tl_leaflet_vector.php rename to src/Resources/contao/languages/de/tl_leaflet_vector.php diff --git a/module/languages/de/tl_module.php b/src/Resources/contao/languages/de/tl_module.php similarity index 100% rename from module/languages/de/tl_module.php rename to src/Resources/contao/languages/de/tl_module.php diff --git a/module/languages/en/leaflet.php b/src/Resources/contao/languages/en/leaflet.php similarity index 100% rename from module/languages/en/leaflet.php rename to src/Resources/contao/languages/en/leaflet.php diff --git a/module/languages/en/modules.php b/src/Resources/contao/languages/en/modules.php similarity index 100% rename from module/languages/en/modules.php rename to src/Resources/contao/languages/en/modules.php diff --git a/module/languages/en/tl_content.php b/src/Resources/contao/languages/en/tl_content.php similarity index 100% rename from module/languages/en/tl_content.php rename to src/Resources/contao/languages/en/tl_content.php diff --git a/module/languages/en/tl_leaflet_control.php b/src/Resources/contao/languages/en/tl_leaflet_control.php similarity index 100% rename from module/languages/en/tl_leaflet_control.php rename to src/Resources/contao/languages/en/tl_leaflet_control.php diff --git a/module/languages/en/tl_leaflet_icon.php b/src/Resources/contao/languages/en/tl_leaflet_icon.php similarity index 100% rename from module/languages/en/tl_leaflet_icon.php rename to src/Resources/contao/languages/en/tl_leaflet_icon.php diff --git a/module/languages/en/tl_leaflet_layer.php b/src/Resources/contao/languages/en/tl_leaflet_layer.php similarity index 100% rename from module/languages/en/tl_leaflet_layer.php rename to src/Resources/contao/languages/en/tl_leaflet_layer.php diff --git a/module/languages/en/tl_leaflet_map.php b/src/Resources/contao/languages/en/tl_leaflet_map.php similarity index 100% rename from module/languages/en/tl_leaflet_map.php rename to src/Resources/contao/languages/en/tl_leaflet_map.php diff --git a/module/languages/en/tl_leaflet_marker.php b/src/Resources/contao/languages/en/tl_leaflet_marker.php similarity index 100% rename from module/languages/en/tl_leaflet_marker.php rename to src/Resources/contao/languages/en/tl_leaflet_marker.php diff --git a/module/languages/en/tl_leaflet_popup.php b/src/Resources/contao/languages/en/tl_leaflet_popup.php similarity index 100% rename from module/languages/en/tl_leaflet_popup.php rename to src/Resources/contao/languages/en/tl_leaflet_popup.php diff --git a/module/languages/en/tl_leaflet_style.php b/src/Resources/contao/languages/en/tl_leaflet_style.php similarity index 100% rename from module/languages/en/tl_leaflet_style.php rename to src/Resources/contao/languages/en/tl_leaflet_style.php diff --git a/module/languages/en/tl_leaflet_vector.php b/src/Resources/contao/languages/en/tl_leaflet_vector.php similarity index 100% rename from module/languages/en/tl_leaflet_vector.php rename to src/Resources/contao/languages/en/tl_leaflet_vector.php diff --git a/module/languages/en/tl_module.php b/src/Resources/contao/languages/en/tl_module.php similarity index 100% rename from module/languages/en/tl_module.php rename to src/Resources/contao/languages/en/tl_module.php diff --git a/module/public/.htaccess b/src/Resources/contao/public/.htaccess similarity index 100% rename from module/public/.htaccess rename to src/Resources/contao/public/.htaccess diff --git a/module/templates/be_leaflet_about.html5 b/src/Resources/contao/templates/be_leaflet_about.html5 similarity index 100% rename from module/templates/be_leaflet_about.html5 rename to src/Resources/contao/templates/be_leaflet_about.html5 diff --git a/module/templates/be_leaflet_geocode.html5 b/src/Resources/contao/templates/be_leaflet_geocode.html5 similarity index 100% rename from module/templates/be_leaflet_geocode.html5 rename to src/Resources/contao/templates/be_leaflet_geocode.html5 diff --git a/module/templates/ce_leaflet_map.html5 b/src/Resources/contao/templates/ce_leaflet_map.html5 similarity index 100% rename from module/templates/ce_leaflet_map.html5 rename to src/Resources/contao/templates/ce_leaflet_map.html5 diff --git a/module/templates/leaflet_map_html.html5 b/src/Resources/contao/templates/leaflet_map_html.html5 similarity index 100% rename from module/templates/leaflet_map_html.html5 rename to src/Resources/contao/templates/leaflet_map_html.html5 diff --git a/module/templates/leaflet_map_js.html5 b/src/Resources/contao/templates/leaflet_map_js.html5 similarity index 100% rename from module/templates/leaflet_map_js.html5 rename to src/Resources/contao/templates/leaflet_map_js.html5 diff --git a/module/templates/mod_leaflet_map.html5 b/src/Resources/contao/templates/mod_leaflet_map.html5 similarity index 100% rename from module/templates/mod_leaflet_map.html5 rename to src/Resources/contao/templates/mod_leaflet_map.html5 From 3e40da22ba41793fb9fc7a769c5054edea56e6de Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 15:24:34 +0200 Subject: [PATCH 004/152] Drop bin dir. --- build.default.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/build.default.properties b/build.default.properties index a3502c0..06357d7 100644 --- a/build.default.properties +++ b/build.default.properties @@ -1,4 +1,3 @@ -phpcq.bin.dir = <${basedir}/bin phpcs.standard = ${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml phpmd.ruleset = ${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml phpcs.excluded = src/Resources/contao/languages From 540680f7f6dbe8252dedc6088bfba5ef0db4fefe Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 15:25:58 +0200 Subject: [PATCH 005/152] Use phpcq all tasks. --- build.xml | 2 +- composer.json | 121 +++++++++++++++++++++++++------------------------- 2 files changed, 61 insertions(+), 62 deletions(-) diff --git a/build.xml b/build.xml index ccf97f7..3471b6b 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + diff --git a/composer.json b/composer.json index 3658cf0..398371c 100644 --- a/composer.json +++ b/composer.json @@ -1,64 +1,63 @@ { - "name":"netzmacht/contao-leaflet-maps", - "description":"Contao Leaflet maps integration", - "keywords":["contao", "maps", "leaflet"], - "type":"contao-module", - "license":"LGPL-3.0+", - "authors":[ - { - "name":"David Molineus", - "email":"mail@netzmacht.de", - "homepage":"http://www.netzmacht.de", - "role":"Project leader" - } - ], - "support":{ - "email":"mail@netzmacht.de", - "issues":"https://github.com/netzmacht/contao-leaflet-maps/issues", - "source":"https://github.com/netzmacht/contao-leaflet-maps" - }, - "require":{ - "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":"^3.0@dev", - "contao-community-alliance/meta-palettes": "^1.5", - "menatwork/contao-multicolumnwizard": "^3.2", - "doctrine/cache": "^1.0" - }, - "require-dev":{ - "netzmacht/contao-build-tools": "^1.1" - }, - "autoload": { - "psr-4": { - "Netzmacht\\Contao\\Leaflet\\": "src/" - } - }, - "config": { - "bin-dir": "bin" - }, - "prefer-stable": true, - "minimum-stability": "dev", - "extra":{ - "branch-alias": { - "dev-master": "2.0.x-dev", - "dev-develop": "2.1.x-dev", - "dev-support/0.7.x": "0.7.x-dev" - }, - "contao": { - "sources":{ - "module": "system/modules/leaflet", - "assets/maps": "assets/leaflet/maps", - "assets/js": "assets/leaflet/js" - }, - "transifex": { - "project": "contao-leaflet-maps", - "prefix": "core-", - "languages_cto": "module/languages", - "languages_tx": ".tx" - } - } + "name": "netzmacht/contao-leaflet-maps", + "description": "Contao Leaflet maps integration", + "keywords": [ + "contao", + "maps", + "leaflet" + ], + "type": "contao-bundle", + "license": "LGPL-3.0+", + "authors": [ + { + "name": "David Molineus", + "email": "mail@netzmacht.de", + "homepage": "https://netzmacht.de", + "role": "Developer" } + ], + "support": { + "email": "mail@netzmacht.de", + "issues": "https://github.com/netzmacht/contao-leaflet-maps/issues", + "source": "https://github.com/netzmacht/contao-leaflet-maps" + }, + "require": { + "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.1", + "netzmacht/contao-toolkit": "^3.0@dev", + "contao-community-alliance/meta-palettes": "^1.5", + "menatwork/contao-multicolumnwizard": "^3.2", + "doctrine/cache": "^1.0" + }, + "require-dev": { + "phpcq/all-tasks": "^1.2" + }, + "autoload": { + "psr-4": { + "Netzmacht\\Contao\\Leaflet\\": "src/" + } + }, + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev", + "dev-develop": "2.1.x-dev", + "dev-release/3.0.0": "3.0.x-dev" + }, + "contao": { + "sources": { + "module": "system/modules/leaflet", + "assets/maps": "assets/leaflet/maps", + "assets/js": "assets/leaflet/js" + }, + "transifex": { + "project": "contao-leaflet-maps", + "prefix": "core-", + "languages_cto": "module/languages", + "languages_tx": ".tx" + } + } + } } From f8aac5747ca6e5bdd7550569539db98ae53b86c9 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 15:27:49 +0200 Subject: [PATCH 006/152] Update interface. --- src/Alias/DefaultAliasFilter.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Alias/DefaultAliasFilter.php b/src/Alias/DefaultAliasFilter.php index 3fe9e70..12247f9 100644 --- a/src/Alias/DefaultAliasFilter.php +++ b/src/Alias/DefaultAliasFilter.php @@ -8,6 +8,8 @@ * */ +declare(strict_types=1); + namespace Netzmacht\Contao\Leaflet\Alias; use Netzmacht\Contao\Toolkit\Data\Alias\Filter\AbstractFilter; @@ -42,7 +44,7 @@ class DefaultAliasFilter extends AbstractFilter /** * {@inheritdoc} */ - public function repeatUntilValid() + public function repeatUntilValid(): bool { return false; } @@ -50,7 +52,7 @@ class DefaultAliasFilter extends AbstractFilter /** * {@inheritdoc} */ - public function apply($model, $value, $separator) + public function apply($model, $value, string $separator): string { if (!$value) { return $this->prefix . $separator . $model->id; From dfc1fa49d94d66f774f404c29a1f7b1a8f01c344 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 15:34:19 +0200 Subject: [PATCH 007/152] Restore compatibility with contao-toolkit 3.0. --- src/Frontend/AbstractMapHybrid.php | 10 ++++++---- .../InsertTag/LeafletInsertTagParser.php | 20 +++++++------------ src/Frontend/MapElement.php | 4 +++- src/Frontend/MapModule.php | 4 +++- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index a69d87f..7344558 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -9,15 +9,17 @@ * */ +declare(strict_types=1); + namespace Netzmacht\Contao\Leaflet\Frontend; -use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator; use Database\Result; use Model\Collection; use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid; use Netzmacht\Contao\Toolkit\View\Template\TemplateFactory; +use Symfony\Component\Translation\TranslatorInterface as Translator; /** * Class HybridTrait provides method required by the frontend module and content element the same time. @@ -79,7 +81,7 @@ abstract class AbstractMapHybrid extends AbstractHybrid * * @return string */ - public function generate() + public function generate(): string { $this->mapProvider->handleAjaxRequest($this->getIdentifier()); @@ -113,7 +115,7 @@ abstract class AbstractMapHybrid extends AbstractHybrid * * @SuppressWarnings(PHPMD.Superglobals) */ - protected function compile() + protected function compile(): void { try { $template = $this->get('leaflet_template') ?: 'leaflet_map_js'; @@ -146,5 +148,5 @@ abstract class AbstractMapHybrid extends AbstractHybrid * * @return string */ - abstract protected function getIdentifier(); + abstract protected function getIdentifier(): string; } diff --git a/src/Frontend/InsertTag/LeafletInsertTagParser.php b/src/Frontend/InsertTag/LeafletInsertTagParser.php index fb2c35b..58c53ad 100644 --- a/src/Frontend/InsertTag/LeafletInsertTagParser.php +++ b/src/Frontend/InsertTag/LeafletInsertTagParser.php @@ -9,6 +9,8 @@ * */ +declare(strict_types=1); + namespace Netzmacht\Contao\Leaflet\Frontend\InsertTag; use Netzmacht\Contao\Leaflet\MapProvider; @@ -57,28 +59,20 @@ class LeafletInsertTagParser implements Parser /** * {@inheritDoc} */ - public static function getTags() + public function supports(string $tag): bool { - return ['leaflet']; + return $tag === 'leaflet'; } /** * {@inheritDoc} */ - public function supports($tag) - { - return in_array($tag, static::getTags()); - } - - /** - * {@inheritDoc} - */ - public function parse($raw, $tag, $params = null, $cache = true) + public function parse(string $raw, string $tag, string $params = null, bool $cache = true): string { $parts = explode('::', $params); if (empty($parts[0])) { - return false; + return ''; } $style = empty($parts[1]) ? 'width:400px;height:300px' : $parts[1]; @@ -98,7 +92,7 @@ class LeafletInsertTagParser implements Parser * * @throws \Exception If debug mode is enabled and something went wrong. */ - private function generateMap($mapId, $template, $style) + private function generateMap($mapId, string $template, string $style) { try { return $this->mapProvider->generate($mapId, null, $mapId, $template, $style); diff --git a/src/Frontend/MapElement.php b/src/Frontend/MapElement.php index 0ae08f1..dc1cdb2 100644 --- a/src/Frontend/MapElement.php +++ b/src/Frontend/MapElement.php @@ -9,6 +9,8 @@ * */ +declare(strict_types=1); + namespace Netzmacht\Contao\Leaflet\Frontend; /** @@ -30,7 +32,7 @@ class MapElement extends AbstractMapHybrid * * @return string */ - protected function getIdentifier() + protected function getIdentifier(): string { if ($this->get('leaflet_mapId')) { return $this->get('leaflet_mapId'); diff --git a/src/Frontend/MapModule.php b/src/Frontend/MapModule.php index 3819d8e..13b1431 100644 --- a/src/Frontend/MapModule.php +++ b/src/Frontend/MapModule.php @@ -9,6 +9,8 @@ * */ +declare(strict_types=1); + namespace Netzmacht\Contao\Leaflet\Frontend; /** @@ -30,7 +32,7 @@ class MapModule extends AbstractMapHybrid * * @return string */ - protected function getIdentifier() + protected function getIdentifier(): string { if ($this->get('leaflet_mapId')) { return $this->get('leaflet_mapId'); From 84294686a57b91bc70f1fcd7a5b910f63030bd17 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 15:45:43 +0200 Subject: [PATCH 008/152] Update file headers. --- src/Alias/DefaultAliasFilter.php | 10 ++++++---- src/Backend/About.php | 7 ++++--- src/Boot.php | 7 ++++--- src/ContaoAssets.php | 7 ++++--- src/Dca/ControlCallbacks.php | 7 ++++--- src/Dca/FrontendIntegration.php | 7 ++++--- src/Dca/LayerCallbacks.php | 7 ++++--- src/Dca/LeafletCallbacks.php | 7 ++++--- src/Dca/MapCallbacks.php | 7 ++++--- src/Dca/MarkerCallbacks.php | 7 ++++--- src/Dca/Validator.php | 10 ++++++---- src/Dca/VectorCallbacks.php | 7 ++++--- src/Definition/Layer/OverpassLayer.php | 10 ++++++---- src/Definition/Style.php | 7 ++++--- src/Definition/Style/FixedStyle.php | 7 ++++--- src/DependencyInjection/LeafletServices.php | 10 ++++++---- src/Event/BuildDefinitionEvent.php | 7 ++++--- src/Event/ConvertToGeoJsonEvent.php | 7 ++++--- src/Event/GetHashEvent.php | 7 ++++--- src/Event/GetJavascriptEvent.php | 7 ++++--- src/Event/InitializeDefinitionMapperEvent.php | 7 ++++--- src/Event/InitializeEventDispatcherEvent.php | 7 ++++--- src/Event/InitializeLeafletBuilderEvent.php | 7 ++++--- src/Filter/BboxFilter.php | 7 ++++--- src/Filter/DistanceFilter.php | 7 ++++--- src/Filter/Filter.php | 7 ++++--- src/Frontend/AbstractMapHybrid.php | 7 ++++--- src/Frontend/DataController.php | 7 ++++--- src/Frontend/InsertTag/LeafletInsertTagParser.php | 7 ++++--- src/Frontend/MapElement.php | 7 ++++--- src/Frontend/MapModule.php | 7 ++++--- src/Frontend/RequestUrl.php | 7 ++++--- src/Frontend/ValueFilter.php | 7 ++++--- src/MapProvider.php | 7 ++++--- src/Mapper/AbstractMapper.php | 7 ++++--- src/Mapper/AbstractTypeMapper.php | 7 ++++--- src/Mapper/Control/AbstractControlMapper.php | 7 ++++--- src/Mapper/Control/AttributionControlMapper.php | 7 ++++--- src/Mapper/Control/FullscreenControlMapper.php | 9 ++++----- src/Mapper/Control/LayersControlMapper.php | 7 ++++--- src/Mapper/Control/LoadingControlMapper.php | 7 ++++--- src/Mapper/Control/ScaleControlMapper.php | 7 ++++--- src/Mapper/Control/ZoomControlMapper.php | 7 ++++--- src/Mapper/DefinitionMapper.php | 7 ++++--- src/Mapper/GeoJsonMapper.php | 7 ++++--- src/Mapper/Layer/AbstractLayerMapper.php | 7 ++++--- src/Mapper/Layer/GroupLayerMapper.php | 7 ++++--- src/Mapper/Layer/MarkerClusterLayerMapper.php | 7 ++++--- src/Mapper/Layer/MarkersLayerMapper.php | 7 ++++--- src/Mapper/Layer/OverpassLayerMapper.php | 10 ++++++---- src/Mapper/Layer/ProviderLayerMapper.php | 7 ++++--- src/Mapper/Layer/ReferenceLayerMapper.php | 7 ++++--- src/Mapper/Layer/TileLayerMapper.php | 7 ++++--- src/Mapper/Layer/VectorsLayerMapper.php | 7 ++++--- src/Mapper/MapMapper.php | 7 ++++--- src/Mapper/Mapper.php | 7 ++++--- src/Mapper/OptionsBuilder.php | 8 ++++---- src/Mapper/Style/AbstractStyleMapper.php | 7 ++++--- src/Mapper/Style/FixedStyleMapper.php | 10 ++++------ src/Mapper/Type/AbstractIconMapper.php | 7 ++++--- src/Mapper/Type/DivIconMapper.php | 7 ++++--- src/Mapper/Type/ExtraMarkersIconMapper.php | 7 ++++--- src/Mapper/Type/ImageIconMapper.php | 7 ++++--- src/Mapper/UI/MarkerMapper.php | 7 ++++--- src/Mapper/UI/PopupMapper.php | 7 ++++--- src/Mapper/Vector/AbstractVectorMapper.php | 7 ++++--- src/Mapper/Vector/CircleMapper.php | 7 ++++--- src/Mapper/Vector/CircleMarkerMapper.php | 7 ++++--- src/Mapper/Vector/MultiPolygonMapper.php | 7 ++++--- src/Mapper/Vector/MultiPolylineMapper.php | 7 ++++--- src/Mapper/Vector/PolygonMapper.php | 7 ++++--- src/Mapper/Vector/PolylineMapper.php | 7 ++++--- src/Mapper/Vector/RectangleMapper.php | 7 ++++--- src/Model/AbstractActiveModel.php | 7 ++++--- src/Model/ControlModel.php | 7 ++++--- src/Model/IconModel.php | 7 ++++--- src/Model/LayerModel.php | 7 ++++--- src/Model/MapModel.php | 7 ++++--- src/Model/MarkerModel.php | 7 ++++--- src/Model/PopupModel.php | 7 ++++--- src/Model/StyleModel.php | 7 ++++--- src/Model/VectorModel.php | 7 ++++--- src/Resources/contao/config/autoload.php | 7 ++++--- src/Resources/contao/config/config.php | 7 ++++--- src/Resources/contao/config/event_subscribers.php | 8 +++++--- src/Resources/contao/config/leaflet_amenities.php | 7 ++++--- src/Resources/contao/config/leaflet_providers.php | 7 ++++--- src/Resources/contao/config/services.php | 7 ++++--- src/Resources/contao/dca/tl_content.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_control.php | 8 +++++--- src/Resources/contao/dca/tl_leaflet_control_layer.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_icon.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_layer.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_map.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_map_layer.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_marker.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_popup.php | 7 ++++--- src/Resources/contao/dca/tl_leaflet_style.php | 8 +++++--- src/Resources/contao/dca/tl_leaflet_vector.php | 7 ++++--- src/Resources/contao/dca/tl_module.php | 7 ++++--- src/Resources/contao/languages/en/leaflet.php | 10 ++++++++++ src/Resources/contao/languages/en/modules.php | 10 ++++++++++ src/Resources/contao/languages/en/tl_content.php | 10 ++++++++++ .../contao/languages/en/tl_leaflet_control.php | 10 ++++++++++ src/Resources/contao/languages/en/tl_leaflet_icon.php | 10 ++++++++++ src/Resources/contao/languages/en/tl_leaflet_layer.php | 10 ++++++++++ src/Resources/contao/languages/en/tl_leaflet_map.php | 10 ++++++++++ .../contao/languages/en/tl_leaflet_marker.php | 10 ++++++++++ src/Resources/contao/languages/en/tl_leaflet_popup.php | 10 ++++++++++ src/Resources/contao/languages/en/tl_leaflet_style.php | 10 ++++++++++ .../contao/languages/en/tl_leaflet_vector.php | 10 ++++++++++ src/Resources/contao/languages/en/tl_module.php | 10 ++++++++++ src/Subscriber/BootSubscriber.php | 7 ++++--- src/Subscriber/EncoderSubscriber.php | 7 ++++--- src/Subscriber/GeoJsonSubscriber.php | 7 ++++--- src/Subscriber/HashSubscriber.php | 7 ++++--- 116 files changed, 549 insertions(+), 323 deletions(-) diff --git a/src/Alias/DefaultAliasFilter.php b/src/Alias/DefaultAliasFilter.php index 12247f9..8653421 100644 --- a/src/Alias/DefaultAliasFilter.php +++ b/src/Alias/DefaultAliasFilter.php @@ -1,11 +1,13 @@ - * @copyright 2016 netzmacht David Molineus. All rights reserved. - * @filesource + * Leaflet maps for Contao CMS. * + * @package contao-leaflet-maps + * @author David Molineus + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource */ declare(strict_types=1); diff --git a/src/Backend/About.php b/src/Backend/About.php index 8a1b350..50abf88 100644 --- a/src/Backend/About.php +++ b/src/Backend/About.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Backend; diff --git a/src/Boot.php b/src/Boot.php index a07590e..1b0116c 100644 --- a/src/Boot.php +++ b/src/Boot.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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; diff --git a/src/ContaoAssets.php b/src/ContaoAssets.php index bc5e907..6b43f1b 100644 --- a/src/ContaoAssets.php +++ b/src/ContaoAssets.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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; diff --git a/src/Dca/ControlCallbacks.php b/src/Dca/ControlCallbacks.php index 9b170ac..9e49018 100644 --- a/src/Dca/ControlCallbacks.php +++ b/src/Dca/ControlCallbacks.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Dca; diff --git a/src/Dca/FrontendIntegration.php b/src/Dca/FrontendIntegration.php index d97ce28..f07c46a 100644 --- a/src/Dca/FrontendIntegration.php +++ b/src/Dca/FrontendIntegration.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Dca; diff --git a/src/Dca/LayerCallbacks.php b/src/Dca/LayerCallbacks.php index 5831d0b..b456c29 100644 --- a/src/Dca/LayerCallbacks.php +++ b/src/Dca/LayerCallbacks.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Dca; diff --git a/src/Dca/LeafletCallbacks.php b/src/Dca/LeafletCallbacks.php index 3e97bf7..77f0c23 100644 --- a/src/Dca/LeafletCallbacks.php +++ b/src/Dca/LeafletCallbacks.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Dca; diff --git a/src/Dca/MapCallbacks.php b/src/Dca/MapCallbacks.php index ad5943b..ed186fe 100644 --- a/src/Dca/MapCallbacks.php +++ b/src/Dca/MapCallbacks.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Dca; diff --git a/src/Dca/MarkerCallbacks.php b/src/Dca/MarkerCallbacks.php index 0b9aa40..933234c 100644 --- a/src/Dca/MarkerCallbacks.php +++ b/src/Dca/MarkerCallbacks.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Dca; diff --git a/src/Dca/Validator.php b/src/Dca/Validator.php index 5da9c57..6607ce6 100644 --- a/src/Dca/Validator.php +++ b/src/Dca/Validator.php @@ -1,11 +1,13 @@ - * @copyright 2016 netzmacht David Molineus. All rights reserved. - * @filesource + * Leaflet maps for Contao CMS. * + * @package contao-leaflet-maps + * @author David Molineus + * @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\Dca; diff --git a/src/Dca/VectorCallbacks.php b/src/Dca/VectorCallbacks.php index d4ba594..034e72a 100644 --- a/src/Dca/VectorCallbacks.php +++ b/src/Dca/VectorCallbacks.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Dca; diff --git a/src/Definition/Layer/OverpassLayer.php b/src/Definition/Layer/OverpassLayer.php index 15e8139..dfee41b 100644 --- a/src/Definition/Layer/OverpassLayer.php +++ b/src/Definition/Layer/OverpassLayer.php @@ -1,11 +1,13 @@ - * @copyright 2016 netzmacht David Molineus. All rights reserved. - * @filesource + * Leaflet maps for Contao CMS. * + * @package contao-leaflet-maps + * @author David Molineus + * @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\Definition\Layer; diff --git a/src/Definition/Style.php b/src/Definition/Style.php index 3631ef2..40f2abc 100644 --- a/src/Definition/Style.php +++ b/src/Definition/Style.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Definition; diff --git a/src/Definition/Style/FixedStyle.php b/src/Definition/Style/FixedStyle.php index a6a37ff..c33309d 100644 --- a/src/Definition/Style/FixedStyle.php +++ b/src/Definition/Style/FixedStyle.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Definition\Style; diff --git a/src/DependencyInjection/LeafletServices.php b/src/DependencyInjection/LeafletServices.php index 4d3b2a6..2b300ec 100644 --- a/src/DependencyInjection/LeafletServices.php +++ b/src/DependencyInjection/LeafletServices.php @@ -1,11 +1,13 @@ - * @copyright 2016 netzmacht David Molineus. All rights reserved. - * @filesource + * Leaflet maps for Contao CMS. * + * @package contao-leaflet-maps + * @author David Molineus + * @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; diff --git a/src/Event/BuildDefinitionEvent.php b/src/Event/BuildDefinitionEvent.php index c7cbbe1..9112fb6 100644 --- a/src/Event/BuildDefinitionEvent.php +++ b/src/Event/BuildDefinitionEvent.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Event; diff --git a/src/Event/ConvertToGeoJsonEvent.php b/src/Event/ConvertToGeoJsonEvent.php index 8bf6d80..d323e1b 100644 --- a/src/Event/ConvertToGeoJsonEvent.php +++ b/src/Event/ConvertToGeoJsonEvent.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Event; diff --git a/src/Event/GetHashEvent.php b/src/Event/GetHashEvent.php index c9961c4..00eaba6 100644 --- a/src/Event/GetHashEvent.php +++ b/src/Event/GetHashEvent.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Event; diff --git a/src/Event/GetJavascriptEvent.php b/src/Event/GetJavascriptEvent.php index fca1b4f..3a4f3be 100644 --- a/src/Event/GetJavascriptEvent.php +++ b/src/Event/GetJavascriptEvent.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Event; diff --git a/src/Event/InitializeDefinitionMapperEvent.php b/src/Event/InitializeDefinitionMapperEvent.php index 4b7a199..64ce78e 100644 --- a/src/Event/InitializeDefinitionMapperEvent.php +++ b/src/Event/InitializeDefinitionMapperEvent.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Event; diff --git a/src/Event/InitializeEventDispatcherEvent.php b/src/Event/InitializeEventDispatcherEvent.php index 8be23e5..13f5e09 100644 --- a/src/Event/InitializeEventDispatcherEvent.php +++ b/src/Event/InitializeEventDispatcherEvent.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Event; diff --git a/src/Event/InitializeLeafletBuilderEvent.php b/src/Event/InitializeLeafletBuilderEvent.php index af933d9..99a9071 100644 --- a/src/Event/InitializeLeafletBuilderEvent.php +++ b/src/Event/InitializeLeafletBuilderEvent.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Event; diff --git a/src/Filter/BboxFilter.php b/src/Filter/BboxFilter.php index 6ec6ed6..c7d418c 100644 --- a/src/Filter/BboxFilter.php +++ b/src/Filter/BboxFilter.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Filter; diff --git a/src/Filter/DistanceFilter.php b/src/Filter/DistanceFilter.php index f730545..4cfb87b 100644 --- a/src/Filter/DistanceFilter.php +++ b/src/Filter/DistanceFilter.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Filter; diff --git a/src/Filter/Filter.php b/src/Filter/Filter.php index 0715dfd..c88e2ab 100644 --- a/src/Filter/Filter.php +++ b/src/Filter/Filter.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Filter; diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index 7344558..c7c71f1 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ declare(strict_types=1); diff --git a/src/Frontend/DataController.php b/src/Frontend/DataController.php index c7c957b..b3c1275 100644 --- a/src/Frontend/DataController.php +++ b/src/Frontend/DataController.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Frontend; diff --git a/src/Frontend/InsertTag/LeafletInsertTagParser.php b/src/Frontend/InsertTag/LeafletInsertTagParser.php index 58c53ad..53aa54e 100644 --- a/src/Frontend/InsertTag/LeafletInsertTagParser.php +++ b/src/Frontend/InsertTag/LeafletInsertTagParser.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ declare(strict_types=1); diff --git a/src/Frontend/MapElement.php b/src/Frontend/MapElement.php index dc1cdb2..5e0c46c 100644 --- a/src/Frontend/MapElement.php +++ b/src/Frontend/MapElement.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ declare(strict_types=1); diff --git a/src/Frontend/MapModule.php b/src/Frontend/MapModule.php index 13b1431..8f47ebe 100644 --- a/src/Frontend/MapModule.php +++ b/src/Frontend/MapModule.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ declare(strict_types=1); diff --git a/src/Frontend/RequestUrl.php b/src/Frontend/RequestUrl.php index cd37039..9fc849a 100644 --- a/src/Frontend/RequestUrl.php +++ b/src/Frontend/RequestUrl.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Frontend; diff --git a/src/Frontend/ValueFilter.php b/src/Frontend/ValueFilter.php index 4885ba9..253da7c 100644 --- a/src/Frontend/ValueFilter.php +++ b/src/Frontend/ValueFilter.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Frontend; diff --git a/src/MapProvider.php b/src/MapProvider.php index 01293bb..ee4083a 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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; diff --git a/src/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php index a02f9cf..b773ae7 100644 --- a/src/Mapper/AbstractMapper.php +++ b/src/Mapper/AbstractMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper; diff --git a/src/Mapper/AbstractTypeMapper.php b/src/Mapper/AbstractTypeMapper.php index f3dfa05..81bc4e9 100644 --- a/src/Mapper/AbstractTypeMapper.php +++ b/src/Mapper/AbstractTypeMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper; diff --git a/src/Mapper/Control/AbstractControlMapper.php b/src/Mapper/Control/AbstractControlMapper.php index 3c21f08..e7664a3 100644 --- a/src/Mapper/Control/AbstractControlMapper.php +++ b/src/Mapper/Control/AbstractControlMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Control; diff --git a/src/Mapper/Control/AttributionControlMapper.php b/src/Mapper/Control/AttributionControlMapper.php index 7f940ae..f2613a2 100644 --- a/src/Mapper/Control/AttributionControlMapper.php +++ b/src/Mapper/Control/AttributionControlMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Control; diff --git a/src/Mapper/Control/FullscreenControlMapper.php b/src/Mapper/Control/FullscreenControlMapper.php index 0bbbb3b..e0705e2 100644 --- a/src/Mapper/Control/FullscreenControlMapper.php +++ b/src/Mapper/Control/FullscreenControlMapper.php @@ -1,18 +1,17 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Control; -use Netzmacht\LeafletPHP\Definition; - /** * Class FullscreenControlMapper. * diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index b9242e9..0b2269c 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Control; diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php index 881fd70..76be93f 100644 --- a/src/Mapper/Control/LoadingControlMapper.php +++ b/src/Mapper/Control/LoadingControlMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Control; diff --git a/src/Mapper/Control/ScaleControlMapper.php b/src/Mapper/Control/ScaleControlMapper.php index d2c33c5..d68caf8 100644 --- a/src/Mapper/Control/ScaleControlMapper.php +++ b/src/Mapper/Control/ScaleControlMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Control; diff --git a/src/Mapper/Control/ZoomControlMapper.php b/src/Mapper/Control/ZoomControlMapper.php index c62c7d7..1bed566 100644 --- a/src/Mapper/Control/ZoomControlMapper.php +++ b/src/Mapper/Control/ZoomControlMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Control; diff --git a/src/Mapper/DefinitionMapper.php b/src/Mapper/DefinitionMapper.php index 100cf6e..6522d99 100644 --- a/src/Mapper/DefinitionMapper.php +++ b/src/Mapper/DefinitionMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper; diff --git a/src/Mapper/GeoJsonMapper.php b/src/Mapper/GeoJsonMapper.php index 1d29354..f0ac257 100644 --- a/src/Mapper/GeoJsonMapper.php +++ b/src/Mapper/GeoJsonMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper; diff --git a/src/Mapper/Layer/AbstractLayerMapper.php b/src/Mapper/Layer/AbstractLayerMapper.php index f16d1c8..c8cc96e 100644 --- a/src/Mapper/Layer/AbstractLayerMapper.php +++ b/src/Mapper/Layer/AbstractLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php index 3dbb302..27d6987 100644 --- a/src/Mapper/Layer/GroupLayerMapper.php +++ b/src/Mapper/Layer/GroupLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index 329f3d6..b5b27f5 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index fdb9b75..a8731c8 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/Layer/OverpassLayerMapper.php b/src/Mapper/Layer/OverpassLayerMapper.php index 74d9bec..587b9d7 100644 --- a/src/Mapper/Layer/OverpassLayerMapper.php +++ b/src/Mapper/Layer/OverpassLayerMapper.php @@ -1,11 +1,13 @@ - * @copyright 2016 netzmacht David Molineus. All rights reserved. - * @filesource + * Leaflet maps for Contao CMS. * + * @package contao-leaflet-maps + * @author David Molineus + * @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\Mapper\Layer; diff --git a/src/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php index 28d72ca..2f9f40b 100644 --- a/src/Mapper/Layer/ProviderLayerMapper.php +++ b/src/Mapper/Layer/ProviderLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/Layer/ReferenceLayerMapper.php b/src/Mapper/Layer/ReferenceLayerMapper.php index a0eef6c..220e836 100644 --- a/src/Mapper/Layer/ReferenceLayerMapper.php +++ b/src/Mapper/Layer/ReferenceLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/Layer/TileLayerMapper.php b/src/Mapper/Layer/TileLayerMapper.php index 9709528..dcfac16 100644 --- a/src/Mapper/Layer/TileLayerMapper.php +++ b/src/Mapper/Layer/TileLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index 5605753..7aa6d90 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Layer; diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 1fa132e..334963d 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper; diff --git a/src/Mapper/Mapper.php b/src/Mapper/Mapper.php index 215cf00..f4a651f 100644 --- a/src/Mapper/Mapper.php +++ b/src/Mapper/Mapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper; diff --git a/src/Mapper/OptionsBuilder.php b/src/Mapper/OptionsBuilder.php index 377e7f0..0f13cbd 100644 --- a/src/Mapper/OptionsBuilder.php +++ b/src/Mapper/OptionsBuilder.php @@ -1,14 +1,14 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper; use Netzmacht\LeafletPHP\Definition; diff --git a/src/Mapper/Style/AbstractStyleMapper.php b/src/Mapper/Style/AbstractStyleMapper.php index 7bed34a..6561d68 100644 --- a/src/Mapper/Style/AbstractStyleMapper.php +++ b/src/Mapper/Style/AbstractStyleMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Style; diff --git a/src/Mapper/Style/FixedStyleMapper.php b/src/Mapper/Style/FixedStyleMapper.php index bf312a1..4fa1ed2 100644 --- a/src/Mapper/Style/FixedStyleMapper.php +++ b/src/Mapper/Style/FixedStyleMapper.php @@ -1,18 +1,16 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Style; -use Netzmacht\LeafletPHP\Definition; - /** * Class FixedStyleMapper maps the fixed style to the corresponding definition. * diff --git a/src/Mapper/Type/AbstractIconMapper.php b/src/Mapper/Type/AbstractIconMapper.php index 2ba7479..181a659 100644 --- a/src/Mapper/Type/AbstractIconMapper.php +++ b/src/Mapper/Type/AbstractIconMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Type; diff --git a/src/Mapper/Type/DivIconMapper.php b/src/Mapper/Type/DivIconMapper.php index fc1992a..c7a596b 100644 --- a/src/Mapper/Type/DivIconMapper.php +++ b/src/Mapper/Type/DivIconMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Type; diff --git a/src/Mapper/Type/ExtraMarkersIconMapper.php b/src/Mapper/Type/ExtraMarkersIconMapper.php index a78aed7..ac768dd 100644 --- a/src/Mapper/Type/ExtraMarkersIconMapper.php +++ b/src/Mapper/Type/ExtraMarkersIconMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Type; diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index dacb96e..830a525 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Type; diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php index 0dfa4bb..1581100 100644 --- a/src/Mapper/UI/MarkerMapper.php +++ b/src/Mapper/UI/MarkerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\UI; diff --git a/src/Mapper/UI/PopupMapper.php b/src/Mapper/UI/PopupMapper.php index 92886cf..48bd9bb 100644 --- a/src/Mapper/UI/PopupMapper.php +++ b/src/Mapper/UI/PopupMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\UI; diff --git a/src/Mapper/Vector/AbstractVectorMapper.php b/src/Mapper/Vector/AbstractVectorMapper.php index 3eceb65..5fbce8f 100644 --- a/src/Mapper/Vector/AbstractVectorMapper.php +++ b/src/Mapper/Vector/AbstractVectorMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Mapper/Vector/CircleMapper.php b/src/Mapper/Vector/CircleMapper.php index 069c38a..d8cfa3e 100644 --- a/src/Mapper/Vector/CircleMapper.php +++ b/src/Mapper/Vector/CircleMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Mapper/Vector/CircleMarkerMapper.php b/src/Mapper/Vector/CircleMarkerMapper.php index d29c9f8..4a0c633 100644 --- a/src/Mapper/Vector/CircleMarkerMapper.php +++ b/src/Mapper/Vector/CircleMarkerMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Mapper/Vector/MultiPolygonMapper.php b/src/Mapper/Vector/MultiPolygonMapper.php index b8a1099..25642e9 100644 --- a/src/Mapper/Vector/MultiPolygonMapper.php +++ b/src/Mapper/Vector/MultiPolygonMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Mapper/Vector/MultiPolylineMapper.php b/src/Mapper/Vector/MultiPolylineMapper.php index 2b5dd9f..93736a7 100644 --- a/src/Mapper/Vector/MultiPolylineMapper.php +++ b/src/Mapper/Vector/MultiPolylineMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Mapper/Vector/PolygonMapper.php b/src/Mapper/Vector/PolygonMapper.php index de4ff20..cbffbb5 100644 --- a/src/Mapper/Vector/PolygonMapper.php +++ b/src/Mapper/Vector/PolygonMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php index 38117ce..d7e3b09 100644 --- a/src/Mapper/Vector/PolylineMapper.php +++ b/src/Mapper/Vector/PolylineMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Mapper/Vector/RectangleMapper.php b/src/Mapper/Vector/RectangleMapper.php index e72d96f..3d4757c 100644 --- a/src/Mapper/Vector/RectangleMapper.php +++ b/src/Mapper/Vector/RectangleMapper.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Mapper\Vector; diff --git a/src/Model/AbstractActiveModel.php b/src/Model/AbstractActiveModel.php index 029f3bc..7ec2c9a 100644 --- a/src/Model/AbstractActiveModel.php +++ b/src/Model/AbstractActiveModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/ControlModel.php b/src/Model/ControlModel.php index 6498618..77c32ea 100644 --- a/src/Model/ControlModel.php +++ b/src/Model/ControlModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/IconModel.php b/src/Model/IconModel.php index bf3ecfa..02aaff7 100644 --- a/src/Model/IconModel.php +++ b/src/Model/IconModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/LayerModel.php b/src/Model/LayerModel.php index 1c601a0..3a06557 100644 --- a/src/Model/LayerModel.php +++ b/src/Model/LayerModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/MapModel.php b/src/Model/MapModel.php index 1b401e0..9d5ba61 100644 --- a/src/Model/MapModel.php +++ b/src/Model/MapModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/MarkerModel.php b/src/Model/MarkerModel.php index f19f3f1..d9908b6 100644 --- a/src/Model/MarkerModel.php +++ b/src/Model/MarkerModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/PopupModel.php b/src/Model/PopupModel.php index 5da81d1..addfdb7 100644 --- a/src/Model/PopupModel.php +++ b/src/Model/PopupModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/StyleModel.php b/src/Model/StyleModel.php index dbc852c..a81ff61 100644 --- a/src/Model/StyleModel.php +++ b/src/Model/StyleModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Model/VectorModel.php b/src/Model/VectorModel.php index 93651ca..608a3d1 100644 --- a/src/Model/VectorModel.php +++ b/src/Model/VectorModel.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Model; diff --git a/src/Resources/contao/config/autoload.php b/src/Resources/contao/config/autoload.php index 15e4fd5..88ff920 100644 --- a/src/Resources/contao/config/autoload.php +++ b/src/Resources/contao/config/autoload.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ TemplateLoader::addFiles( diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index f729f1b..3b58620 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ /* diff --git a/src/Resources/contao/config/event_subscribers.php b/src/Resources/contao/config/event_subscribers.php index 3bd139c..50c807e 100644 --- a/src/Resources/contao/config/event_subscribers.php +++ b/src/Resources/contao/config/event_subscribers.php @@ -1,13 +1,15 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ + return array( $GLOBALS['container']['leaflet.boot.subscriber'], 'Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber', diff --git a/src/Resources/contao/config/leaflet_amenities.php b/src/Resources/contao/config/leaflet_amenities.php index 07e5210..3cdd730 100644 --- a/src/Resources/contao/config/leaflet_amenities.php +++ b/src/Resources/contao/config/leaflet_amenities.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ return [ diff --git a/src/Resources/contao/config/leaflet_providers.php b/src/Resources/contao/config/leaflet_providers.php index d1531a8..0e29dd4 100644 --- a/src/Resources/contao/config/leaflet_providers.php +++ b/src/Resources/contao/config/leaflet_providers.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ /* diff --git a/src/Resources/contao/config/services.php b/src/Resources/contao/config/services.php index 8ed2ab0..10238dd 100644 --- a/src/Resources/contao/config/services.php +++ b/src/Resources/contao/config/services.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ use Doctrine\Common\Cache\ArrayCache; diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php index 45d2a7a..643f586 100644 --- a/src/Resources/contao/dca/tl_content.php +++ b/src/Resources/contao/dca/tl_content.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_content']['metapalettes']['leaflet'] = array( diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 56ef50a..50a671f 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -1,13 +1,15 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ + \Controller::loadLanguageFile('leaflet'); $GLOBALS['TL_DCA']['tl_leaflet_control'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_control_layer.php b/src/Resources/contao/dca/tl_leaflet_control_layer.php index dfdc01a..61f1672 100644 --- a/src/Resources/contao/dca/tl_leaflet_control_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_control_layer.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_control_layer'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index b9ef4fc..d714e0a 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index bd36502..f6254ff 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 2af0667..8819cc5 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_map_layer.php b/src/Resources/contao/dca/tl_leaflet_map_layer.php index 49d73d0..55272ec 100644 --- a/src/Resources/contao/dca/tl_leaflet_map_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_map_layer.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_map_layer'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index ad160f0..8a792a2 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index b8f2fec..9ace839 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index e3a57c2..d502d3c 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -1,13 +1,15 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ + $GLOBALS['TL_DCA']['tl_leaflet_style'] = array ( 'config' => array( diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index b2a14ea..b1e06ca 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php index 0ef3d2e..4e91f0a 100644 --- a/src/Resources/contao/dca/tl_module.php +++ b/src/Resources/contao/dca/tl_module.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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 - * */ $GLOBALS['TL_DCA']['tl_module']['metapalettes']['leaflet'] = array( diff --git a/src/Resources/contao/languages/en/leaflet.php b/src/Resources/contao/languages/en/leaflet.php index bcd3324..92e53cd 100644 --- a/src/Resources/contao/languages/en/leaflet.php +++ b/src/Resources/contao/languages/en/leaflet.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['leaflet_control']['zoom'][0] = 'Zoom control'; $GLOBALS['TL_LANG']['leaflet_control']['zoom'][1] = 'A basic zoom control. For more details read the Leaflet documentation.'; $GLOBALS['TL_LANG']['leaflet_control']['attribution'][0] = 'Attribution control'; diff --git a/src/Resources/contao/languages/en/modules.php b/src/Resources/contao/languages/en/modules.php index 178e11a..4625146 100644 --- a/src/Resources/contao/languages/en/modules.php +++ b/src/Resources/contao/languages/en/modules.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['MOD']['leaflet'][0] = 'Leaflet'; $GLOBALS['TL_LANG']['MOD']['leaflet'][1] = 'Leaflet extension for Contao'; $GLOBALS['TL_LANG']['MOD']['leaflet_map'][0] = 'Leaflet Maps'; diff --git a/src/Resources/contao/languages/en/tl_content.php b/src/Resources/contao/languages/en/tl_content.php index 6ebd1f0..f999863 100644 --- a/src/Resources/contao/languages/en/tl_content.php +++ b/src/Resources/contao/languages/en/tl_content.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_content']['leaflet_legend'] = 'Leaflet map configuration'; $GLOBALS['TL_LANG']['tl_content']['leaflet_map'][0] = 'Leaflet Map'; $GLOBALS['TL_LANG']['tl_content']['leaflet_map'][1] = 'Choose a Leaflet Map'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_control.php b/src/Resources/contao/languages/en/tl_leaflet_control.php index 358eb6f..be1d648 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_control.php +++ b/src/Resources/contao/languages/en/tl_leaflet_control.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_control']['name_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_control']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_control']['active_legend'] = 'Activation'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_icon.php b/src/Resources/contao/languages/en/tl_leaflet_icon.php index cd63188..a8a0de6 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_icon.php +++ b/src/Resources/contao/languages/en/tl_leaflet_icon.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_icon']['title_legend'] = 'Title'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadow_legend'] = 'Shadow'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_layer.php b/src/Resources/contao/languages/en/tl_leaflet_layer.php index 08c9cbd..5a9b0db 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_layer.php +++ b/src/Resources/contao/languages/en/tl_leaflet_layer.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_layer']['title_legend'] = 'Layer'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['active_legend'] = 'Activation'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['expert_legend'] = 'Expert settings'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_map.php b/src/Resources/contao/languages/en/tl_leaflet_map.php index d5f5721..0c3393e 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_map.php +++ b/src/Resources/contao/languages/en/tl_leaflet_map.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_map']['title_legend'] = 'Title'; $GLOBALS['TL_LANG']['tl_leaflet_map']['interaction_legend'] = 'Interaction controls'; $GLOBALS['TL_LANG']['tl_leaflet_map']['zoom_legend'] = 'Center and zoom'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_marker.php b/src/Resources/contao/languages/en/tl_leaflet_marker.php index fde43f2..e6c9b41 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_marker.php +++ b/src/Resources/contao/languages/en/tl_leaflet_marker.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_marker']['title_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['content_legend'] = 'Content'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['config_legend'] = 'Configuration'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_popup.php b/src/Resources/contao/languages/en/tl_leaflet_popup.php index a4af8c7..de9b890 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_popup.php +++ b/src/Resources/contao/languages/en/tl_leaflet_popup.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_popup']['title_legend'] = 'Title'; $GLOBALS['TL_LANG']['tl_leaflet_popup']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_popup']['size_legend'] = 'Popup size'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_style.php b/src/Resources/contao/languages/en/tl_leaflet_style.php index 44f7592..b354fd2 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_style.php +++ b/src/Resources/contao/languages/en/tl_leaflet_style.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_style']['title_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_style']['active_legend'] = 'Activation'; $GLOBALS['TL_LANG']['tl_leaflet_style']['config_legend'] = 'Configuration'; diff --git a/src/Resources/contao/languages/en/tl_leaflet_vector.php b/src/Resources/contao/languages/en/tl_leaflet_vector.php index c89189f..ebbdb3b 100644 --- a/src/Resources/contao/languages/en/tl_leaflet_vector.php +++ b/src/Resources/contao/languages/en/tl_leaflet_vector.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_vector']['title_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['active_legend'] = 'Activation'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['config_legend'] = 'Configuration'; diff --git a/src/Resources/contao/languages/en/tl_module.php b/src/Resources/contao/languages/en/tl_module.php index a81965e..76c1734 100644 --- a/src/Resources/contao/languages/en/tl_module.php +++ b/src/Resources/contao/languages/en/tl_module.php @@ -1,5 +1,15 @@ + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_module']['leaflet_legend'] = 'Leaflet map configuration'; $GLOBALS['TL_LANG']['tl_module']['leaflet_map'][0] = 'Leaflet Map'; $GLOBALS['TL_LANG']['tl_module']['leaflet_map'][1] = 'Choose a Leaflet Map'; diff --git a/src/Subscriber/BootSubscriber.php b/src/Subscriber/BootSubscriber.php index 9df111d..7969dc7 100644 --- a/src/Subscriber/BootSubscriber.php +++ b/src/Subscriber/BootSubscriber.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Subscriber; diff --git a/src/Subscriber/EncoderSubscriber.php b/src/Subscriber/EncoderSubscriber.php index 4f380c0..ecbd87f 100644 --- a/src/Subscriber/EncoderSubscriber.php +++ b/src/Subscriber/EncoderSubscriber.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Subscriber; diff --git a/src/Subscriber/GeoJsonSubscriber.php b/src/Subscriber/GeoJsonSubscriber.php index 4b9d819..a929a4b 100644 --- a/src/Subscriber/GeoJsonSubscriber.php +++ b/src/Subscriber/GeoJsonSubscriber.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Subscriber; diff --git a/src/Subscriber/HashSubscriber.php b/src/Subscriber/HashSubscriber.php index 65a1883..add011f 100644 --- a/src/Subscriber/HashSubscriber.php +++ b/src/Subscriber/HashSubscriber.php @@ -1,12 +1,13 @@ - * @copyright 2014-2016 netzmacht David Molineus - * @license LGPL 3.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\Subscriber; From 20b9144b89d5f4b795daba345c43c5eaf64234e2 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 16:14:46 +0200 Subject: [PATCH 009/152] Apply coding standards. --- .travis.yml | 23 +- composer.json | 5 + src/Dca/ControlCallbacks.php | 4 +- src/Dca/LayerCallbacks.php | 4 +- src/Dca/MapCallbacks.php | 2 +- src/Frontend/DataController.php | 2 +- src/Resources/contao/config/config.php | 17 +- src/Resources/contao/config/services.php | 82 +- .../contao/dca/tl_leaflet_control.php | 27 +- .../contao/dca/tl_leaflet_control_layer.php | 2 +- src/Resources/contao/dca/tl_leaflet_icon.php | 35 +- src/Resources/contao/dca/tl_leaflet_layer.php | 1046 ++++++++--------- src/Resources/contao/dca/tl_leaflet_map.php | 33 +- .../contao/dca/tl_leaflet_map_layer.php | 2 +- .../contao/dca/tl_leaflet_marker.php | 21 +- src/Resources/contao/dca/tl_leaflet_popup.php | 17 +- src/Resources/contao/dca/tl_leaflet_style.php | 16 +- .../contao/dca/tl_leaflet_vector.php | 25 +- 18 files changed, 654 insertions(+), 709 deletions(-) diff --git a/.travis.yml b/.travis.yml index a983487..bd5f744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,26 @@ language: php php: - - "5.4" - - "5.5" - - "5.6" - - "7.0" - - "nightly" + - "7.1" env: - - CONTAO_VERSION=~3.5.1 + - CONTAO_VERSION=contao/core-bundle ~4.4.0 + +matrix: + exclude: sudo: false install: - travis_retry composer self-update && composer --version - - travis_retry composer require contao/core $CONTAO_VERSION --no-update + - travis_retry composer require $CONTAO_VERSION --no-update - travis_retry composer update --prefer-dist --no-interaction script: ant -keep-going -matrix: - allow_failures: - - php: "7.0" - - php: "nightly" - -# Hack to make things work again - we can not use a shallow repository. git: depth: 2147483647 + +cache: + directories: + - vendor diff --git a/composer.json b/composer.json index 398371c..a785563 100644 --- a/composer.json +++ b/composer.json @@ -40,6 +40,11 @@ "Netzmacht\\Contao\\Leaflet\\": "src/" } }, + "autoload-dev": { + "files": [ + "vendor/phpcq/autoload-validation/hacks/contao-hack.php" + ] + }, "extra": { "branch-alias": { "dev-master": "2.0.x-dev", diff --git a/src/Dca/ControlCallbacks.php b/src/Dca/ControlCallbacks.php index 9e49018..99c0732 100644 --- a/src/Dca/ControlCallbacks.php +++ b/src/Dca/ControlCallbacks.php @@ -123,7 +123,7 @@ class ControlCallbacks extends Callbacks /** * Save layer relations. * - * @param $layers $layers The layer id values. + * @param mixed $layers The layer id values. * @param \DataContainer $dataContainer The dataContainer driver. * * @return null @@ -171,7 +171,7 @@ class ControlCallbacks extends Callbacks ->execute($values[$layer['layer']]['id']); $sorting += 128; - unset ($values[$layer['layer']]); + unset($values[$layer['layer']]); } } diff --git a/src/Dca/LayerCallbacks.php b/src/Dca/LayerCallbacks.php index b456c29..9f47e2d 100644 --- a/src/Dca/LayerCallbacks.php +++ b/src/Dca/LayerCallbacks.php @@ -55,7 +55,7 @@ class LayerCallbacks extends Callbacks /** * Tile providers configuration. - * + * * @var array */ private $tileProviders; @@ -134,7 +134,6 @@ class LayerCallbacks extends Callbacks { if (!empty($this->layers[$row['type']]['icon'])) { $src = $this->layers[$row['type']]['icon']; - } else { $src = 'iconPLAIN.gif'; } @@ -230,7 +229,6 @@ class LayerCallbacks extends Callbacks $this->translator->translate('pasteinto.1', $table, [$row['id']]) ) ); - } elseif ($row['id'] > 0) { $buffer .= \Image::getHtml('pasteinto_.gif'); } diff --git a/src/Dca/MapCallbacks.php b/src/Dca/MapCallbacks.php index ed186fe..c599748 100644 --- a/src/Dca/MapCallbacks.php +++ b/src/Dca/MapCallbacks.php @@ -124,7 +124,7 @@ class MapCallbacks extends Callbacks } $sorting += 128; - unset ($values[$layerId]); + unset($values[$layerId]); } } diff --git a/src/Frontend/DataController.php b/src/Frontend/DataController.php index b3c1275..abf8eca 100644 --- a/src/Frontend/DataController.php +++ b/src/Frontend/DataController.php @@ -44,7 +44,7 @@ class DataController /** * Filters configuration. - * + * * @var array */ private $filters; diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index 3b58620..f65811b 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -13,6 +13,7 @@ /* * Backend module. */ + array_insert( $GLOBALS['BE_MOD'], 1, @@ -57,18 +58,21 @@ array_insert( /* * Content elements. */ + $GLOBALS['TL_CTE']['includes']['leaflet'] = 'Netzmacht\Contao\Toolkit\Component\ContentElement\ContentElementDecorator'; /* * Frontend modules */ + $GLOBALS['FE_MOD']['includes']['leaflet'] = 'Netzmacht\Contao\Toolkit\Component\Module\ModuleDecorator'; /* * Models. */ + $GLOBALS['TL_MODELS']['tl_leaflet_control'] = 'Netzmacht\Contao\Leaflet\Model\ControlModel'; $GLOBALS['TL_MODELS']['tl_leaflet_icon'] = 'Netzmacht\Contao\Leaflet\Model\IconModel'; $GLOBALS['TL_MODELS']['tl_leaflet_layer'] = 'Netzmacht\Contao\Leaflet\Model\LayerModel'; @@ -84,6 +88,7 @@ $GLOBALS['TL_MODELS']['tl_leaflet_vector'] = 'Netzmacht\Contao\Leaflet\Model\Ve * * Mappers do the translations between the database models and the leaflet definition. */ + $GLOBALS['LEAFLET_MAPPERS'] = array(); $GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\MapMapper'; @@ -173,6 +178,7 @@ $GLOBALS['LEAFLET_MAPPERS'][] = function () { * * @see https://github.com/contao-community-alliance/event-dispatcher#event-subscriber-per-configuration */ + $GLOBALS['LEAFLET_ENCODERS'] = array(); $GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\MapEncoder'; $GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\ControlEncoder'; @@ -188,6 +194,7 @@ $GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\Contao\Leaflet\Subscriber\EncoderSub * * The type is used for the database driven definitions. */ + $GLOBALS['LEAFLET_LAYERS'] = array ( 'provider' => array @@ -295,7 +302,8 @@ $GLOBALS['LEAFLET_LAYERS'] = array * * Supported leaflet control types. Register your type for the database driven definition here. */ -$GLOBALS['LEAFLET_CONTROLS'] = array('zoom', 'layers', 'scale', 'attribution', 'loading', 'fullscreen'); + +$GLOBALS['LEAFLET_CONTROLS'] = array('zoom', 'layers', 'scale', 'attribution', 'loading', 'fullscreen'); /* @@ -303,6 +311,7 @@ $GLOBALS['LEAFLET_CONTROLS'] = array('zoom', 'layers', 'scale', 'attribution', * * Supported leaflet icon types. Register you type for the database driven definition here. */ + $GLOBALS['LEAFLET_ICONS'] = array('image', 'div', 'extra'); @@ -313,6 +322,7 @@ $GLOBALS['LEAFLET_ICONS'] = array('image', 'div', 'extra'); * The goal is to provide different style strategies. For instance a random style chooser, one which uses a color * range and so one. */ + $GLOBALS['LEAFLET_STYLES'] = array('fixed'); /* @@ -320,6 +330,7 @@ $GLOBALS['LEAFLET_STYLES'] = array('fixed'); * * Supported leaflet vector types. Register you type for the database driven definition here. */ + $GLOBALS['LEAFLET_VECTORS'] = array ( 'polyline', @@ -335,6 +346,7 @@ $GLOBALS['LEAFLET_VECTORS'] = array /* * Leaflet tile layer providers. */ + require_once TL_ROOT . '/system/modules/leaflet/config/leaflet_providers.php'; /* @@ -351,6 +363,7 @@ require_once TL_ROOT . '/system/modules/leaflet/config/leaflet_providers.php'; * You don't have to define it as array if you simply add a file. Do not add |static and or media type flag to it. * It's getting added by default if not being in debug mode. */ + if (!isset($GLOBALS['LEAFLET_LIBRARIES'])) { $GLOBALS['LEAFLET_LIBRARIES'] = array(); } @@ -367,6 +380,7 @@ if (!isset($GLOBALS['LEAFLET_LIBRARIES'])) { * - file: Thread value a uuid and find the path. * - files: Thread values as a list of file uuids and get an array of paths. */ + $GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_marker'][] = 'id'; $GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_marker'][] = 'title'; $GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_marker'][] = 'alias'; @@ -379,5 +393,6 @@ $GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_vector'][] = 'alias'; /* * Filters can be passed to a data request to get only specific data from a layer. */ + $GLOBALS['LEAFLET_FILTERS']['bbox'] = 'Netzmacht\Contao\Leaflet\Filter\BboxFilter'; $GLOBALS['LEAFLET_FILTERS']['distance'] = 'Netzmacht\Contao\Leaflet\Filter\DistanceFilter'; diff --git a/src/Resources/contao/config/services.php b/src/Resources/contao/config/services.php index 10238dd..1680757 100644 --- a/src/Resources/contao/config/services.php +++ b/src/Resources/contao/config/services.php @@ -48,11 +48,14 @@ use Netzmacht\LeafletPHP\Leaflet; use Symfony\Component\EventDispatcher\EventDispatcher; /** @var \Pimple $container */ +// @codingStandardsIgnoreStart global $container; +// @codingStandardsIgnoreEnd /* * Leaflet map provider is a simply api entry to to get the leaflet map from the database. */ + $container[LeafletServices::MAP_PROVIDER] = $container->share(function ($container) { return new MapProvider( $container[LeafletServices::DEFINITION_MAPPER], @@ -69,6 +72,7 @@ $container[LeafletServices::MAP_PROVIDER] = $container->share(function ($contain /* * Contao assets handler. Loads Leaflet assets as contao (static) assets. */ + $container[LeafletServices::MAP_ASSETS] = $container->share(function ($container) { return new ContaoAssets($container[Services::ASSETS_MANAGER]); }); @@ -76,6 +80,7 @@ $container[LeafletServices::MAP_ASSETS] = $container->share(function ($container /* * The leaflet boot. */ + $container[LeafletServices::BOOT] = $container->share(function ($container) { return new Boot($container[Services::EVENT_DISPATCHER]); }); @@ -93,6 +98,7 @@ $container['leaflet.boot.subscriber'] = $container->share(function ($container) /* * The definition mapper. */ + $container[LeafletServices::DEFINITION_MAPPER] = $container->share(function ($container) { /** @var Boot $boot */ $boot = $container[LeafletServices::BOOT]; @@ -105,6 +111,7 @@ $container[LeafletServices::DEFINITION_MAPPER] = $container->share(function ($co /* * The local event dispatcher is used for the leaflet javascript encoding system. */ + $container[LeafletServices::DEFINITION_BUILDER_EVENT_DISPATCHER] = $container->share(function ($container) { /** @var Boot $boot */ $boot = $container[LeafletServices::BOOT]; @@ -116,6 +123,7 @@ $container[LeafletServices::DEFINITION_BUILDER_EVENT_DISPATCHER] = $container->s /* * The javascript encoder factory being used for building the map javascript. */ + $container[LeafletServices::DEFINITION_ENCODER_FACTORY] = function ($container) { $dispatcher = $container[LeafletServices::DEFINITION_BUILDER_EVENT_DISPATCHER]; @@ -133,27 +141,27 @@ $container[LeafletServices::DEFINITION_ENCODER_FACTORY] = function ($container) /* * The leaflet builder transforms the definition to javascript. */ -$container[LeafletServices::DEFINITION_BUILDER] = $container->share(function($container) { + +$container[LeafletServices::DEFINITION_BUILDER] = $container->share(function ($container) { /** @var Boot $boot */ $boot = $container[LeafletServices::BOOT]; $dispatcher = $container[LeafletServices::DEFINITION_BUILDER_EVENT_DISPATCHER]; $factory = $container[LeafletServices::DEFINITION_ENCODER_FACTORY]; $builder = new Builder($factory); - $leaflet = new Leaflet($builder, $dispatcher, array(), JSON_UNESCAPED_SLASHES ^ Flags::BUILD_STACK); + $leaflet = new Leaflet($builder, $dispatcher, array(), (JSON_UNESCAPED_SLASHES ^ Flags::BUILD_STACK)); return $boot->initializeLeafletBuilder($leaflet); }); -$container[LeafletServices::FRONTEND_VALUE_FILTER] = $container->share(function($container) { +$container[LeafletServices::FRONTEND_VALUE_FILTER] = $container->share(function ($container) { return new ValueFilter($container[Services::INSERT_TAG_REPLACER]); }); -/** +/* * Internal used leaflet cache. - * - * @var Cache */ + $container[LeafletServices::CACHE] = $container->share( function ($container) { if ($container[Services::PRODUCTION_MODE]) { @@ -164,11 +172,10 @@ $container[LeafletServices::CACHE] = $container->share( } ); -/** +/* * Leaflet alias generator. - * - * @return \Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator */ + $container[LeafletServices::ALIAS_GENERATOR] = $container->share( function ($container) { return function ($dataContainerName, $aliasField, $fields) use ($container) { @@ -190,11 +197,11 @@ $container[LeafletServices::ALIAS_GENERATOR] = $container->share( } ); -/** +/* * Leaflet alias generator. - * * @return \Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator */ + $container[LeafletServices::PARENT_ALIAS_GENERATOR] = $container->share( function ($container) { return function ($dataContainerName, $aliasField, $fields) use ($container) { @@ -217,11 +224,10 @@ $container[LeafletServices::PARENT_ALIAS_GENERATOR] = $container->share( } ); -/** +/* * Callback helper class for tl_leaflet_map. - * - * @return MapCallbacks */ + $container['leaflet.dca.map-callbacks'] = $container->share( function ($container) { return new MapCallbacks( @@ -231,11 +237,10 @@ $container['leaflet.dca.map-callbacks'] = $container->share( } ); -/** +/* * Callback helper class for tl_leaflet_layer. - * - * @return LayerCallbacks */ + $container['leaflet.dca.layer-callbacks'] = $container->share( function ($container) { return new LayerCallbacks( @@ -249,11 +254,10 @@ $container['leaflet.dca.layer-callbacks'] = $container->share( } ); -/** +/* * Callback helper class for tl_leaflet_control. - * - * @return ControlCallbacks */ + $container['leaflet.dca.control-callbacks'] = $container->share( function ($container) { return new ControlCallbacks( @@ -263,22 +267,20 @@ $container['leaflet.dca.control-callbacks'] = $container->share( } ); -/** +/* * Callback helper class for tl_leaflet_control. - * - * @return ControlCallbacks */ + $container['leaflet.dca.vector-callbacks'] = $container->share( function ($container) { return new VectorCallbacks($container[Services::DCA_MANAGER]); } ); -/** +/* * Callback helper class for frontend integration. - * - * @return FrontendIntegration */ + $container['leaflet.dca.frontend-integration'] = $container->share( function ($container) { return new FrontendIntegration( @@ -287,11 +289,10 @@ $container['leaflet.dca.frontend-integration'] = $container->share( } ); -/** +/* * Common callback helpers. - * - * @return LeafletCallbacks */ + $container['leaflet.dca.common'] = $container->share( function ($container) { return new LeafletCallbacks( @@ -300,11 +301,10 @@ $container['leaflet.dca.common'] = $container->share( } ); -/** +/* * Validator helper class. - * - * @return Validator */ + $container['leaflet.dca.validator'] = $container->share( function ($container) { return new Validator( @@ -313,15 +313,10 @@ $container['leaflet.dca.validator'] = $container->share( } ); -/** +/* * Component factory for content element. - * - * @param ContentModel $model Content model. - * @param string $column Template section. - * @param ContainerInterface $container Container. - * - * @return MapElement */ + $container[Services::CONTENT_ELEMENTS_MAP]['leaflet'] = function ($model, $column, ContainerInterface $container) { return new MapElement( $model, @@ -334,15 +329,10 @@ $container[Services::CONTENT_ELEMENTS_MAP]['leaflet'] = function ($model, $colum ); }; -/** +/* * Component factory for frontend module. - * - * @param ModuleModel $model Module model. - * @param string $column Template section. - * @param ContainerInterface $container Container. - * - * @return MapModule */ + $container[Services::MODULES_MAP]['leaflet'] = function ($model, $column, ContainerInterface $container) { return new MapModule( $model, diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 50a671f..be6bc71 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -31,7 +31,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ], ), - // List + // List configuration 'list' => array ( 'sorting' => array @@ -78,14 +78,18 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['delete'], 'href' => 'act=delete', 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"' ), 'toggle' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton('tl_leaflet_control', 'active') + 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( + 'tl_leaflet_control', + 'active' + ) ), 'show' => array ( @@ -134,7 +138,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'pid' => array ( @@ -175,8 +179,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ), \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "varchar(255) NULL" + 'eval' => array( + 'mandatory' => false, + 'maxlength' => 255, + 'tl_class' => 'w50', + 'nullIfEmpty' => true, + ), + 'sql' => 'varchar(255) NULL' ), 'type' => array ( @@ -313,7 +322,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ), ) ), - 'sql' => "mediumblob NULL" + 'sql' => 'mediumblob NULL' ), 'maxWidth' => array ( @@ -364,7 +373,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'exclude' => true, 'inputType' => 'listWizard', 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'clr', 'allowHtml' => true), - 'sql' => "mediumblob NULL" + 'sql' => 'mediumblob NULL' ), 'separate' => array ( @@ -410,7 +419,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'rte' => 'ace|json', 'tl_class' => 'clr' ), - 'sql' => "mediumtext NULL" + 'sql' => 'mediumtext NULL' ), 'simulateFullScreen' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_control_layer.php b/src/Resources/contao/dca/tl_leaflet_control_layer.php index 61f1672..d67c65b 100644 --- a/src/Resources/contao/dca/tl_leaflet_control_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_control_layer.php @@ -28,7 +28,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control_layer'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index d714e0a..4925ed5 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -93,7 +93,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['delete'], 'href' => 'act=delete', 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"' ), 'toggle' => array ( @@ -172,7 +173,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( @@ -201,7 +202,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'type' => array ( @@ -242,7 +243,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'clr', 'extensions' => 'gif,png,svg,jpg' ), - 'sql' => "binary(16) NULL", + 'sql' => 'binary(16) NULL', ), 'iconRetinaImage' => array ( @@ -256,7 +257,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'clr', 'extensions' => 'gif,png,svg,jpg' ), - 'sql' => "binary(16) NULL", + 'sql' => 'binary(16) NULL', ), 'shadowImage' => array ( @@ -270,7 +271,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'clr', 'extensions' => 'gif,png,svg,jpg' ), - 'sql' => "binary(16) NULL", + 'sql' => 'binary(16) NULL', ), 'shadowRetinaImage' => array ( @@ -284,7 +285,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'clr', 'extensions' => 'gif,png,svg,jpg' ), - 'sql' => "binary(16) NULL", + 'sql' => 'binary(16) NULL', ), 'iconAnchor' => array ( @@ -299,7 +300,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'shadowAnchor' => array ( @@ -314,7 +315,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'popupAnchor' => array ( @@ -329,7 +330,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'className' => array ( @@ -349,7 +350,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(64) NULL" + 'sql' => 'varchar(64) NULL' ), 'html' => array ( @@ -364,7 +365,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'rte' => 'ace|html', 'tl_class' => 'clr' ), - 'sql' => "mediumtext NULL" + 'sql' => 'mediumtext NULL' ), 'icon' => array ( @@ -376,7 +377,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(64) NULL" + 'sql' => 'varchar(64) NULL' ), 'prefix' => array ( @@ -388,7 +389,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(64) NULL" + 'sql' => 'varchar(64) NULL' ), 'shape' => array ( @@ -400,7 +401,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'eval' => array( 'tl_class' => 'w50', ), - 'sql' => "varchar(64) NULL" + 'sql' => 'varchar(64) NULL' ), 'iconColor' => array ( @@ -415,7 +416,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50 wizard', 'nullIfEmpty' => true, ), - 'sql' => "varchar(16) NULL" + 'sql' => 'varchar(16) NULL' ), 'markerColor' => array ( @@ -444,7 +445,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(16) NULL" + 'sql' => 'varchar(16) NULL' ), ), ); diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index f6254ff..43ea9e8 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -10,125 +10,107 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_layer'] = array -( - 'config' => array( +$GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ + 'config' => [ 'dataContainer' => 'Table', 'enableVersioning' => true, - 'ctable' => array('tl_leaflet_vector', 'tl_leaflet_marker'), - 'ondelete_callback' => array( + 'ctable' => ['tl_leaflet_vector', 'tl_leaflet_marker'], + 'ondelete_callback' => [ \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('deleteRelations'), - ), - 'sql' => array - ( - 'keys' => array - ( + ], + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'pid' => 'index', 'alias' => 'unique', - ) - ), - 'onload_callback' => array( - function() { + ], + ], + 'onload_callback' => [ + function () { \Controller::loadLanguageFile('leaflet'); - } - ), + }, + ], 'onsubmit_callback' => [ \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), ], - ), - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 5, - 'fields' => array('title'), - 'flag' => 1, - 'icon' => 'system/modules/leaflet/assets/img/layers.png', - 'panelLayout' => 'filter;search,limit', - 'paste_button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getPasteButtons'), - ), - 'label' => array - ( - 'fields' => array('title'), - 'format' => '%s', - 'label_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateRow') - ), - 'global_operations' => array - ( - 'styles' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'], - 'href' => 'table=tl_leaflet_style', - 'icon' => 'system/modules/leaflet/assets/img/style.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'icons' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'], - 'href' => 'table=tl_leaflet_icon', - 'icon' => 'system/modules/leaflet/assets/img/icons.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'popups' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'], - 'href' => 'table=tl_leaflet_popup', - 'icon' => 'system/modules/leaflet/assets/img/popup.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ) - ), - 'operations' => array - ( - 'markers' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['markers'], - 'href' => 'table=tl_leaflet_marker', - 'icon' => 'edit.gif', - 'button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateMarkersButton') - ), - 'vectors' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['vectors'], - 'href' => 'table=tl_leaflet_vector', - 'icon' => 'edit.gif', - 'button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateVectorsButton'), - ), - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'], - 'href' => 'act=edit', - 'icon' => 'header.gif' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'cut' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['cut'], - 'href' => 'act=paste&mode=cut', - 'icon' => 'cut.gif', - 'attributes' => 'onclick="Backend.getScrollOffset()"', - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' - ), - 'toggle' => array - ( + ], + 'list' => [ + 'sorting' => [ + 'mode' => 5, + 'fields' => ['title'], + 'flag' => 1, + 'icon' => 'system/modules/leaflet/assets/img/layers.png', + 'panelLayout' => 'filter;search,limit', + 'paste_button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getPasteButtons'), + ], + 'label' => [ + 'fields' => ['title'], + 'format' => '%s', + 'label_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateRow'), + ], + 'global_operations' => [ + 'styles' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'], + 'href' => 'table=tl_leaflet_style', + 'icon' => 'system/modules/leaflet/assets/img/style.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'icons' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'], + 'href' => 'table=tl_leaflet_icon', + 'icon' => 'system/modules/leaflet/assets/img/icons.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'popups' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'], + 'href' => 'table=tl_leaflet_popup', + 'icon' => 'system/modules/leaflet/assets/img/popup.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + ], + 'operations' => [ + 'markers' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['markers'], + 'href' => 'table=tl_leaflet_marker', + 'icon' => 'edit.gif', + 'button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateMarkersButton'), + ], + 'vectors' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['vectors'], + 'href' => 'table=tl_leaflet_vector', + 'icon' => 'edit.gif', + 'button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateVectorsButton'), + ], + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'], + 'href' => 'act=edit', + 'icon' => 'header.gif', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'cut' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['cut'], + 'href' => 'act=paste&mode=cut', + 'icon' => 'cut.gif', + 'attributes' => 'onclick="Backend.getScrollOffset()"', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'toggle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', @@ -136,45 +118,44 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array 'tl_leaflet_layer', 'active' ), - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'palettes' => array( - '__selector__' => array('type'), - ), + 'palettes' => [ + '__selector__' => ['type'], + ], - 'metapalettes' => array( - 'default' => array( - 'title' => array('title', 'alias', 'type'), - 'config' => array(), - 'style' => array(), - 'expert' => array(':hide'), - 'active' => array('active'), - ), - 'markers extends default' => array( - '+expert' => array('pointToLayer'), - '+config' => array('boundsMode', 'deferred') - ), - 'group extends default' => array( - '+title' => array('groupType'), - '+active' => array('boundsMode') - ), - 'vectors extends default' => array( - '+expert' => array('onEachFeature', 'pointToLayer'), - '+config' => array('boundsMode', 'deferred'), - ), - 'reference extends default' => array( - '+title' => array('reference', 'standalone') - ), - 'markercluster extends default' => array( - 'config' => array( + 'metapalettes' => [ + 'default' => [ + 'title' => ['title', 'alias', 'type'], + 'config' => [], + 'style' => [], + 'expert' => [':hide'], + 'active' => ['active'], + ], + 'markers extends default' => [ + '+expert' => ['pointToLayer'], + '+config' => ['boundsMode', 'deferred'], + ], + 'group extends default' => [ + '+title' => ['groupType'], + '+active' => ['boundsMode'], + ], + 'vectors extends default' => [ + '+expert' => ['onEachFeature', 'pointToLayer'], + '+config' => ['boundsMode', 'deferred'], + ], + 'reference extends default' => [ + '+title' => ['reference', 'standalone'], + ], + 'markercluster extends default' => [ + 'config' => [ 'showCoverageOnHover', 'zoomToBoundsOnClick', 'removeOutsideVisibleBounds', @@ -183,22 +164,22 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array 'disableClusteringAtZoom', 'maxClusterRadius', 'singleMarkerMode', - ), - '+expert' => array( + ], + '+expert' => [ 'polygonOptions', 'iconCreateFunction', - 'disableDefaultStyle' - ) - ), - 'tile extends default' => array( - 'config' => array( + 'disableDefaultStyle', + ], + ], + 'tile extends default' => [ + 'config' => [ 'tileUrl', 'subdomains', 'attribution', 'minZoom', 'maxZoom', - ), - '+expert' => array( + ], + '+expert' => [ 'errorTileUrl', 'tileSize', 'tms', @@ -213,77 +194,70 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array 'updateWhenIdle', 'detectRetina', 'reuseTiles', - 'bounds' - ) - ), - 'overpass extends default' => array( - 'config' => array( + 'bounds', + ], + ], + 'overpass extends default' => [ + 'config' => [ 'overpassQuery', 'boundsMode', 'minZoom', 'overpassEndpoint', - 'overpassPopup' - ), - 'style' => array( - 'amenityIcons' - ), - '+expert' => array( + 'overpassPopup', + ], + 'style' => [ + 'amenityIcons', + ], + '+expert' => [ 'onEachFeature', 'pointToLayer', - ), - ), - ), + ], + ], + ], - 'metasubselectpalettes' => array( - 'type' => array( - 'provider' => array('tile_provider', 'tile_provider_variant') - ), - 'tile_provider' => array( - 'MapBox' => array('tile_provider_key'), - 'HERE' => array('tile_provider_key', 'tile_provider_code'), - ), - ), + 'metasubselectpalettes' => [ + 'type' => [ + 'provider' => ['tile_provider', 'tile_provider_variant'], + ], + 'tile_provider' => [ + 'MapBox' => ['tile_provider_key'], + 'HERE' => ['tile_provider_key', 'tile_provider_code'], + ], + ], - 'metasubpalettes' => array( - 'spiderfyOnMaxZoom' => array('spiderfyDistanceMultiplier'), - 'deferred' => array('cache'), - 'cache' => array('cacheLifeTime') - ), + 'metasubpalettes' => [ + 'spiderfyOnMaxZoom' => ['spiderfyDistanceMultiplier'], + 'deferred' => ['cache'], + 'cache' => ['cacheLifeTime'], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" - ), - 'pid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'sorting' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'pid' => [ 'sql' => "int(10) unsigned NOT NULL default '0'", - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'title' => array - ( + ], + 'sorting' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['title'], 'exclude' => true, 'inputType' => 'text', 'search' => true, - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['alias'], 'exclude' => true, 'inputType' => 'text', 'search' => true, - 'save_callback' => array( + 'save_callback' => [ \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( 'tl_leaflet_layer', 'alias', @@ -291,641 +265,587 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), - ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'sql' => "varchar(255) NULL" - ), - 'type' => array - ( + ], + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'sql' => 'varchar(255) NULL', + ], + 'type' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['type'], 'exclude' => true, 'inputType' => 'select', 'filter' => true, - 'eval' => array( + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, 'submitOnChange' => true, 'chosen' => true, 'helpwizard' => true, - ), + ], 'options' => array_keys($GLOBALS['LEAFLET_LAYERS']), 'reference' => &$GLOBALS['TL_LANG']['leaflet_layer'], - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'active' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['active'], - 'exclude' => true, - 'inputType' => 'checkbox', - 'filter' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''", + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'active' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['active'], + 'exclude' => true, + 'inputType' => 'checkbox', + 'filter' => true, + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), ], - ), - 'tile_provider' => array( + ], + 'tile_provider' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider'], 'exclude' => true, 'inputType' => 'select', - 'eval' => array( + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50 clr', 'includeBlankOption' => true, 'submitOnChange' => true, 'chosen' => true, - ), + ], 'options' => array_keys($GLOBALS['LEAFLET_TILE_PROVIDERS']), - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'tile_provider_variant' => array( + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'tile_provider_variant' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_variant'], 'exclude' => true, 'inputType' => 'select', - 'eval' => array( + 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', 'submitOnChange' => true, 'chosen' => false, - ), + ], 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getVariants'), - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'tile_provider_key' => array - ( + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'tile_provider_key' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_key'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'clr w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'tile_provider_code' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'clr w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'tile_provider_code' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_code'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'deferred' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'deferred' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['deferred'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'groupType' => array - ( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'groupType' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['groupType'], 'exclude' => true, 'inputType' => 'select', - 'eval' => array( - 'mandatory' => true, - 'tl_class' => 'w50', - 'submitOnChange' => true, - 'helpwizard' => true, - ), + 'eval' => [ + 'mandatory' => true, + 'tl_class' => 'w50', + 'submitOnChange' => true, + 'helpwizard' => true, + ], 'default' => 'layer', - 'options' => array('layer', 'feature'), + 'options' => ['layer', 'feature'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes'], - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'reference' => array - ( + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'reference' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['reference'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getLayers'), - 'eval' => array( + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', 'chosen' => true, 'includeBlankOption' => true, - ), + ], 'sql' => "int(10) unsigned NOT NULL default '0'", - ), - 'standalone' => array - ( + ], + 'standalone' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['standalone'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'onEachFeature' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'onEachFeature' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['onEachFeature'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace|javascript', - 'tl_class' => 'clr' - ), - 'sql' => "mediumtext NULL" - ), - 'pointToLayer' => array - ( + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'pointToLayer' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['pointToLayer'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace|javascript', - 'tl_class' => 'clr' - ), - 'sql' => "mediumtext NULL" - ), - 'showCoverageOnHover' => array - ( + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'showCoverageOnHover' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['showCoverageOnHover'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'zoomToBoundsOnClick' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'zoomToBoundsOnClick' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['zoomToBoundsOnClick'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'spiderfyOnMaxZoom' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'spiderfyOnMaxZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['spiderfyOnMaxZoom'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'removeOutsideVisibleBounds' => array - ( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'removeOutsideVisibleBounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['removeOutsideVisibleBounds'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'animateAddingMarkers' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'animateAddingMarkers' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['animateAddingMarkers'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'disableClusteringAtZoom' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'disableClusteringAtZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['disableClusteringAtZoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), 'default' => '', - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => "int(4) NULL" - ), - 'maxClusterRadius' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'maxClusterRadius' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxClusterRadius'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "int(5) NULL" - ), - 'singleMarkerMode' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true], + 'sql' => 'int(5) NULL', + ], + 'singleMarkerMode' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['singleMarkerMode'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => false, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'polygonOptions' => array - ( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => false, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'polygonOptions' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['polygonOptions'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace|json', - 'tl_class' => 'clr' - ), - 'sql' => "mediumtext NULL" - ), - 'spiderfyDistanceMultiplier' => array - ( + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'spiderfyDistanceMultiplier' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['spiderfyDistanceMultiplier'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "int(5) NULL" - ), - 'iconCreateFunction' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true], + 'sql' => 'int(5) NULL', + ], + 'iconCreateFunction' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['iconCreateFunction'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace|javascript', - 'tl_class' => 'clr' - ), - 'sql' => "mediumtext NULL" - ), - 'disableDefaultStyle' => array - ( + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'disableDefaultStyle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['disableDefaultStyle'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'boundsMode' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false, 'isBoolean' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'boundsMode' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['boundsMode'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getBoundsModes'), - 'eval' => array('tl_class' => 'w50', 'includeBlankOption' => true), - 'sql' => "varchar(6) NOT NULL default ''" - ), - 'tileUrl' => array - ( + 'eval' => ['tl_class' => 'w50', 'includeBlankOption' => true], + 'sql' => "varchar(6) NOT NULL default ''", + ], + 'tileUrl' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tileUrl'], 'exclude' => true, 'inputType' => 'text', 'default' => '', - 'eval' => array('maxlength' => 255, 'tl_class' => 'w50', 'mandatory' => true), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'minZoom' => array - ( + 'eval' => ['maxlength' => 255, 'tl_class' => 'w50', 'mandatory' => true], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'minZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['minZoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => "int(4) NULL" - ), - 'maxZoom' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'maxZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxZoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => "int(4) NULL" - ), - 'maxNativeZoom' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'maxNativeZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxNativeZoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => "int(4) NULL" - ), - 'tileSize' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'tileSize' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tileSize'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "int(5) NULL" - ), - 'subdomains' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true], + 'sql' => 'int(5) NULL', + ], + 'subdomains' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['subdomains'], 'exclude' => true, 'inputType' => 'text', 'default' => '', - 'eval' => array('maxlength' => 16, 'tl_class' => 'w50'), - 'sql' => "varchar(16) NOT NULL default ''" - ), - 'errorTileUrl' => array - ( + 'eval' => ['maxlength' => 16, 'tl_class' => 'w50'], + 'sql' => "varchar(16) NOT NULL default ''", + ], + 'errorTileUrl' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['errorTileUrl'], 'exclude' => true, 'inputType' => 'text', 'default' => '', - 'eval' => array('maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'attribution' => array - ( + 'eval' => ['maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'attribution' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['attribution'], 'exclude' => true, 'inputType' => 'text', 'default' => '', - 'eval' => array('maxlength' => 255, 'tl_class' => 'long', 'allowHtml' => true), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'tms' => array - ( + 'eval' => ['maxlength' => 255, 'tl_class' => 'long', 'allowHtml' => true], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'tms' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tms'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'continuousWorld' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'continuousWorld' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['continuousWorld'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'noWrap' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'noWrap' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['noWrap'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'zoomOffset' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'zoomOffset' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['zoomOffset'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "int(5) NULL" - ), - 'zoomReverse' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true], + 'sql' => 'int(5) NULL', + ], + 'zoomReverse' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['zoomReverse'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'opacity' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'opacity' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['opacity'], 'exclude' => true, 'inputType' => 'text', 'default' => '1.0', - 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50 clr'), - 'sql' => "varchar(4) NOT NULL default ''" - ), - 'zIndex' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50 clr'], + 'sql' => "varchar(4) NOT NULL default ''", + ], + 'zIndex' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['zIndex'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "int(5) NULL" - ), - 'unloadvisibleTiles' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true], + 'sql' => 'int(5) NULL', + ], + 'unloadvisibleTiles' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['unloadvisibleTiles'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'updateWhenIdle' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'updateWhenIdle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['updateWhenIdle'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'detectRetina' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'detectRetina' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['detectRetina'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'reuseTiles' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'reuseTiles' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['reuseTiles'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'bounds' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'bounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['bounds'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( - ), - 'eval' => array( + 'save_callback' => [ + ], + 'eval' => [ 'maxlength' => 255, - 'multiple'=>true, - 'size'=>2, + 'multiple' => true, + 'size' => 2, 'tl_class' => 'long clr', 'nullIfEmpty' => true, - ), - 'sql' => "mediumblob NULL" - ), - 'cache' => array - ( + ], + 'sql' => 'mediumblob NULL', + ], + 'cache' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['cache'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'cacheLifeTime' => array - ( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'cacheLifeTime' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['cacheLifeTime'], 'exclude' => true, 'inputType' => 'text', 'default' => 0, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'overpassQuery' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'overpassQuery' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['overpassQuery'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace', - 'tl_class' => 'clr' - ), - 'sql' => "mediumtext NULL" - ), - 'overpassEndpoint' => array - ( + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'overpassEndpoint' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['overpassEndpoint'], 'exclude' => true, 'inputType' => 'text', 'default' => '', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'overpassCallback' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'overpassCallback' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['overpassCallback'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace|javascript', - 'tl_class' => 'clr' - ), - 'sql' => "mediumtext NULL" - ), - 'minZoomIndicatorPosition' => array - ( + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'minZoomIndicatorPosition' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['minZoomIndicatorPosition'], 'exclude' => true, 'inputType' => 'select', 'filter' => true, 'sorting' => true, - 'options' => array('topleft', 'topright', 'bottomleft', 'bottomright'), + 'options' => ['topleft', 'topright', 'bottomleft', 'bottomright'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_layer'], - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50', 'helpwizard' => true), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'minZoomIndicatorMessage' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50', 'helpwizard' => true], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'minZoomIndicatorMessage' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['minZoomIndicatorMessage'], 'exclude' => true, 'inputType' => 'text', 'default' => '', - 'eval' => array('tl_class' => 'clr w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'minZoomIndicatorMessageNoLayer' => array - ( + 'eval' => ['tl_class' => 'clr w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'minZoomIndicatorMessageNoLayer' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['minZoomIndicatorMessageNoLayer'], 'exclude' => true, 'inputType' => 'text', 'default' => '', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'debug' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'debug' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['debug'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50 m12'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'amenityIcons' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcons'], - 'exclude' => true, - 'inputType' => 'multiColumnWizard', - 'options_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'), - 'eval' => array( - 'columnFields' => array( - 'amenity' => array( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'], - 'exclude' => true, - 'inputType' => 'select', + 'eval' => ['tl_class' => 'w50 m12'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'amenityIcons' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcons'], + 'exclude' => true, + 'inputType' => 'multiColumnWizard', + 'options_callback' => ['Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'], + 'eval' => [ + 'columnFields' => [ + 'amenity' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'], + 'exclude' => true, + 'inputType' => 'select', 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getAmenities'), - 'eval' => array( - 'mandatory' => true, - 'tl_class' => 'w50', - 'style' => 'width: 200px', - 'chosen' => true, - ), - ), - 'icon' => array( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'], - 'exclude' => true, - 'inputType' => 'select', - 'options_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'), - 'eval' => array( - 'mandatory' => true, - 'tl_class' => 'w50', - 'style' => 'width: 200px', - 'chosen' => true, - ), - ), - ), - ), - 'sql' => "blob NULL", - ), - 'overpassPopup' => array - ( + 'eval' => [ + 'mandatory' => true, + 'tl_class' => 'w50', + 'style' => 'width: 200px', + 'chosen' => true, + ], + ], + 'icon' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'], + 'exclude' => true, + 'inputType' => 'select', + 'options_callback' => ['Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'], + 'eval' => [ + 'mandatory' => true, + 'tl_class' => 'w50', + 'style' => 'width: 200px', + 'chosen' => true, + ], + ], + ], + ], + 'sql' => 'blob NULL', + ], + 'overpassPopup' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['overpassPopup'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace|javascript', - 'tl_class' => 'clr' - ), - 'sql' => "mediumtext NULL" - ), - ) -); + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 8819cc5..17b4193 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -25,7 +25,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array ) ), 'onload_callback' => array( - function() { + function () { \Controller::loadLanguageFile('leaflet'); } ), @@ -84,7 +84,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'], 'href' => 'act=delete', 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"' ), 'show' => array ( @@ -151,7 +152,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( @@ -182,7 +183,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias') ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'center' => array ( @@ -200,7 +201,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'tl_class' => 'long clr', 'nullIfEmpty' => true, ), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'layers' => array ( @@ -235,7 +236,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array ), 'flatArray' => true ), - 'sql' => "mediumblob NULL" + 'sql' => 'mediumblob NULL' ), 'zoom' => array ( @@ -251,7 +252,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'includeBlankOption' => true, 'nullIfEmpty' => true ), - 'sql' => "int(4) NULL" + 'sql' => 'int(4) NULL' ), 'adjustZoomExtra' => array ( @@ -275,7 +276,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'includeBlankOption' => true, 'nullIfEmpty' => true ), - 'sql' => "int(4) NULL" + 'sql' => 'int(4) NULL' ), 'maxZoom' => array ( @@ -290,7 +291,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'includeBlankOption' => true, 'nullIfEmpty' => true ), - 'sql' => "int(4) NULL" + 'sql' => 'int(4) NULL' ), 'zoomSnap' => array ( @@ -304,7 +305,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'includeBlankOption' => true, 'nullIfEmpty' => true ), - 'sql' => "varchar(4) NULL" + 'sql' => 'varchar(4) NULL' ), 'zoomDelta' => array ( @@ -318,7 +319,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'includeBlankOption' => true, 'nullIfEmpty' => true ), - 'sql' => "varchar(4) NULL" + 'sql' => 'varchar(4) NULL' ), 'dragging' => array ( @@ -461,7 +462,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'style' => 'min-height: 40px;', 'rte' => 'ace|json' ), - 'sql' => "text NULL" + 'sql' => 'text NULL' ), 'adjustBounds' => array ( @@ -494,7 +495,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'includeBlankOption' => true, 'nullIfEmpty' => true ), - 'sql' => "varchar(32) NULL" + 'sql' => 'varchar(32) NULL' ), 'locate' => array ( @@ -529,7 +530,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'inputType' => 'text', 'default' => null, 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "int(9) NULL" + 'sql' => 'int(9) NULL' ), 'locateMaximumAge' => array ( @@ -538,7 +539,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'inputType' => 'text', 'default' => null, 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => "int(9) NULL" + 'sql' => 'int(9) NULL' ), 'enableHighAccuracy' => array ( @@ -562,7 +563,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'includeBlankOption' => true, 'nullIfEmpty' => true ), - 'sql' => "int(4) NULL" + 'sql' => 'int(4) NULL' ), 'cache' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_map_layer.php b/src/Resources/contao/dca/tl_leaflet_map_layer.php index 55272ec..ab8a034 100644 --- a/src/Resources/contao/dca/tl_leaflet_map_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_map_layer.php @@ -28,7 +28,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map_layer'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index 8a792a2..eda2571 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -26,7 +26,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array ) ), 'onload_callback' => array( - function() { + function () { \Controller::loadLanguageFile('leaflet'); } ), @@ -94,7 +94,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['delete'], 'href' => 'act=delete', 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"' ), 'toggle' => array ( @@ -143,7 +144,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( @@ -185,7 +186,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'coordinates' => array ( @@ -215,7 +216,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'exclude' => true, 'inputType' => 'text', 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "decimal(10,8) NULL" + 'sql' => 'decimal(10,8) NULL' ), 'longitude' => array ( @@ -223,7 +224,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'exclude' => true, 'inputType' => 'text', 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "decimal(11,8) NULL" + 'sql' => 'decimal(11,8) NULL' ), 'altitude' => array ( @@ -231,7 +232,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'exclude' => true, 'inputType' => 'text', 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "float NULL" + 'sql' => 'float NULL' ), 'active' => array ( @@ -293,7 +294,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'inputType' => 'text', 'eval' => array('mandatory' => true, 'rte' => 'tinyMCE', 'helpwizard' => true, 'tl_class' => 'clr'), 'explanation' => 'insertTags', - 'sql' => "mediumtext NULL" + 'sql' => 'mediumtext NULL' ), 'customIcon' => array ( @@ -350,7 +351,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'inputType' => 'text', 'default' => 0, 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'clr w50', 'nullIfEmpty' => true), - 'sql' => "int(5) NULL" + 'sql' => 'int(5) NULL' ), 'ignoreForBounds' => array ( @@ -371,7 +372,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'style' => 'min-height: 40px;', 'rte' => 'ace|json' ), - 'sql' => "text NULL" + 'sql' => 'text NULL' ), ), ); diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index 9ace839..36809b8 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -93,7 +93,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['delete'], 'href' => 'act=delete', 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"' ), 'toggle' => array ( @@ -144,7 +145,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( @@ -173,7 +174,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'maxWidth' => array ( @@ -182,7 +183,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'inputType' => 'text', 'default' => null, 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "int(4) NULL" + 'sql' => 'int(4) NULL' ), 'minWidth' => array ( @@ -191,7 +192,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'inputType' => 'text', 'default' => null, 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "int(4) NULL" + 'sql' => 'int(4) NULL' ), 'maxHeight' => array ( @@ -200,7 +201,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'inputType' => 'text', 'default' => null, 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "int(4) NULL" + 'sql' => 'int(4) NULL' ), 'autoPan' => array ( @@ -242,7 +243,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'autoPanPadding' => array ( @@ -256,7 +257,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'multiple' => true, 'size' => 2, ), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'zoomAnimation' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index d502d3c..4b2641e 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -93,7 +93,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['delete'], 'href' => 'act=delete', 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"' ), 'toggle' => array ( @@ -138,7 +139,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( @@ -167,7 +168,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'type' => array ( @@ -274,8 +275,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'inputType' => 'select', 'options' => array('butt', 'round', 'square', 'inherit'), 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['lineCaps'], - 'eval' => array('mandatory' => false, 'tl_class' => 'w50 clr', 'includeBlankOption' => true, 'helpwizard'), - 'sql' => "varchar(8) NOT NULL default ''" + 'eval' => array( + 'mandatory' => false, + 'tl_class' => 'w50 clr', + 'includeBlankOption' => true, + 'helpwizard' => true, + ), + 'sql' => "varchar(8) NOT NULL default ''", ), 'lineJoin' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index b1e06ca..a418e98 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -26,7 +26,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array ) ), 'onload_callback' => array( - function() { + function () { \Controller::loadLanguageFile('leaflet'); } ), @@ -101,7 +101,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['delete'], 'href' => 'act=delete', 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"' + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"' ), 'toggle' => array ( @@ -168,7 +169,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array ( 'id' => array ( - 'sql' => "int(10) unsigned NOT NULL auto_increment" + 'sql' => 'int(10) unsigned NOT NULL auto_increment' ), 'tstamp' => array ( @@ -211,7 +212,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'type' => array ( @@ -279,7 +280,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'inputType' => 'text', 'eval' => array('mandatory' => true, 'rte' => 'tinyMCE', 'helpwizard' => true, 'tl_class' => 'clr'), 'explanation' => 'insertTags', - 'sql' => "mediumtext NULL" + 'sql' => 'mediumtext NULL' ), 'style' => array ( @@ -329,7 +330,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'nullIfEmpty' => true, 'mandatory' => true, ), - 'sql' => "varchar(255) NULL" + 'sql' => 'varchar(255) NULL' ), 'radius' => array ( @@ -349,7 +350,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'save_callback' => array( \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateMultipleCoordinates') ), - 'sql' => "longblob NULL" + 'sql' => 'longblob NULL' ), 'multiData' => array ( @@ -374,7 +375,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'save_callback' => array( \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateMultipleCoordinateSets') ), - 'sql' => "longblob NULL" + 'sql' => 'longblob NULL' ), 'bounds' => array ( @@ -384,12 +385,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'save_callback' => array(), 'eval' => array( 'maxlength' => 255, - 'multiple'=>true, - 'size'=>2, + 'multiple' => true, + 'size' => 2, 'tl_class' => 'long clr', 'nullIfEmpty' => true, ), - 'sql' => "mediumblob NULL" + 'sql' => 'mediumblob NULL' ), 'ignoreForBounds' => array ( @@ -410,7 +411,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'style' => 'min-height: 40px;', 'rte' => 'ace|json' ), - 'sql' => "text NULL" + 'sql' => 'text NULL' ), ), ); From a3ac7262f0b81696ce60596647b39b34fb4c1b5d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 16:31:15 +0200 Subject: [PATCH 010/152] Add plugin and bundle. --- composer.json | 9 +++---- src/ContaoManager/Plugin.php | 40 ++++++++++++++++++++++++++++ src/NetzmachtContaoLeafletBundle.php | 26 ++++++++++++++++++ 3 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 src/ContaoManager/Plugin.php create mode 100644 src/NetzmachtContaoLeafletBundle.php diff --git a/composer.json b/composer.json index a785563..69b8194 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,8 @@ "doctrine/cache": "^1.0" }, "require-dev": { - "phpcq/all-tasks": "^1.2" + "phpcq/all-tasks": "^1.2", + "contao/manager-plugin": "^2.1" }, "autoload": { "psr-4": { @@ -51,12 +52,8 @@ "dev-develop": "2.1.x-dev", "dev-release/3.0.0": "3.0.x-dev" }, + "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\ContaoManager\\Plugin", "contao": { - "sources": { - "module": "system/modules/leaflet", - "assets/maps": "assets/leaflet/maps", - "assets/js": "assets/leaflet/js" - }, "transifex": { "project": "contao-leaflet-maps", "prefix": "core-", diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php new file mode 100644 index 0000000..c9985b7 --- /dev/null +++ b/src/ContaoManager/Plugin.php @@ -0,0 +1,40 @@ + + * @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\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\Toolkit\NetzmachtContaoToolkitBundle; + +/** + * Contao manager plugin. + * + * @package Netzmacht\Contao\Leaflet\ContaoManager + */ +class Plugin implements BundlePluginInterface +{ + /** + * {@inheritdoc} + */ + public function getBundles(ParserInterface $parser) + { + return [ + BundleConfig::create(NetzmachtContaoLeafletBundle::class) + ->setLoadAfter([ContaoCoreBundle::class, NetzmachtContaoToolkitBundle::class]) + ->setReplace(['leaflet']) + ]; + } +} diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/NetzmachtContaoLeafletBundle.php new file mode 100644 index 0000000..e9ffbb4 --- /dev/null +++ b/src/NetzmachtContaoLeafletBundle.php @@ -0,0 +1,26 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet; + +use Symfony\Component\HttpKernel\Bundle\Bundle; + +/** + * Class NetzmachtContaoLeafletBundle. + * + * @package Netzmacht\Contao\Leaflet + */ +class NetzmachtContaoLeafletBundle extends Bundle +{ +} From bce7e31cb3f04f2df90dc5a5ee43b851d8a90407 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 16:31:58 +0200 Subject: [PATCH 011/152] Drop autoload files. --- src/Resources/contao/config/autoload.ini | 1 - src/Resources/contao/config/autoload.php | 22 ---------------------- 2 files changed, 23 deletions(-) delete mode 100644 src/Resources/contao/config/autoload.ini delete mode 100644 src/Resources/contao/config/autoload.php diff --git a/src/Resources/contao/config/autoload.ini b/src/Resources/contao/config/autoload.ini deleted file mode 100644 index 2524a49..0000000 --- a/src/Resources/contao/config/autoload.ini +++ /dev/null @@ -1 +0,0 @@ -requires[] = 'toolkit' diff --git a/src/Resources/contao/config/autoload.php b/src/Resources/contao/config/autoload.php deleted file mode 100644 index 88ff920..0000000 --- a/src/Resources/contao/config/autoload.php +++ /dev/null @@ -1,22 +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 - */ - -TemplateLoader::addFiles( - array( - 'ce_leaflet_map' => 'system/modules/leaflet/templates', - 'leaflet_map_js' => 'system/modules/leaflet/templates', - 'leaflet_map_html' => 'system/modules/leaflet/templates', - 'mod_leaflet_map' => 'system/modules/leaflet/templates', - 'be_leaflet_geocode' => 'system/modules/leaflet/templates', - 'be_leaflet_about' => 'system/modules/leaflet/templates', - ) -); From 04c693ac7f32faa8828a0d156aee756dbee75d7f Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 16:40:13 +0200 Subject: [PATCH 012/152] Use symfony translator. --- src/Dca/FrontendIntegration.php | 8 ++++---- src/Dca/LayerCallbacks.php | 10 +++++----- src/Dca/Validator.php | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Dca/FrontendIntegration.php b/src/Dca/FrontendIntegration.php index f07c46a..820f723 100644 --- a/src/Dca/FrontendIntegration.php +++ b/src/Dca/FrontendIntegration.php @@ -12,10 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Dca; -use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator; use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\MapModel; +use Symfony\Component\Translation\TranslatorInterface as Translator; /** * Class Module is the helper for the tl_module dca. @@ -88,18 +88,18 @@ class FrontendIntegration \RequestToken::get(), sprintf( $pattern, - specialchars($this->translator->translate('editalias.1', 'tl_content', [$dataContainer->value])), + specialchars($this->translator->trans('editalias.1', [$dataContainer->value], 'contao_tl_content')), specialchars( str_replace( "'", "\\'", - sprintf($this->translator->translate('editalias.1', 'tl_content', [$dataContainer->value])) + sprintf($this->translator->trans('editalias.1', [$dataContainer->value], 'contao_tl_content')) ) ) ), \Image::getHtml( 'alias.gif', - $this->translator->translate('editalias.0', 'tl_content', [$dataContainer->value]), + $this->translator->trans('editalias.0', [$dataContainer->value], 'contao_tl_content'), 'style="vertical-align:top"' ) ); diff --git a/src/Dca/LayerCallbacks.php b/src/Dca/LayerCallbacks.php index 9f47e2d..e739a2b 100644 --- a/src/Dca/LayerCallbacks.php +++ b/src/Dca/LayerCallbacks.php @@ -12,11 +12,11 @@ namespace Netzmacht\Contao\Leaflet\Dca; -use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator; use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Symfony\Component\Translation\TranslatorInterface as Translator; /** * Class Layer is the helper class for the tl_leaflet_layer dca. @@ -203,10 +203,10 @@ class LayerCallbacks extends Callbacks $buffer = sprintf( '%s ', $pasteAfterUrl, - specialchars($this->translator->translate('pasteafter.1', $table, [$row['id']])), + specialchars($this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)), \Image::getHtml( 'pasteafter.gif', - $this->translator->translate('pasteafter.1', $table, [$row['id']]) + $this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table) ) ); @@ -223,10 +223,10 @@ class LayerCallbacks extends Callbacks $buffer .= sprintf( '%s ', $pasteIntoUrl, - specialchars($this->translator->translate('pasteinto.1', $table, [$row['id']])), + specialchars($this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)), \Image::getHtml( 'pasteinto.gif', - $this->translator->translate('pasteinto.1', $table, [$row['id']]) + $this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table) ) ); } elseif ($row['id'] > 0) { diff --git a/src/Dca/Validator.php b/src/Dca/Validator.php index 6607ce6..f96a920 100644 --- a/src/Dca/Validator.php +++ b/src/Dca/Validator.php @@ -12,9 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Dca; -use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator; use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory; use Netzmacht\LeafletPHP\Value\LatLng; +use Symfony\Component\Translation\TranslatorInterface as Translator; /** * Class Validator. @@ -66,7 +66,7 @@ class Validator LatLng::fromString($value); } catch (\Exception $e) { throw new \InvalidArgumentException( - $this->translator->translate('invalidCoordinates', 'leaflet', [$value]), + $this->translator->trans('invalidCoordinates', [$value], 'contao_leaflet'), 0, $e ); @@ -126,7 +126,7 @@ class Validator { if (preg_match('/^[A-Za-z_]+[A-Za-z0-9_]+$/', $value) !== 1) { throw new \InvalidArgumentException( - $this->translator->translate('invalidAlias', 'leaflet') + $this->translator->trans('invalidAlias', [], 'contao_leaflet') ); } From 6ad637d4fa9b204bdfdb47bf96c293284376cac2 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 16:45:16 +0200 Subject: [PATCH 013/152] Move amanities config to parameters.yml. --- src/Resources/config/parameters.yml | 201 ++++++++++++++++ .../contao/config/leaflet_amenities.php | 214 ------------------ 2 files changed, 201 insertions(+), 214 deletions(-) create mode 100644 src/Resources/config/parameters.yml delete mode 100644 src/Resources/contao/config/leaflet_amenities.php diff --git a/src/Resources/config/parameters.yml b/src/Resources/config/parameters.yml new file mode 100644 index 0000000..05b5c2c --- /dev/null +++ b/src/Resources/config/parameters.yml @@ -0,0 +1,201 @@ +netzmacht.contao_leaflet_maps.amenities: + - 'administration' + - 'advertising' + - 'alm' + - 'animal_boarding' + - 'animal_breeding' + - 'animal_shelter' + - 'architect_office' + - 'arts_centre' + - 'artwork' + - 'atm' + - 'audiologist' + - 'baby_hatch' + - 'bank' + - 'bar' + - 'bbq' + - 'bench' + - 'bicycle_parking' + - 'bicycle_rental' + - 'bicycle_repair_station' + - 'bicycle_trailer_sharing' + - 'biergarten' + - 'bikeshed' + - 'boat_rental' + - 'boat_sharing' + - 'boat_storage' + - 'brothel' + - 'bts' + - 'bureau_de_change' + - 'bus_station' + - 'cafe' + - 'canoe_hire' + - 'car_rental' + - 'car_repair' + - 'car_sharing' + - 'car_wash' + - 'casino' + - 'charging_station' + - 'childcare' + - 'cinema' + - 'citymap_post' + - 'clinic' + - 'clock' + - 'club' + - 'coast_guard' + - 'coast_radar_station' + - 'college' + - 'community_center' + - 'community_centre' + - 'compressed_air' + - 'concert_hall' + - 'conference_centre' + - 'courthouse' + - 'coworking_space' + - 'crematorium' + - 'crucifix' + - 'crypt' + - 'customs' + - 'dancing_school' + - 'dead_pub' + - 'dentist' + - 'disused' + - 'dive_centre' + - 'doctors' + - 'dog_bin' + - 'dog_waste_bin' + - 'dojo' + - 'drinking_water' + - '_driving_school' + - 'education' + - 'embassy' + - 'emergency_phone' + - 'emergency_service' + - 'events_venue' + - 'ev_charging' + - 'exhibition_centre' + - 'fast_food' + - 'ferry_terminal' + - 'festival_grounds' + - 'financial_advice' + - 'fire_hydrant' + - 'fire_station' + - 'first_aid' + - 'fish_spa' + - 'food_court' + - 'fountain' + - 'fuel' + - 'gambling' + - 'game_feeding' + - 'garages' + - 'grave_yard' + - 'grit_bin' + - 'harbourmaster' + - 'hospice' + - 'hospital' + - 'hotel' + - 'hunting_stand' + - 'ice_cream' + - 'internet_cafe' + - 'jobcentre' + - 'kindergarten' + - 'kiosk' + - 'kitchen' + - 'Kneippbecken' + - 'kneipp_water_cure' + - 'language_school' + - 'lavoir' + - 'library' + - 'lifeboat_station' + - 'life_ring' + - 'loading_dock' + - 'love_hotel' + - 'marae' + - 'marketplace' + - 'milk_dispenser' + - 'mobile_library' + - 'monastery' + - 'money_transfer' + - 'mortuary' + - 'motorcycle_parking' + - 'motorcycle_rental' + - 'music_school' + - 'music_venue' + - 'nameplate' + - 'nightclub' + - 'nursery' + - 'nursing_home' + - 'park' + - 'parking' + - 'parking_entrance' + - 'parking_space' + - 'pharmacy' + - 'photo_booth' + - 'place_of_worship' + - 'planetarium' + - 'police' + - 'post_box' + - 'post_office' + - 'preschool' + - 'printer' + - 'prison' + - 'prison_camp' + - 'proposed' + - 'pub' + - 'public_bath' + - 'public_bookcase' + - 'public_building' + - 'public_hall' + - 'ranger_station' + - 'recycling' + - 'refugee_housing' + - 'register_office' + - 'rescue_box' + - 'rescue_station' + - 'research_institute' + - 'restaurant' + - 'retirement_home' + - 'sanatorium' + - 'sanitary_dump_station' + - 'sauna' + - 'school' + - 'scout_hut' + - 'shelter' + - 'shop' + - 'shower' + - 'ski_school' + - 'smoking_area' + - 'social_centre' + - 'social_facility' + - 'spa' + - 'stables' + - 'stripclub' + - 'studio' + - 'swimming_pool' + - 'swingerclub' + - 'table' + - 'taxi' + - 'telephone' + - 'theatre' + - 'ticket_booth' + - 'ticket_validator' + - 'toilets' + - 'townhall' + - 'trolley_bay' + - 'university' + - 'vacuum_cleaner' + - 'vehicle_inspection' + - 'vending_machine' + - 'veterinary' + - 'vivarium' + - 'wash_center' + - 'waste_basket' + - 'waste_disposal' + - 'waste_transfer_station' + - 'water' + - 'watering_place' + - 'water_point' + - 'weighbridge' + - 'winery' + - 'yacht_club' + - 'youth_centre' diff --git a/src/Resources/contao/config/leaflet_amenities.php b/src/Resources/contao/config/leaflet_amenities.php deleted file mode 100644 index 3cdd730..0000000 --- a/src/Resources/contao/config/leaflet_amenities.php +++ /dev/null @@ -1,214 +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 - */ - -return [ - 'administration', - 'advertising', - 'alm', - 'animal_boarding', - 'animal_breeding', - 'animal_shelter', - 'architect_office', - 'arts_centre', - 'artwork', - 'atm', - 'audiologist', - 'baby_hatch', - 'bank', - 'bar', - 'bbq', - 'bench', - 'bicycle_parking', - 'bicycle_rental', - 'bicycle_repair_station', - 'bicycle_trailer_sharing', - 'biergarten', - 'bikeshed', - 'boat_rental', - 'boat_sharing', - 'boat_storage', - 'brothel', - 'bts', - 'bureau_de_change', - 'bus_station', - 'cafe', - 'canoe_hire', - 'car_rental', - 'car_repair', - 'car_sharing', - 'car_wash', - 'casino', - 'charging_station', - 'childcare', - 'cinema', - 'citymap_post', - 'clinic', - 'clock', - 'club', - 'coast_guard', - 'coast_radar_station', - 'college', - 'community_center', - 'community_centre', - 'compressed_air', - 'concert_hall', - 'conference_centre', - 'courthouse', - 'coworking_space', - 'crematorium', - 'crucifix', - 'crypt', - 'customs', - 'dancing_school', - 'dead_pub', - 'dentist', - 'disused', - 'dive_centre', - 'doctors', - 'dog_bin', - 'dog_waste_bin', - 'dojo', - 'drinking_water', - '_driving_school', - 'education', - 'embassy', - 'emergency_phone', - 'emergency_service', - 'events_venue', - 'ev_charging', - 'exhibition_centre', - 'fast_food', - 'ferry_terminal', - 'festival_grounds', - 'financial_advice', - 'fire_hydrant', - 'fire_station', - 'first_aid', - 'fish_spa', - 'food_court', - 'fountain', - 'fuel', - 'gambling', - 'game_feeding', - 'garages', - 'grave_yard', - 'grit_bin', - 'harbourmaster', - 'hospice', - 'hospital', - 'hotel', - 'hunting_stand', - 'ice_cream', - 'internet_cafe', - 'jobcentre', - 'kindergarten', - 'kiosk', - 'kitchen', - 'Kneippbecken', - 'kneipp_water_cure', - 'language_school', - 'lavoir', - 'library', - 'lifeboat_station', - 'life_ring', - 'loading_dock', - 'love_hotel', - 'marae', - 'marketplace', - 'milk_dispenser', - 'mobile_library', - 'monastery', - 'money_transfer', - 'mortuary', - 'motorcycle_parking', - 'motorcycle_rental', - 'music_school', - 'music_venue', - 'nameplate', - 'nightclub', - 'nursery', - 'nursing_home', - 'park', - 'parking', - 'parking_entrance', - 'parking_space', - 'pharmacy', - 'photo_booth', - 'place_of_worship', - 'planetarium', - 'police', - 'post_box', - 'post_office', - 'preschool', - 'printer', - 'prison', - 'prison_camp', - 'proposed', - 'pub', - 'public_bath', - 'public_bookcase', - 'public_building', - 'public_hall', - 'ranger_station', - 'recycling', - 'refugee_housing', - 'register_office', - 'rescue_box', - 'rescue_station', - 'research_institute', - 'restaurant', - 'retirement_home', - 'sanatorium', - 'sanitary_dump_station', - 'sauna', - 'school', - 'scout_hut', - 'shelter', - 'shop', - 'shower', - 'ski_school', - 'smoking_area', - 'social_centre', - 'social_facility', - 'spa', - 'stables', - 'stripclub', - 'studio', - 'swimming_pool', - 'swingerclub', - 'table', - 'taxi', - 'telephone', - 'theatre', - 'ticket_booth', - 'ticket_validator', - 'toilets', - 'townhall', - 'trolley_bay', - 'university', - 'vacuum_cleaner', - 'vehicle_inspection', - 'vending_machine', - 'veterinary', - 'vivarium', - 'wash_center', - 'waste_basket', - 'waste_disposal', - 'waste_transfer_station', - 'water', - 'watering_place', - 'water_point', - 'weighbridge', - 'winery', - 'yacht_club', - 'youth_centre', -]; From 909288d4fc728981256432c6a509799de43dd414 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 17:02:15 +0200 Subject: [PATCH 014/152] Move providers to yml file. --- .../amenities.yml} | 0 src/Resources/config/parameters/providers.yml | 156 +++++++++++++++ .../contao/config/leaflet_providers.php | 182 ------------------ 3 files changed, 156 insertions(+), 182 deletions(-) rename src/Resources/config/{parameters.yml => parameters/amenities.yml} (100%) create mode 100644 src/Resources/config/parameters/providers.yml delete mode 100644 src/Resources/contao/config/leaflet_providers.php diff --git a/src/Resources/config/parameters.yml b/src/Resources/config/parameters/amenities.yml similarity index 100% rename from src/Resources/config/parameters.yml rename to src/Resources/config/parameters/amenities.yml diff --git a/src/Resources/config/parameters/providers.yml b/src/Resources/config/parameters/providers.yml new file mode 100644 index 0000000..8329dd0 --- /dev/null +++ b/src/Resources/config/parameters/providers.yml @@ -0,0 +1,156 @@ +netzmacht.contao_leaflet_maps.providers: + OpenStreetMap: + variants: ['Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH'] + + OpenSeaMap: [] + + OpenTopoMap: [] + + Thunderforest: + variants: + - 'OpenCycleMap' + - 'Transport' + - 'TransportDark' + - 'SpinalMap' + - 'Landscape' + - 'Outdoors' + - 'Pioneer' + + OpenMapSurfer: + variants: ['Roads', 'AdminBounds', 'Grayscale'] + + Hydda: + variants: ['Full', 'Base', 'RoadsAndLabels'] + + MapBox: + class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\MapBoxProvider' + options: + key: 'tile_provider_key' + + Stamen: + variants: + - 'Toner' + - 'TonerBackground' + - 'TonerHybrid' + - 'TonerLines' + - 'TonerLabels' + - 'TonerLite' + - 'Terrain' + - 'TerrainBackground' + - 'TopOSMRelief' + - 'TopOSMFeatures' + - 'Watercolor' + + Esri: + variants: + - 'WorldStreetMap' + - 'DeLorme' + - 'WorldTopoMap' + - 'WorldImagery' + - 'WorldTerrain' + - 'WorldShadedRelief' + - 'WorldPhysical' + - 'OceanBasemap' + - 'NatGeoWorldMap' + - 'WorldGrayCanvas' + + OpenWeatherMap: + variants: + - 'Clouds' + - 'CloudsClassic' + - 'Precipitation' + - 'PrecipitationClassic' + - 'Rain' + - 'RainClassic' + - 'Pressure' + - 'PressureContour' + - 'Wind' + - 'Temperature' + - 'Snow' + + HERE: + class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider' + variants: + - 'normalDay' + - 'normalDayCustom' + - 'normalDayGrey' + - 'normalDayMobile' + - 'normalDayGreyMobile' + - 'normalDayTransit' + - 'normalDayTransitMobile' + - 'normalNight' + - 'normalNightMobile' + - 'normalNightGrey' + - 'normalNightGreyMobile' + - 'basicMap' + - 'mapLabels' + - 'trafficFlow' + - 'carnavDayGrey' + - 'hybridDay' + - 'hybridDayMobile' + - 'pedestrianDay' + - 'pedestrianNight' + - 'satelliteDay' + - 'terrainDay' + - 'terrainDayMobile' + options: + appId: 'tile_provider_key' + appCode: 'tile_provider_code' + fields: ['tile_provider_key', 'tile_provider_code'] + + JusticeMap: + variants: + - 'income' + - 'americanIndian' + - 'asian' + - 'black' + - 'hispanic' + - 'multi' + - 'nonWhite' + - 'white' + - 'plurality' + + FreeMapSK: [] + + MtbMap: [] + + CartoDB: + variants: + - 'Positron' + - 'PositronNoLabels' + - 'PositronOnlyLabels' + - 'DarkMatter' + - 'DarkMatterNoLabels' + - 'DarkMatterOnlyLabels' + + HikeBike: + variants: + - 'HikeBike' + - 'HillShading' + + BasemapAT: + variants: + - 'basemap' + - 'grau' + - 'overlay' + - 'highdpi' + - 'orthofoto' + + nlmaps: + variants: + - 'standaard' + - 'pastel' + - 'grijs' + - 'luchtfoto' + + NASAGIBS: + variants: + - 'ModisTerraTrueColorCR' + - 'ModisTerraBands367CR' + - 'ViirsEarthAtNight2012' + - 'ModisTerraLSTDay' + - 'ModisTerraSnowCover' + - 'ModisTerraAOD' + - 'ModisTerraChlorophyll' + + NLS: [] diff --git a/src/Resources/contao/config/leaflet_providers.php b/src/Resources/contao/config/leaflet_providers.php deleted file mode 100644 index 0e29dd4..0000000 --- a/src/Resources/contao/config/leaflet_providers.php +++ /dev/null @@ -1,182 +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 - */ - -/* - * Support all providers and variants which are supported by leaflet-providers. - * See https://github.com/leaflet-extras/leaflet-providers/blob/master/leaflet-providers.js - */ - -$GLOBALS['LEAFLET_TILE_PROVIDERS'] = array -( - 'OpenStreetMap' => array - ( - 'variants' => array('Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH'), - ), - 'OpenSeaMap' => array(), - 'OpenTopoMap' => array(), - 'Thunderforest' => array - ( - 'variants' => array( - 'OpenCycleMap', - 'Transport', - 'TransportDark', - 'SpinalMap', - 'Landscape', - 'Outdoors', - 'Pioneer' - ) - ), - 'OpenMapSurfer' => array - ( - 'variants' => array('Roads', 'AdminBounds', 'Grayscale') - ), - 'Hydda' => array( - 'variants' => array('Full', 'Base', 'RoadsAndLabels') - ), - 'MapBox' => array( - 'class' => 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\MapBoxProvider', - 'options' => array( - 'key' => 'tile_provider_key' - ), - ), - 'Stamen' => array( - 'variants' => array( - 'Toner', - 'TonerBackground', - 'TonerHybrid', - 'TonerLines', - 'TonerLabels', - 'TonerLite', - 'Terrain', - 'TerrainBackground', - 'TopOSMRelief', - 'TopOSMFeatures', - 'Watercolor' - ) - ), - 'Esri' => array( - 'variants' => array( - 'WorldStreetMap', - 'DeLorme', - 'WorldTopoMap', - 'WorldImagery', - 'WorldTerrain', - 'WorldShadedRelief', - 'WorldPhysical', - 'OceanBasemap', - 'NatGeoWorldMap', - 'WorldGrayCanvas' - ) - ), - 'OpenWeatherMap' => array( - 'variants' => array( - 'Clouds', - 'CloudsClassic', - 'Precipitation', - 'PrecipitationClassic', - 'Rain', - 'RainClassic', - 'Pressure', - 'PressureContour', - 'Wind', - 'Temperature', - 'Snow' - ) - ), - 'HERE' => array( - 'variants' => array( - 'normalDay', - 'normalDayCustom', - 'normalDayGrey', - 'normalDayMobile', - 'normalDayGreyMobile', - 'normalDayTransit', - 'normalDayTransitMobile', - 'normalNight', - 'normalNightMobile', - 'normalNightGrey', - 'normalNightGreyMobile', - 'basicMap', - 'mapLabels', - 'trafficFlow', - 'carnavDayGrey', - 'hybridDay', - 'hybridDayMobile', - 'pedestrianDay', - 'pedestrianNight', - 'satelliteDay', - 'terrainDay', - 'terrainDayMobile', - ), - 'options' => array( - 'appId' => 'tile_provider_key', - 'appCode' => 'tile_provider_code', - ), - 'fields' => array('tile_provider_key', 'tile_provider_code'), - 'class' => 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider', - ), - 'JusticeMap' => array( - 'variants' => array( - 'income', - 'americanIndian', - 'asian', - 'black', - 'hispanic', - 'multi', - 'nonWhite', - 'white', - 'plurality' - ) - ), - 'FreeMapSK' => array(), - 'MtbMap' => array(), - 'CartoDB' => array( - 'variants' => array( - 'Positron', - 'PositronNoLabels', - 'PositronOnlyLabels', - 'DarkMatter', - 'DarkMatterNoLabels', - 'DarkMatterOnlyLabels', - ) - ), - 'HikeBike' => array( - 'variants' => array( - 'HikeBike', - 'HillShading', - ) - ), - 'BasemapAT' => array( - 'variants' => array( - 'basemap', - 'grau', - 'overlay', - 'highdpi', - 'orthofoto', - ) - ), - 'nlmaps' => array( - 'variants' => array('standaard', 'pastel', 'grijs', 'luchtfoto') - ), - 'NASAGIBS' => array( - 'variants' => array( - 'ModisTerraTrueColorCR', - 'ModisTerraBands367CR', - 'ViirsEarthAtNight2012', - 'ModisTerraLSTDay', - 'ModisTerraSnowCover', - 'ModisTerraAOD', - 'ModisTerraChlorophyll', - ) - ), - 'NLS' => array() -); From ceb05bb08f5a48665db16b848f15bfe3c1d947ea Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 5 Oct 2017 17:35:46 +0200 Subject: [PATCH 015/152] Work on moving configuration to yml files. --- src/Resources/config/config.yml | 8 + src/Resources/config/parameters/amenities.yml | 403 +++++++++--------- src/Resources/config/parameters/common.yml | 60 +++ src/Resources/config/parameters/providers.yml | 301 ++++++------- src/Resources/config/services/encoders.yml | 40 ++ src/Resources/config/services/filters.yml | 11 + src/Resources/config/services/listeners.yml | 0 src/Resources/config/services/mappers.yml | 33 ++ src/Resources/config/services/services.yml | 3 + 9 files changed, 508 insertions(+), 351 deletions(-) create mode 100644 src/Resources/config/config.yml create mode 100644 src/Resources/config/parameters/common.yml create mode 100644 src/Resources/config/services/encoders.yml create mode 100644 src/Resources/config/services/filters.yml create mode 100644 src/Resources/config/services/listeners.yml create mode 100644 src/Resources/config/services/mappers.yml create mode 100644 src/Resources/config/services/services.yml diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml new file mode 100644 index 0000000..b2db1a6 --- /dev/null +++ b/src/Resources/config/config.yml @@ -0,0 +1,8 @@ +imports: + - { resource: parameters/common.yml } + - { resource: parameters/amenities.yml } + - { resource: parameters/providers.yml } + - { resource: services/encoders.yml } + - { resource: services/mappers.yml } + - { resource: services/services.yml } + - { resource: services/listeners.yml } diff --git a/src/Resources/config/parameters/amenities.yml b/src/Resources/config/parameters/amenities.yml index 05b5c2c..fa8ff6b 100644 --- a/src/Resources/config/parameters/amenities.yml +++ b/src/Resources/config/parameters/amenities.yml @@ -1,201 +1,202 @@ -netzmacht.contao_leaflet_maps.amenities: - - 'administration' - - 'advertising' - - 'alm' - - 'animal_boarding' - - 'animal_breeding' - - 'animal_shelter' - - 'architect_office' - - 'arts_centre' - - 'artwork' - - 'atm' - - 'audiologist' - - 'baby_hatch' - - 'bank' - - 'bar' - - 'bbq' - - 'bench' - - 'bicycle_parking' - - 'bicycle_rental' - - 'bicycle_repair_station' - - 'bicycle_trailer_sharing' - - 'biergarten' - - 'bikeshed' - - 'boat_rental' - - 'boat_sharing' - - 'boat_storage' - - 'brothel' - - 'bts' - - 'bureau_de_change' - - 'bus_station' - - 'cafe' - - 'canoe_hire' - - 'car_rental' - - 'car_repair' - - 'car_sharing' - - 'car_wash' - - 'casino' - - 'charging_station' - - 'childcare' - - 'cinema' - - 'citymap_post' - - 'clinic' - - 'clock' - - 'club' - - 'coast_guard' - - 'coast_radar_station' - - 'college' - - 'community_center' - - 'community_centre' - - 'compressed_air' - - 'concert_hall' - - 'conference_centre' - - 'courthouse' - - 'coworking_space' - - 'crematorium' - - 'crucifix' - - 'crypt' - - 'customs' - - 'dancing_school' - - 'dead_pub' - - 'dentist' - - 'disused' - - 'dive_centre' - - 'doctors' - - 'dog_bin' - - 'dog_waste_bin' - - 'dojo' - - 'drinking_water' - - '_driving_school' - - 'education' - - 'embassy' - - 'emergency_phone' - - 'emergency_service' - - 'events_venue' - - 'ev_charging' - - 'exhibition_centre' - - 'fast_food' - - 'ferry_terminal' - - 'festival_grounds' - - 'financial_advice' - - 'fire_hydrant' - - 'fire_station' - - 'first_aid' - - 'fish_spa' - - 'food_court' - - 'fountain' - - 'fuel' - - 'gambling' - - 'game_feeding' - - 'garages' - - 'grave_yard' - - 'grit_bin' - - 'harbourmaster' - - 'hospice' - - 'hospital' - - 'hotel' - - 'hunting_stand' - - 'ice_cream' - - 'internet_cafe' - - 'jobcentre' - - 'kindergarten' - - 'kiosk' - - 'kitchen' - - 'Kneippbecken' - - 'kneipp_water_cure' - - 'language_school' - - 'lavoir' - - 'library' - - 'lifeboat_station' - - 'life_ring' - - 'loading_dock' - - 'love_hotel' - - 'marae' - - 'marketplace' - - 'milk_dispenser' - - 'mobile_library' - - 'monastery' - - 'money_transfer' - - 'mortuary' - - 'motorcycle_parking' - - 'motorcycle_rental' - - 'music_school' - - 'music_venue' - - 'nameplate' - - 'nightclub' - - 'nursery' - - 'nursing_home' - - 'park' - - 'parking' - - 'parking_entrance' - - 'parking_space' - - 'pharmacy' - - 'photo_booth' - - 'place_of_worship' - - 'planetarium' - - 'police' - - 'post_box' - - 'post_office' - - 'preschool' - - 'printer' - - 'prison' - - 'prison_camp' - - 'proposed' - - 'pub' - - 'public_bath' - - 'public_bookcase' - - 'public_building' - - 'public_hall' - - 'ranger_station' - - 'recycling' - - 'refugee_housing' - - 'register_office' - - 'rescue_box' - - 'rescue_station' - - 'research_institute' - - 'restaurant' - - 'retirement_home' - - 'sanatorium' - - 'sanitary_dump_station' - - 'sauna' - - 'school' - - 'scout_hut' - - 'shelter' - - 'shop' - - 'shower' - - 'ski_school' - - 'smoking_area' - - 'social_centre' - - 'social_facility' - - 'spa' - - 'stables' - - 'stripclub' - - 'studio' - - 'swimming_pool' - - 'swingerclub' - - 'table' - - 'taxi' - - 'telephone' - - 'theatre' - - 'ticket_booth' - - 'ticket_validator' - - 'toilets' - - 'townhall' - - 'trolley_bay' - - 'university' - - 'vacuum_cleaner' - - 'vehicle_inspection' - - 'vending_machine' - - 'veterinary' - - 'vivarium' - - 'wash_center' - - 'waste_basket' - - 'waste_disposal' - - 'waste_transfer_station' - - 'water' - - 'watering_place' - - 'water_point' - - 'weighbridge' - - 'winery' - - 'yacht_club' - - 'youth_centre' +parameters: + netzmacht.contao_leaflet_maps.amenities: + - 'administration' + - 'advertising' + - 'alm' + - 'animal_boarding' + - 'animal_breeding' + - 'animal_shelter' + - 'architect_office' + - 'arts_centre' + - 'artwork' + - 'atm' + - 'audiologist' + - 'baby_hatch' + - 'bank' + - 'bar' + - 'bbq' + - 'bench' + - 'bicycle_parking' + - 'bicycle_rental' + - 'bicycle_repair_station' + - 'bicycle_trailer_sharing' + - 'biergarten' + - 'bikeshed' + - 'boat_rental' + - 'boat_sharing' + - 'boat_storage' + - 'brothel' + - 'bts' + - 'bureau_de_change' + - 'bus_station' + - 'cafe' + - 'canoe_hire' + - 'car_rental' + - 'car_repair' + - 'car_sharing' + - 'car_wash' + - 'casino' + - 'charging_station' + - 'childcare' + - 'cinema' + - 'citymap_post' + - 'clinic' + - 'clock' + - 'club' + - 'coast_guard' + - 'coast_radar_station' + - 'college' + - 'community_center' + - 'community_centre' + - 'compressed_air' + - 'concert_hall' + - 'conference_centre' + - 'courthouse' + - 'coworking_space' + - 'crematorium' + - 'crucifix' + - 'crypt' + - 'customs' + - 'dancing_school' + - 'dead_pub' + - 'dentist' + - 'disused' + - 'dive_centre' + - 'doctors' + - 'dog_bin' + - 'dog_waste_bin' + - 'dojo' + - 'drinking_water' + - '_driving_school' + - 'education' + - 'embassy' + - 'emergency_phone' + - 'emergency_service' + - 'events_venue' + - 'ev_charging' + - 'exhibition_centre' + - 'fast_food' + - 'ferry_terminal' + - 'festival_grounds' + - 'financial_advice' + - 'fire_hydrant' + - 'fire_station' + - 'first_aid' + - 'fish_spa' + - 'food_court' + - 'fountain' + - 'fuel' + - 'gambling' + - 'game_feeding' + - 'garages' + - 'grave_yard' + - 'grit_bin' + - 'harbourmaster' + - 'hospice' + - 'hospital' + - 'hotel' + - 'hunting_stand' + - 'ice_cream' + - 'internet_cafe' + - 'jobcentre' + - 'kindergarten' + - 'kiosk' + - 'kitchen' + - 'Kneippbecken' + - 'kneipp_water_cure' + - 'language_school' + - 'lavoir' + - 'library' + - 'lifeboat_station' + - 'life_ring' + - 'loading_dock' + - 'love_hotel' + - 'marae' + - 'marketplace' + - 'milk_dispenser' + - 'mobile_library' + - 'monastery' + - 'money_transfer' + - 'mortuary' + - 'motorcycle_parking' + - 'motorcycle_rental' + - 'music_school' + - 'music_venue' + - 'nameplate' + - 'nightclub' + - 'nursery' + - 'nursing_home' + - 'park' + - 'parking' + - 'parking_entrance' + - 'parking_space' + - 'pharmacy' + - 'photo_booth' + - 'place_of_worship' + - 'planetarium' + - 'police' + - 'post_box' + - 'post_office' + - 'preschool' + - 'printer' + - 'prison' + - 'prison_camp' + - 'proposed' + - 'pub' + - 'public_bath' + - 'public_bookcase' + - 'public_building' + - 'public_hall' + - 'ranger_station' + - 'recycling' + - 'refugee_housing' + - 'register_office' + - 'rescue_box' + - 'rescue_station' + - 'research_institute' + - 'restaurant' + - 'retirement_home' + - 'sanatorium' + - 'sanitary_dump_station' + - 'sauna' + - 'school' + - 'scout_hut' + - 'shelter' + - 'shop' + - 'shower' + - 'ski_school' + - 'smoking_area' + - 'social_centre' + - 'social_facility' + - 'spa' + - 'stables' + - 'stripclub' + - 'studio' + - 'swimming_pool' + - 'swingerclub' + - 'table' + - 'taxi' + - 'telephone' + - 'theatre' + - 'ticket_booth' + - 'ticket_validator' + - 'toilets' + - 'townhall' + - 'trolley_bay' + - 'university' + - 'vacuum_cleaner' + - 'vehicle_inspection' + - 'vending_machine' + - 'veterinary' + - 'vivarium' + - 'wash_center' + - 'waste_basket' + - 'waste_disposal' + - 'waste_transfer_station' + - 'water' + - 'watering_place' + - 'water_point' + - 'weighbridge' + - 'winery' + - 'yacht_club' + - 'youth_centre' diff --git a/src/Resources/config/parameters/common.yml b/src/Resources/config/parameters/common.yml new file mode 100644 index 0000000..cfaa383 --- /dev/null +++ b/src/Resources/config/parameters/common.yml @@ -0,0 +1,60 @@ +parameters: + # leaflet controls. + # + # Supported leaflet control types. Register your type for the database driven definition here. + netzmacht.contao_leaflet_maps.controls: + - 'zoom' + - 'layers' + - 'scale' + - 'attribution' + - 'loading' + - 'fullscreen' + + # Leaflet icons. + # + # Supported leaflet icon types. Register you type for the database driven definition here. + netzmacht.contao_leaflet_maps.icons: + - 'image' + - 'div' + - 'extra' + + # The style concept is not part of the LeafletJS library. Styles are extracted from the Path options. Instead + # of defining the style for every vector again, manage them at one place. + # + # The goal is to provide different style strategies. For instance a random style chooser, one which uses a color + # range and so one. + netzmacht.contao_leaflet_maps.styles: + - 'fixed' + + # Leaflet vectors. + # + # Supported leaflet vector types. Register you type for the database driven definition here. + netzmacht.contao_leaflet_maps.vectors: + - 'polyline' + - 'polygon' + - 'multiPolyline' + - 'multiPolygon' + - 'rectangle' + - 'circle' + - 'circleMarker' + + # When creating a GeoJSON feature of a map object a feature.properties.model object is passed. + # Define the properties you always want to set. + # + # For more control you can subscribe the ConvertToGeoJsonEvent. + # + # The entry can be a string or an array. If an array is passed, the 2nd value is the type. Following types + # are supported. + # - array: Use deserialize before adding the value + # - file: Thread value a uuid and find the path. + # - files: Thread values as a list of file uuids and get an array of paths. + netzmacht.contao_leaflet_maps.feature_model_properties: + tl_leaflet_marker: + - 'id' + - 'title' + - 'alias' + + tl_leaflet_vector: + - 'id' + - 'title' + - 'alias' diff --git a/src/Resources/config/parameters/providers.yml b/src/Resources/config/parameters/providers.yml index 8329dd0..6b61706 100644 --- a/src/Resources/config/parameters/providers.yml +++ b/src/Resources/config/parameters/providers.yml @@ -1,156 +1,157 @@ -netzmacht.contao_leaflet_maps.providers: - OpenStreetMap: - variants: ['Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH'] - - OpenSeaMap: [] - - OpenTopoMap: [] - - Thunderforest: - variants: - - 'OpenCycleMap' - - 'Transport' - - 'TransportDark' - - 'SpinalMap' - - 'Landscape' - - 'Outdoors' - - 'Pioneer' - - OpenMapSurfer: - variants: ['Roads', 'AdminBounds', 'Grayscale'] - - Hydda: - variants: ['Full', 'Base', 'RoadsAndLabels'] - - MapBox: - class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\MapBoxProvider' - options: - key: 'tile_provider_key' - - Stamen: - variants: - - 'Toner' - - 'TonerBackground' - - 'TonerHybrid' - - 'TonerLines' - - 'TonerLabels' - - 'TonerLite' - - 'Terrain' - - 'TerrainBackground' - - 'TopOSMRelief' - - 'TopOSMFeatures' - - 'Watercolor' - - Esri: - variants: - - 'WorldStreetMap' - - 'DeLorme' - - 'WorldTopoMap' - - 'WorldImagery' - - 'WorldTerrain' - - 'WorldShadedRelief' - - 'WorldPhysical' - - 'OceanBasemap' - - 'NatGeoWorldMap' - - 'WorldGrayCanvas' +parameters: + netzmacht.contao_leaflet_maps.providers: + OpenStreetMap: + variants: ['Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH'] - OpenWeatherMap: - variants: - - 'Clouds' - - 'CloudsClassic' - - 'Precipitation' - - 'PrecipitationClassic' - - 'Rain' - - 'RainClassic' - - 'Pressure' - - 'PressureContour' - - 'Wind' - - 'Temperature' - - 'Snow' + OpenSeaMap: [] - HERE: - class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider' - variants: - - 'normalDay' - - 'normalDayCustom' - - 'normalDayGrey' - - 'normalDayMobile' - - 'normalDayGreyMobile' - - 'normalDayTransit' - - 'normalDayTransitMobile' - - 'normalNight' - - 'normalNightMobile' - - 'normalNightGrey' - - 'normalNightGreyMobile' - - 'basicMap' - - 'mapLabels' - - 'trafficFlow' - - 'carnavDayGrey' - - 'hybridDay' - - 'hybridDayMobile' - - 'pedestrianDay' - - 'pedestrianNight' - - 'satelliteDay' - - 'terrainDay' - - 'terrainDayMobile' - options: - appId: 'tile_provider_key' - appCode: 'tile_provider_code' - fields: ['tile_provider_key', 'tile_provider_code'] - - JusticeMap: - variants: - - 'income' - - 'americanIndian' - - 'asian' - - 'black' - - 'hispanic' - - 'multi' - - 'nonWhite' - - 'white' - - 'plurality' - - FreeMapSK: [] - - MtbMap: [] - - CartoDB: - variants: - - 'Positron' - - 'PositronNoLabels' - - 'PositronOnlyLabels' - - 'DarkMatter' - - 'DarkMatterNoLabels' - - 'DarkMatterOnlyLabels' + OpenTopoMap: [] - HikeBike: - variants: - - 'HikeBike' - - 'HillShading' + Thunderforest: + variants: + - 'OpenCycleMap' + - 'Transport' + - 'TransportDark' + - 'SpinalMap' + - 'Landscape' + - 'Outdoors' + - 'Pioneer' - BasemapAT: - variants: - - 'basemap' - - 'grau' - - 'overlay' - - 'highdpi' - - 'orthofoto' + OpenMapSurfer: + variants: ['Roads', 'AdminBounds', 'Grayscale'] - nlmaps: - variants: - - 'standaard' - - 'pastel' - - 'grijs' - - 'luchtfoto' - - NASAGIBS: - variants: - - 'ModisTerraTrueColorCR' - - 'ModisTerraBands367CR' - - 'ViirsEarthAtNight2012' - - 'ModisTerraLSTDay' - - 'ModisTerraSnowCover' - - 'ModisTerraAOD' - - 'ModisTerraChlorophyll' + Hydda: + variants: ['Full', 'Base', 'RoadsAndLabels'] - NLS: [] + MapBox: + class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\MapBoxProvider' + options: + key: 'tile_provider_key' + + Stamen: + variants: + - 'Toner' + - 'TonerBackground' + - 'TonerHybrid' + - 'TonerLines' + - 'TonerLabels' + - 'TonerLite' + - 'Terrain' + - 'TerrainBackground' + - 'TopOSMRelief' + - 'TopOSMFeatures' + - 'Watercolor' + + Esri: + variants: + - 'WorldStreetMap' + - 'DeLorme' + - 'WorldTopoMap' + - 'WorldImagery' + - 'WorldTerrain' + - 'WorldShadedRelief' + - 'WorldPhysical' + - 'OceanBasemap' + - 'NatGeoWorldMap' + - 'WorldGrayCanvas' + + OpenWeatherMap: + variants: + - 'Clouds' + - 'CloudsClassic' + - 'Precipitation' + - 'PrecipitationClassic' + - 'Rain' + - 'RainClassic' + - 'Pressure' + - 'PressureContour' + - 'Wind' + - 'Temperature' + - 'Snow' + + HERE: + class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider' + variants: + - 'normalDay' + - 'normalDayCustom' + - 'normalDayGrey' + - 'normalDayMobile' + - 'normalDayGreyMobile' + - 'normalDayTransit' + - 'normalDayTransitMobile' + - 'normalNight' + - 'normalNightMobile' + - 'normalNightGrey' + - 'normalNightGreyMobile' + - 'basicMap' + - 'mapLabels' + - 'trafficFlow' + - 'carnavDayGrey' + - 'hybridDay' + - 'hybridDayMobile' + - 'pedestrianDay' + - 'pedestrianNight' + - 'satelliteDay' + - 'terrainDay' + - 'terrainDayMobile' + options: + appId: 'tile_provider_key' + appCode: 'tile_provider_code' + fields: ['tile_provider_key', 'tile_provider_code'] + + JusticeMap: + variants: + - 'income' + - 'americanIndian' + - 'asian' + - 'black' + - 'hispanic' + - 'multi' + - 'nonWhite' + - 'white' + - 'plurality' + + FreeMapSK: [] + + MtbMap: [] + + CartoDB: + variants: + - 'Positron' + - 'PositronNoLabels' + - 'PositronOnlyLabels' + - 'DarkMatter' + - 'DarkMatterNoLabels' + - 'DarkMatterOnlyLabels' + + HikeBike: + variants: + - 'HikeBike' + - 'HillShading' + + BasemapAT: + variants: + - 'basemap' + - 'grau' + - 'overlay' + - 'highdpi' + - 'orthofoto' + + nlmaps: + variants: + - 'standaard' + - 'pastel' + - 'grijs' + - 'luchtfoto' + + NASAGIBS: + variants: + - 'ModisTerraTrueColorCR' + - 'ModisTerraBands367CR' + - 'ViirsEarthAtNight2012' + - 'ModisTerraLSTDay' + - 'ModisTerraSnowCover' + - 'ModisTerraAOD' + - 'ModisTerraChlorophyll' + + NLS: [] diff --git a/src/Resources/config/services/encoders.yml b/src/Resources/config/services/encoders.yml new file mode 100644 index 0000000..3d636c2 --- /dev/null +++ b/src/Resources/config/services/encoders.yml @@ -0,0 +1,40 @@ +services: + netzmacht.contao_leaflet_maps.encoder.map: + class: Netzmacht\LeafletPHP\Encoder\MapEncoder + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } + + netzmacht.contao_leaflet_maps.encoder.control: + class: Netzmacht\LeafletPHP\Encoder\ControlEncoder + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } + + netzmacht.contao_leaflet_maps.encoder.group: + class: Netzmacht\LeafletPHP\Encoder\GroupEncoder + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } + + netzmacht.contao_leaflet_maps.encoder.raster: + class: Netzmacht\LeafletPHP\Encoder\RasterEncoder + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } + + netzmacht.contao_leaflet_maps.encoder.vector: + class: Netzmacht\LeafletPHP\Encoder\VectorEncoder + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } + + netzmacht.contao_leaflet_maps.encoder.ui: + class: Netzmacht\LeafletPHP\Encoder\UIEncoder + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } + + netzmacht.contao_leaflet_maps.encoder.type: + class: Netzmacht\LeafletPHP\Encoder\TypeEncoder + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } + + netzmacht.contao_leaflet_maps.encoder.subscriber: + class: Netzmacht\Contao\Leaflet\Subscriber\EncoderSubscriber + tags: + - { name: netzmacht.contao_leaflet_maps.encoder } diff --git a/src/Resources/config/services/filters.yml b/src/Resources/config/services/filters.yml new file mode 100644 index 0000000..3a8bf82 --- /dev/null +++ b/src/Resources/config/services/filters.yml @@ -0,0 +1,11 @@ +services: + # Filters can be passed to a data request to get only specific data from a layer. + netzmacht.contao_leaflet_maps.filter.bbox: + class: Netzmacht\Contao\Leaflet\Filter\BboxFilter + tags: + - { name: 'netzmacht.contao_leaflet_maps.filter', alias: 'bbox' } + + netzmacht.contao_leaflet_maps.filter.distance: + class: Netzmacht\Contao\Leaflet\Filter\DistanceFilter + tags: + - { name: 'netzmacht.contao_leaflet_maps.filter', alias: 'distance' } diff --git a/src/Resources/config/services/listeners.yml b/src/Resources/config/services/listeners.yml new file mode 100644 index 0000000..e69de29 diff --git a/src/Resources/config/services/mappers.yml b/src/Resources/config/services/mappers.yml new file mode 100644 index 0000000..3ed87a9 --- /dev/null +++ b/src/Resources/config/services/mappers.yml @@ -0,0 +1,33 @@ +services: + netzmacht.contao_leaflet_maps.mapper.popup: + class: Netzmacht\Contao\Leaflet\Mapper\UI\PopupMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.image_icon: + class: Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.div_icon: + class: Netzmacht\Contao\Leaflet\Mapper\Type\DivIconMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.extra_markers: + class: Netzmacht\Contao\Leaflet\Mapper\Type\ExtraMarkersIconMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.fixed_style: + class: Netzmacht\Contao\Leaflet\Mapper\Style\FixedStyleMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.marker: + class: Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + diff --git a/src/Resources/config/services/services.yml b/src/Resources/config/services/services.yml new file mode 100644 index 0000000..99f8863 --- /dev/null +++ b/src/Resources/config/services/services.yml @@ -0,0 +1,3 @@ +services: + netzmacht.contao_leaflet_maps.frontend.value_filter: + class: From 8300531de32216c765cecae6c51bfe0a4be88cfd Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 09:28:33 +0200 Subject: [PATCH 016/152] Restructure config files, add extension and complete mappers services. --- .../NetzmachtContaoLeafletExtension.php | 51 +++++ .../config/{parameters => }/amenities.yml | 0 src/Resources/config/config.yml | 68 ++++++- .../config/{services => }/encoders.yml | 0 .../config/{services => }/filters.yml | 0 .../config/{services => }/listeners.yml | 0 src/Resources/config/mappers.yml | 177 ++++++++++++++++++ src/Resources/config/parameters/common.yml | 60 ------ .../config/{parameters => }/providers.yml | 0 .../config/{services => }/services.yml | 3 + src/Resources/config/services/mappers.yml | 33 ---- 11 files changed, 291 insertions(+), 101 deletions(-) create mode 100644 src/DependencyInjection/NetzmachtContaoLeafletExtension.php rename src/Resources/config/{parameters => }/amenities.yml (100%) rename src/Resources/config/{services => }/encoders.yml (100%) rename src/Resources/config/{services => }/filters.yml (100%) rename src/Resources/config/{services => }/listeners.yml (100%) create mode 100644 src/Resources/config/mappers.yml delete mode 100644 src/Resources/config/parameters/common.yml rename src/Resources/config/{parameters => }/providers.yml (100%) rename src/Resources/config/{services => }/services.yml (57%) delete mode 100644 src/Resources/config/services/mappers.yml diff --git a/src/DependencyInjection/NetzmachtContaoLeafletExtension.php b/src/DependencyInjection/NetzmachtContaoLeafletExtension.php new file mode 100644 index 0000000..076c91e --- /dev/null +++ b/src/DependencyInjection/NetzmachtContaoLeafletExtension.php @@ -0,0 +1,51 @@ + + * @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 Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; + +/** + * Class NetzmachtContaoLeafletExtension. + * + * @package Netzmacht\Contao\Leaflet\DependencyInjection + */ +class NetzmachtContaoLeafletExtension extends Extension +{ + /** + * {@inheritdoc} + */ + public function load(array $configs, ContainerBuilder $container) + { + $loader = new YamlFileLoader( + $container, + new FileLocator(dirname(__DIR__) .'/Resources/config') + ); + + // Common config, services and listeners + $loader->load('config.yml'); + $loader->load('services.yml'); + $loader->load('listeners.yml'); + + // Amenities and providers config + $loader->load('amenities.yml'); + $loader->load('providers.yml'); + + // Other services + $loader->load('filters.yml'); + $loader->load('mappers.yml'); + $loader->load('encoders.yml'); + } +} diff --git a/src/Resources/config/parameters/amenities.yml b/src/Resources/config/amenities.yml similarity index 100% rename from src/Resources/config/parameters/amenities.yml rename to src/Resources/config/amenities.yml diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml index b2db1a6..1624280 100644 --- a/src/Resources/config/config.yml +++ b/src/Resources/config/config.yml @@ -1,8 +1,60 @@ -imports: - - { resource: parameters/common.yml } - - { resource: parameters/amenities.yml } - - { resource: parameters/providers.yml } - - { resource: services/encoders.yml } - - { resource: services/mappers.yml } - - { resource: services/services.yml } - - { resource: services/listeners.yml } +parameters: + # leaflet controls. + # + # Supported leaflet control types. Register your type for the database driven definition here. + netzmacht.contao_leaflet_maps.controls: + - 'zoom' + - 'layers' + - 'scale' + - 'attribution' + - 'loading' + - 'fullscreen' + + # Leaflet icons. + # + # Supported leaflet icon types. Register you type for the database driven definition here. + netzmacht.contao_leaflet_maps.icons: + - 'image' + - 'div' + - 'extra' + + # The style concept is not part of the LeafletJS library. Styles are extracted from the Path options. Instead + # of defining the style for every vector again, manage them at one place. + # + # The goal is to provide different style strategies. For instance a random style chooser, one which uses a color + # range and so one. + netzmacht.contao_leaflet_maps.styles: + - 'fixed' + + # Leaflet vectors. + # + # Supported leaflet vector types. Register you type for the database driven definition here. + netzmacht.contao_leaflet_maps.vectors: + - 'polyline' + - 'polygon' + - 'multiPolyline' + - 'multiPolygon' + - 'rectangle' + - 'circle' + - 'circleMarker' + + # When creating a GeoJSON feature of a map object a feature.properties.model object is passed. + # Define the properties you always want to set. + # + # For more control you can subscribe the ConvertToGeoJsonEvent. + # + # The entry can be a string or an array. If an array is passed, the 2nd value is the type. Following types + # are supported. + # - array: Use deserialize before adding the value + # - file: Thread value a uuid and find the path. + # - files: Thread values as a list of file uuids and get an array of paths. + netzmacht.contao_leaflet_maps.feature_model_properties: + tl_leaflet_marker: + - 'id' + - 'title' + - 'alias' + + tl_leaflet_vector: + - 'id' + - 'title' + - 'alias' diff --git a/src/Resources/config/services/encoders.yml b/src/Resources/config/encoders.yml similarity index 100% rename from src/Resources/config/services/encoders.yml rename to src/Resources/config/encoders.yml diff --git a/src/Resources/config/services/filters.yml b/src/Resources/config/filters.yml similarity index 100% rename from src/Resources/config/services/filters.yml rename to src/Resources/config/filters.yml diff --git a/src/Resources/config/services/listeners.yml b/src/Resources/config/listeners.yml similarity index 100% rename from src/Resources/config/services/listeners.yml rename to src/Resources/config/listeners.yml diff --git a/src/Resources/config/mappers.yml b/src/Resources/config/mappers.yml new file mode 100644 index 0000000..5265dde --- /dev/null +++ b/src/Resources/config/mappers.yml @@ -0,0 +1,177 @@ +# Leaflet mappers. +# +# Mappers translate between the database models and the leaflet definition. +services: + _defaults: + public: false + + + # Map mapper + netzmacht.contao_leaflet_maps.mapper.map: + class: Netzmacht\Contao\Leaflet\Mapper\MapMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + + # Layer mappers + netzmacht.contao_leaflet_maps.mapper.tile_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\TileLayerMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.provider_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\ProviderLayerMapper + arguments: + - '%netzmacht.contao_leaflet_maps.providers%' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.markers_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkersLayerMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.group_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\GroupLayerMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.vectors_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\VectorsLayerMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.reference_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\ReferenceLayerMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.overpass_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\OverpassLayerMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.marker_cluster_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkerClusterLayerMapper + arguments: + - '@netzmacht.contao_leaflet_maps.map.assets' + tags: + - { name: netzmacht.contao_leflet_maps.mapper } + + + # Control mappers + netzmacht.contao_leaflet_maps.mapper.zoom_control: + class: Netzmacht\Contao\Leaflet\Mapper\Control\ZoomControlMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.scale_control: + class: Netzmacht\Contao\Leaflet\Mapper\Control\ScaleControlMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.layers_control: + class: Netzmacht\Contao\Leaflet\Mapper\Control\LayersControlMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.attribution_control: + class: Netzmacht\Contao\Leaflet\Mapper\Control\AttributionControlMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.loading_control: + class: Netzmacht\Contao\Leaflet\Mapper\Control\LoadingControlMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.fullscreen_control: + class: Netzmacht\Contao\Leaflet\Mapper\Control\FullscreenControlMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + + # Vector mappers + netzmacht.contao_leaflet_maps.mapper.polyline: + class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolylineMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.multi_polyline: + class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolylineMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.polygon: + class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolygonMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.multi_polygon: + class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolygonMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.circle: + class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.circle_mapper: + class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMarkerMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.rectangle_mapper: + class: Netzmacht\Contao\Leaflet\Mapper\Vector\RectangleMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + + # Miscellaneous mappers + netzmacht.contao_leaflet_maps.mapper.popup: + class: Netzmacht\Contao\Leaflet\Mapper\UI\PopupMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.image_icon: + class: Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.div_icon: + class: Netzmacht\Contao\Leaflet\Mapper\Type\DivIconMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.extra_markers: + class: Netzmacht\Contao\Leaflet\Mapper\Type\ExtraMarkersIconMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.fixed_style: + class: Netzmacht\Contao\Leaflet\Mapper\Style\FixedStyleMapper + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + + netzmacht.contao_leaflet_maps.mapper.marker: + class: Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper + arguments: + - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + tags: + - { name: netzmacht.contao_leaflet_maps.mapper } + diff --git a/src/Resources/config/parameters/common.yml b/src/Resources/config/parameters/common.yml deleted file mode 100644 index cfaa383..0000000 --- a/src/Resources/config/parameters/common.yml +++ /dev/null @@ -1,60 +0,0 @@ -parameters: - # leaflet controls. - # - # Supported leaflet control types. Register your type for the database driven definition here. - netzmacht.contao_leaflet_maps.controls: - - 'zoom' - - 'layers' - - 'scale' - - 'attribution' - - 'loading' - - 'fullscreen' - - # Leaflet icons. - # - # Supported leaflet icon types. Register you type for the database driven definition here. - netzmacht.contao_leaflet_maps.icons: - - 'image' - - 'div' - - 'extra' - - # The style concept is not part of the LeafletJS library. Styles are extracted from the Path options. Instead - # of defining the style for every vector again, manage them at one place. - # - # The goal is to provide different style strategies. For instance a random style chooser, one which uses a color - # range and so one. - netzmacht.contao_leaflet_maps.styles: - - 'fixed' - - # Leaflet vectors. - # - # Supported leaflet vector types. Register you type for the database driven definition here. - netzmacht.contao_leaflet_maps.vectors: - - 'polyline' - - 'polygon' - - 'multiPolyline' - - 'multiPolygon' - - 'rectangle' - - 'circle' - - 'circleMarker' - - # When creating a GeoJSON feature of a map object a feature.properties.model object is passed. - # Define the properties you always want to set. - # - # For more control you can subscribe the ConvertToGeoJsonEvent. - # - # The entry can be a string or an array. If an array is passed, the 2nd value is the type. Following types - # are supported. - # - array: Use deserialize before adding the value - # - file: Thread value a uuid and find the path. - # - files: Thread values as a list of file uuids and get an array of paths. - netzmacht.contao_leaflet_maps.feature_model_properties: - tl_leaflet_marker: - - 'id' - - 'title' - - 'alias' - - tl_leaflet_vector: - - 'id' - - 'title' - - 'alias' diff --git a/src/Resources/config/parameters/providers.yml b/src/Resources/config/providers.yml similarity index 100% rename from src/Resources/config/parameters/providers.yml rename to src/Resources/config/providers.yml diff --git a/src/Resources/config/services/services.yml b/src/Resources/config/services.yml similarity index 57% rename from src/Resources/config/services/services.yml rename to src/Resources/config/services.yml index 99f8863..e0f2c45 100644 --- a/src/Resources/config/services/services.yml +++ b/src/Resources/config/services.yml @@ -1,3 +1,6 @@ services: netzmacht.contao_leaflet_maps.frontend.value_filter: class: + + netzmacht.contao_leaflet_maps.map.assets: + class: diff --git a/src/Resources/config/services/mappers.yml b/src/Resources/config/services/mappers.yml deleted file mode 100644 index 3ed87a9..0000000 --- a/src/Resources/config/services/mappers.yml +++ /dev/null @@ -1,33 +0,0 @@ -services: - netzmacht.contao_leaflet_maps.mapper.popup: - class: Netzmacht\Contao\Leaflet\Mapper\UI\PopupMapper - tags: - - { name: netzmacht.contao_leaflet_maps.mapper } - - netzmacht.contao_leaflet_maps.mapper.image_icon: - class: Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper - tags: - - { name: netzmacht.contao_leaflet_maps.mapper } - - netzmacht.contao_leaflet_maps.mapper.div_icon: - class: Netzmacht\Contao\Leaflet\Mapper\Type\DivIconMapper - tags: - - { name: netzmacht.contao_leaflet_maps.mapper } - - netzmacht.contao_leaflet_maps.mapper.extra_markers: - class: Netzmacht\Contao\Leaflet\Mapper\Type\ExtraMarkersIconMapper - tags: - - { name: netzmacht.contao_leaflet_maps.mapper } - - netzmacht.contao_leaflet_maps.mapper.fixed_style: - class: Netzmacht\Contao\Leaflet\Mapper\Style\FixedStyleMapper - tags: - - { name: netzmacht.contao_leaflet_maps.mapper } - - netzmacht.contao_leaflet_maps.mapper.marker: - class: Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper - arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' - tags: - - { name: netzmacht.contao_leaflet_maps.mapper } - From 320359d2f0fc3dd4f9a855fd231e1c3fd2baec28 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 09:56:19 +0200 Subject: [PATCH 017/152] Add docs. --- src/Resources/config/encoders.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Resources/config/encoders.yml b/src/Resources/config/encoders.yml index 3d636c2..5d13566 100644 --- a/src/Resources/config/encoders.yml +++ b/src/Resources/config/encoders.yml @@ -1,3 +1,7 @@ +# Leaflet encoders. +# +# The encoders transforms the definitions into javascript. The encoders has to be an implementation of the +# EventSubscriberInterface of the event dispatcher. services: netzmacht.contao_leaflet_maps.encoder.map: class: Netzmacht\LeafletPHP\Encoder\MapEncoder From f5badd14c560806156492cd4780cb9ae2267f937 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 10:07:19 +0200 Subject: [PATCH 018/152] Move layers configuration. --- .../Label/Layer/AbstractLabelRenderer.php | 38 +++++++++ .../Renderer/Label/Layer/ChainRenderer.php | 70 ++++++++++++++++ .../Label/Layer/LayerLabelRenderer.php | 45 +++++++++++ .../Label/Layer/MarkersLabelRenderer.php | 49 ++++++++++++ .../Label/Layer/OverpassLabelRenderer.php | 46 +++++++++++ .../Label/Layer/ProviderLabelRenderer.php | 52 ++++++++++++ .../Label/Layer/ReferenceLabelRenderer.php | 48 +++++++++++ .../Label/Layer/VectorsLabelRenderer.php | 49 ++++++++++++ .../NetzmachtContaoLeafletExtension.php | 1 + src/Resources/config/layers.yml | 80 +++++++++++++++++++ 10 files changed, 478 insertions(+) create mode 100644 src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php create mode 100644 src/Backend/Renderer/Label/Layer/ChainRenderer.php create mode 100644 src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php create mode 100644 src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php create mode 100644 src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php create mode 100644 src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php create mode 100644 src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php create mode 100644 src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php create mode 100644 src/Resources/config/layers.yml diff --git a/src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php b/src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php new file mode 100644 index 0000000..7b18795 --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php @@ -0,0 +1,38 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +/** + * Class AbstractLabelRenderer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +abstract class AbstractLabelRenderer implements LayerLabelRenderer +{ + /** + * {@inheritdoc} + */ + public function supports(array $row): bool + { + return $row['type'] === $this->getLayerType(); + } + + /** + * Get the supported layer type. + * + * @return string + */ + abstract protected function getLayerType(): string; +} diff --git a/src/Backend/Renderer/Label/Layer/ChainRenderer.php b/src/Backend/Renderer/Label/Layer/ChainRenderer.php new file mode 100644 index 0000000..3a8963d --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/ChainRenderer.php @@ -0,0 +1,70 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Class ChainRenderer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +final class ChainRenderer implements LayerLabelRenderer +{ + /** + * List of layer label renderer. + * + * @var array|LayerLabelRenderer[] + */ + private $renderer; + + /** + * ChainRenderer constructor. + * + * @param array|LayerLabelRenderer[] $renderer List of layer label renderer. + */ + public function __construct($renderer) + { + $this->renderer = $renderer; + } + + /** + * {@inheritDoc} + */ + public function supports(array $row): bool + { + foreach ($this->renderer as $renderer) { + if ($renderer->supports($row)) { + return true; + } + } + + return false; + } + + /** + * {@inheritDoc} + */ + public function render(array $row, string $label, Translator $translator): string + { + foreach ($this->renderer as $renderer) { + if ($renderer->supports($row)) { + return $renderer->render($row, $label, $translator); + } + } + + return $label; + } +} diff --git a/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php b/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php new file mode 100644 index 0000000..dbefd3d --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php @@ -0,0 +1,45 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Interface LayerLabelRenderer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +interface LayerLabelRenderer +{ + /** + * Check if current row is supported. + * + * @param array $row Current row. + * + * @return bool + */ + public function supports(array $row): bool; + + /** + * Render the backend label of an layer. + * + * @param array $row Current row. + * @param string $label Default label. + * @param Translator $translator The translator. + * + * @return string + */ + public function render(array $row, string $label, Translator $translator): string; +} diff --git a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php new file mode 100644 index 0000000..20b6cd7 --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php @@ -0,0 +1,49 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Netzmacht\Contao\Leaflet\Model\MarkerModel; +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Class MarkersLabelRenderer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +final class MarkersLabelRenderer extends AbstractLabelRenderer +{ + /** + * {@inheritdoc} + */ + protected function getLayerType(): string + { + return 'markers'; + } + + /** + * {@inheritdoc} + */ + public function render(array $row, string $label, Translator $translator): string + { + $count = MarkerModel::countBy('pid', $row['id']); + $label .= sprintf( + ' (%s %s)', + $count, + $translator->trans('countEntries', [], 'contao_tl_leaflet_layer') + ); + + return $label; + } +} diff --git a/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php b/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php new file mode 100644 index 0000000..93542b5 --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php @@ -0,0 +1,46 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Contao\StringUtil; +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Class OverpassLabelRenderer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +final class OverpassLabelRenderer extends AbstractLabelRenderer +{ + /** + * {@inheritdoc} + */ + protected function getLayerType(): string + { + return 'vectors'; + } + + /** + * {@inheritdoc} + */ + public function render(array $row, string $label, Translator $translator): string + { + if ($row['overpassQuery']) { + $label .= ' ' . StringUtil::substr($row['overpassQuery'], 50) . ''; + } + + return $label; + } +} diff --git a/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php b/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php new file mode 100644 index 0000000..7d6b08a --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php @@ -0,0 +1,52 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Backend label renderer for provider layer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +final class ProviderLabelRenderer extends AbstractLabelRenderer +{ + /** + * {@inheritdoc} + */ + protected function getLayerType(): string + { + return 'provider'; + } + + /** + * {@inheritdoc} + */ + public function render(array $row, string $label, Translator $translator): string + { + $langKey = 'leaflet_provider.' . $row['tile_provider'] . '.0'; + $translated = $translator->trans($langKey, [], 'contao_leaflet'); + + if ($translated !== $langKey) { + $provider = $translated; + } else { + $provider = $row['tile_provider']; + } + + $label .= sprintf(' (%s)', $provider); + + return $label; + } +} diff --git a/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php b/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php new file mode 100644 index 0000000..7968928 --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php @@ -0,0 +1,48 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Class ReferenceLabelRenderer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +final class ReferenceLabelRenderer extends AbstractLabelRenderer +{ + /** + * {@inheritdoc} + */ + protected function getLayerType(): string + { + return 'vectors'; + } + + /** + * {@inheritdoc} + */ + public function render(array $row, string $label, Translator $translator): string + { + $reference = LayerModel::findByPk($row['reference']); + + if ($reference) { + $label .= ' (' . $reference->title . ')'; + } + + return $label; + } +} diff --git a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php new file mode 100644 index 0000000..f91ce66 --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php @@ -0,0 +1,49 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Netzmacht\Contao\Leaflet\Model\VectorModel; +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Class VectorsLabelRenderer. + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +final class VectorsLabelRenderer extends AbstractLabelRenderer +{ + /** + * {@inheritdoc} + */ + protected function getLayerType(): string + { + return 'vectors'; + } + + /** + * {@inheritdoc} + */ + public function render(array $row, string $label, Translator $translator): string + { + $count = VectorModel::countBy('pid', $row['id']); + $label .= sprintf( + ' (%s %s)', + $count, + $translator->trans('countEntries', [], 'contao_tl_leaflet_layer') + ); + + return $label; + } +} diff --git a/src/DependencyInjection/NetzmachtContaoLeafletExtension.php b/src/DependencyInjection/NetzmachtContaoLeafletExtension.php index 076c91e..0735618 100644 --- a/src/DependencyInjection/NetzmachtContaoLeafletExtension.php +++ b/src/DependencyInjection/NetzmachtContaoLeafletExtension.php @@ -47,5 +47,6 @@ class NetzmachtContaoLeafletExtension extends Extension $loader->load('filters.yml'); $loader->load('mappers.yml'); $loader->load('encoders.yml'); + $loader->load('layers.yml'); } } diff --git a/src/Resources/config/layers.yml b/src/Resources/config/layers.yml new file mode 100644 index 0000000..6026489 --- /dev/null +++ b/src/Resources/config/layers.yml @@ -0,0 +1,80 @@ +# Leaflet layer types. +# +# The type is used for the database driven definitions. +parameters: + netzmacht.contao_leaflet_maps.layers: + provider: + children: false + icon: 'bundles/netzmachtcontaoleaflet/img/provider.png' + + group: + children: true + icon: 'bundles/netzmachtcontaoleaflet/img/group.png' + + markers: + children: false + icon: 'bundles/netzmachtcontaoleaflet/img/markers.png' + markers: true + boundsMode: + extend: true + fit: 'deferred' + + vectors: + children: false + icon: 'bundles/netzmachtcontaoleaflet/img/vectors.png' + vectors: true + boundsMode: + extend: true + + reference: + children: false + icon: 'bundles/netzmachtcontaoleaflet/img/reference.png' + + markercluster: + children: true + icon: 'bundles/netzmachtcontaoleaflet/img/markercluster.png' + + tile: + children: false + icon: 'bundles/netzmachtcontaoleaflet/img/tile.png' + + overpass: + children: false + icon: 'bundles/netzmachtcontaoleaflet/img/overpass.png' + boundsMode: + extend: true + fit: true + +services: + _defaults: + public: false + + netzmacht.contao_leaflet_maps.layer_label_renderer: + class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ChainRenderer + arguments: + - [] + + netzmacht.contao_leaflet_maps.layer_label_renderer.markers: + class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\MarkersLabelRenderer + tags: + - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + + netzmacht.contao_leaflet_maps.layer_label_renderer.overpass: + class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\OverpassLabelRenderer + tags: + - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + + netzmacht.contao_leaflet_maps.layer_label_renderer.provider: + class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ProviderLabelRenderer + tags: + - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + + netzmacht.contao_leaflet_maps.layer_label_renderer.reference: + class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ReferenceLabelRenderer + tags: + - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + + netzmacht.contao_leaflet_maps.layer_label_renderer.vectors: + class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\VectorsLabelRenderer + tags: + - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } From 25f89f91b6f28d912032436bfd0fb52d8064f34a Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 10:09:56 +0200 Subject: [PATCH 019/152] Add compiler pass for layer label renderer. --- src/NetzmachtContaoLeafletBundle.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/NetzmachtContaoLeafletBundle.php index e9ffbb4..9c2c089 100644 --- a/src/NetzmachtContaoLeafletBundle.php +++ b/src/NetzmachtContaoLeafletBundle.php @@ -14,6 +14,8 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet; +use Netzmacht\Contao\Toolkit\DependencyInjection\CompilerPass\AddTaggedServicesAsArgumentCompilerPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; /** @@ -23,4 +25,16 @@ use Symfony\Component\HttpKernel\Bundle\Bundle; */ class NetzmachtContaoLeafletBundle extends Bundle { + /** + * {@inheritDoc} + */ + public function build(ContainerBuilder $container) + { + $container->addCompilerPass( + new AddTaggedServicesAsArgumentCompilerPass( + 'netzmacht.contao_leaflet_maps.layer_label_renderer', + 'netzmacht.contao_leaflet_maps.layer_label_renderer' + ) + ); + } } From 7727263f298af6a32a419ef8f3e61ccc07690c32 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 10:11:51 +0200 Subject: [PATCH 020/152] Move assets to public folder. --- src/Resources/contao/assets/.htaccess | 7 ------- .../{contao/assets => public}/css/about.css | 0 .../{contao/assets => public}/css/backend.css | 0 .../{contao/assets => public}/img/about.png | Bin .../{contao/assets => public}/img/cluster.png | Bin .../{contao/assets => public}/img/cluster_1.png | Bin .../{contao/assets => public}/img/control.png | Bin .../assets => public}/img/fol-placeholder.gif | Bin .../{contao/assets => public}/img/group.png | Bin .../{contao/assets => public}/img/group_1.png | Bin .../{contao/assets => public}/img/icons.png | Bin .../{contao/assets => public}/img/layers.png | Bin .../{contao/assets => public}/img/logo.png | Bin src/Resources/{contao/assets => public}/img/map.png | Bin .../{contao/assets => public}/img/markers.png | Bin .../{contao/assets => public}/img/markers_1.png | Bin .../{contao/assets => public}/img/overpass.png | Bin .../{contao/assets => public}/img/popup.png | Bin .../{contao/assets => public}/img/provider.png | Bin .../{contao/assets => public}/img/provider_1.png | Bin .../{contao/assets => public}/img/reference.png | Bin .../{contao/assets => public}/img/reference_1.png | Bin .../{contao/assets => public}/img/style.png | Bin .../{contao/assets => public}/img/tile.png | Bin .../{contao/assets => public}/img/tile_1.png | Bin .../{contao/assets => public}/img/vectors.png | Bin .../{contao/assets => public}/img/vectors_1.png | Bin 27 files changed, 7 deletions(-) delete mode 100644 src/Resources/contao/assets/.htaccess rename src/Resources/{contao/assets => public}/css/about.css (100%) rename src/Resources/{contao/assets => public}/css/backend.css (100%) rename src/Resources/{contao/assets => public}/img/about.png (100%) rename src/Resources/{contao/assets => public}/img/cluster.png (100%) rename src/Resources/{contao/assets => public}/img/cluster_1.png (100%) rename src/Resources/{contao/assets => public}/img/control.png (100%) rename src/Resources/{contao/assets => public}/img/fol-placeholder.gif (100%) rename src/Resources/{contao/assets => public}/img/group.png (100%) rename src/Resources/{contao/assets => public}/img/group_1.png (100%) rename src/Resources/{contao/assets => public}/img/icons.png (100%) rename src/Resources/{contao/assets => public}/img/layers.png (100%) rename src/Resources/{contao/assets => public}/img/logo.png (100%) rename src/Resources/{contao/assets => public}/img/map.png (100%) rename src/Resources/{contao/assets => public}/img/markers.png (100%) rename src/Resources/{contao/assets => public}/img/markers_1.png (100%) rename src/Resources/{contao/assets => public}/img/overpass.png (100%) rename src/Resources/{contao/assets => public}/img/popup.png (100%) rename src/Resources/{contao/assets => public}/img/provider.png (100%) rename src/Resources/{contao/assets => public}/img/provider_1.png (100%) rename src/Resources/{contao/assets => public}/img/reference.png (100%) rename src/Resources/{contao/assets => public}/img/reference_1.png (100%) rename src/Resources/{contao/assets => public}/img/style.png (100%) rename src/Resources/{contao/assets => public}/img/tile.png (100%) rename src/Resources/{contao/assets => public}/img/tile_1.png (100%) rename src/Resources/{contao/assets => public}/img/vectors.png (100%) rename src/Resources/{contao/assets => public}/img/vectors_1.png (100%) diff --git a/src/Resources/contao/assets/.htaccess b/src/Resources/contao/assets/.htaccess deleted file mode 100644 index 28cc359..0000000 --- a/src/Resources/contao/assets/.htaccess +++ /dev/null @@ -1,7 +0,0 @@ - - Order allow,deny - Allow from all - - - Require all granted - \ No newline at end of file diff --git a/src/Resources/contao/assets/css/about.css b/src/Resources/public/css/about.css similarity index 100% rename from src/Resources/contao/assets/css/about.css rename to src/Resources/public/css/about.css diff --git a/src/Resources/contao/assets/css/backend.css b/src/Resources/public/css/backend.css similarity index 100% rename from src/Resources/contao/assets/css/backend.css rename to src/Resources/public/css/backend.css diff --git a/src/Resources/contao/assets/img/about.png b/src/Resources/public/img/about.png similarity index 100% rename from src/Resources/contao/assets/img/about.png rename to src/Resources/public/img/about.png diff --git a/src/Resources/contao/assets/img/cluster.png b/src/Resources/public/img/cluster.png similarity index 100% rename from src/Resources/contao/assets/img/cluster.png rename to src/Resources/public/img/cluster.png diff --git a/src/Resources/contao/assets/img/cluster_1.png b/src/Resources/public/img/cluster_1.png similarity index 100% rename from src/Resources/contao/assets/img/cluster_1.png rename to src/Resources/public/img/cluster_1.png diff --git a/src/Resources/contao/assets/img/control.png b/src/Resources/public/img/control.png similarity index 100% rename from src/Resources/contao/assets/img/control.png rename to src/Resources/public/img/control.png diff --git a/src/Resources/contao/assets/img/fol-placeholder.gif b/src/Resources/public/img/fol-placeholder.gif similarity index 100% rename from src/Resources/contao/assets/img/fol-placeholder.gif rename to src/Resources/public/img/fol-placeholder.gif diff --git a/src/Resources/contao/assets/img/group.png b/src/Resources/public/img/group.png similarity index 100% rename from src/Resources/contao/assets/img/group.png rename to src/Resources/public/img/group.png diff --git a/src/Resources/contao/assets/img/group_1.png b/src/Resources/public/img/group_1.png similarity index 100% rename from src/Resources/contao/assets/img/group_1.png rename to src/Resources/public/img/group_1.png diff --git a/src/Resources/contao/assets/img/icons.png b/src/Resources/public/img/icons.png similarity index 100% rename from src/Resources/contao/assets/img/icons.png rename to src/Resources/public/img/icons.png diff --git a/src/Resources/contao/assets/img/layers.png b/src/Resources/public/img/layers.png similarity index 100% rename from src/Resources/contao/assets/img/layers.png rename to src/Resources/public/img/layers.png diff --git a/src/Resources/contao/assets/img/logo.png b/src/Resources/public/img/logo.png similarity index 100% rename from src/Resources/contao/assets/img/logo.png rename to src/Resources/public/img/logo.png diff --git a/src/Resources/contao/assets/img/map.png b/src/Resources/public/img/map.png similarity index 100% rename from src/Resources/contao/assets/img/map.png rename to src/Resources/public/img/map.png diff --git a/src/Resources/contao/assets/img/markers.png b/src/Resources/public/img/markers.png similarity index 100% rename from src/Resources/contao/assets/img/markers.png rename to src/Resources/public/img/markers.png diff --git a/src/Resources/contao/assets/img/markers_1.png b/src/Resources/public/img/markers_1.png similarity index 100% rename from src/Resources/contao/assets/img/markers_1.png rename to src/Resources/public/img/markers_1.png diff --git a/src/Resources/contao/assets/img/overpass.png b/src/Resources/public/img/overpass.png similarity index 100% rename from src/Resources/contao/assets/img/overpass.png rename to src/Resources/public/img/overpass.png diff --git a/src/Resources/contao/assets/img/popup.png b/src/Resources/public/img/popup.png similarity index 100% rename from src/Resources/contao/assets/img/popup.png rename to src/Resources/public/img/popup.png diff --git a/src/Resources/contao/assets/img/provider.png b/src/Resources/public/img/provider.png similarity index 100% rename from src/Resources/contao/assets/img/provider.png rename to src/Resources/public/img/provider.png diff --git a/src/Resources/contao/assets/img/provider_1.png b/src/Resources/public/img/provider_1.png similarity index 100% rename from src/Resources/contao/assets/img/provider_1.png rename to src/Resources/public/img/provider_1.png diff --git a/src/Resources/contao/assets/img/reference.png b/src/Resources/public/img/reference.png similarity index 100% rename from src/Resources/contao/assets/img/reference.png rename to src/Resources/public/img/reference.png diff --git a/src/Resources/contao/assets/img/reference_1.png b/src/Resources/public/img/reference_1.png similarity index 100% rename from src/Resources/contao/assets/img/reference_1.png rename to src/Resources/public/img/reference_1.png diff --git a/src/Resources/contao/assets/img/style.png b/src/Resources/public/img/style.png similarity index 100% rename from src/Resources/contao/assets/img/style.png rename to src/Resources/public/img/style.png diff --git a/src/Resources/contao/assets/img/tile.png b/src/Resources/public/img/tile.png similarity index 100% rename from src/Resources/contao/assets/img/tile.png rename to src/Resources/public/img/tile.png diff --git a/src/Resources/contao/assets/img/tile_1.png b/src/Resources/public/img/tile_1.png similarity index 100% rename from src/Resources/contao/assets/img/tile_1.png rename to src/Resources/public/img/tile_1.png diff --git a/src/Resources/contao/assets/img/vectors.png b/src/Resources/public/img/vectors.png similarity index 100% rename from src/Resources/contao/assets/img/vectors.png rename to src/Resources/public/img/vectors.png diff --git a/src/Resources/contao/assets/img/vectors_1.png b/src/Resources/public/img/vectors_1.png similarity index 100% rename from src/Resources/contao/assets/img/vectors_1.png rename to src/Resources/public/img/vectors_1.png From b96e95550476b4889ba29c0bef454fcd2537d413 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 11:41:12 +0200 Subject: [PATCH 021/152] Implement encoder factory as class. --- src/Encoder/EncoderFactory.php | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/Encoder/EncoderFactory.php diff --git a/src/Encoder/EncoderFactory.php b/src/Encoder/EncoderFactory.php new file mode 100644 index 0000000..3d690c7 --- /dev/null +++ b/src/Encoder/EncoderFactory.php @@ -0,0 +1,63 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Encoder; + +use Netzmacht\JavascriptBuilder\Encoder; +use Netzmacht\JavascriptBuilder\Encoder\ChainEncoder; +use Netzmacht\JavascriptBuilder\Output; +use Netzmacht\JavascriptBuilder\Symfony\EventDispatchingEncoder; +use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; + +/** + * Class EncoderFactory. + * + * @package Netzmacht\Contao\Leaflet\Encoder + */ +final class EncoderFactory +{ + /** + * Definition builder event dispatcher. + * + * @var EventDispatcher + */ + private $dispatcher; + + /** + * EncoderFactory constructor. + * + * @param EventDispatcher $dispatcher Definition builder event dispatcher. + */ + public function __construct(EventDispatcher $dispatcher) + { + $this->dispatcher = $dispatcher; + } + + /** + * Create the encoder. + * + * @param Output $output Output object. + * + * @return Encoder + */ + public function __invoke(Output $output): Encoder + { + $encoder = (new ChainEncoder()) + ->register(new Encoder\MultipleObjectsEncoder()) + ->register(new EventDispatchingEncoder($this->dispatcher)) + ->register(new Encoder\JavascriptEncoder($output, JSON_UNESCAPED_SLASHES)); + + return $encoder; + } +} From f172c42426ba995efe543cdb74814378e33fe164 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 11:47:54 +0200 Subject: [PATCH 022/152] Work on service definitions. --- src/Alias/DefaultAliasGeneratorFactory.php | 66 +++++++++++++++++++ src/Alias/ParentAliasGeneratorFactory.php | 66 +++++++++++++++++++ src/Resources/config/encoders.yml | 3 + src/Resources/config/services.yml | 73 +++++++++++++++++++++- 4 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 src/Alias/DefaultAliasGeneratorFactory.php create mode 100644 src/Alias/ParentAliasGeneratorFactory.php diff --git a/src/Alias/DefaultAliasGeneratorFactory.php b/src/Alias/DefaultAliasGeneratorFactory.php new file mode 100644 index 0000000..5c486c8 --- /dev/null +++ b/src/Alias/DefaultAliasGeneratorFactory.php @@ -0,0 +1,66 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Alias; + +use Doctrine\DBAL\Connection; +use Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator; +use Netzmacht\Contao\Toolkit\Data\Alias\Factory\AliasGeneratorFactory; +use Netzmacht\Contao\Toolkit\Data\Alias\Filter\ExistingAliasFilter; +use Netzmacht\Contao\Toolkit\Data\Alias\Filter\SlugifyFilter; +use Netzmacht\Contao\Toolkit\Data\Alias\Filter\SuffixFilter; +use Netzmacht\Contao\Toolkit\Data\Alias\FilterBasedAliasGenerator; +use Netzmacht\Contao\Toolkit\Data\Alias\Validator\UniqueDatabaseValueValidator; + +/** + * Class DefaultAliasGeneratorFactory. + * + * @package Netzmacht\Contao\Leaflet\Alias + */ +class DefaultAliasGeneratorFactory implements AliasGeneratorFactory +{ + /** + * Database connection. + * + * @var Connection + */ + private $connection; + + /** + * DefaultAliasGeneratorFactory constructor. + * + * @param Connection $connection Database connection. + */ + public function __construct(Connection $connection) + { + $this->connection = $connection; + } + + /** + * {@inheritDoc} + */ + public function create(string $dataContainerName, string $aliasField, array $fields): AliasGenerator + { + $filters = [ + new ExistingAliasFilter(), + new SlugifyFilter($fields), + new DefaultAliasFilter($dataContainerName), + new SuffixFilter(), + ]; + + $validator = new UniqueDatabaseValueValidator($this->connection, $dataContainerName, $aliasField); + + return new FilterBasedAliasGenerator($filters, $validator, $dataContainerName, $aliasField, '_'); + } +} diff --git a/src/Alias/ParentAliasGeneratorFactory.php b/src/Alias/ParentAliasGeneratorFactory.php new file mode 100644 index 0000000..5a2a8b6 --- /dev/null +++ b/src/Alias/ParentAliasGeneratorFactory.php @@ -0,0 +1,66 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Alias; + +use Doctrine\DBAL\Connection; +use Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator; +use Netzmacht\Contao\Toolkit\Data\Alias\Factory\AliasGeneratorFactory; +use Netzmacht\Contao\Toolkit\Data\Alias\Filter\ExistingAliasFilter; +use Netzmacht\Contao\Toolkit\Data\Alias\Filter\SlugifyFilter; +use Netzmacht\Contao\Toolkit\Data\Alias\Filter\SuffixFilter; +use Netzmacht\Contao\Toolkit\Data\Alias\FilterBasedAliasGenerator; +use Netzmacht\Contao\Toolkit\Data\Alias\Validator\UniqueDatabaseValueValidator; + +/** + * Alias generator validating against the parent id (pid). + * + * @package Netzmacht\Contao\Leaflet\Alias + */ +class ParentAliasGeneratorFactory implements AliasGeneratorFactory +{ + /** + * Database connection. + * + * @var Connection + */ + private $connection; + + /** + * DefaultAliasGeneratorFactory constructor. + * + * @param Connection $connection Database connection. + */ + public function __construct(Connection $connection) + { + $this->connection = $connection; + } + + /** + * {@inheritDoc} + */ + public function create(string $dataContainerName, string $aliasField, array $fields): AliasGenerator + { + $filters = [ + new ExistingAliasFilter(), + new SlugifyFilter($fields), + new DefaultAliasFilter($dataContainerName), + new SuffixFilter(), + ]; + + $validator = new UniqueDatabaseValueValidator($this->connection, $dataContainerName, $aliasField, ['pid']); + + return new FilterBasedAliasGenerator($filters, $validator, $dataContainerName, $aliasField, '_'); + } +} diff --git a/src/Resources/config/encoders.yml b/src/Resources/config/encoders.yml index 5d13566..1d9c81f 100644 --- a/src/Resources/config/encoders.yml +++ b/src/Resources/config/encoders.yml @@ -3,6 +3,9 @@ # The encoders transforms the definitions into javascript. The encoders has to be an implementation of the # EventSubscriberInterface of the event dispatcher. services: + _defaults: + public: false + netzmacht.contao_leaflet_maps.encoder.map: class: Netzmacht\LeafletPHP\Encoder\MapEncoder tags: diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index e0f2c45..66f1e17 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -1,6 +1,75 @@ +parameters: + netzmacht.contao_leaflet_maps.cache_dir: '%kernel.cache_dir%/leaflet' + + # JSON_UNESCAPED_SLASHES ^ Netzmacht\JavascriptBuilder\Flags::BUILD_STACK + netzmacht.contao_leaflet_maps.encoding_flags: 16448 + services: + netzmacht.contao_leaflet_maps.map.provider: + class: Netzmacht\Contao\Leaflet\MapProvider + arguments: + - '@netzmacht.contao_leaflet_maps.definition.mapper' + - '@netzmacht.contao_leaflet_maps.definition.builder' + - '@event_dispatcher' + - '@netzmacht.contao_toolkit.contao.input' + - '@netzmacht.contao_leaflet_maps.map.assets' + - '@netzmacht.contao_leaflet_maps.cache' + - '' # TODO: Rework filter handling. + - '%kernel.debug%' + + netzmacht.contao_leaflet_maps.cache: + alias: 'netzmacht.contao_leaflet_maps.cache.default' + + netzmacht.contao_leaflet_maps.cache.default: + class: Doctrine\Common\Cache\FilesystemCache + arguments: + - '%netzmacht.contao_leaflet_maps.cache_dir%' + + netzmacht.contao_leaflet_maps.cache.debug: + class: Doctrine\Common\Cache\ArrayCache + netzmacht.contao_leaflet_maps.frontend.value_filter: - class: + class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter + arguments: + - '@netzmacht.contao_toolkit.insert_tag.replacer' netzmacht.contao_leaflet_maps.map.assets: - class: + class: Netzmacht\Contao\Leaflet\ContaoAssets + arguments: + - '@netzmacht.contao_toolkit.assets_manager' + + netzmacht.contao_leaflet_maps.definition.builder: + class: Netzmacht\LeafletPHP\Leaflet + arguments: + - '@netzmacht.contao_leaflet_maps.definition.builder.javascript_builder' + - '@netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher' + - [] + - '%netzmacht.contao_leaflet_maps.encoding_flags%' + + netzmacht.contao_leaflet_maps.definition.builder.javascript_builder: + class: Netzmacht\JavascriptBuilder\Builder + arguments: + - '@netzmacht.contao_leaflet_maps.definition.encoder_factory' + + netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher: + class: Symfony\Component\EventDispatcher\EventDispatcher + + netzmacht.contao_leaflet_maps.definition.mapper: + class: Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper + arguments: + - '@event_dispatcher' + + netzmacht.contao_leaflet_maps.definition.encoder_factory: + class: Netzmacht\Contao\Leaflet\Encoder\EncoderFactory + arguments: + - '@netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher' + + netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default: + class: Netzmacht\Contao\Leaflet\Alias\DefaultAliasGeneratorFactory + arguments: + - '@database_connection' + + netzmacht.contao_leaflet_maps.definition.alias_generator.factory_parent: + class: Netzmacht\Contao\Leaflet\Alias\ParentAliasGeneratorFactory + arguments: + - '@database_connection' From 307381ddb6403ae181777d8e734d1062bd2425f0 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 12:04:39 +0200 Subject: [PATCH 023/152] Rework map callbacks as a listener. --- src/Dca/MapCallbacks.php | 160 ------------------- src/Listeners/Dca/MapDcaListener.php | 164 ++++++++++++++++++++ src/Resources/config/listeners.yml | 6 + src/Resources/contao/config/services.php | 4 +- src/Resources/contao/dca/tl_leaflet_map.php | 6 +- 5 files changed, 175 insertions(+), 165 deletions(-) delete mode 100644 src/Dca/MapCallbacks.php create mode 100644 src/Listeners/Dca/MapDcaListener.php diff --git a/src/Dca/MapCallbacks.php b/src/Dca/MapCallbacks.php deleted file mode 100644 index c599748..0000000 --- a/src/Dca/MapCallbacks.php +++ /dev/null @@ -1,160 +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\Dca; - -use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks; -use Netzmacht\Contao\Toolkit\Dca\Manager; -use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; - -/** - * Class Map is the helper class for the tl_leaflet_map dca. - * - * @package Netzmacht\Contao\Leaflet\Dca - */ -class MapCallbacks extends Callbacks -{ - /** - * Name of the data container. - * - * @var string - */ - protected static $name = 'tl_leaflet_map'; - - /** - * Helper service name. - * - * @var string - */ - protected static $serviceName = 'leaflet.dca.map-callbacks'; - - /** - * The database connection. - * - * @var \Database - */ - private $database; - - /** - * Construct. - * - * @param Manager $manager Data container manager. - * @param \Database $database Database connection. - */ - public function __construct(Manager $manager, \Database $database) - { - parent::__construct($manager); - - $this->database = $database; - } - - /** - * Load layer relations. - * - * @param mixed $value The actual value. - * @param \DataContainer $dataContainer The data container driver. - * - * @return array - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function loadLayerRelations($value, $dataContainer) - { - $result = $this->database - ->prepare('SELECT lid FROM tl_leaflet_map_layer WHERE mid=? ORDER BY sorting') - ->execute($dataContainer->id); - - return $result->fetchEach('lid'); - } - - /** - * Save layer relations. - * - * @param mixed $layerId The layer id values. - * @param \DataContainer $dataContainer The dataContainer driver. - * - * @return null - */ - public function saveLayerRelations($layerId, $dataContainer) - { - $new = deserialize($layerId, true); - $values = array(); - $result = $this->database - ->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=? order BY sorting') - ->execute($dataContainer->id); - - while ($result->next()) { - $values[$result->lid] = $result->row(); - } - - $sorting = 0; - - foreach ($new as $layerId) { - if (!isset($values[$layerId])) { - $this->database - ->prepare('INSERT INTO tl_leaflet_map_layer %s') - ->set( - array( - 'tstamp' => time(), - 'lid' => $layerId, - 'mid' => $dataContainer->id, - 'sorting' => $sorting - ) - ) - ->execute(); - - $sorting += 128; - } else { - if ($values[$layerId]['sorting'] <= ($sorting - 128) - || $values[$layerId]['sorting'] >= ($sorting + 128)) { - $this->database - ->prepare('UPDATE tl_leaflet_map_layer %s WHERE id=?') - ->set(array('tstamp' => time(), 'sorting' => $sorting)) - ->execute($values[$layerId]['id']); - } - - $sorting += 128; - unset($values[$layerId]); - } - } - - $ids = array_map( - function ($item) { - return $item['id']; - }, - $values - ); - - if ($ids) { - $this->database->query('DELETE FROM tl_leaflet_map_layer WHERE id IN(' . implode(',', $ids) . ')'); - } - - return null; - } - - /** - * Get all layers except of the current layer. - * - * @param \DataContainer $dataContainer The dataContainer driver. - * - * @return array - */ - public function getLayers($dataContainer) - { - $collection = LayerModel::findBy('id !', $dataContainer->id); - - return OptionsBuilder::fromCollection($collection, 'title') - ->asTree() - ->getOptions(); - } -} diff --git a/src/Listeners/Dca/MapDcaListener.php b/src/Listeners/Dca/MapDcaListener.php new file mode 100644 index 0000000..a09776f --- /dev/null +++ b/src/Listeners/Dca/MapDcaListener.php @@ -0,0 +1,164 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Listeners\Dca; + +use Contao\DataContainer; +use Doctrine\DBAL\Connection; +use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; +use Netzmacht\Contao\Toolkit\Dca\Manager; +use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; +use PDO; + +/** + * Class Map is the helper class for the tl_leaflet_map dca. + * + * @package Netzmacht\Contao\Leaflet\Dca + */ +class MapDcaListener extends AbstractListener +{ + /** + * Name of the data container. + * + * @var string + */ + protected static $name = 'tl_leaflet_map'; + + /** + * The database connection. + * + * @var Connection + */ + private $connection; + + /** + * Construct. + * + * @param Manager $manager Data container manager. + * @param Connection $connection Database connection. + */ + public function __construct(Manager $manager, Connection $connection) + { + parent::__construct($manager); + + $this->connection = $connection; + } + + /** + * Load layer relations. + * + * @param mixed $value The actual value. + * @param DataContainer $dataContainer The data container driver. + * + * @return array + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function loadLayerRelations($value, $dataContainer): array + { + $statement = $this->connection->prepare('SELECT lid FROM tl_leaflet_map_layer WHERE mid=:mid ORDER BY sorting'); + $statement->bindValue('mid', $dataContainer->id); + + if ($statement->execute()) { + return $statement->fetchAll(PDO::FETCH_ASSOC, PDO::FETCH_COLUMN, 0); + } + + return []; + } + + /** + * Save layer relations. + * + * @param mixed $layerId The layer id values. + * @param DataContainer $dataContainer The dataContainer driver. + * + * @return null + */ + public function saveLayerRelations($layerId, $dataContainer) + { + $new = deserialize($layerId, true); + $values = array(); + $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting'); + + $statement->bindValue('mid', $dataContainer->id); + $statement->execute(); + + while ($row = $statement->fetch()) { + $values[$row['lid']] = $row; + } + + $sorting = 0; + + foreach ($new as $layerId) { + if (!isset($values[$layerId])) { + $data = [ + 'tstamp' => time(), + 'lid' => $layerId, + 'mid' => $dataContainer->id, + 'sorting' => $sorting + ]; + + $this->connection->insert('tl_leaflet_map_layer', $data); + $sorting += 128; + } else { + if ($values[$layerId]['sorting'] <= ($sorting - 128) + || $values[$layerId]['sorting'] >= ($sorting + 128) + ) { + $this->connection->update( + 'tl_leaflet_map_layer', + ['tstamp' => time(), 'sorting' => $sorting], + ['id' => $values[$layerId]['id']] + ); + } + + $sorting += 128; + unset($values[$layerId]); + } + } + + $ids = array_map( + function ($item) { + return $item['id']; + }, + $values + ); + + if ($ids) { + $this->connection->executeUpdate( + 'DELETE FROM tl_leaflet_map_layer WHERE id IN(?)', + [$ids], + [Connection::PARAM_INT_ARRAY] + ); + } + + return null; + } + + /** + * Get all layers except of the current layer. + * + * @param DataContainer $dataContainer The dataContainer driver. + * + * @return array + */ + public function getLayers($dataContainer) + { + $collection = LayerModel::findBy('id !', $dataContainer->id); + + return OptionsBuilder::fromCollection($collection, 'title') + ->asTree() + ->getOptions(); + } +} diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index e69de29..283abd0 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -0,0 +1,6 @@ +services: + netzmacht.contao_leaflet_maps.listeners.dca.map: + class: Netzmacht\Contao\Leaflet\Listeners\Dca\MapDcaListener + arguments: + - '@netzmacht.contao_toolkit.dca.manager' + - '@database_connection' diff --git a/src/Resources/contao/config/services.php b/src/Resources/contao/config/services.php index 1680757..ad6edbf 100644 --- a/src/Resources/contao/config/services.php +++ b/src/Resources/contao/config/services.php @@ -20,7 +20,7 @@ use Netzmacht\Contao\Leaflet\Dca\ControlCallbacks; use Netzmacht\Contao\Leaflet\Dca\FrontendIntegration; use Netzmacht\Contao\Leaflet\Dca\LayerCallbacks; use Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks; -use Netzmacht\Contao\Leaflet\Dca\MapCallbacks; +use Netzmacht\Contao\Leaflet\Listeners\Dca\MapDcaListener; use Netzmacht\Contao\Leaflet\Dca\Validator; use Netzmacht\Contao\Leaflet\Dca\VectorCallbacks; use Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices; @@ -230,7 +230,7 @@ $container[LeafletServices::PARENT_ALIAS_GENERATOR] = $container->share( $container['leaflet.dca.map-callbacks'] = $container->share( function ($container) { - return new MapCallbacks( + return new MapDcaListener( $container[Services::DCA_MANAGER], $container[Services::DATABASE_CONNECTION] ); diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 17b4193..edf1964 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -209,10 +209,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'exclude' => true, 'inputType' => 'multiColumnWizard', 'load_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\MapCallbacks::callback('loadLayerRelations'), + ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'loadLayerRelations'], ), 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\MapCallbacks::callback('saveLayerRelations'), + ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'saveLayerRelations'], ), 'eval' => array( 'multiple' => true, @@ -223,7 +223,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['reference'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\MapCallbacks::callback('getLayers'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'getLayers'], 'eval' => array( 'mandatory' => true, 'tl_class' => 'w50', From fde6c2b4c760d918207df8dec8fc756e058e4e3f Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:17:49 +0200 Subject: [PATCH 024/152] Rework control callbacks as a listener service. --- .../Dca/ControlDcaListener.php} | 93 +++++++++---------- src/Resources/config/listeners.yml | 6 ++ src/Resources/contao/config/services.php | 4 +- .../contao/dca/tl_leaflet_control.php | 10 +- 4 files changed, 58 insertions(+), 55 deletions(-) rename src/{Dca/ControlCallbacks.php => Listeners/Dca/ControlDcaListener.php} (59%) diff --git a/src/Dca/ControlCallbacks.php b/src/Listeners/Dca/ControlDcaListener.php similarity index 59% rename from src/Dca/ControlCallbacks.php rename to src/Listeners/Dca/ControlDcaListener.php index 99c0732..9947e2e 100644 --- a/src/Dca/ControlCallbacks.php +++ b/src/Listeners/Dca/ControlDcaListener.php @@ -10,9 +10,10 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Dca; +namespace Netzmacht\Contao\Leaflet\Listeners\Dca; -use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks; +use Doctrine\DBAL\Connection; +use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\ControlModel; @@ -23,7 +24,7 @@ use Netzmacht\Contao\Leaflet\Model\LayerModel; * * @package Netzmacht\Contao\Leaflet\Dca */ -class ControlCallbacks extends Callbacks +class ControlDcaListener extends AbstractListener { /** * Name of the data container. @@ -32,31 +33,24 @@ class ControlCallbacks extends Callbacks */ protected static $name = 'tl_leaflet_control'; - /** - * Helper service name. - * - * @var string - */ - protected static $serviceName = 'leaflet.dca.control-callbacks'; - /** * The database connection. * - * @var \Database + * @var Connection */ - private $database; + private $connection; /** * Construct. * - * @param Manager $manager Data container manager. - * @param \Database $database Database connection. + * @param Manager $manager Data container manager. + * @param Connection $connection Database connection. */ - public function __construct(Manager $manager, \Database $database) + public function __construct(Manager $manager, Connection $connection) { parent::__construct($manager); - $this->database = $database; + $this->connection = $connection; } /** @@ -113,11 +107,13 @@ class ControlCallbacks extends Callbacks */ public function loadLayerRelations($value, $dataContainer) { - $result = $this->database - ->prepare('SELECT lid As layer, mode FROM tl_leaflet_control_layer WHERE cid=? ORDER BY sorting') - ->execute($dataContainer->id); + $query = 'SELECT lid As layer, mode FROM tl_leaflet_control_layer WHERE cid=:cid ORDER BY sorting'; + $statement = $this->connection->prepare($query); + $statement->bindValue('cid', $dataContainer->id); - return $result->fetchAllAssoc(); + $statement->execute(); + + return $statement->fetchAll(); } /** @@ -132,43 +128,40 @@ class ControlCallbacks extends Callbacks { $new = deserialize($layers, true); $values = array(); - $result = $this->database - ->prepare('SELECT * FROM tl_leaflet_control_layer WHERE cid=? order BY sorting') - ->execute($dataContainer->id); + $query = 'SELECT * FROM tl_leaflet_control_layer WHERE cid=:cid order BY sorting'; + $statement = $this->connection->prepare($query); + $statement->bindValue('cid', $dataContainer->id); - while ($result->next()) { - $values[$result->lid] = $result->row(); + while ($row = $statement->fetch()) { + $values[$row['lid']] = $row; } $sorting = 0; foreach ($new as $layer) { if (!isset($values[$layer['layer']])) { - $this->database - ->prepare('INSERT INTO tl_leaflet_control_layer %s') - ->set( - array( - 'tstamp' => time(), - 'lid' => $layer['layer'], - 'cid' => $dataContainer->id, - 'mode' => $layer['mode'], - 'sorting' => $sorting - ) - ) - ->execute(); + $data = [ + 'tstamp' => time(), + 'lid' => $layer['layer'], + 'cid' => $dataContainer->id, + 'mode' => $layer['mode'], + 'sorting' => $sorting + ]; + $this->connection->insert('tl_leaflet_control_layer', $data); $sorting += 128; } else { - $this->database - ->prepare('UPDATE tl_leaflet_control_layer %s WHERE id=?') - ->set( - array( - 'tstamp' => time(), - 'sorting' => $sorting, - 'mode' => $layer['mode'] - ) - ) - ->execute($values[$layer['layer']]['id']); + $this->connection->update( + 'tl_leaflet_control_layer', + [ + 'tstamp' => time(), + 'sorting' => $sorting, + 'mode' => $layer['mode'] + ], + [ + 'id' => $values[$layer['layer']]['id'] + ] + ); $sorting += 128; unset($values[$layer['layer']]); @@ -183,7 +176,11 @@ class ControlCallbacks extends Callbacks ); if ($ids) { - $this->database->query('DELETE FROM tl_leaflet_control_layer WHERE id IN(' . implode(',', $ids) . ')'); + $this->connection->executeUpdate( + 'DELETE FROM tl_leaflet_control_layer WHERE id IN(?)', + [$ids], + [Connection::PARAM_INT_ARRAY] + ); } return null; diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 283abd0..721e3ae 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -4,3 +4,9 @@ services: arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' + + netzmacht.contao_leaflet_maps.listeners.dca.control: + class: Netzmacht\Contao\Leaflet\Listeners\Dca\ControlDcaListener + arguments: + - '@netzmacht.contao_toolkit.dca.manager' + - '@database_connection' diff --git a/src/Resources/contao/config/services.php b/src/Resources/contao/config/services.php index ad6edbf..10c41cf 100644 --- a/src/Resources/contao/config/services.php +++ b/src/Resources/contao/config/services.php @@ -16,7 +16,7 @@ use Interop\Container\ContainerInterface; use Netzmacht\Contao\Leaflet\Alias\DefaultAliasFilter; use Netzmacht\Contao\Leaflet\Boot; use Netzmacht\Contao\Leaflet\ContaoAssets; -use Netzmacht\Contao\Leaflet\Dca\ControlCallbacks; +use Netzmacht\Contao\Leaflet\Listeners\Dca\ControlDcaListener; use Netzmacht\Contao\Leaflet\Dca\FrontendIntegration; use Netzmacht\Contao\Leaflet\Dca\LayerCallbacks; use Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks; @@ -260,7 +260,7 @@ $container['leaflet.dca.layer-callbacks'] = $container->share( $container['leaflet.dca.control-callbacks'] = $container->share( function ($container) { - return new ControlCallbacks( + return new ControlDcaListener( $container[Services::DCA_MANAGER], $container[Services::DATABASE_CONNECTION] ); diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index be6bc71..88c10a3 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -42,7 +42,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'flag' => 1, 'sorting' => 2, 'panelLayout' => 'filter,sort;search,limit', - 'child_record_callback' => \Netzmacht\Contao\Leaflet\Dca\ControlCallbacks::callback('generateRow'), + 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'generateRow'], ), 'label' => array ( @@ -286,10 +286,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'exclude' => true, 'inputType' => 'multiColumnWizard', 'load_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\ControlCallbacks::callback('loadLayerRelations'), + ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'loadLayerRelations'], ), 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\ControlCallbacks::callback('saveLayerRelations'), + ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'saveLayerRelations'], ), 'eval' => array ( @@ -301,7 +301,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layer'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\ControlCallbacks::callback('getLayers'), + 'options_callback' => \Netzmacht\Contao\Leaflet\Listeners\Dca\ControlDcaListener::callback('getLayers'), 'eval' => array( 'style' => 'width: 300px', 'chosen' => true, @@ -388,7 +388,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomControl'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\ControlCallbacks::callback('getZoomControls'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getZoomControls'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'], 'eval' => array( 'mandatory' => false, From 1fc47f705d0a92c09395e13137f6192254978c01 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:19:46 +0200 Subject: [PATCH 025/152] Rename listener namespace. --- .../Dca/LayerDcaListener.php} | 13 +++---------- src/{Listeners => Listener}/Dca/MapDcaListener.php | 2 +- src/Resources/config/listeners.yml | 4 ++-- src/Resources/contao/dca/tl_leaflet_control.php | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) rename src/{Dca/LayerCallbacks.php => Listener/Dca/LayerDcaListener.php} (97%) rename src/{Listeners => Listener}/Dca/MapDcaListener.php (98%) diff --git a/src/Dca/LayerCallbacks.php b/src/Listener/Dca/LayerDcaListener.php similarity index 97% rename from src/Dca/LayerCallbacks.php rename to src/Listener/Dca/LayerDcaListener.php index e739a2b..18f9f3c 100644 --- a/src/Dca/LayerCallbacks.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -10,9 +10,9 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Dca; +namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks; +use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\LayerModel; @@ -23,7 +23,7 @@ use Symfony\Component\Translation\TranslatorInterface as Translator; * * @package Netzmacht\Contao\Leaflet\Dca */ -class LayerCallbacks extends Callbacks +class LayerDcaListener extends AbstractListener { /** * Name of the data container. @@ -32,13 +32,6 @@ class LayerCallbacks extends Callbacks */ protected static $name = 'tl_leaflet_layer'; - /** - * Helper service name. - * - * @var string - */ - protected static $serviceName = 'leaflet.dca.layer-callbacks'; - /** * Layers definition. * diff --git a/src/Listeners/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php similarity index 98% rename from src/Listeners/Dca/MapDcaListener.php rename to src/Listener/Dca/MapDcaListener.php index a09776f..a8f5037 100644 --- a/src/Listeners/Dca/MapDcaListener.php +++ b/src/Listener/Dca/MapDcaListener.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet\Listeners\Dca; +namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\DataContainer; use Doctrine\DBAL\Connection; diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 721e3ae..8f8beee 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -1,12 +1,12 @@ services: netzmacht.contao_leaflet_maps.listeners.dca.map: - class: Netzmacht\Contao\Leaflet\Listeners\Dca\MapDcaListener + class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' netzmacht.contao_leaflet_maps.listeners.dca.control: - class: Netzmacht\Contao\Leaflet\Listeners\Dca\ControlDcaListener + class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 88c10a3..96e4a81 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -301,7 +301,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layer'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Listeners\Dca\ControlDcaListener::callback('getLayers'), + 'options_callback' => \Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener::callback('getLayers'), 'eval' => array( 'style' => 'width: 300px', 'chosen' => true, From e67b1522258797a70485e3dc23c45aa5dcb3d896 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:21:06 +0200 Subject: [PATCH 026/152] Replace old callback notation. --- src/{Listeners => Listener}/Dca/ControlDcaListener.php | 2 +- src/Resources/contao/dca/tl_leaflet_control.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/{Listeners => Listener}/Dca/ControlDcaListener.php (99%) diff --git a/src/Listeners/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php similarity index 99% rename from src/Listeners/Dca/ControlDcaListener.php rename to src/Listener/Dca/ControlDcaListener.php index 9947e2e..8c36033 100644 --- a/src/Listeners/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -10,7 +10,7 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Listeners\Dca; +namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 96e4a81..cdf1517 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -301,7 +301,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layer'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener::callback('getLayers'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getLayers'], 'eval' => array( 'style' => 'width: 300px', 'chosen' => true, From 598adb54b1a051e7e1ff648e7fa460be325adf85 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:33:19 +0200 Subject: [PATCH 027/152] Rework layer callbacks to an listener service. --- src/Listener/Dca/LayerDcaListener.php | 81 ++++++++++--------- src/Resources/config/listeners.yml | 11 +++ src/Resources/contao/config/services.php | 8 +- src/Resources/contao/dca/tl_leaflet_layer.php | 18 ++--- 4 files changed, 66 insertions(+), 52 deletions(-) diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 18f9f3c..d87e6ef 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -12,6 +12,11 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; +use Contao\Controller; +use Contao\Image; +use Contao\StringUtil; +use Doctrine\DBAL\Connection; +use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; @@ -42,9 +47,9 @@ class LayerDcaListener extends AbstractListener /** * The database connection. * - * @var \Database + * @var Connection */ - private $database; + private $connection; /** * Tile providers configuration. @@ -67,33 +72,43 @@ class LayerDcaListener extends AbstractListener */ private $amenities; + /** + * Layer label renderer. + * + * @var LayerLabelRenderer + */ + private $labelRenderer; + /** * Construct. * - * @param Manager $manager Data container manager. - * @param \Database $database Database connection. - * @param Translator $translator Translator. - * @param array $layers Leaflet layer configuration. - * @param array $tileProviders Tile providers. - * @param array $amenities OSM amenities. + * @param Manager $manager Data container manager. + * @param Connection $connection Database connection. + * @param Translator $translator Translator. + * @param LayerLabelRenderer $labelRenderer Layer label renderer. + * @param array $layers Leaflet layer configuration. + * @param array $tileProviders Tile providers. + * @param array $amenities OSM amenities. */ public function __construct( Manager $manager, - \Database $database, + Connection $connection, Translator $translator, + LayerLabelRenderer $labelRenderer, array $layers, array $tileProviders, array $amenities ) { parent::__construct($manager); - \Controller::loadLanguageFile('leaflet_layer'); + Controller::loadLanguageFile('leaflet_layer'); - $this->database = $database; + $this->connection = $connection; $this->layers = $layers; $this->tileProviders = $tileProviders; $this->translator = $translator; $this->amenities = $amenities; + $this->labelRenderer = $labelRenderer; } /** @@ -135,12 +150,9 @@ class LayerDcaListener extends AbstractListener $src = preg_replace('/(\.[^\.]+)$/', '_1$1', $src); } - $alt = $this->getFormatter()->formatValue('type', $row['type']); - $icon = \Image::getHtml($src, $alt, sprintf('title="%s"', strip_tags($alt))); - - if (!empty($this->layers[$row['type']]['label'])) { - $label = $this->layers[$row['type']]['label']($row, $label); - } + $alt = $this->getFormatter()->formatValue('type', $row['type']); + $icon = Image::getHtml($src, $alt, sprintf('title="%s"', StringUtil::specialchars(strip_tags($alt)))); + $label = $this->labelRenderer->render($row, $label, $this->translator); return $icon . ' ' . $label; } @@ -282,13 +294,13 @@ class LayerDcaListener extends AbstractListener public function deleteRelations($dataContainer, $undoId) { if ($undoId) { - $undo = $this->database - ->prepare('SELECT * FROM tl_undo WHERE id=?') - ->limit(1) - ->execute($undoId) - ->row(); + $statement = $this->connection->prepare('SELECT * FROM tl_undo WHERE id=:id LIMIT 0,1'); + $statement->bindValue('id', $undoId); + $statement->execute(); - $result = $this->database + $undo = $statement->fetch(); + + $result = $this->connection ->prepare('SELECT * FROM tl_leaflet_map_layer WHERE lid=?') ->execute($dataContainer->id); @@ -298,26 +310,17 @@ class LayerDcaListener extends AbstractListener $undo['data']['tl_leaflet_map_layer'][] = $result->row(); } - $result = $this->database - ->prepare('SELECT * FROM tl_leaflet_control_layer WHERE lid=?') - ->execute($dataContainer->id); + $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_control_layer WHERE lid=:lid'); + $statement->bindValue('lid', $dataContainer->id); + $statement->execute(); - while ($result->next()) { - $undo['data']['tl_leaflet_control_layer'][] = $result->row(); - } + $undo['data']['tl_leaflet_control_layer'] = $statement->fetchAll(); - $this->database->prepare('UPDATE tl_undo %s WHERE id=?') - ->set(array('data' => $undo['data'])) - ->execute($undo['id']); + $this->connection->update('tl_undo', ['data' => $undo['data']], ['id' => $undo['id']]); } - $this->database - ->prepare('DELETE FROM tl_leaflet_map_layer WHERE lid=?') - ->execute($dataContainer->id); - - $this->database - ->prepare('DELETE FROM tl_leaflet_control_layer WHERE lid=?') - ->execute($dataContainer->id); + $this->connection->delete('tl_leaflet_map_layer', ['lid' => $dataContainer->id]); + $this->connection->delete('tl_leaflet_control_layer', ['lid' => $dataContainer->id]); } /** diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 8f8beee..a38b719 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -10,3 +10,14 @@ services: arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' + + netzmacht.contao_leaflet_maps.listeners.dca.layer: + class: Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener + arguments: + - '@netzmacht.contao_toolkit.dca.manager' + - '@database_connection' + - '@translator' + - '@netzmacht.contao_leaflet_maps.layer_label_renderer' + - '%netzmacht.contao_leaflet_maps.layers%' + - '%netzmacht.contao_leaflet_maps.providers%' + - '%netzmacht.contao_leaflet_maps.amenities%' diff --git a/src/Resources/contao/config/services.php b/src/Resources/contao/config/services.php index 10c41cf..e2d128b 100644 --- a/src/Resources/contao/config/services.php +++ b/src/Resources/contao/config/services.php @@ -16,11 +16,11 @@ use Interop\Container\ContainerInterface; use Netzmacht\Contao\Leaflet\Alias\DefaultAliasFilter; use Netzmacht\Contao\Leaflet\Boot; use Netzmacht\Contao\Leaflet\ContaoAssets; -use Netzmacht\Contao\Leaflet\Listeners\Dca\ControlDcaListener; +use Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener; use Netzmacht\Contao\Leaflet\Dca\FrontendIntegration; -use Netzmacht\Contao\Leaflet\Dca\LayerCallbacks; +use Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener; use Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks; -use Netzmacht\Contao\Leaflet\Listeners\Dca\MapDcaListener; +use Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener; use Netzmacht\Contao\Leaflet\Dca\Validator; use Netzmacht\Contao\Leaflet\Dca\VectorCallbacks; use Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices; @@ -243,7 +243,7 @@ $container['leaflet.dca.map-callbacks'] = $container->share( $container['leaflet.dca.layer-callbacks'] = $container->share( function ($container) { - return new LayerCallbacks( + return new LayerDcaListener( $container[Services::DCA_MANAGER], $container[Services::DATABASE_CONNECTION], $container[Services::TRANSLATOR], diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 43ea9e8..31a45dc 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -16,7 +16,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'enableVersioning' => true, 'ctable' => ['tl_leaflet_vector', 'tl_leaflet_marker'], 'ondelete_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('deleteRelations'), + ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'deleteRelations'], ], 'sql' => [ 'keys' => [ @@ -41,12 +41,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'flag' => 1, 'icon' => 'system/modules/leaflet/assets/img/layers.png', 'panelLayout' => 'filter;search,limit', - 'paste_button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getPasteButtons'), + 'paste_button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getPasteButtons'], ], 'label' => [ 'fields' => ['title'], 'format' => '%s', - 'label_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateRow'), + 'label_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateRow'], ], 'global_operations' => [ 'styles' => [ @@ -79,13 +79,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['markers'], 'href' => 'table=tl_leaflet_marker', 'icon' => 'edit.gif', - 'button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateMarkersButton'), + 'button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateMarkersButton'], ], 'vectors' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['vectors'], 'href' => 'table=tl_leaflet_vector', 'icon' => 'edit.gif', - 'button_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('generateVectorsButton'), + 'button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateVectorsButton'], ], 'edit' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'], @@ -321,7 +321,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'submitOnChange' => true, 'chosen' => false, ], - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getVariants'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getVariants'], 'sql' => "varchar(32) NOT NULL default ''", ], 'tile_provider_key' => [ @@ -365,7 +365,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['reference'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getLayers'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayers'], 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', @@ -525,7 +525,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['boundsMode'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getBoundsModes'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getBoundsModes'], 'eval' => ['tl_class' => 'w50', 'includeBlankOption' => true], 'sql' => "varchar(6) NOT NULL default ''", ], @@ -810,7 +810,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getAmenities'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getAmenities'], 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', From 32d47531f7bd410020a0aab496bb2764d3992c2d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:39:40 +0200 Subject: [PATCH 028/152] Add getIcons callback to the layer dca listener. --- src/Listener/Dca/LayerDcaListener.php | 19 +++++++++++++++++++ src/Resources/contao/dca/tl_leaflet_layer.php | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index d87e6ef..8e79bf3 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -17,6 +17,7 @@ use Contao\Image; use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer; +use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; @@ -373,6 +374,24 @@ class LayerDcaListener extends AbstractListener return $this->amenities; } + /** + * Get all icons. + * + * @return array + */ + public function getIcons() + { + $collection = IconModel::findAll(array('order' => 'title')); + $builder = OptionsBuilder::fromCollection( + $collection, + function ($model) { + return sprintf('%s [%s]', $model['title'], $model['type']); + } + ); + + return $builder->getOptions(); + } + /** * Generate a button. * diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 31a45dc..a92d6a3 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -803,7 +803,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcons'], 'exclude' => true, 'inputType' => 'multiColumnWizard', - 'options_callback' => ['Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'], + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getIcons'], 'eval' => [ 'columnFields' => [ 'amenity' => [ @@ -822,7 +822,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'], + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getIcons'], 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', From 6111fc359458c89a9e9c404114d17eeb643d01d8 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:44:11 +0200 Subject: [PATCH 029/152] Rework marker dca callbacks to a service listener. --- .../Dca/MarkerDcaListener.php} | 58 ++++++++++++++----- src/Resources/config/listeners.yml | 5 ++ .../contao/dca/tl_leaflet_marker.php | 14 ++--- 3 files changed, 54 insertions(+), 23 deletions(-) rename src/{Dca/MarkerCallbacks.php => Listener/Dca/MarkerDcaListener.php} (68%) diff --git a/src/Dca/MarkerCallbacks.php b/src/Listener/Dca/MarkerDcaListener.php similarity index 68% rename from src/Dca/MarkerCallbacks.php rename to src/Listener/Dca/MarkerDcaListener.php index 933234c..6d3716c 100644 --- a/src/Dca/MarkerCallbacks.php +++ b/src/Listener/Dca/MarkerDcaListener.php @@ -10,8 +10,10 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Dca; +namespace Netzmacht\Contao\Leaflet\Listener\Dca; +use Contao\Controller; +use Doctrine\DBAL\Connection; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; @@ -21,8 +23,35 @@ use Netzmacht\Contao\Leaflet\Model\PopupModel; * * @package Netzmacht\Contao\Leaflet\Dca */ -class MarkerCallbacks +class MarkerDcaListener { + /** + * Database connection. + * + * @var Connection + */ + private $connection; + + /** + * MarkerDcaListener constructor. + * + * @param Connection $connection Database connection. + */ + public function __construct(Connection $connection) + { + $this->connection = $connection; + } + + /** + * Initialize the language files. + * + * @return void + */ + public function initialize(): void + { + Controller::loadLanguageFile('leaflet'); + } + /** * Generate the row label. * @@ -92,10 +121,7 @@ class MarkerCallbacks } } - \Database::getInstance() - ->prepare('UPDATE tl_leaflet_marker %s WHERE id=?') - ->set($combined) - ->execute($dataContainer->id); + $this->connection->update('tl_leaflet_marker', $combined, ['id' => $dataContainer->id]); return null; } @@ -112,21 +138,23 @@ class MarkerCallbacks */ public function loadCoordinates($value, $dataContainer) { - $result = \Database::getInstance() - ->prepare('SELECT latitude, longitude, altitude FROM tl_leaflet_marker WHERE id=?') - ->execute($dataContainer->id); + $query = 'SELECT latitude, longitude, altitude FROM tl_leaflet_marker WHERE id=:id'; + $statement = $this->connection->prepare($query); + $statement->bindValue('id', $dataContainer->id); - if ($result->numRows) { - $buffer = $result->latitude; + $statement->execute(); - if ($buffer && $result->longitude) { - $buffer .= ',' . $result->longitude; + if ($row = $statement->fetch()) { + $buffer = $row['latitude']; + + if ($buffer && $row['longitude']) { + $buffer .= ',' . $row['longitude']; } else { return $buffer; } - if ($buffer && $result->altitude) { - $buffer .= ',' . $result->longitude; + if ($buffer && $row['altitude']) { + $buffer .= ',' . $row['altitude']; } return $buffer; diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index a38b719..7ece7ff 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -21,3 +21,8 @@ services: - '%netzmacht.contao_leaflet_maps.layers%' - '%netzmacht.contao_leaflet_maps.providers%' - '%netzmacht.contao_leaflet_maps.amenities%' + + netzmacht.contao_leaflet_maps.listeners.dca.marker: + class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener + arguments: + - '@database_connection' diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index eda2571..cc8c3ba 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -26,9 +26,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array ) ), 'onload_callback' => array( - function () { - \Controller::loadLanguageFile('leaflet'); - } + ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'initialize'], ), 'onsubmit_callback' => [ \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), @@ -44,7 +42,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'flag' => 1, 'panelLayout' => 'sort,filter;search,limit', 'headerFields' => array('title', 'type'), - 'child_record_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'generateRow'), + 'child_record_callback' => array('netzmacht.contao_leaflet_maps.listeners.dca.marker\'', 'generateRow'), ), 'label' => array ( @@ -195,10 +193,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'inputType' => 'text', 'save_callback' => array( \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates'), - array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'saveCoordinates') + array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'saveCoordinates') ), 'load_callback' => array( - array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'loadCoordinates') + array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'loadCoordinates') ), 'wizard' => array( Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getGeocoder') @@ -278,7 +276,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popup'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getPopups'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getPopups'], 'eval' => array( 'mandatory' => false, 'tl_class' => 'w50', @@ -309,7 +307,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'), + 'options_callback' => array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getIcons'), 'eval' => array( 'mandatory' => true, 'tl_class' => 'w50', From ad6482c28c24bf9199c85eac2ddfb97d7d4158bd Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:47:13 +0200 Subject: [PATCH 030/152] Rework vector dca callbacks to a service listener. --- .../Dca/VectorDcaListener.php} | 32 +++++++++++++------ src/Resources/config/listeners.yml | 5 +++ .../contao/dca/tl_leaflet_vector.php | 6 ++-- 3 files changed, 30 insertions(+), 13 deletions(-) rename src/{Dca/VectorCallbacks.php => Listener/Dca/VectorDcaListener.php} (68%) diff --git a/src/Dca/VectorCallbacks.php b/src/Listener/Dca/VectorDcaListener.php similarity index 68% rename from src/Dca/VectorCallbacks.php rename to src/Listener/Dca/VectorDcaListener.php index 034e72a..4db7baa 100644 --- a/src/Dca/VectorCallbacks.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -10,9 +10,10 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Dca; +namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Netzmacht\Contao\Toolkit\Dca\Callback\Callbacks; +use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\StyleModel; @@ -21,7 +22,7 @@ use Netzmacht\Contao\Leaflet\Model\StyleModel; * * @package Netzmacht\Contao\Leaflet\Dca */ -class VectorCallbacks extends Callbacks +class VectorDcaListener extends AbstractListener { /** * Name of the data container. @@ -30,13 +31,6 @@ class VectorCallbacks extends Callbacks */ protected static $name = 'tl_leaflet_vector'; - /** - * Helper service name. - * - * @var string - */ - protected static $serviceName = 'leaflet.dca.vector-callbacks'; - /** * Generate the row label. * @@ -64,4 +58,22 @@ class VectorCallbacks extends Callbacks return OptionsBuilder::fromCollection($collection, 'title')->getOptions(); } + + /** + * Get all icons. + * + * @return array + */ + public function getIcons() + { + $collection = IconModel::findAll(array('order' => 'title')); + $builder = OptionsBuilder::fromCollection( + $collection, + function ($model) { + return sprintf('%s [%s]', $model['title'], $model['type']); + } + ); + + return $builder->getOptions(); + } } diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 7ece7ff..983ed06 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -26,3 +26,8 @@ services: class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener arguments: - '@database_connection' + + netzmacht.contao_leaflet_maps.listeners.dca.vector: + class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener + arguments: + - '@netzmacht.contao_toolkit.dca.manager' diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index a418e98..9429dca 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -44,7 +44,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'flag' => 1, 'panelLayout' => 'sort,filter;search,limit', 'headerFields' => array('title', 'type'), - 'child_record_callback' => Netzmacht\Contao\Leaflet\Dca\VectorCallbacks::callback('generateRow'), + 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'generateRow'], ), 'label' => array ( @@ -264,7 +264,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popup'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getPopups'), + 'options_callback' => array('Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener', 'getPopups'), 'eval' => array( 'mandatory' => false, 'tl_class' => 'w50', @@ -287,7 +287,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['style'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\VectorCallbacks::callback('getStyles'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getStyles'], 'eval' => array( 'mandatory' => false, 'tl_class' => 'w50', From 5a4fd9b4340f70479491f669fccf5665380bee1d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:47:57 +0200 Subject: [PATCH 031/152] Fix reference to vector. --- src/Subscriber/GeoJsonSubscriber.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Subscriber/GeoJsonSubscriber.php b/src/Subscriber/GeoJsonSubscriber.php index a929a4b..a66bbd6 100644 --- a/src/Subscriber/GeoJsonSubscriber.php +++ b/src/Subscriber/GeoJsonSubscriber.php @@ -12,9 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Subscriber; -use Netzmacht\Contao\Leaflet\Dca\VectorCallbacks; use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\LeafletPHP\Definition\Vector; use Netzmacht\LeafletPHP\Value\GeoJson\Feature; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Marker; @@ -101,7 +101,7 @@ class GeoJsonSubscriber implements EventSubscriberInterface $definition = $event->getDefinition(); $model = $event->getModel(); - if (($definition instanceof Marker || $definition instanceof VectorCallbacks) + if (($definition instanceof Marker || $definition instanceof Vector) && $model instanceof \Model && $feature instanceof Feature) { $this->setDataProperty($model, $feature); $this->setBoundsInformation($model, $feature); From 6c7b136c0e909a37f5629780edec20fba6e7f397 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 13:56:46 +0200 Subject: [PATCH 032/152] Rework leaflet dca callbacks to a listener service. --- .../Dca/LeafletDcaListener.php} | 37 +++++++++---------- src/Resources/config/listeners.yml | 6 +++ .../contao/dca/tl_leaflet_control.php | 4 +- src/Resources/contao/dca/tl_leaflet_icon.php | 4 +- src/Resources/contao/dca/tl_leaflet_layer.php | 12 +++--- src/Resources/contao/dca/tl_leaflet_map.php | 12 +++--- .../contao/dca/tl_leaflet_marker.php | 6 +-- src/Resources/contao/dca/tl_leaflet_popup.php | 4 +- src/Resources/contao/dca/tl_leaflet_style.php | 4 +- .../contao/dca/tl_leaflet_vector.php | 6 +-- 10 files changed, 49 insertions(+), 46 deletions(-) rename src/{Dca/LeafletCallbacks.php => Listener/Dca/LeafletDcaListener.php} (73%) diff --git a/src/Dca/LeafletCallbacks.php b/src/Listener/Dca/LeafletDcaListener.php similarity index 73% rename from src/Dca/LeafletCallbacks.php rename to src/Listener/Dca/LeafletDcaListener.php index 77f0c23..911afdf 100644 --- a/src/Dca/LeafletCallbacks.php +++ b/src/Listener/Dca/LeafletDcaListener.php @@ -10,46 +10,44 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Dca; +namespace Netzmacht\Contao\Leaflet\Listener\Dca; +use Contao\DataContainer; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory; use Netzmacht\LeafletPHP\Value\LatLng; +use Symfony\Component\Filesystem\Filesystem; /** * Class Leaflet is the base helper providing different methods. * * @package Netzmacht\Contao\Leaflet\Dca */ -class LeafletCallbacks +class LeafletDcaListener { /** * File system. * - * @var \Files + * @var Filesystem */ private $fileSystem; /** - * LeafletCallbacks constructor. + * Cache dir. * - * @param \Files $fileSystem File system. + * @var string */ - public function __construct(\Files $fileSystem) - { - $this->fileSystem = $fileSystem; - } + private $cacheDir; /** - * Generate the callback definition. + * LeafletCallbacks constructor. * - * @param string $methodName Callback method name. - * - * @return callable + * @param Filesystem $fileSystem File system. + * @param string $cacheDir Cache dir. */ - public static function callback($methodName) + public function __construct(Filesystem $fileSystem, string $cacheDir) { - return CallbackFactory::service('leaflet.dca.common', $methodName); + $this->fileSystem = $fileSystem; + $this->cacheDir = $cacheDir; } /** @@ -65,7 +63,7 @@ class LeafletCallbacks /** * Get the geocoder wizard. * - * @param \DataContainer $dataContainer The dataContainer driver. + * @param DataContainer $dataContainer The dataContainer driver. * * @return string */ @@ -78,10 +76,9 @@ class LeafletCallbacks $latLng = LatLng::fromString($dataContainer->value); $template->marker = json_encode($latLng); } catch (\Exception $e) { - // LatLng throws an exeption of value could not be created. Just let the value empty when. + // LatLng throws an exception of value could not be created. Just let the value empty when. } - return $template->parse(); } @@ -113,7 +110,7 @@ class LeafletCallbacks */ public function clearCache($value = null) { - $this->fileSystem->rrdir('system/cache/leaflet', true); + $this->fileSystem->remove($this->cacheDir); return $value; } diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 983ed06..c689984 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -1,4 +1,10 @@ services: + netzmacht.contao_leaflet_maps.listeners.dca.leaflet: + class: Netzmacht\Contao\Leaflet\Listener\Dca\LeafletDcaListener + arguments: + - '@filesystem' + - '%netzmacht.contao_leaflet_maps.cache_dir%' + netzmacht.contao_leaflet_maps.listeners.dca.map: class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener arguments: diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index cdf1517..a4aca37 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -27,7 +27,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ) ), 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), @@ -227,7 +227,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'eval' => array('tl_class' => 'w50'), 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), 'zoomInText' => array diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index 4925ed5..6647127 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -24,7 +24,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array ) ), 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), @@ -228,7 +228,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'eval' => array('tl_class' => 'w50'), 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), 'iconImage' => array diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index a92d6a3..822d0d4 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -31,7 +31,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ }, ], 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ], 'list' => [ @@ -294,7 +294,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ], 'tile_provider' => [ @@ -452,7 +452,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['disableClusteringAtZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'default' => '', 'eval' => [ 'maxlength' => 4, @@ -541,7 +541,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['minZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', @@ -555,7 +555,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', @@ -569,7 +569,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxNativeZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index edf1964..00f69d1 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -30,7 +30,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array } ), 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), @@ -194,7 +194,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates'), ), 'wizard' => array( - Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getGeocoder') + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] ), 'eval' => array( 'maxlength' => 255, @@ -243,7 +243,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'default' => '', 'eval' => array( 'maxlength' => 4, @@ -268,7 +268,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => array( 'maxlength' => 4, 'rgxp' => 'digit', @@ -283,7 +283,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => array( 'maxlength' => 4, 'rgxp' => 'digit', @@ -555,7 +555,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getZoomLevels'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => array( 'maxlength' => 4, 'rgxp' => 'digit', diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index cc8c3ba..7993df9 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -29,7 +29,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'initialize'], ), 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), @@ -199,7 +199,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'loadCoordinates') ), 'wizard' => array( - Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getGeocoder') + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] ), 'eval' => array( 'maxlength' => 255, @@ -243,7 +243,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'eval' => array('tl_class' => 'w50'), 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), 'tooltip' => array diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index 36809b8..afee0b4 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -24,7 +24,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array ) ), 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), @@ -297,7 +297,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'eval' => array('tl_class' => 'w50'), 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), ), diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index 4b2641e..36aa0a0 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -24,7 +24,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array ) ), 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), @@ -305,7 +305,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'eval' => array('tl_class' => 'w50'), 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), ), diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index 9429dca..405af7e 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -31,7 +31,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array } ), 'onsubmit_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), @@ -247,7 +247,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'eval' => array('tl_class' => 'w50'), 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - \Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('clearCache'), + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], ), 'addPopup' => array @@ -322,7 +322,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates') ), 'wizard' => array( - Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks::callback('getGeocoder') + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] ), 'eval' => array( 'maxlength' => 255, From f03ed713f390acd2c059d95d5755a48c2e29494e Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:02:31 +0200 Subject: [PATCH 033/152] Rework validator callbacks to a listener service. --- src/{ => Listener}/Dca/Validator.php | 15 +-------------- src/Resources/config/listeners.yml | 5 +++++ src/Resources/contao/dca/tl_leaflet_control.php | 2 +- src/Resources/contao/dca/tl_leaflet_icon.php | 8 ++++---- src/Resources/contao/dca/tl_leaflet_layer.php | 2 +- src/Resources/contao/dca/tl_leaflet_map.php | 4 ++-- src/Resources/contao/dca/tl_leaflet_marker.php | 4 ++-- src/Resources/contao/dca/tl_leaflet_popup.php | 4 ++-- src/Resources/contao/dca/tl_leaflet_style.php | 2 +- src/Resources/contao/dca/tl_leaflet_vector.php | 8 ++++---- 10 files changed, 23 insertions(+), 31 deletions(-) rename src/{ => Listener}/Dca/Validator.php (87%) diff --git a/src/Dca/Validator.php b/src/Listener/Dca/Validator.php similarity index 87% rename from src/Dca/Validator.php rename to src/Listener/Dca/Validator.php index f96a920..2fc5ef3 100644 --- a/src/Dca/Validator.php +++ b/src/Listener/Dca/Validator.php @@ -10,9 +10,8 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Dca; +namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory; use Netzmacht\LeafletPHP\Value\LatLng; use Symfony\Component\Translation\TranslatorInterface as Translator; @@ -40,18 +39,6 @@ class Validator $this->translator = $translator; } - /** - * Generate the callback definition. - * - * @param string $methodName Callback method name. - * - * @return callable - */ - public static function callback($methodName) - { - return CallbackFactory::service('leaflet.dca.validator', $methodName); - } - /** * Validate coordinates. * diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index c689984..b717b39 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -5,6 +5,11 @@ services: - '@filesystem' - '%netzmacht.contao_leaflet_maps.cache_dir%' + netzmacht.contao_leaflet_maps.listeners.dca.validator: + class: Netzmacht\Contao\Leaflet\Listener\Dca\Validator + arguments: + - '@translator' + netzmacht.contao_leaflet_maps.listeners.dca.map: class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener arguments: diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index a4aca37..7be201e 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -177,7 +177,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::PARENT_ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array( 'mandatory' => false, diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index 6647127..c205c9c 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -199,7 +199,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'sql' => 'varchar(255) NULL' @@ -293,7 +293,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] ), 'eval' => array( 'maxlength' => 255, @@ -308,7 +308,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] ), 'eval' => array( 'maxlength' => 255, @@ -323,7 +323,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] ), 'eval' => array( 'maxlength' => 255, diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 822d0d4..670faa7 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -264,7 +264,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'sql' => 'varchar(255) NULL', diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 00f69d1..39e5f68 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -180,7 +180,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'] ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'sql' => 'varchar(255) NULL' @@ -191,7 +191,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], ), 'wizard' => array( ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index 7993df9..2af6606 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -181,7 +181,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'sql' => 'varchar(255) NULL' @@ -192,7 +192,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'saveCoordinates') ), 'load_callback' => array( diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index afee0b4..a492b15 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -171,7 +171,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'sql' => 'varchar(255) NULL' @@ -236,7 +236,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] ), 'eval' => array( 'maxlength' => 255, diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index 36aa0a0..827f06c 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -165,7 +165,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'sql' => 'varchar(255) NULL' diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index 405af7e..ca0b799 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -209,7 +209,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array ['title'], \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR ), - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'), + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'sql' => 'varchar(255) NULL' @@ -319,7 +319,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] ), 'wizard' => array( ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] @@ -348,7 +348,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'search' => false, 'eval' => array('mandatory' => true, 'alwaysSave' => true), 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateMultipleCoordinates') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinates'] ), 'sql' => 'longblob NULL' ), @@ -373,7 +373,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array ) ), 'save_callback' => array( - \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateMultipleCoordinateSets') + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinateSets'] ), 'sql' => 'longblob NULL' ), From ad5e30fd09ca6f84c304e21e90aa55ca9b6d8383 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:06:20 +0200 Subject: [PATCH 034/152] Rework frontend integration callback class to a listener service. --- .../Dca/FrontendIntegrationListener.php} | 23 +++++-------------- src/Resources/config/listeners.yml | 5 ++++ src/Resources/contao/dca/tl_content.php | 4 ++-- src/Resources/contao/dca/tl_module.php | 4 ++-- 4 files changed, 15 insertions(+), 21 deletions(-) rename src/{Dca/FrontendIntegration.php => Listener/Dca/FrontendIntegrationListener.php} (83%) diff --git a/src/Dca/FrontendIntegration.php b/src/Listener/Dca/FrontendIntegrationListener.php similarity index 83% rename from src/Dca/FrontendIntegration.php rename to src/Listener/Dca/FrontendIntegrationListener.php index 820f723..c5e7846 100644 --- a/src/Dca/FrontendIntegration.php +++ b/src/Listener/Dca/FrontendIntegrationListener.php @@ -10,9 +10,10 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Dca; +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\MapModel; use Symfony\Component\Translation\TranslatorInterface as Translator; @@ -22,7 +23,7 @@ use Symfony\Component\Translation\TranslatorInterface as Translator; * * @package Netzmacht\Contao\Leaflet\Dca */ -class FrontendIntegration +final class FrontendIntegrationListener { /** * Translator. @@ -41,24 +42,12 @@ class FrontendIntegration $this->translator = $translator; } - /** - * Generate the callback definition. - * - * @param string $methodName Callback method name. - * - * @return callable - */ - public static function callback($methodName) - { - return CallbackFactory::service('leaflet.dca.frontend-integration', $methodName); - } - /** * Get all leaflet maps. * * @return array */ - public function getMaps() + public function getMaps(): array { $collection = MapModel::findAll(); @@ -72,7 +61,7 @@ class FrontendIntegration * * @return string */ - public function getEditMapLink($dataContainer) + public function getEditMapLink($dataContainer): string { if ($dataContainer->value < 1) { return ''; diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index b717b39..7120107 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -10,6 +10,11 @@ services: arguments: - '@translator' + netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration: + class: Netzmacht\Contao\Leaflet\Listener\Dca\FrontendIntegrationListener + arguments: + - '@translator' + netzmacht.contao_leaflet_maps.listeners.dca.map: class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener arguments: diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php index 643f586..29b6533 100644 --- a/src/Resources/contao/dca/tl_content.php +++ b/src/Resources/contao/dca/tl_content.php @@ -23,9 +23,9 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_map'] = array( 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_map'], 'inputType' => 'select', 'exclude' => true, - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\FrontendIntegration::callback('getMaps'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'], 'wizard' => array( - \Netzmacht\Contao\Leaflet\Dca\FrontendIntegration::callback('getEditMapLink'), + ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'], ), 'eval' => array( 'tl_class' => 'w50 wizard', diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php index 4e91f0a..ca1cf5f 100644 --- a/src/Resources/contao/dca/tl_module.php +++ b/src/Resources/contao/dca/tl_module.php @@ -23,9 +23,9 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_map'] = array( 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_map'], 'inputType' => 'select', 'exclude' => true, - 'options_callback' => \Netzmacht\Contao\Leaflet\Dca\FrontendIntegration::callback('getMaps'), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'], 'wizard' => array( - \Netzmacht\Contao\Leaflet\Dca\FrontendIntegration::callback('getEditMapLink'), + ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'], ), 'eval' => array( 'tl_class' => 'w50 wizard', From ad6a4e938403cd82d949d6d645588061349f54a6 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:14:39 +0200 Subject: [PATCH 035/152] Replace old alias generator callback definition with toolkit 3.0 compatible ones. --- src/Resources/contao/dca/tl_leaflet_control.php | 13 +++++++------ src/Resources/contao/dca/tl_leaflet_icon.php | 13 +++++++------ src/Resources/contao/dca/tl_leaflet_layer.php | 13 +++++++------ src/Resources/contao/dca/tl_leaflet_map.php | 13 +++++++------ src/Resources/contao/dca/tl_leaflet_marker.php | 13 +++++++------ src/Resources/contao/dca/tl_leaflet_popup.php | 13 +++++++------ src/Resources/contao/dca/tl_leaflet_style.php | 13 +++++++------ src/Resources/contao/dca/tl_leaflet_vector.php | 13 +++++++------ 8 files changed, 56 insertions(+), 48 deletions(-) diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 7be201e..da68fe9 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -171,12 +171,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'inputType' => 'text', 'search' => true, 'save_callback' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_control', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::PARENT_ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array( @@ -185,6 +180,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'tl_class' => 'w50', 'nullIfEmpty' => true, ), + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_parent', + 'fields' => ['title'] + ], + ], 'sql' => 'varchar(255) NULL' ), 'type' => array diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index c205c9c..69b6980 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -193,15 +193,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_icon', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'fields' => ['title'] + ], + ], 'sql' => 'varchar(255) NULL' ), 'type' => array diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 670faa7..5f8a2c0 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -258,15 +258,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'inputType' => 'text', 'search' => true, 'save_callback' => [ - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_layer', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'fields' => ['title'] + ], + ], 'sql' => 'varchar(255) NULL', ], 'type' => [ diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 39e5f68..173c0ed 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -174,15 +174,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'inputType' => 'text', 'search' => true, 'save_callback' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_map', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'] ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'fields' => ['title'] + ] + ], 'sql' => 'varchar(255) NULL' ), 'center' => array diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index 2af6606..1b7f999 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -175,15 +175,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'inputType' => 'text', 'search' => true, 'save_callback' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_marker', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'fields' => ['title'] + ], + ], 'sql' => 'varchar(255) NULL' ), 'coordinates' => array diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index a492b15..b96dccf 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -165,15 +165,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_popup', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'fields' => ['title'] + ], + ], 'sql' => 'varchar(255) NULL' ), 'maxWidth' => array diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index 827f06c..5c662fc 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -159,15 +159,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'exclude' => true, 'inputType' => 'text', 'save_callback' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_style', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'fields' => ['title'] + ], + ], 'sql' => 'varchar(255) NULL' ), 'type' => array diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index ca0b799..b10982f 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -203,15 +203,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'inputType' => 'text', 'search' => true, 'save_callback' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::aliasGenerator( - 'tl_leaflet_vector', - 'alias', - ['title'], - \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR - ), + ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), + 'toolkit' => [ + 'alias_generator' => [ + 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'fields' => ['title'] + ], + ], 'sql' => 'varchar(255) NULL' ), 'type' => array From 594b10b0cf452b6adbda8b7a82e0bf4aed9d70c1 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:24:55 +0200 Subject: [PATCH 036/152] Rework leaflet state button callbacks to be compatible with toolkit 3.0. --- src/Resources/contao/dca/tl_leaflet_control.php | 13 +++++++++---- src/Resources/contao/dca/tl_leaflet_icon.php | 13 +++++++++---- src/Resources/contao/dca/tl_leaflet_layer.php | 13 +++++++++---- src/Resources/contao/dca/tl_leaflet_marker.php | 13 +++++++++---- src/Resources/contao/dca/tl_leaflet_popup.php | 13 +++++++++---- src/Resources/contao/dca/tl_leaflet_style.php | 13 +++++++++---- src/Resources/contao/dca/tl_leaflet_vector.php | 13 +++++++++---- 7 files changed, 63 insertions(+), 28 deletions(-) diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index da68fe9..08bf1dd 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -86,10 +86,15 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( - 'tl_leaflet_control', - 'active' - ) + 'button_callback' => [ + 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', + 'handleButtonCallback' + ], + 'toolkit' => [ + 'state_button' => [ + 'stateColumn' => ['active'] + ] + ], ), 'show' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index 69b6980..f14ff5a 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -101,10 +101,15 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( - 'tl_leaflet_icon', - 'active' - ) + 'button_callback' => [ + 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', + 'handleButtonCallback' + ], + 'toolkit' => [ + 'state_button' => [ + 'stateColumn' => ['active'] + ] + ], ), 'show' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 5f8a2c0..2e5f3d5 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -114,10 +114,15 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( - 'tl_leaflet_layer', - 'active' - ), + 'button_callback' => [ + 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', + 'handleButtonCallback' + ], + 'toolkit' => [ + 'state_button' => [ + 'stateColumn' => ['active'] + ] + ], ], 'show' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['show'], diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index 1b7f999..dda7d75 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -100,10 +100,15 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( - 'tl_leaflet_marker', - 'active' - ) + 'button_callback' => [ + 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', + 'handleButtonCallback' + ], + 'toolkit' => [ + 'state_button' => [ + 'stateColumn' => ['active'] + ] + ], ), 'show' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index b96dccf..2269ec0 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -101,10 +101,15 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( - 'tl_leaflet_popup', - 'active' - ) + 'button_callback' => [ + 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', + 'handleButtonCallback' + ], + 'toolkit' => [ + 'state_button' => [ + 'stateColumn' => ['active'] + ] + ], ), 'show' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index 5c662fc..3d436a6 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -101,10 +101,15 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( - 'tl_leaflet_style', - 'active' - ) + 'button_callback' => [ + 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', + 'handleButtonCallback' + ], + 'toolkit' => [ + 'state_button' => [ + 'stateColumn' => ['active'] + ] + ], ), 'show' => array ( diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index b10982f..d70f973 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -109,10 +109,15 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', - 'button_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::stateButton( - 'tl_leaflet_vector', - 'active' - ) + 'button_callback' => [ + 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', + 'handleButtonCallback' + ], + 'toolkit' => [ + 'state_button' => [ + 'stateColumn' => ['active'] + ] + ], ), 'show' => array ( From 3828c9ce135d1ca9fa421b650b712b5ec49b699b Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:27:04 +0200 Subject: [PATCH 037/152] Use toolkit 3.0 color picker. --- src/Resources/contao/dca/tl_leaflet_icon.php | 2 +- src/Resources/contao/dca/tl_leaflet_style.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index f14ff5a..b1f681d 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -415,7 +415,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'exclude' => true, 'inputType' => 'text', 'wizard' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::colorPicker() + ['netzmacht.contao_toolkit.dca.listeners.color_picker', 'handleWizardCallback'], ), 'eval' => array( 'maxlength' => 64, diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index 3d436a6..53987be 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -207,7 +207,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'exclude' => true, 'inputType' => 'text', 'wizard' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::colorPicker() + ['netzmacht.contao_toolkit.dca.listeners.color_picker', 'handleWizardCallback'], ), 'eval' => array( 'tl_class' => 'w50 wizard clr', @@ -248,7 +248,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'exclude' => true, 'inputType' => 'text', 'wizard' => array( - \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::colorPicker() + ['netzmacht.contao_toolkit.dca.listeners.color_picker', 'handleWizardCallback'], ), 'eval' => array( 'tl_class' => 'clr w50 wizard', From 47713e8a38fc7fee69fd8df29f26725cda5a6c3d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:35:42 +0200 Subject: [PATCH 038/152] Replace the template options callback with toolkit 3.0 listener. --- src/Resources/contao/dca/tl_content.php | 7 ++++++- src/Resources/contao/dca/tl_module.php | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php index 29b6533..1cb40be 100644 --- a/src/Resources/contao/dca/tl_content.php +++ b/src/Resources/contao/dca/tl_content.php @@ -71,10 +71,15 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_template'] = array( 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_template'], 'inputType' => 'select', 'exclude' => true, - 'options_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::getTemplates('leaflet_map_js'), + 'options_callback' => ['netzmacht.contao_toolkit.dca.listeners.template_options', 'handleOptionsCallback'], 'eval' => array( 'tl_class' => 'w50', 'chosen' => true, ), + 'toolkit' => [ + 'template_options' => [ + 'prefix' => 'leaflet_map_js' + ] + ], 'sql' => "varchar(64) NOT NULL default ''" ); diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php index ca1cf5f..a48bacd 100644 --- a/src/Resources/contao/dca/tl_module.php +++ b/src/Resources/contao/dca/tl_module.php @@ -71,10 +71,15 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_template'] = array( 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_template'], 'inputType' => 'select', 'exclude' => true, - 'options_callback' => \Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory::getTemplates('leaflet_map_js'), + 'options_callback' => ['netzmacht.contao_toolkit.dca.listeners.template_options', 'handleOptionsCallback'], 'eval' => array( 'tl_class' => 'w50', 'chosen' => true, ), + 'toolkit' => [ + 'template_options' => [ + 'prefix' => 'leaflet_map_js' + ] + ], 'sql' => "varchar(64) NOT NULL default ''" ); From b82b0109371dace9a66381b01ffda017fc09c5a5 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:38:43 +0200 Subject: [PATCH 039/152] Load language file in the onload callback. --- src/Listener/Dca/LeafletDcaListener.php | 11 +++++++++++ src/Resources/contao/dca/tl_leaflet_control.php | 5 +++-- src/Resources/contao/dca/tl_leaflet_layer.php | 8 +++----- src/Resources/contao/dca/tl_leaflet_map.php | 4 +--- src/Resources/contao/dca/tl_leaflet_vector.php | 4 +--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/Listener/Dca/LeafletDcaListener.php b/src/Listener/Dca/LeafletDcaListener.php index 911afdf..99d89c8 100644 --- a/src/Listener/Dca/LeafletDcaListener.php +++ b/src/Listener/Dca/LeafletDcaListener.php @@ -12,6 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; +use Contao\Controller; use Contao\DataContainer; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\LeafletPHP\Value\LatLng; @@ -50,6 +51,16 @@ class LeafletDcaListener $this->cacheDir = $cacheDir; } + /** + * Load the language files. + * + * @return void + */ + public function loadLanguageFile(): void + { + Controller::loadLanguageFile('leaflet'); + } + /** * Create the zoom range. * diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 08bf1dd..3e38885 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -10,8 +10,6 @@ * @filesource */ -\Controller::loadLanguageFile('leaflet'); - $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ( 'config' => array( @@ -26,6 +24,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'pid' => 'index', ) ), + 'onload_callback' => array( + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], + ), 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 2e5f3d5..17e1504 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -25,11 +25,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'alias' => 'unique', ], ], - 'onload_callback' => [ - function () { - \Controller::loadLanguageFile('leaflet'); - }, - ], + 'onload_callback' => array( + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], + ), 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 173c0ed..1bbfb05 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -25,9 +25,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array ) ), 'onload_callback' => array( - function () { - \Controller::loadLanguageFile('leaflet'); - } + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], ), 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index d70f973..b5c969c 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -26,9 +26,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array ) ), 'onload_callback' => array( - function () { - \Controller::loadLanguageFile('leaflet'); - } + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], ), 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], From bc425ea7723e18b74958b781c7975dade18d15d5 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:40:44 +0200 Subject: [PATCH 040/152] Code style. --- src/Listener/Dca/ControlDcaListener.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index 8c36033..29f199d 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -12,6 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; +use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; @@ -109,8 +110,8 @@ class ControlDcaListener extends AbstractListener { $query = 'SELECT lid As layer, mode FROM tl_leaflet_control_layer WHERE cid=:cid ORDER BY sorting'; $statement = $this->connection->prepare($query); - $statement->bindValue('cid', $dataContainer->id); + $statement->bindValue('cid', $dataContainer->id); $statement->execute(); return $statement->fetchAll(); @@ -126,9 +127,9 @@ class ControlDcaListener extends AbstractListener */ public function saveLayerRelations($layers, $dataContainer) { - $new = deserialize($layers, true); - $values = array(); - $query = 'SELECT * FROM tl_leaflet_control_layer WHERE cid=:cid order BY sorting'; + $new = StringUtil::deserialize($layers, true); + $values = []; + $query = 'SELECT * FROM tl_leaflet_control_layer WHERE cid=:cid order BY sorting'; $statement = $this->connection->prepare($query); $statement->bindValue('cid', $dataContainer->id); From 2c88d7aec54b1ef3fd8f57bf552aaeca780f65bf Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:54:58 +0200 Subject: [PATCH 041/152] Add module factories. --- .../{ => ContentElement}/MapElement.php | 6 +- .../ContentElement/MapElementFactory.php | 69 +++++++++++++++++++ src/Frontend/{ => Module}/MapModule.php | 6 +- src/Frontend/Module/MapModuleFactory.php | 69 +++++++++++++++++++ src/Resources/config/services.yml | 14 ++++ 5 files changed, 160 insertions(+), 4 deletions(-) rename src/Frontend/{ => ContentElement}/MapElement.php (84%) create mode 100644 src/Frontend/ContentElement/MapElementFactory.php rename src/Frontend/{ => Module}/MapModule.php (84%) create mode 100644 src/Frontend/Module/MapModuleFactory.php diff --git a/src/Frontend/MapElement.php b/src/Frontend/ContentElement/MapElement.php similarity index 84% rename from src/Frontend/MapElement.php rename to src/Frontend/ContentElement/MapElement.php index 5e0c46c..72eb6fa 100644 --- a/src/Frontend/MapElement.php +++ b/src/Frontend/ContentElement/MapElement.php @@ -12,7 +12,9 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet\Frontend; +namespace Netzmacht\Contao\Leaflet\Frontend\ContentElement; + +use Netzmacht\Contao\Leaflet\Frontend\AbstractMapHybrid; /** * The content element for the leaflet map. @@ -36,7 +38,7 @@ class MapElement extends AbstractMapHybrid protected function getIdentifier(): string { if ($this->get('leaflet_mapId')) { - return $this->get('leaflet_mapId'); + return (string) $this->get('leaflet_mapId'); } if ($this->get('cssID')[0]) { diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php new file mode 100644 index 0000000..30e525d --- /dev/null +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -0,0 +1,69 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Frontend\ContentElement; + +use Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElement; +use Netzmacht\Contao\Toolkit\Component\Component; +use Netzmacht\Contao\Toolkit\Component\ComponentFactory; +use Psr\Container\ContainerInterface as Container; + +/** + * Class MapElementFactory + * + * @package Netzmacht\Contao\Leaflet\Frontend\ContentElement + */ +class MapElementFactory implements ComponentFactory +{ + /** + * Dependency container. + * + * @var Container + */ + private $container; + + /** + * MapElementFactory constructor. + * + * @param Container $container Dependency container. + */ + public function __construct(Container $container) + { + $this->container = $container; + } + + /** + * {@inheritDoc} + */ + public function supports($model): bool + { + return $model->type === 'leaflet'; + } + + /** + * {@inheritDoc} + */ + public function create($model, string $column): Component + { + return new MapElement( + $model, + $this->container->get('netzmacht.contao_toolkit.view.template_factory'), + $this->container->get('translator'), + $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), + $this->container->get('netzmacht.contao_toolkit.contao.input'), + $this->container->get('netzmacht.contao_toolkit.contao.config'), + $column + ); + } +} diff --git a/src/Frontend/MapModule.php b/src/Frontend/Module/MapModule.php similarity index 84% rename from src/Frontend/MapModule.php rename to src/Frontend/Module/MapModule.php index 8f47ebe..f3239f3 100644 --- a/src/Frontend/MapModule.php +++ b/src/Frontend/Module/MapModule.php @@ -12,7 +12,9 @@ declare(strict_types=1); -namespace Netzmacht\Contao\Leaflet\Frontend; +namespace Netzmacht\Contao\Leaflet\Frontend\Module; + +use Netzmacht\Contao\Leaflet\Frontend\AbstractMapHybrid; /** * The frontend module for the Leaflet map. @@ -36,7 +38,7 @@ class MapModule extends AbstractMapHybrid protected function getIdentifier(): string { if ($this->get('leaflet_mapId')) { - return $this->get('leaflet_mapId'); + return (string) $this->get('leaflet_mapId'); } if ($this->get('cssID')[0]) { diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php new file mode 100644 index 0000000..9622258 --- /dev/null +++ b/src/Frontend/Module/MapModuleFactory.php @@ -0,0 +1,69 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Frontend\Module; + +use Netzmacht\Contao\Leaflet\Frontend\Module\MapModule; +use Netzmacht\Contao\Toolkit\Component\Component; +use Netzmacht\Contao\Toolkit\Component\ComponentFactory; +use Psr\Container\ContainerInterface as Container; + +/** + * Class MapElementFactory + * + * @package Netzmacht\Contao\Leaflet\Frontend\ContentElement + */ +class MapModuleFactory implements ComponentFactory +{ + /** + * Dependency container. + * + * @var Container + */ + private $container; + + /** + * MapModuleFactory constructor. + * + * @param Container $container Dependency container. + */ + public function __construct(Container $container) + { + $this->container = $container; + } + + /** + * {@inheritDoc} + */ + public function supports($model): bool + { + return $model->type === 'leaflet'; + } + + /** + * {@inheritDoc} + */ + public function create($model, string $column): Component + { + return new MapModule( + $model, + $this->container->get('netzmacht.contao_toolkit.view.template_factory'), + $this->container->get('translator'), + $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), + $this->container->get('netzmacht.contao_toolkit.contao.input'), + $this->container->get('netzmacht.contao_toolkit.contao.config'), + $column + ); + } +} diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index 66f1e17..5527eb4 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -73,3 +73,17 @@ services: class: Netzmacht\Contao\Leaflet\Alias\ParentAliasGeneratorFactory arguments: - '@database_connection' + + netzmacht.contao_leaflet_maps.frontend.element_factory: + class: Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElementFactory + arguments: + - '@service_container' + tags: + - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } + + netzmacht.contao_leaflet_maps.frontend.module_factory: + class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory + arguments: + - '@service_container' + tags: + - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } From 25e3e0d5fb5b81ceb6417d6a304b596129bf5cd1 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:58:31 +0200 Subject: [PATCH 042/152] Register geo json subscriber. --- src/Resources/config/listeners.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 7120107..e49b95e 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -47,3 +47,10 @@ services: class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' + + netzmacht.contao_leaflet_maps.listeners.geo_json_subscriber: + class: Netzmacht\Contao\Leaflet\Subscriber\GeoJsonSubscriber + arguments: + - '%netzmacht.contao_leaflet_maps.feature_model_properties%' + tags: + - { name: 'kernel.event_subscriber' } From aa524478e6d16e95af65607a10f039629c7d3523 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 14:58:56 +0200 Subject: [PATCH 043/152] Drop old services.php. --- src/Resources/contao/config/services.php | 352 ----------------------- 1 file changed, 352 deletions(-) delete mode 100644 src/Resources/contao/config/services.php diff --git a/src/Resources/contao/config/services.php b/src/Resources/contao/config/services.php deleted file mode 100644 index e2d128b..0000000 --- a/src/Resources/contao/config/services.php +++ /dev/null @@ -1,352 +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 - */ - -use Doctrine\Common\Cache\ArrayCache; -use Doctrine\Common\Cache\FilesystemCache; -use Interop\Container\ContainerInterface; -use Netzmacht\Contao\Leaflet\Alias\DefaultAliasFilter; -use Netzmacht\Contao\Leaflet\Boot; -use Netzmacht\Contao\Leaflet\ContaoAssets; -use Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener; -use Netzmacht\Contao\Leaflet\Dca\FrontendIntegration; -use Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener; -use Netzmacht\Contao\Leaflet\Dca\LeafletCallbacks; -use Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener; -use Netzmacht\Contao\Leaflet\Dca\Validator; -use Netzmacht\Contao\Leaflet\Dca\VectorCallbacks; -use Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices; -use Netzmacht\Contao\Leaflet\Frontend\MapElement; -use Netzmacht\Contao\Leaflet\Frontend\MapModule; -use Netzmacht\Contao\Leaflet\Frontend\ValueFilter; -use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\MapProvider; -use Netzmacht\Contao\Leaflet\Subscriber\BootSubscriber; -use Netzmacht\Contao\Leaflet\Subscriber\GeoJsonSubscriber; -use Netzmacht\Contao\Toolkit\Data\Alias\Filter\ExistingAliasFilter; -use Netzmacht\Contao\Toolkit\Data\Alias\Filter\SlugifyFilter; -use Netzmacht\Contao\Toolkit\Data\Alias\Filter\SuffixFilter; -use Netzmacht\Contao\Toolkit\Data\Alias\FilterBasedAliasGenerator; -use Netzmacht\Contao\Toolkit\Data\Alias\Validator\UniqueDatabaseValueValidator; -use Netzmacht\Contao\Toolkit\DependencyInjection\Services; -use Netzmacht\JavascriptBuilder\Builder; -use Netzmacht\JavascriptBuilder\Encoder\ChainEncoder; -use Netzmacht\JavascriptBuilder\Encoder\JavascriptEncoder; -use Netzmacht\JavascriptBuilder\Encoder\MultipleObjectsEncoder; -use Netzmacht\JavascriptBuilder\Flags; -use Netzmacht\JavascriptBuilder\Output; -use Netzmacht\JavascriptBuilder\Symfony\EventDispatchingEncoder; -use Netzmacht\LeafletPHP\Leaflet; -use Symfony\Component\EventDispatcher\EventDispatcher; - -/** @var \Pimple $container */ -// @codingStandardsIgnoreStart -global $container; -// @codingStandardsIgnoreEnd - -/* - * Leaflet map provider is a simply api entry to to get the leaflet map from the database. - */ - -$container[LeafletServices::MAP_PROVIDER] = $container->share(function ($container) { - return new MapProvider( - $container[LeafletServices::DEFINITION_MAPPER], - $container[LeafletServices::DEFINITION_BUILDER], - $container[Services::EVENT_DISPATCHER], - $container[Services::INPUT], - $container[LeafletServices::MAP_ASSETS], - $container[LeafletServices::CACHE], - $GLOBALS['LEAFLET_FILTERS'], - \Config::get('debugMode') || \Config::get('displayErrors') - ); -}); - -/* - * Contao assets handler. Loads Leaflet assets as contao (static) assets. - */ - -$container[LeafletServices::MAP_ASSETS] = $container->share(function ($container) { - return new ContaoAssets($container[Services::ASSETS_MANAGER]); -}); - -/* - * The leaflet boot. - */ - -$container[LeafletServices::BOOT] = $container->share(function ($container) { - return new Boot($container[Services::EVENT_DISPATCHER]); -}); - -$container['leaflet.boot.subscriber'] = $container->share(function ($container) { - return new BootSubscriber( - $container[LeafletServices::MAP_ASSETS], - $GLOBALS['LEAFLET_MAPPERS'], - $GLOBALS['LEAFLET_ENCODERS'], - $GLOBALS['LEAFLET_LIBRARIES'] - ); -}); - - -/* - * The definition mapper. - */ - -$container[LeafletServices::DEFINITION_MAPPER] = $container->share(function ($container) { - /** @var Boot $boot */ - $boot = $container[LeafletServices::BOOT]; - $mapper = new DefinitionMapper($container[Services::EVENT_DISPATCHER]); - - return $boot->initializeDefinitionMapper($mapper); -}); - - -/* - * The local event dispatcher is used for the leaflet javascript encoding system. - */ - -$container[LeafletServices::DEFINITION_BUILDER_EVENT_DISPATCHER] = $container->share(function ($container) { - /** @var Boot $boot */ - $boot = $container[LeafletServices::BOOT]; - $dispatcher = new EventDispatcher(); - - return $boot->initializeEventDispatcher($dispatcher); -}); - -/* - * The javascript encoder factory being used for building the map javascript. - */ - -$container[LeafletServices::DEFINITION_ENCODER_FACTORY] = function ($container) { - $dispatcher = $container[LeafletServices::DEFINITION_BUILDER_EVENT_DISPATCHER]; - - return function (Output $output) use ($dispatcher) { - $encoder = new ChainEncoder(); - $encoder - ->register(new MultipleObjectsEncoder()) - ->register(new EventDispatchingEncoder($dispatcher)) - ->register(new JavascriptEncoder($output, JSON_UNESCAPED_SLASHES)); - - return $encoder; - }; -}; - -/* - * The leaflet builder transforms the definition to javascript. - */ - -$container[LeafletServices::DEFINITION_BUILDER] = $container->share(function ($container) { - /** @var Boot $boot */ - $boot = $container[LeafletServices::BOOT]; - $dispatcher = $container[LeafletServices::DEFINITION_BUILDER_EVENT_DISPATCHER]; - $factory = $container[LeafletServices::DEFINITION_ENCODER_FACTORY]; - - $builder = new Builder($factory); - $leaflet = new Leaflet($builder, $dispatcher, array(), (JSON_UNESCAPED_SLASHES ^ Flags::BUILD_STACK)); - - return $boot->initializeLeafletBuilder($leaflet); -}); - -$container[LeafletServices::FRONTEND_VALUE_FILTER] = $container->share(function ($container) { - return new ValueFilter($container[Services::INSERT_TAG_REPLACER]); -}); - -/* - * Internal used leaflet cache. - */ - -$container[LeafletServices::CACHE] = $container->share( - function ($container) { - if ($container[Services::PRODUCTION_MODE]) { - return new FilesystemCache(TL_ROOT . '/system/cache/leaflet'); - } else { - return new ArrayCache(); - } - } -); - -/* - * Leaflet alias generator. - */ - -$container[LeafletServices::ALIAS_GENERATOR] = $container->share( - function ($container) { - return function ($dataContainerName, $aliasField, $fields) use ($container) { - $filters = [ - new ExistingAliasFilter(), - new SlugifyFilter($fields), - new DefaultAliasFilter($dataContainerName), - new SuffixFilter(), - ]; - - $validator = new UniqueDatabaseValueValidator( - $container[Services::DATABASE_CONNECTION], - $dataContainerName, - $aliasField - ); - - return new FilterBasedAliasGenerator($filters, $validator, $dataContainerName, $aliasField, '_'); - }; - } -); - -/* - * Leaflet alias generator. - * @return \Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator - */ - -$container[LeafletServices::PARENT_ALIAS_GENERATOR] = $container->share( - function ($container) { - return function ($dataContainerName, $aliasField, $fields) use ($container) { - $filters = [ - new ExistingAliasFilter(), - new SlugifyFilter($fields), - new DefaultAliasFilter($dataContainerName), - new SuffixFilter(), - ]; - - $validator = new UniqueDatabaseValueValidator( - $container[Services::DATABASE_CONNECTION], - $dataContainerName, - $aliasField, - ['pid'] - ); - - return new FilterBasedAliasGenerator($filters, $validator, $dataContainerName, $aliasField, '_'); - }; - } -); - -/* - * Callback helper class for tl_leaflet_map. - */ - -$container['leaflet.dca.map-callbacks'] = $container->share( - function ($container) { - return new MapDcaListener( - $container[Services::DCA_MANAGER], - $container[Services::DATABASE_CONNECTION] - ); - } -); - -/* - * Callback helper class for tl_leaflet_layer. - */ - -$container['leaflet.dca.layer-callbacks'] = $container->share( - function ($container) { - return new LayerDcaListener( - $container[Services::DCA_MANAGER], - $container[Services::DATABASE_CONNECTION], - $container[Services::TRANSLATOR], - $GLOBALS['LEAFLET_LAYERS'], - $GLOBALS['LEAFLET_TILE_PROVIDERS'], - require TL_ROOT . '/system/modules/leaflet/config/leaflet_amenities.php' - ); - } -); - -/* - * Callback helper class for tl_leaflet_control. - */ - -$container['leaflet.dca.control-callbacks'] = $container->share( - function ($container) { - return new ControlDcaListener( - $container[Services::DCA_MANAGER], - $container[Services::DATABASE_CONNECTION] - ); - } -); - -/* - * Callback helper class for tl_leaflet_control. - */ - -$container['leaflet.dca.vector-callbacks'] = $container->share( - function ($container) { - return new VectorCallbacks($container[Services::DCA_MANAGER]); - } -); - -/* - * Callback helper class for frontend integration. - */ - -$container['leaflet.dca.frontend-integration'] = $container->share( - function ($container) { - return new FrontendIntegration( - $container[Services::TRANSLATOR] - ); - } -); - -/* - * Common callback helpers. - */ - -$container['leaflet.dca.common'] = $container->share( - function ($container) { - return new LeafletCallbacks( - $container[Services::FILE_SYSTEM] - ); - } -); - -/* - * Validator helper class. - */ - -$container['leaflet.dca.validator'] = $container->share( - function ($container) { - return new Validator( - $container[Services::TRANSLATOR] - ); - } -); - -/* - * Component factory for content element. - */ - -$container[Services::CONTENT_ELEMENTS_MAP]['leaflet'] = function ($model, $column, ContainerInterface $container) { - return new MapElement( - $model, - $container->get(Services::TEMPLATE_FACTORY), - $container->get(Services::TRANSLATOR), - $container->get(LeafletServices::MAP_PROVIDER), - $container->get(Services::INPUT), - $container->get(Services::CONFIG), - $column - ); -}; - -/* - * Component factory for frontend module. - */ - -$container[Services::MODULES_MAP]['leaflet'] = function ($model, $column, ContainerInterface $container) { - return new MapModule( - $model, - $container->get(Services::TEMPLATE_FACTORY), - $container->get(Services::TRANSLATOR), - $container->get(LeafletServices::MAP_PROVIDER), - $container->get(Services::INPUT), - $container->get(Services::CONFIG), - $column - ); -}; - -$container['leaflet.subscriber.geo-json'] = $container->share(function () { - return new GeoJsonSubscriber( - $GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES'] - ); -}); From e513edcd3b00bc805e7c8c0bd673e1afbb691c3a Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:00:56 +0200 Subject: [PATCH 044/152] Use Contao vendor namespace. --- src/Frontend/AbstractMapHybrid.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index c7c71f1..ac83fb6 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -14,8 +14,11 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend; -use Database\Result; -use Model\Collection; +use Contao\Config; +use Contao\Database\Result; +use Contao\Input; +use Contao\Model; +use Contao\Model\Collection; use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid; @@ -53,21 +56,21 @@ abstract class AbstractMapHybrid extends AbstractHybrid /** * HybridTrait constructor. * - * @param Result|\Model|Collection $model Component model. - * @param TemplateFactory $templateFactory Template factory. - * @param Translator $translator Translator. - * @param MapProvider $mapProvider Map provider. - * @param \Input $input Request Input. - * @param \Config $config Config. - * @param string $column Column in which the element appears. + * @param Result|Model|Collection $model Component model. + * @param TemplateFactory $templateFactory Template factory. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param Input $input Request Input. + * @param Config $config Config. + * @param string $column Column in which the element appears. */ public function __construct( $model, TemplateFactory $templateFactory, Translator $translator, MapProvider $mapProvider, - \Input $input, - \Config $config, + Input $input, + Config $config, $column = null ) { parent::__construct($model, $templateFactory, $translator, $column); From 0a76a5450fc9b0a49ded903e27f4d4dff0c2ef05 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:04:04 +0200 Subject: [PATCH 045/152] Clean config.php. --- src/Resources/contao/config/config.php | 338 +------------------------ 1 file changed, 13 insertions(+), 325 deletions(-) diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index f65811b..55db360 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -10,6 +10,9 @@ * @filesource */ +use Netzmacht\Contao\Toolkit\Component\ContentElement\ContentElementDecorator; +use Netzmacht\Contao\Toolkit\Component\Module\ModuleDecorator; + /* * Backend module. */ @@ -59,340 +62,25 @@ array_insert( * Content elements. */ -$GLOBALS['TL_CTE']['includes']['leaflet'] = 'Netzmacht\Contao\Toolkit\Component\ContentElement\ContentElementDecorator'; +$GLOBALS['TL_CTE']['includes']['leaflet'] = ContentElementDecorator::class; /* * Frontend modules */ -$GLOBALS['FE_MOD']['includes']['leaflet'] = 'Netzmacht\Contao\Toolkit\Component\Module\ModuleDecorator'; +$GLOBALS['FE_MOD']['includes']['leaflet'] = ModuleDecorator::class; /* * Models. */ -$GLOBALS['TL_MODELS']['tl_leaflet_control'] = 'Netzmacht\Contao\Leaflet\Model\ControlModel'; -$GLOBALS['TL_MODELS']['tl_leaflet_icon'] = 'Netzmacht\Contao\Leaflet\Model\IconModel'; -$GLOBALS['TL_MODELS']['tl_leaflet_layer'] = 'Netzmacht\Contao\Leaflet\Model\LayerModel'; -$GLOBALS['TL_MODELS']['tl_leaflet_map'] = 'Netzmacht\Contao\Leaflet\Model\MapModel'; -$GLOBALS['TL_MODELS']['tl_leaflet_marker'] = 'Netzmacht\Contao\Leaflet\Model\MarkerModel'; -$GLOBALS['TL_MODELS']['tl_leaflet_popup'] = 'Netzmacht\Contao\Leaflet\Model\PopupModel'; -$GLOBALS['TL_MODELS']['tl_leaflet_style'] = 'Netzmacht\Contao\Leaflet\Model\StyleModel'; -$GLOBALS['TL_MODELS']['tl_leaflet_vector'] = 'Netzmacht\Contao\Leaflet\Model\VectorModel'; - - -/* - * Leaflet mappers. - * - * Mappers do the translations between the database models and the leaflet definition. - */ - -$GLOBALS['LEAFLET_MAPPERS'] = array(); -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\MapMapper'; - -// Layer mappers. -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Layer\TileLayerMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new \Netzmacht\Contao\Leaflet\Mapper\Layer\ProviderLayerMapper( - $GLOBALS['LEAFLET_TILE_PROVIDERS'] - ); -}; - -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Layer\MarkersLayerMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Layer\GroupLayerMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Layer\VectorsLayerMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Layer\ReferenceLayerMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Layer\OverpassLayerMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new \Netzmacht\Contao\Leaflet\Mapper\Layer\MarkerClusterLayerMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::MAP_ASSETS] - ); -}; - -// Control mappers. -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Control\ZoomControlMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Control\ScaleControlMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Control\LayersControlMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Control\AttributionControlMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Control\LoadingControlMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Control\FullscreenControlMapper'; - -// Vector mappers. -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new Netzmacht\Contao\Leaflet\Mapper\Vector\PolylineMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolylineMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new Netzmacht\Contao\Leaflet\Mapper\Vector\PolygonMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolygonMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMarkerMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new Netzmacht\Contao\Leaflet\Mapper\Vector\RectangleMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; - -// Miscellaneous mappers. -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\UI\PopupMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Type\DivIconMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Type\ExtraMarkersIconMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = 'Netzmacht\Contao\Leaflet\Mapper\Style\FixedStyleMapper'; -$GLOBALS['LEAFLET_MAPPERS'][] = function () { - return new \Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper( - $GLOBALS['container'][\Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::FRONTEND_VALUE_FILTER] - ); -}; - -/* - * Leaflet encoders. - * - * The encoders transforms the definitions into javascript. The encoders has to be an implementation of the - * EventDispatcherInterface of the event dispatcher. - * - * You can define the encoders using the syntax of the cca event dispatcher implementation. - * - * @see https://github.com/contao-community-alliance/event-dispatcher#event-subscriber-per-configuration - */ - -$GLOBALS['LEAFLET_ENCODERS'] = array(); -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\MapEncoder'; -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\ControlEncoder'; -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\GroupEncoder'; -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\RasterEncoder'; -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\VectorEncoder'; -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\UIEncoder'; -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\LeafletPHP\Encoder\TypeEncoder'; -$GLOBALS['LEAFLET_ENCODERS'][] = 'Netzmacht\Contao\Leaflet\Subscriber\EncoderSubscriber'; - -/* - * Leaflet layer types. - * - * The type is used for the database driven definitions. - */ - -$GLOBALS['LEAFLET_LAYERS'] = array -( - 'provider' => array - ( - 'children' => false, - 'icon' => 'system/modules/leaflet/assets/img/provider.png', - 'label' => function ($row, $label) { - if (!empty($GLOBALS['TL_LANG']['leaflet_provider'][$row['tile_provider']][0])) { - $provider = $GLOBALS['TL_LANG']['leaflet_provider'][$row['tile_provider']][0]; - } else { - $provider = $row['tile_provider']; - } - - $label .= sprintf(' (%s)', $provider); - - return $label; - } - ), - 'group' => array - ( - 'children' => true, - 'icon' => 'system/modules/leaflet/assets/img/group.png', - ), - 'markers' => array - ( - 'children' => false, - 'icon' => 'system/modules/leaflet/assets/img/markers.png', - 'markers' => true, - 'boundsMode' => array( - 'extend' => true, - 'fit' => 'deferred' - ), - 'label' => function ($row, $label) { - $count = \Netzmacht\Contao\Leaflet\Model\MarkerModel::countBy('pid', $row['id']); - $label .= sprintf( - ' (%s %s)', - $count, - $GLOBALS['TL_LANG']['tl_leaflet_layer']['countEntries'] - ); - - return $label; - } - ), - 'vectors' => array - ( - 'children' => false, - 'icon' => 'system/modules/leaflet/assets/img/vectors.png', - 'vectors' => true, - 'boundsMode' => array( - 'extend' => true, - ), - 'label' => function ($row, $label) { - $count = \Netzmacht\Contao\Leaflet\Model\VectorModel::countBy('pid', $row['id']); - $label .= sprintf( - ' (%s %s)', - $count, - $GLOBALS['TL_LANG']['tl_leaflet_layer']['countEntries'] - ); - - return $label; - } - ), - 'reference' => array - ( - 'children' => false, - 'icon' => 'system/modules/leaflet/assets/img/reference.png', - 'label' => function ($row, $label) { - $reference = \Netzmacht\Contao\Leaflet\Model\LayerModel::findByPk($row['reference']); - - if ($reference) { - $label .= ' (' . $reference->title . ')'; - } - - return $label; - } - ), - 'markercluster' => array - ( - 'children' => true, - 'icon' => 'system/modules/leaflet/assets/img/cluster.png', - ), - 'tile' => array( - 'children' => false, - 'icon' => 'system/modules/leaflet/assets/img/tile.png', - ), - 'overpass' => array( - 'children' => false, - 'icon' => 'system/modules/leaflet/assets/img/overpass.png', - 'label' => function ($row, $label) { - if ($row['overpassQuery']) { - $label .= ' ' . \StringUtil::substr($row['overpassQuery'], 50) . ''; - } - - return $label; - }, - 'boundsMode' => array( - 'extend' => true, - 'fit' => true, - ), - ), -); - -/* - * leaflet controls. - * - * Supported leaflet control types. Register your type for the database driven definition here. - */ - -$GLOBALS['LEAFLET_CONTROLS'] = array('zoom', 'layers', 'scale', 'attribution', 'loading', 'fullscreen'); - - -/* - * Leaflet icons. - * - * Supported leaflet icon types. Register you type for the database driven definition here. - */ - -$GLOBALS['LEAFLET_ICONS'] = array('image', 'div', 'extra'); - - -/* - * The style concept is not part of the LeafletJS library. Styles are extracted from the Path options. Instead - * of defining the style for every vector again, manage them at one place. - * - * The goal is to provide different style strategies. For instance a random style chooser, one which uses a color - * range and so one. - */ - -$GLOBALS['LEAFLET_STYLES'] = array('fixed'); - -/* - * Leaflet vectors. - * - * Supported leaflet vector types. Register you type for the database driven definition here. - */ - -$GLOBALS['LEAFLET_VECTORS'] = array -( - 'polyline', - 'polygon', - 'multiPolyline', - 'multiPolygon', - 'rectangle', - 'circle', - 'circleMarker' -); - - -/* - * Leaflet tile layer providers. - */ - -require_once TL_ROOT . '/system/modules/leaflet/config/leaflet_providers.php'; - -/* - * Leaflet assets. - * - * The leaflet definition are aware of the required javascript libraries. Register the assets so that they are - * loaded automatically. - * - * Each entry is an array of 2 values. The first is the resource. The second is a type. Supported types are: - * - url: An valid url. - * - file: An file path relative to the Contao Root. - * - source: Inline css/javascript. - * - * You don't have to define it as array if you simply add a file. Do not add |static and or media type flag to it. - * It's getting added by default if not being in debug mode. - */ - -if (!isset($GLOBALS['LEAFLET_LIBRARIES'])) { - $GLOBALS['LEAFLET_LIBRARIES'] = array(); -} - -/* - * When creating a GeoJSON feature of a map object a feature.properties.model object is passed. - * Define the properties you always want to set. - * - * For more control you can subscribe the ConvertToGeoJsonEvent. - * - * The entry can be a string or an array. If an array is passed, the 2nd value is the type. Following types - * are supported. - * - array: Use deserialize before adding the value - * - file: Thread value a uuid and find the path. - * - files: Thread values as a list of file uuids and get an array of paths. - */ - -$GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_marker'][] = 'id'; -$GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_marker'][] = 'title'; -$GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_marker'][] = 'alias'; - -$GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_vector'][] = 'id'; -$GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_vector'][] = 'title'; -$GLOBALS['LEAFLET_FEATURE_MODEL_PROPERTIES']['tl_leaflet_vector'][] = 'alias'; - - -/* - * Filters can be passed to a data request to get only specific data from a layer. - */ - -$GLOBALS['LEAFLET_FILTERS']['bbox'] = 'Netzmacht\Contao\Leaflet\Filter\BboxFilter'; -$GLOBALS['LEAFLET_FILTERS']['distance'] = 'Netzmacht\Contao\Leaflet\Filter\DistanceFilter'; +$GLOBALS['TL_MODELS']['tl_leaflet_control'] = \Netzmacht\Contao\Leaflet\Model\ControlModel::class; +$GLOBALS['TL_MODELS']['tl_leaflet_icon'] = \Netzmacht\Contao\Leaflet\Model\IconModel::class; +$GLOBALS['TL_MODELS']['tl_leaflet_layer'] = \Netzmacht\Contao\Leaflet\Model\LayerModel::class; +$GLOBALS['TL_MODELS']['tl_leaflet_map'] = \Netzmacht\Contao\Leaflet\Model\MapModel::class; +$GLOBALS['TL_MODELS']['tl_leaflet_marker'] = \Netzmacht\Contao\Leaflet\Model\MarkerModel::class; +$GLOBALS['TL_MODELS']['tl_leaflet_popup'] = \Netzmacht\Contao\Leaflet\Model\PopupModel::class; +$GLOBALS['TL_MODELS']['tl_leaflet_style'] = \Netzmacht\Contao\Leaflet\Model\StyleModel::class; +$GLOBALS['TL_MODELS']['tl_leaflet_vector'] = \Netzmacht\Contao\Leaflet\Model\VectorModel::class; From 8a240ab0ff0d8a4978e780c0d8b207893fe6868a Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:06:35 +0200 Subject: [PATCH 046/152] Adjust assets path. --- src/Resources/contao/config/config.php | 12 ++++++------ src/Resources/contao/dca/tl_leaflet_icon.php | 6 +++--- src/Resources/contao/dca/tl_leaflet_layer.php | 8 ++++---- src/Resources/contao/dca/tl_leaflet_map.php | 2 +- src/Resources/contao/dca/tl_leaflet_marker.php | 4 ++-- src/Resources/contao/dca/tl_leaflet_popup.php | 6 +++--- src/Resources/contao/dca/tl_leaflet_style.php | 6 +++--- src/Resources/contao/dca/tl_leaflet_vector.php | 4 ++-- .../contao/templates/be_leaflet_about.html5 | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index 55db360..9dda154 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -30,8 +30,8 @@ array_insert( 'tl_leaflet_map', 'tl_leaflet_control', ), - 'icon' => 'system/modules/leaflet/assets/img/map.png', - 'stylesheet' => 'system/modules/leaflet/assets/css/backend.css', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/map.png', + 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/backend.css', ), 'leaflet_layer' => array ( @@ -44,14 +44,14 @@ array_insert( 'tl_leaflet_style', 'tl_leaflet_popup', ), - 'icon' => 'system/modules/leaflet/assets/img/layers.png', - 'stylesheet' => 'system/modules/leaflet/assets/css/backend.css', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', + 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/backend.css', ), 'leaflet_about' => array ( 'callback' => 'Netzmacht\Contao\Leaflet\Backend\About', - 'icon' => 'system/modules/leaflet/assets/img/about.png', - 'stylesheet' => 'system/modules/leaflet/assets/css/about.css', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/about.png', + 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/about.css', ) ) ) diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index b1f681d..17be690 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -49,21 +49,21 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['layersBtn'], 'href' => 'table=tl_leaflet_layer', - 'icon' => 'system/modules/leaflet/assets/img/layers.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' ), 'styles' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['styles'], 'href' => 'table=tl_leaflet_style', - 'icon' => 'system/modules/leaflet/assets/img/style.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'popups' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['popups'], 'href' => 'table=tl_leaflet_popup', - 'icon' => 'system/modules/leaflet/assets/img/popup.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'all' => array diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 17e1504..9a70e95 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -37,7 +37,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'mode' => 5, 'fields' => ['title'], 'flag' => 1, - 'icon' => 'system/modules/leaflet/assets/img/layers.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', 'panelLayout' => 'filter;search,limit', 'paste_button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getPasteButtons'], ], @@ -50,19 +50,19 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'styles' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'], 'href' => 'table=tl_leaflet_style', - 'icon' => 'system/modules/leaflet/assets/img/style.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', 'attributes' => 'onclick="Backend.getScrollOffset();"', ], 'icons' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'], 'href' => 'table=tl_leaflet_icon', - 'icon' => 'system/modules/leaflet/assets/img/icons.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', 'attributes' => 'onclick="Backend.getScrollOffset();"', ], 'popups' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'], 'href' => 'table=tl_leaflet_popup', - 'icon' => 'system/modules/leaflet/assets/img/popup.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', 'attributes' => 'onclick="Backend.getScrollOffset();"', ], 'all' => [ diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 1bbfb05..63dc70c 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -68,7 +68,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'], 'href' => 'table=tl_leaflet_control', - 'icon' => 'system/modules/leaflet/assets/img/control.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/control.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' ), 'copy' => array diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index dda7d75..5ccc567 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -55,14 +55,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icons'], 'href' => 'table=tl_leaflet_icon&id=', - 'icon' => 'system/modules/leaflet/assets/img/icons.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' ), 'popups' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popups'], 'href' => 'table=tl_leaflet_popup', - 'icon' => 'system/modules/leaflet/assets/img/popup.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'all' => array diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index 2269ec0..1b595cc 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -49,21 +49,21 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn'], 'href' => 'table=tl_leaflet_layer', - 'icon' => 'system/modules/leaflet/assets/img/layers.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' ), 'styles' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'], 'href' => 'table=tl_leaflet_style', - 'icon' => 'system/modules/leaflet/assets/img/style.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'icons' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'], 'href' => 'table=tl_leaflet_icon', - 'icon' => 'system/modules/leaflet/assets/img/icons.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'all' => array diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index 53987be..39c19d2 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -49,21 +49,21 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['layersBtn'], 'href' => 'table=tl_leaflet_layer', - 'icon' => 'system/modules/leaflet/assets/img/layers.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' ), 'icons' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['icons'], 'href' => 'table=tl_leaflet_icon', - 'icon' => 'system/modules/leaflet/assets/img/icons.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'popups' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'], 'href' => 'table=tl_leaflet_popup', - 'icon' => 'system/modules/leaflet/assets/img/popup.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'all' => array diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index b5c969c..d5a13c9 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -55,14 +55,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['styles'], 'href' => 'table=tl_leaflet_style', - 'icon' => 'system/modules/leaflet/assets/img/style.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'popups' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popups'], 'href' => 'table=tl_leaflet_popup', - 'icon' => 'system/modules/leaflet/assets/img/popup.png', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', 'attributes' => 'onclick="Backend.getScrollOffset();"' ), 'all' => array diff --git a/src/Resources/contao/templates/be_leaflet_about.html5 b/src/Resources/contao/templates/be_leaflet_about.html5 index 84c8e0c..c859416 100644 --- a/src/Resources/contao/templates/be_leaflet_about.html5 +++ b/src/Resources/contao/templates/be_leaflet_about.html5 @@ -18,7 +18,7 @@
> - +

netzmacht
David Molineus
From 25b90f4c13af62c1d41de4db4c7bd18b18589bf1 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:10:01 +0200 Subject: [PATCH 047/152] Register insert tag replacer. --- src/Resources/config/services.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index 5527eb4..f2e46ee 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -82,8 +82,16 @@ services: - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } netzmacht.contao_leaflet_maps.frontend.module_factory: - class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory - arguments: - - '@service_container' - tags: - - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } + class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory + arguments: + - '@service_container' + tags: + - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } + + netzmacht.contao_leaflet_maps.frontend.insert_tag: + class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser + arguments: + - '@netzmacht.contao_leaflet_maps.map.provider' + - '%kernel.debug%' + tags: + - { name: 'netzmacht.contao_toolkit.insert_tag_parser' } From 1b035901c138639472902aba69353661174d192c Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:16:02 +0200 Subject: [PATCH 048/152] Register definition mappers. --- .../Pass/RegisterDefinitionMapperPass.php | 50 +++++++++++++++++++ src/NetzmachtContaoLeafletBundle.php | 3 ++ 2 files changed, 53 insertions(+) create mode 100644 src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php diff --git a/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php b/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php new file mode 100644 index 0000000..0a34f95 --- /dev/null +++ b/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php @@ -0,0 +1,50 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass; + +use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Reference; + +/** + * Register all definition mappers. + * + * @package Netzmacht\Contao\Leaflet\DependencyInjection\Pass + */ +class RegisterDefinitionMapperPass implements CompilerPassInterface +{ + /** + * {@inheritDoc} + */ + public function process(ContainerBuilder $container) + { + if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.mapper')) { + return; + } + + $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.mapper'); + $taggedServices = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.mapper '); + + foreach ($taggedServices as $serviceId => $tags) { + foreach ($tags as $attributes) { + if (isset($attributes['priority'])) { + $definition->addMethodCall('register', [new Reference($serviceId), (int) $attributes['priority']]); + } else { + $definition->addMethodCall('register', [new Reference($serviceId)]); + } + } + } + } +} diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/NetzmachtContaoLeafletBundle.php index 9c2c089..e067424 100644 --- a/src/NetzmachtContaoLeafletBundle.php +++ b/src/NetzmachtContaoLeafletBundle.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet; +use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterDefinitionMapperPass; use Netzmacht\Contao\Toolkit\DependencyInjection\CompilerPass\AddTaggedServicesAsArgumentCompilerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; @@ -30,6 +31,8 @@ class NetzmachtContaoLeafletBundle extends Bundle */ public function build(ContainerBuilder $container) { + $container->addCompilerPass(new RegisterDefinitionMapperPass()); + $container->addCompilerPass( new AddTaggedServicesAsArgumentCompilerPass( 'netzmacht.contao_leaflet_maps.layer_label_renderer', From a43b740ba077ca65097d2c1c7c68857aac6724c8 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:35:02 +0200 Subject: [PATCH 049/152] Register definition encoders. --- .../Pass/RegisterEncodersPass.php | 44 +++++++++++++++++++ src/NetzmachtContaoLeafletBundle.php | 2 + 2 files changed, 46 insertions(+) create mode 100644 src/DependencyInjection/Pass/RegisterEncodersPass.php diff --git a/src/DependencyInjection/Pass/RegisterEncodersPass.php b/src/DependencyInjection/Pass/RegisterEncodersPass.php new file mode 100644 index 0000000..4281f4e --- /dev/null +++ b/src/DependencyInjection/Pass/RegisterEncodersPass.php @@ -0,0 +1,44 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass; + +use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Reference; + +/** + * Register all definition encoders. + * + * @package Netzmacht\Contao\Leaflet\DependencyInjection\Pass + */ +class RegisterEncodersPass implements CompilerPassInterface +{ + /** + * {@inheritDoc} + */ + public function process(ContainerBuilder $container) + { + if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher')) { + return; + } + + $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher'); + $serviceIds = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.encoder'); + + foreach ($serviceIds as $serviceId => $tags) { + $definition->addMethodCall('addSubscriber', [new Reference($serviceId)]); + } + } +} diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/NetzmachtContaoLeafletBundle.php index e067424..77e1336 100644 --- a/src/NetzmachtContaoLeafletBundle.php +++ b/src/NetzmachtContaoLeafletBundle.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterDefinitionMapperPass; +use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterEncodersPass; use Netzmacht\Contao\Toolkit\DependencyInjection\CompilerPass\AddTaggedServicesAsArgumentCompilerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; @@ -32,6 +33,7 @@ class NetzmachtContaoLeafletBundle extends Bundle public function build(ContainerBuilder $container) { $container->addCompilerPass(new RegisterDefinitionMapperPass()); + $container->addCompilerPass(new RegisterEncodersPass()); $container->addCompilerPass( new AddTaggedServicesAsArgumentCompilerPass( From e8edeb8021dbfb7a689855cdda4478d1154a4d9c Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:36:04 +0200 Subject: [PATCH 050/152] Register libraries. --- .../Pass/RegisterLibrariesPass.php | 56 +++++++++++++++++++ src/NetzmachtContaoLeafletBundle.php | 3 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 src/DependencyInjection/Pass/RegisterLibrariesPass.php diff --git a/src/DependencyInjection/Pass/RegisterLibrariesPass.php b/src/DependencyInjection/Pass/RegisterLibrariesPass.php new file mode 100644 index 0000000..f8e275f --- /dev/null +++ b/src/DependencyInjection/Pass/RegisterLibrariesPass.php @@ -0,0 +1,56 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass; + +use Netzmacht\LeafletPHP\Assets; +use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; + +/** + * Class RegisterLibrariesPass. + * + * @package Netzmacht\Contao\Leaflet\DependencyInjection\Pass + */ +class RegisterLibrariesPass implements CompilerPassInterface +{ + /** + * {@inheritDoc} + */ + public function process(ContainerBuilder $container) + { + if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.builder')) { + return; + } + + if (!$container->hasParameter('netzmacht.contao_leaflet_maps.libraries')) { + return; + } + + $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.builder'); + $libraries = $container->getParameter('netzmacht.contao_leaflet_maps.libraries'); + + foreach ($libraries as $name => $assets) { + if (!empty($assets['css'])) { + list ($source, $type) = (array) $assets['css']; + $definition->addMethodCall('registerStylesheet', [$name, $source, $type ?: Assets::TYPE_FILE]); + } + + if (!empty($assets['javascript'])) { + list ($source, $type) = (array) $assets['javascript']; + $definition->addMethodCall('registerJavascript', [$name, $source, $type ?: Assets::TYPE_FILE]); + } + } + } +} diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/NetzmachtContaoLeafletBundle.php index 77e1336..b7fcd34 100644 --- a/src/NetzmachtContaoLeafletBundle.php +++ b/src/NetzmachtContaoLeafletBundle.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet; +use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterLibrariesPass; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterDefinitionMapperPass; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterEncodersPass; use Netzmacht\Contao\Toolkit\DependencyInjection\CompilerPass\AddTaggedServicesAsArgumentCompilerPass; @@ -34,7 +35,7 @@ class NetzmachtContaoLeafletBundle extends Bundle { $container->addCompilerPass(new RegisterDefinitionMapperPass()); $container->addCompilerPass(new RegisterEncodersPass()); - + $container->addCompilerPass(new RegisterLibrariesPass()); $container->addCompilerPass( new AddTaggedServicesAsArgumentCompilerPass( 'netzmacht.contao_leaflet_maps.layer_label_renderer', From 31cd1c3ae4643412ec86bcdd19567b09b49fd9ad Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:50:34 +0200 Subject: [PATCH 051/152] Rename events and remove old ones. --- src/Event/BuildDefinitionEvent.php | 2 +- src/Event/ConvertToGeoJsonEvent.php | 2 +- src/Event/GetHashEvent.php | 2 +- src/Event/GetJavascriptEvent.php | 2 +- src/Event/InitializeDefinitionMapperEvent.php | 53 ------------------- src/Event/InitializeEventDispatcherEvent.php | 53 ------------------- src/Event/InitializeLeafletBuilderEvent.php | 53 ------------------- 7 files changed, 4 insertions(+), 163 deletions(-) delete mode 100644 src/Event/InitializeDefinitionMapperEvent.php delete mode 100644 src/Event/InitializeEventDispatcherEvent.php delete mode 100644 src/Event/InitializeLeafletBuilderEvent.php diff --git a/src/Event/BuildDefinitionEvent.php b/src/Event/BuildDefinitionEvent.php index 9112fb6..a463659 100644 --- a/src/Event/BuildDefinitionEvent.php +++ b/src/Event/BuildDefinitionEvent.php @@ -23,7 +23,7 @@ use Symfony\Component\EventDispatcher\Event; */ class BuildDefinitionEvent extends Event { - const NAME = 'leaflet.mapper.definition'; + const NAME = 'netzmacht.contao_leaflet.mapper.build_definition'; /** * The leaflet object definition. diff --git a/src/Event/ConvertToGeoJsonEvent.php b/src/Event/ConvertToGeoJsonEvent.php index d323e1b..581f4f5 100644 --- a/src/Event/ConvertToGeoJsonEvent.php +++ b/src/Event/ConvertToGeoJsonEvent.php @@ -23,7 +23,7 @@ use Symfony\Component\EventDispatcher\Event; */ class ConvertToGeoJsonEvent extends Event { - const NAME = 'leaflet.mapper.convert-to-geojson'; + const NAME = 'netzmacht.contao_leaflet.mapper.convert_to_geojson'; /** * The definition. diff --git a/src/Event/GetHashEvent.php b/src/Event/GetHashEvent.php index 00eaba6..b857bbb 100644 --- a/src/Event/GetHashEvent.php +++ b/src/Event/GetHashEvent.php @@ -21,7 +21,7 @@ use Symfony\Component\EventDispatcher\Event; */ class GetHashEvent extends Event { - const NAME = 'leaflet.get-hash'; + const NAME = 'netzmacht.contao_leaflet.get_hash'; /** * The data. diff --git a/src/Event/GetJavascriptEvent.php b/src/Event/GetJavascriptEvent.php index 3a4f3be..32339a6 100644 --- a/src/Event/GetJavascriptEvent.php +++ b/src/Event/GetJavascriptEvent.php @@ -22,7 +22,7 @@ use Symfony\Component\EventDispatcher\Event; */ class GetJavascriptEvent extends Event { - const NAME = 'leaflet.service.get-javascript'; + const NAME = 'netzmacht.contao_leaflet.get_javascript'; /** * The generated javascript. diff --git a/src/Event/InitializeDefinitionMapperEvent.php b/src/Event/InitializeDefinitionMapperEvent.php deleted file mode 100644 index 64ce78e..0000000 --- a/src/Event/InitializeDefinitionMapperEvent.php +++ /dev/null @@ -1,53 +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\Event; - -use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Symfony\Component\EventDispatcher\Event; - -/** - * Class InitializeDefinitionMapperEvent is emitted when the definition mapper is created. - * - * @package Netzmacht\Contao\Leaflet\Event - */ -class InitializeDefinitionMapperEvent extends Event -{ - const NAME = 'leaflet.boot.initialize-definition-mapper'; - - /** - * The definitino mapper. - * - * @var DefinitionMapper - */ - private $definitionMapper; - - /** - * Construct. - * - * @param DefinitionMapper $definitionMapper The definition mapper. - */ - public function __construct(DefinitionMapper $definitionMapper) - { - $this->definitionMapper = $definitionMapper; - } - - /** - * Get the definition mapper. - * - * @return DefinitionMapper - */ - public function getDefinitionMapper() - { - return $this->definitionMapper; - } -} diff --git a/src/Event/InitializeEventDispatcherEvent.php b/src/Event/InitializeEventDispatcherEvent.php deleted file mode 100644 index 13f5e09..0000000 --- a/src/Event/InitializeEventDispatcherEvent.php +++ /dev/null @@ -1,53 +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\Event; - -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; - -/** - * InitializeEventDispatcherEvent is emitted then the internal event dispatcher of the encoding system is initialized. - * - * @package Netzmacht\Contao\Leaflet\Event - */ -class InitializeEventDispatcherEvent extends Event -{ - const NAME = 'leaflet.boot.initialize-event-dispatcher'; - - /** - * The event dispatcher. - * - * @var EventDispatcher - */ - private $eventDispatcher; - - /** - * The event dispatcher. - * - * @param EventDispatcher $eventDispatcher The event dispatcher. - */ - public function __construct(EventDispatcher $eventDispatcher) - { - $this->eventDispatcher = $eventDispatcher; - } - - /** - * Get the event dispatcher. - * - * @return EventDispatcher - */ - public function getEventDispatcher() - { - return $this->eventDispatcher; - } -} diff --git a/src/Event/InitializeLeafletBuilderEvent.php b/src/Event/InitializeLeafletBuilderEvent.php deleted file mode 100644 index 99a9071..0000000 --- a/src/Event/InitializeLeafletBuilderEvent.php +++ /dev/null @@ -1,53 +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\Event; - -use Netzmacht\LeafletPHP\Leaflet; -use Symfony\Component\EventDispatcher\Event; - -/** - * Class InitializeLeafletBuilderEvent is emitted when the leaflet builder is created. - * - * @package Netzmacht\Contao\Leaflet\Event - */ -class InitializeLeafletBuilderEvent extends Event -{ - const NAME = 'leaflet.boot.initialize-leaflet-builder'; - - /** - * The leaflet builder. - * - * @var Leaflet - */ - private $builder; - - /** - * Construct. - * - * @param Leaflet $builder The leaflet builder. - */ - public function __construct(Leaflet $builder) - { - $this->builder = $builder; - } - - /** - * Get the builder. - * - * @return Leaflet - */ - public function getBuilder() - { - return $this->builder; - } -} From 524678f56ec20dd86390214d4f4a19afea490e16 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:50:54 +0200 Subject: [PATCH 052/152] Implement assets loading. --- src/Listener/LoadAssetsListener.php | 135 ++++++++++++++++++++++++++++ src/Resources/config/config.yml | 3 + src/Resources/config/listeners.yml | 9 ++ 3 files changed, 147 insertions(+) create mode 100644 src/Listener/LoadAssetsListener.php diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php new file mode 100644 index 0000000..62907a2 --- /dev/null +++ b/src/Listener/LoadAssetsListener.php @@ -0,0 +1,135 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Listener; + +use Netzmacht\Contao\Leaflet\ContaoAssets; +use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\LeafletPHP\Assets; +use Netzmacht\LeafletPHP\Definition\Type\Icon; +use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; + +/** + * Class LoadAssetsListener. + * + * @package Netzmacht\Contao\Leaflet\Listener + */ +class LoadAssetsListener +{ + /** + * Assets. + * + * @var Assets + */ + private $assets; + + /** + * Definition mapper. + * + * @var DefinitionMapper + */ + private $definitionMapper; + + /** + * Libraries. + * + * @var array + */ + private $libraries; + + /** + * LoadAssetsListener constructor. + * + * @param Assets $assets Assets. + * @param DefinitionMapper $definitionMapper Definition mapper. + * @param array $libraries Libraries. + */ + public function __construct(Assets $assets, DefinitionMapper $definitionMapper, array $libraries) + { + $this->assets = $assets; + $this->definitionMapper = $definitionMapper; + } + + /** + * Handle the get javascript event. + * + * @return void + */ + public function onGetJavascriptEvent(): void + { + $this->assets->addJavascript('assets/leaflet/maps/contao-leaflet.js', ContaoAssets::TYPE_FILE); + + $collection = IconModel::findBy('active', true); + + if ($collection) { + $buffer = ''; + $icons = []; + + foreach ($collection as $model) { + /** @var ImageIcon $icon */ + $icon = $this->definitionMapper->handle($model); + $icons[] = [ + 'id' => $icon->getId(), + 'type' => lcfirst($icon->getType()), + 'options' => $icon->getOptions(), + ]; + + $this->loadIconsLibraries($icon); + } + + if ($icons) { + $buffer = sprintf('L.contao.loadIcons(%s);', json_encode($icons)); + } + + // @codingStandardsIgnoreStart + // TODO: Cache it. + // codingStandardsIgnoreEnd + + $file = new \File('assets/leaflet/js/icons.js'); + $file->write($buffer); + $file->close(); + + $this->assets->addJavascript('assets/leaflet/js/icons.js', ContaoAssets::TYPE_FILE); + } + } + + /** + * Load all libraries for an icon. + * + * @param Icon $icon Icon definition. + * + * @return void + */ + protected function loadIconsLibraries($icon): void + { + foreach ($icon::getRequiredLibraries() as $library) { + if (!isset($this->libraries[$library])) { + continue; + } + + $assets = $this->libraries[$library]; + + if (!empty($assets['css'])) { + list ($source, $type) = (array)$assets['css']; + $this->assets->addStylesheet($source, $type ?: Assets::TYPE_FILE); + } + + if (!empty($assets['javascript'])) { + list ($source, $type) = (array)$assets['javascript']; + $this->assets->addJavascript($source, $type ?: Assets::TYPE_FILE); + } + } + } +} diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml index 1624280..3deac1f 100644 --- a/src/Resources/config/config.yml +++ b/src/Resources/config/config.yml @@ -58,3 +58,6 @@ parameters: - 'id' - 'title' - 'alias' + + # Leaflet libraries files + netzmacht.contao_leaflet_maps.libraries: [] diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index e49b95e..99cd010 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -54,3 +54,12 @@ services: - '%netzmacht.contao_leaflet_maps.feature_model_properties%' tags: - { name: 'kernel.event_subscriber' } + + netzmacht.contao_leaflet_maps.listeners.load_assets: + class: Netzmacht\Contao\Leaflet\Listener\LoadAssetsListener + arguments: + - '@netzmacht.contao_leaflet_maps.map.assets' + - '@netzmacht.contao_leaflet_maps.definition.mapper' + - '%netzmacht.contao_leaflet_maps.libraries%' + tags: + - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript' } From b5ae094320a9f1fb4bb81569ee49bdccb36350ee Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:51:20 +0200 Subject: [PATCH 053/152] Drop not required boot subscriber. --- src/Subscriber/BootSubscriber.php | 295 ------------------------------ 1 file changed, 295 deletions(-) delete mode 100644 src/Subscriber/BootSubscriber.php diff --git a/src/Subscriber/BootSubscriber.php b/src/Subscriber/BootSubscriber.php deleted file mode 100644 index 7969dc7..0000000 --- a/src/Subscriber/BootSubscriber.php +++ /dev/null @@ -1,295 +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\Subscriber; - -use ContaoCommunityAlliance\Contao\EventDispatcher\EventDispatcherInitializer; -use Netzmacht\Contao\Leaflet\ContaoAssets; -use Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices; -use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent; -use Netzmacht\Contao\Leaflet\Event\InitializeDefinitionMapperEvent; -use Netzmacht\Contao\Leaflet\Event\InitializeEventDispatcherEvent; -use Netzmacht\Contao\Leaflet\Event\InitializeLeafletBuilderEvent; -use Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser; -use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\Contao\Leaflet\Mapper\Mapper; -use Netzmacht\Contao\Leaflet\Model\IconModel; -use Netzmacht\Contao\Toolkit\Boot\Event\InitializeSystemEvent; -use Netzmacht\Contao\Toolkit\DependencyInjection\Services; -use Netzmacht\LeafletPHP\Assets; -use Netzmacht\LeafletPHP\Definition\Type\Icon; -use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - -/** - * Class BootSubscriber provides handlers for leaflet boot process. - * - * @package Netzmacht\Contao\Leaflet\Subscriber - */ -class BootSubscriber implements EventSubscriberInterface -{ - /** - * Leaflet mapper configuration. - * - * @var array - */ - private $mappers; - - /** - * Leaflet encoder configuration. - * - * @var array - */ - private $encoders; - - /** - * Leaflet libraries configuration. - * - * @var array - */ - private $libraries; - - /** - * Assets manager. - * - * @var ContaoAssets - */ - private $assets; - - /** - * Definition mapper. - * - * @var DefinitionMapper - */ - private $definitionMapper; - - /** - * Flag for loading icon file. - * - * @var bool - */ - private $loadIconFile = false; - - /** - * BootSubscriber constructor. - * - * @param ContaoAssets $assets Leaflet assets manager. - * @param array $mappers Leaflet mapper configuration. - * @param array $encoders Leaflet encoder configuration. - * @param array $libraries Leaflet libraries configuration. - */ - public function __construct( - ContaoAssets $assets, - array $mappers, - array $encoders, - array $libraries - ) { - $this->assets = $assets; - $this->mappers = $mappers; - $this->encoders = $encoders; - $this->libraries = $libraries; - } - - /** - * {@inheritdoc} - */ - public static function getSubscribedEvents() - { - return array( - InitializeSystemEvent::NAME => 'initializeInsertTagParser', - InitializeDefinitionMapperEvent::NAME => 'initializeDefinitionMapper', - InitializeEventDispatcherEvent::NAME => 'initializeEventDispatcher', - InitializeLeafletBuilderEvent::NAME => 'initializeLeafletBuilder', - GetJavascriptEvent::NAME => array(array('loadIcons'), array('loadAssets')), - ); - } - - /** - * Initialize the leaflet insert tag parser. - * - * @param InitializeSystemEvent $event The event. - * - * @return void - */ - public function initializeInsertTagParser(InitializeSystemEvent $event) - { - $container = $event->getContainer(); - $debugMode = $container->get(Services::CONFIG)->get('debugMode'); - $mapProvider = $container->get(LeafletServices::MAP_PROVIDER); - $parser = new LeafletInsertTagParser($mapProvider, $debugMode); - - $container->get(Services::INSERT_TAG_REPLACER)->registerParser($parser); - } - - /** - * Create and register all configured mappers. - * - * @param InitializeDefinitionMapperEvent $event The subscribed event. - * - * @return void - */ - public function initializeDefinitionMapper(InitializeDefinitionMapperEvent $event) - { - $mapper = $event->getDefinitionMapper(); - $this->definitionMapper = $mapper; - - foreach ($this->mappers as $className) { - if (is_array($className)) { - $mapper->register($this->createMapper($className[0]), $className[1]); - } else { - $mapper->register($this->createMapper($className)); - } - } - } - - /** - * Register all leaflet encoders. - * - * @param InitializeEventDispatcherEvent $event The subscribed event. - * - * @return void - */ - public function initializeEventDispatcher(InitializeEventDispatcherEvent $event) - { - $dispatcher = $event->getEventDispatcher(); - $initializer = new EventDispatcherInitializer(); - - $initializer->addSubscribers($dispatcher, $this->encoders); - } - - /** - * Register all libraries assets. - * - * @param InitializeLeafletBuilderEvent $event The subscribed event. - * - * @return void - */ - public function initializeLeafletBuilder(InitializeLeafletBuilderEvent $event) - { - $builder = $event->getBuilder(); - - foreach ($this->libraries as $name => $assets) { - if (!empty($assets['css'])) { - list ($source, $type) = (array) $assets['css']; - $builder->registerStylesheet($name, $source, $type ?: Assets::TYPE_FILE); - } - - if (!empty($assets['javascript'])) { - list ($source, $type) = (array) $assets['javascript']; - $builder->registerJavascript($name, $source, $type ?: Assets::TYPE_FILE); - } - } - } - - /** - * Load Contao leaflet assets. - * - * @return void - */ - public function loadAssets() - { - $this->assets->addJavascript('assets/leaflet/maps/contao-leaflet.js', ContaoAssets::TYPE_FILE); - - if ($this->loadIconFile) { - $this->assets->addJavascript('assets/leaflet/js/icons.js', ContaoAssets::TYPE_FILE); - } - } - - /** - * Load icons. - * - * @return void - */ - public function loadIcons() - { - if (!$this->definitionMapper) { - return; - } - - $collection = IconModel::findBy('active', true); - - if ($collection) { - $buffer = ''; - $icons = array(); - - foreach ($collection as $model) { - /** @var ImageIcon $icon */ - $icon = $this->definitionMapper->handle($model); - $icons[] = array( - 'id' => $icon->getId(), - 'type' => lcfirst($icon->getType()), - 'options' => $icon->getOptions(), - ); - - $this->loadIconsLibraries($icon); - } - - if ($icons) { - $buffer = sprintf('L.contao.loadIcons(%s);', json_encode($icons)); - } - - // @codingStandardsIgnoreStart - // TODO: Cache it. - // codingStandardsIgnoreEnd - - $file = new \File('assets/leaflet/js/icons.js'); - $file->write($buffer); - $file->close(); - - $this->loadIconFile = true; - } - } - - /** - * Create a new mapper. - * - * @param mixed $mapper The mapper class or callable factory. - * - * @return Mapper - */ - private function createMapper($mapper) - { - if (is_callable($mapper)) { - return $mapper(); - } - - return new $mapper; - } - - /** - * Load all libraries for an icon. - * - * @param Icon $icon Icon definition - * - * @return void. - */ - protected function loadIconsLibraries($icon) - { - foreach ($icon::getRequiredLibraries() as $library) { - if (!isset($this->libraries[$library])) { - continue; - } - - $assets = $this->libraries[$library]; - - if (!empty($assets['css'])) { - list ($source, $type) = (array)$assets['css']; - $this->assets->addStylesheet($source, $type ?: Assets::TYPE_FILE); - } - - if (!empty($assets['javascript'])) { - list ($source, $type) = (array)$assets['javascript']; - $this->assets->addJavascript($source, $type ?: Assets::TYPE_FILE); - } - } - } -} From 8eb9a22ae035d23ac7de524ee3107b9b40a5dff4 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:52:07 +0200 Subject: [PATCH 054/152] Remove boot class. --- src/Boot.php | 90 ---------------------------------------------------- 1 file changed, 90 deletions(-) delete mode 100644 src/Boot.php diff --git a/src/Boot.php b/src/Boot.php deleted file mode 100644 index 1b0116c..0000000 --- a/src/Boot.php +++ /dev/null @@ -1,90 +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; - -use Netzmacht\Contao\Leaflet\Event\InitializeDefinitionMapperEvent; -use Netzmacht\Contao\Leaflet\Event\InitializeEventDispatcherEvent; -use Netzmacht\Contao\Leaflet\Event\InitializeLeafletBuilderEvent; -use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\LeafletPHP\Leaflet; -use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; - -/** - * Class Boot initialize the leaflet map extension. - * - * @package Netzmacht\Contao\Leaflet - */ -class Boot -{ - /** - * The event dispatcher. - * - * @var EventDispatcher - */ - private $eventDispatcher; - - /** - * Construct. - * - * @param EventDispatcher $eventDispatcher The event dispatcher. - */ - public function __construct(EventDispatcher $eventDispatcher) - { - $this->eventDispatcher = $eventDispatcher; - } - - /** - * Initialize definition mapper. - * - * @param DefinitionMapper $definitionMapper The definition mapper. - * - * @return DefinitionMapper - */ - public function initializeDefinitionMapper(DefinitionMapper $definitionMapper) - { - $event = new InitializeDefinitionMapperEvent($definitionMapper); - $this->eventDispatcher->dispatch($event::NAME, $event); - - return $definitionMapper; - } - - /** - * Initialize the internal used event dispatcher of the leaflet encoding system. - * - * @param EventDispatcher $eventDispatcher The internal event dispatcher. - * - * @return EventDispatcher - */ - public function initializeEventDispatcher(EventDispatcher $eventDispatcher) - { - $event = new InitializeEventDispatcherEvent($eventDispatcher); - $this->eventDispatcher->dispatch($event::NAME, $event); - - return $eventDispatcher; - } - - /** - * Initialize the leaflet builder. - * - * @param Leaflet $leaflet The leaflet builder. - * - * @return Leaflet - */ - public function initializeLeafletBuilder(Leaflet $leaflet) - { - $event = new InitializeLeafletBuilderEvent($leaflet); - $this->eventDispatcher->dispatch($event::NAME, $event); - - return $leaflet; - } -} From 19329376488aa61f8ebdf5c4a9561e3d41be2347 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 6 Oct 2017 15:53:26 +0200 Subject: [PATCH 055/152] Code style. --- src/DependencyInjection/Pass/RegisterEncodersPass.php | 2 +- src/Listener/LoadAssetsListener.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/DependencyInjection/Pass/RegisterEncodersPass.php b/src/DependencyInjection/Pass/RegisterEncodersPass.php index 4281f4e..b3efa8a 100644 --- a/src/DependencyInjection/Pass/RegisterEncodersPass.php +++ b/src/DependencyInjection/Pass/RegisterEncodersPass.php @@ -37,7 +37,7 @@ class RegisterEncodersPass implements CompilerPassInterface $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher'); $serviceIds = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.encoder'); - foreach ($serviceIds as $serviceId => $tags) { + foreach (array_keys($serviceIds) as $serviceId) { $definition->addMethodCall('addSubscriber', [new Reference($serviceId)]); } } diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 62907a2..1192315 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -60,6 +60,7 @@ class LoadAssetsListener { $this->assets = $assets; $this->definitionMapper = $definitionMapper; + $this->libraries = $libraries; } /** From 96c78d4306b215464ed27c0c4c5b40fca9509236 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 12:00:09 +0200 Subject: [PATCH 056/152] Fix class name. --- src/NetzmachtContaoLeafletBundle.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/NetzmachtContaoLeafletBundle.php index b7fcd34..e83d149 100644 --- a/src/NetzmachtContaoLeafletBundle.php +++ b/src/NetzmachtContaoLeafletBundle.php @@ -17,7 +17,7 @@ namespace Netzmacht\Contao\Leaflet; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterLibrariesPass; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterDefinitionMapperPass; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterEncodersPass; -use Netzmacht\Contao\Toolkit\DependencyInjection\CompilerPass\AddTaggedServicesAsArgumentCompilerPass; +use Netzmacht\Contao\Toolkit\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; @@ -37,7 +37,7 @@ class NetzmachtContaoLeafletBundle extends Bundle $container->addCompilerPass(new RegisterEncodersPass()); $container->addCompilerPass(new RegisterLibrariesPass()); $container->addCompilerPass( - new AddTaggedServicesAsArgumentCompilerPass( + new AddTaggedServicesAsArgumentPass( 'netzmacht.contao_leaflet_maps.layer_label_renderer', 'netzmacht.contao_leaflet_maps.layer_label_renderer' ) From ac87bcf947e44bcad671c6c26bd0d728bc10e03c Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:01:22 +0200 Subject: [PATCH 057/152] Use options callback to get supported layers and providers. --- src/Listener/Dca/LayerDcaListener.php | 20 +++++++++++++++++++ src/Resources/contao/dca/tl_leaflet_layer.php | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 8e79bf3..162b119 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -112,6 +112,26 @@ class LayerDcaListener extends AbstractListener $this->labelRenderer = $labelRenderer; } + /** + * Get layer options. + * + * @return array + */ + public function getLayerOptions(): array + { + return array_keys($this->layers); + } + + /** + * Get tile provider options. + * + * @return array + */ + public function getProviderOptions(): array + { + return array_keys($this->tileProviders); + } + /** * Get variants of the tile provider. * diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 9a70e95..1df4aa5 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -286,7 +286,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'chosen' => true, 'helpwizard' => true, ], - 'options' => array_keys($GLOBALS['LEAFLET_LAYERS']), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayerOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_layer'], 'sql' => "varchar(32) NOT NULL default ''", ], @@ -312,7 +312,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'submitOnChange' => true, 'chosen' => true, ], - 'options' => array_keys($GLOBALS['LEAFLET_TILE_PROVIDERS']), + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getProviderOptions'], 'sql' => "varchar(32) NOT NULL default ''", ], 'tile_provider_variant' => [ From 756c28cdc6429e7cd0e1d48014b634abed4ac544 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:11:39 +0200 Subject: [PATCH 058/152] Fetch mode. --- src/Listener/Dca/MapDcaListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php index a8f5037..a3af283 100644 --- a/src/Listener/Dca/MapDcaListener.php +++ b/src/Listener/Dca/MapDcaListener.php @@ -72,7 +72,7 @@ class MapDcaListener extends AbstractListener $statement->bindValue('mid', $dataContainer->id); if ($statement->execute()) { - return $statement->fetchAll(PDO::FETCH_ASSOC, PDO::FETCH_COLUMN, 0); + return $statement->fetchAll(PDO::FETCH_COLUMN, 0); } return []; From a5fbba740b21d28c59119103081b04d8c8876036 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:18:24 +0200 Subject: [PATCH 059/152] Fix invalid default value. --- src/Resources/contao/dca/tl_leaflet_map.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 63dc70c..43cef78 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -243,7 +243,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], - 'default' => '', + 'default' => null, 'eval' => array( 'maxlength' => 4, 'rgxp' => 'digit', From 5289518d6a0c75ee0758cc4a4a777a8e03968ff2 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:19:47 +0200 Subject: [PATCH 060/152] Allow empty standard layers. --- src/Listener/Dca/MapDcaListener.php | 3 ++- src/Resources/contao/dca/tl_leaflet_map.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php index a3af283..2c20b8e 100644 --- a/src/Listener/Dca/MapDcaListener.php +++ b/src/Listener/Dca/MapDcaListener.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\DataContainer; +use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; @@ -88,7 +89,7 @@ class MapDcaListener extends AbstractListener */ public function saveLayerRelations($layerId, $dataContainer) { - $new = deserialize($layerId, true); + $new = array_filter(StringUtil::deserialize($layerId, true)); $values = array(); $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting'); diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 43cef78..1574705 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -224,7 +224,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'getLayers'], 'eval' => array( - 'mandatory' => true, + 'mandatory' => false, 'tl_class' => 'w50', 'chosen' => true, 'includeBlankOption' => true, From 06fc40295cb719e7323f65d55de4ffd17af6d170 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:20:18 +0200 Subject: [PATCH 061/152] Fix default layer. --- src/Resources/contao/dca/tl_leaflet_layer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 1df4aa5..50d0f30 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -457,7 +457,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], - 'default' => '', + 'default' => null, 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', From d1c6424699caf75036f75af424a5e46b89e1fdc4 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:28:02 +0200 Subject: [PATCH 062/152] Fix service definition. --- src/Resources/contao/dca/tl_leaflet_marker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index 5ccc567..81efd2b 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -42,7 +42,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'flag' => 1, 'panelLayout' => 'sort,filter;search,limit', 'headerFields' => array('title', 'type'), - 'child_record_callback' => array('netzmacht.contao_leaflet_maps.listeners.dca.marker\'', 'generateRow'), + 'child_record_callback' => array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'generateRow'), ), 'label' => array ( From 7cee2fe6310163abb9f19313f35f891eceb85532 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:40:20 +0200 Subject: [PATCH 063/152] Loose type hints to support the adapters. --- src/Frontend/AbstractMapHybrid.php | 4 ++-- src/MapProvider.php | 5 +++-- src/Resources/config/services.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index ac83fb6..4c807d3 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -69,8 +69,8 @@ abstract class AbstractMapHybrid extends AbstractHybrid TemplateFactory $templateFactory, Translator $translator, MapProvider $mapProvider, - Input $input, - Config $config, + $input, + $config, $column = null ) { parent::__construct($model, $templateFactory, $translator, $column); diff --git a/src/MapProvider.php b/src/MapProvider.php index ee4083a..99192ee 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -12,6 +12,7 @@ namespace Netzmacht\Contao\Leaflet; +use Contao\Input; use Doctrine\Common\Cache\Cache; use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent; use Netzmacht\Contao\Leaflet\Filter\Filter; @@ -94,7 +95,7 @@ class MapProvider * @param DefinitionMapper $mapper The definition mapper. * @param Leaflet $leaflet The Leaflet instance. * @param EventDispatcher $eventDispatcher The Contao event dispatcher. - * @param \Input $input Thw request input. + * @param Input $input Thw request input. * @param ContaoAssets $assets Assets handler. * @param Cache $cache Cache. * @param array $filters Request filters configuration. @@ -104,7 +105,7 @@ class MapProvider DefinitionMapper $mapper, Leaflet $leaflet, EventDispatcher $eventDispatcher, - \Input $input, + $input, ContaoAssets $assets, Cache $cache, array $filters, diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index f2e46ee..2b02eda 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -14,7 +14,7 @@ services: - '@netzmacht.contao_toolkit.contao.input' - '@netzmacht.contao_leaflet_maps.map.assets' - '@netzmacht.contao_leaflet_maps.cache' - - '' # TODO: Rework filter handling. + - [] # TODO: Rework filter handling. - '%kernel.debug%' netzmacht.contao_leaflet_maps.cache: From 6af1b3fa22e0bd1a6725e87892cb9dad5eaf0152 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:41:53 +0200 Subject: [PATCH 064/152] Register the hash subscriber and drop old event_subscribers.php. --- src/Resources/config/listeners.yml | 5 +++++ .../contao/config/event_subscribers.php | 17 ----------------- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 src/Resources/contao/config/event_subscribers.php diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 99cd010..a9986cf 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -55,6 +55,11 @@ services: tags: - { name: 'kernel.event_subscriber' } + netzmacht.contao_leaflet_maps.listeners.hash_subscriber: + class: Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber + tags: + - { name: 'kernel.event_subscriber' } + netzmacht.contao_leaflet_maps.listeners.load_assets: class: Netzmacht\Contao\Leaflet\Listener\LoadAssetsListener arguments: diff --git a/src/Resources/contao/config/event_subscribers.php b/src/Resources/contao/config/event_subscribers.php deleted file mode 100644 index 50c807e..0000000 --- a/src/Resources/contao/config/event_subscribers.php +++ /dev/null @@ -1,17 +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 - */ - -return array( - $GLOBALS['container']['leaflet.boot.subscriber'], - 'Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber', - $GLOBALS['container']['leaflet.subscriber.geo-json'], -); From 3c9a54c7e13476605ae231b72b8de926b43e9ab0 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:43:35 +0200 Subject: [PATCH 065/152] Fix tag name. --- src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php b/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php index 0a34f95..16f73ae 100644 --- a/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php +++ b/src/DependencyInjection/Pass/RegisterDefinitionMapperPass.php @@ -35,7 +35,7 @@ class RegisterDefinitionMapperPass implements CompilerPassInterface } $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.mapper'); - $taggedServices = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.mapper '); + $taggedServices = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.mapper'); foreach ($taggedServices as $serviceId => $tags) { foreach ($tags as $attributes) { From 1e315d9bc5e695c7e88ad4fef60aa9ad208ce0dd Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:46:24 +0200 Subject: [PATCH 066/152] Do not use insert tag replacer to remove circular reference to map provider. --- src/Frontend/ValueFilter.php | 21 ++------------------- src/Resources/config/services.yml | 2 -- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/Frontend/ValueFilter.php b/src/Frontend/ValueFilter.php index 253da7c..206fdb6 100644 --- a/src/Frontend/ValueFilter.php +++ b/src/Frontend/ValueFilter.php @@ -12,7 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Frontend; -use Netzmacht\Contao\Toolkit\InsertTag\Replacer; +use Contao\Controller; /** * Class ValueFilter is a service class which can be used to filter values before passing them to an definition object. @@ -21,23 +21,6 @@ use Netzmacht\Contao\Toolkit\InsertTag\Replacer; */ class ValueFilter { - /** - * The insert tag replacer. - * - * @var Replacer - */ - private $insertTagReplacer; - - /** - * Construct. - * - * @param Replacer $replacer The insert tag replacer. - */ - public function __construct($replacer) - { - $this->insertTagReplacer = $replacer; - } - /** * Filter a value so it can be passed to the frontend. * @@ -50,6 +33,6 @@ class ValueFilter */ public function filter($value) { - return $this->insertTagReplacer->replace($value); + return Controller::replaceInsertTags($value); } } diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index 2b02eda..c655129 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -30,8 +30,6 @@ services: netzmacht.contao_leaflet_maps.frontend.value_filter: class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter - arguments: - - '@netzmacht.contao_toolkit.insert_tag.replacer' netzmacht.contao_leaflet_maps.map.assets: class: Netzmacht\Contao\Leaflet\ContaoAssets From e6ed2c456d4dfa9ca1730287629a93743a33d5ad Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 14:47:38 +0200 Subject: [PATCH 067/152] Define event name. --- src/Resources/config/listeners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index a9986cf..cb909d6 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -67,4 +67,4 @@ services: - '@netzmacht.contao_leaflet_maps.definition.mapper' - '%netzmacht.contao_leaflet_maps.libraries%' tags: - - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript' } + - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript', method: 'onGetJavascriptEvent' } From edf212b850eceafc3c5c8bb7e01d67a69a9bf018 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 15:36:11 +0200 Subject: [PATCH 068/152] Rework libraries handling so that libraries don't have to be ported to contao 4.4 only yet. --- .../Assets/LibrariesConfiguration.php | 95 +++++++++++++++++++ src/Listener/LoadAssetsListener.php | 16 ++-- src/Listener/RegisterLibrariesListener.php | 72 ++++++++++++++ src/Resources/config/config.yml | 3 - src/Resources/config/listeners.yml | 9 +- src/Resources/config/services.yml | 5 + src/Resources/contao/config/config.php | 8 ++ src/Resources/public/js/contao-leaflet.js | 1 + 8 files changed, 199 insertions(+), 10 deletions(-) create mode 100644 src/Frontend/Assets/LibrariesConfiguration.php create mode 100644 src/Listener/RegisterLibrariesListener.php create mode 100644 src/Resources/public/js/contao-leaflet.js diff --git a/src/Frontend/Assets/LibrariesConfiguration.php b/src/Frontend/Assets/LibrariesConfiguration.php new file mode 100644 index 0000000..2709f7c --- /dev/null +++ b/src/Frontend/Assets/LibrariesConfiguration.php @@ -0,0 +1,95 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Frontend\Assets; + +use Contao\CoreBundle\Framework\ContaoFrameworkInterface as ContaoFramework; +use Traversable; + +/** + * Class LibrariesConfiguration + * + * @package Netzmacht\Contao\Leaflet\Frontend\Assets + */ +class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess +{ + /** + * @var ContaoFramework + */ + private $framework; + + /** + * LibrariesConfiguration constructor. + * + * @param ContaoFramework $framework + */ + public function __construct(ContaoFramework $framework) + { + $this->framework = $framework; + } + + /** + * {@inheritdoc} + * + * @SuppressWarnings(PHPMD.Superglobals) + */ + public function getIterator() + { + $this->framework->initialize(); + + return new \ArrayIterator($GLOBALS['LEAFLET_LIBRARIES']); + } + + /** + * {@inheritdoc} + * + * @SuppressWarnings(PHPMD.Superglobals) + */ + public function offsetExists($offset) + { + $this->framework->initialize(); + + return isset($GLOBALS['LEAFLET_LIBRARIES'][$offset]); + } + + /** + * {@inheritdoc} + * + * @SuppressWarnings(PHPMD.Superglobals) + */ + public function offsetGet($offset) + { + return $GLOBALS['LEAFLET_LIBRARIES'][$offset]; + } + + /** + * {@inheritdoc} + * + * @SuppressWarnings(PHPMD.Superglobals) + */ + public function offsetSet($offset, $value) + { + $GLOBALS['LEAFLET_LIBRARIES'][$offset] = $value; + } + + /** + * {@inheritdoc} + * + * @SuppressWarnings(PHPMD.Superglobals) + */ + public function offsetUnset($offset) + { + unset($GLOBALS['LEAFLET_LIBRARIES'][$offset]); + } +} diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 1192315..58535d6 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Listener; use Netzmacht\Contao\Leaflet\ContaoAssets; +use Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\LeafletPHP\Assets; @@ -45,18 +46,18 @@ class LoadAssetsListener /** * Libraries. * - * @var array + * @var LibrariesConfiguration */ private $libraries; /** * LoadAssetsListener constructor. * - * @param Assets $assets Assets. - * @param DefinitionMapper $definitionMapper Definition mapper. - * @param array $libraries Libraries. + * @param Assets $assets Assets. + * @param DefinitionMapper $definitionMapper Definition mapper. + * @param LibrariesConfiguration $libraries Libraries. */ - public function __construct(Assets $assets, DefinitionMapper $definitionMapper, array $libraries) + public function __construct(Assets $assets, DefinitionMapper $definitionMapper, LibrariesConfiguration $libraries) { $this->assets = $assets; $this->definitionMapper = $definitionMapper; @@ -70,7 +71,10 @@ class LoadAssetsListener */ public function onGetJavascriptEvent(): void { - $this->assets->addJavascript('assets/leaflet/maps/contao-leaflet.js', ContaoAssets::TYPE_FILE); + $this->assets->addJavascript( + 'web/bundles/netzmachtcontaoleaflet/js/contao-leaflet.js', + ContaoAssets::TYPE_FILE + ); $collection = IconModel::findBy('active', true); diff --git a/src/Listener/RegisterLibrariesListener.php b/src/Listener/RegisterLibrariesListener.php new file mode 100644 index 0000000..fc5ea75 --- /dev/null +++ b/src/Listener/RegisterLibrariesListener.php @@ -0,0 +1,72 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Listener; + +use Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration; +use Netzmacht\LeafletPHP\Assets; +use Netzmacht\LeafletPHP\Leaflet; + +/** + * Class RegisterLibrariesListener. + * + * @package Netzmacht\Contao\Leaflet\Listener + */ +final class RegisterLibrariesListener +{ + /** + * Libraries configuration. + * + * @var LibrariesConfiguration + */ + private $libraries; + + /** + * Leaflet builder. + * + * @var Leaflet + */ + private $leaflet; + + /** + * RegisterLibrariesListener constructor. + * + * @param LibrariesConfiguration $libraries Libraries configuration. + * @param Leaflet $leaflet Leaflet builder. + */ + public function __construct(LibrariesConfiguration $libraries, Leaflet $leaflet) + { + $this->libraries = $libraries; + $this->leaflet = $leaflet; + } + + /** + * Handle the on initialize system hook. + * + * @return void + */ + public function onInitializeSystem(): void + { + foreach ($this->libraries as $name => $assets) { + if (!empty($assets['css'])) { + list ($source, $type) = (array) $assets['css']; + $this->leaflet->registerStylesheet($name, $source, $type ?: Assets::TYPE_FILE); + } + if (!empty($assets['javascript'])) { + list ($source, $type) = (array) $assets['javascript']; + $this->leaflet->registerJavascript($name, $source, $type ?: Assets::TYPE_FILE); + } + } + } +} diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml index 3deac1f..1624280 100644 --- a/src/Resources/config/config.yml +++ b/src/Resources/config/config.yml @@ -58,6 +58,3 @@ parameters: - 'id' - 'title' - 'alias' - - # Leaflet libraries files - netzmacht.contao_leaflet_maps.libraries: [] diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index cb909d6..9cf1389 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -65,6 +65,13 @@ services: arguments: - '@netzmacht.contao_leaflet_maps.map.assets' - '@netzmacht.contao_leaflet_maps.definition.mapper' - - '%netzmacht.contao_leaflet_maps.libraries%' + - '@netzmacht.contao_leaflet_maps.libraries' tags: - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript', method: 'onGetJavascriptEvent' } + + netzmacht.contao_leaflet_maps.listeners.register_libraries: + class: Netzmacht\Contao\Leaflet\Listener\RegisterLibrariesListener + arguments: + - '@netzmacht.contao_leaflet_maps.libraries' + - '@netzmacht.contao_leaflet_maps.definition.builder' + diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index c655129..6ddfc8b 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -17,6 +17,11 @@ services: - [] # TODO: Rework filter handling. - '%kernel.debug%' + netzmacht.contao_leaflet_maps.libraries: + class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration + arguments: + - '@contao.framework' + netzmacht.contao_leaflet_maps.cache: alias: 'netzmacht.contao_leaflet_maps.cache.default' diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index 9dda154..2e00219 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -84,3 +84,11 @@ $GLOBALS['TL_MODELS']['tl_leaflet_marker'] = \Netzmacht\Contao\Leaflet\Model\Ma $GLOBALS['TL_MODELS']['tl_leaflet_popup'] = \Netzmacht\Contao\Leaflet\Model\PopupModel::class; $GLOBALS['TL_MODELS']['tl_leaflet_style'] = \Netzmacht\Contao\Leaflet\Model\StyleModel::class; $GLOBALS['TL_MODELS']['tl_leaflet_vector'] = \Netzmacht\Contao\Leaflet\Model\VectorModel::class; + +/* + * Hooks. + */ +$GLOBALS['TL_HOOKS']['initializeSystem'][] = [ + 'netzmacht.contao_leaflet_maps.listeners.register_libraries', + 'onInitializeSystem' +]; diff --git a/src/Resources/public/js/contao-leaflet.js b/src/Resources/public/js/contao-leaflet.js new file mode 100644 index 0000000..9414982 --- /dev/null +++ b/src/Resources/public/js/contao-leaflet.js @@ -0,0 +1 @@ +L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return"undefined"==typeof this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if("undefined"==typeof window.XMLHttpRequest)return o(Error("Browser not supported"));if("undefined"==typeof e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file From 51fc784800b52b13e7684237fd14bd12e311f5f0 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 15:39:50 +0200 Subject: [PATCH 069/152] Fix controls selection. --- src/Listener/Dca/ControlDcaListener.php | 21 ++++++++++++++++++- src/Resources/config/listeners.yml | 1 + .../contao/dca/tl_leaflet_control.php | 18 ++++++++-------- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index 29f199d..403d572 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -41,17 +41,36 @@ class ControlDcaListener extends AbstractListener */ private $connection; + /** + * Control types. + * + * @var array + */ + private $types; + /** * Construct. * * @param Manager $manager Data container manager. * @param Connection $connection Database connection. + * @param array $types Control types. */ - public function __construct(Manager $manager, Connection $connection) + public function __construct(Manager $manager, Connection $connection, array $types) { parent::__construct($manager); $this->connection = $connection; + $this->types = $types; + } + + /** + * Get control types. + * + * @return array + */ + public function getControlTypes(): array + { + return $this->types; } /** diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 9cf1389..8a3a924 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -26,6 +26,7 @@ services: arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' + - '%netzmacht.contao_leaflet_maps.controls%' netzmacht.contao_leaflet_maps.listeners.dca.layer: class: Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 3e38885..2499498 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -196,12 +196,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array ), 'type' => array ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['type'], - 'exclude' => true, - 'inputType' => 'select', - 'filter' => true, - 'sorting' => true, - 'eval' => array( + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['type'], + 'exclude' => true, + 'inputType' => 'select', + 'filter' => true, + 'sorting' => true, + 'eval' => array( 'mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, @@ -209,9 +209,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'chosen' => true, 'helpwizard' => true, ), - 'options' => $GLOBALS['LEAFLET_CONTROLS'], - 'reference' => &$GLOBALS['TL_LANG']['leaflet_control'], - 'sql' => "varchar(32) NOT NULL default ''" + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getControlTypes'], + 'reference' => &$GLOBALS['TL_LANG']['leaflet_control'], + 'sql' => "varchar(32) NOT NULL default ''", ), 'position' => array ( From fab9b5a0ba4637ab71dc4f2a1052000208bae0d9 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 15:42:37 +0200 Subject: [PATCH 070/152] Fix save callback. --- src/Listener/Dca/ControlDcaListener.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index 403d572..2c10308 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -151,6 +151,7 @@ class ControlDcaListener extends AbstractListener $query = 'SELECT * FROM tl_leaflet_control_layer WHERE cid=:cid order BY sorting'; $statement = $this->connection->prepare($query); $statement->bindValue('cid', $dataContainer->id); + $statement->execute(); while ($row = $statement->fetch()) { $values[$row['lid']] = $row; From 249b12cb616fdfdf129d9feda1c8180703a0670c Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 15:49:38 +0200 Subject: [PATCH 071/152] Code style issues. --- build.default.properties | 2 +- src/Frontend/Assets/LibrariesConfiguration.php | 13 ++++++++++--- src/MapProvider.php | 2 +- src/Resources/contao/config/config.php | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build.default.properties b/build.default.properties index 06357d7..c08524f 100644 --- a/build.default.properties +++ b/build.default.properties @@ -1,4 +1,4 @@ phpcs.standard = ${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml phpmd.ruleset = ${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml -phpcs.excluded = src/Resources/contao/languages +phpcs.excluded = src/Resources/contao/languages,src/Resources/public/js phpcpd.excluded = contao diff --git a/src/Frontend/Assets/LibrariesConfiguration.php b/src/Frontend/Assets/LibrariesConfiguration.php index 2709f7c..94ad1b9 100644 --- a/src/Frontend/Assets/LibrariesConfiguration.php +++ b/src/Frontend/Assets/LibrariesConfiguration.php @@ -15,16 +15,17 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\Assets; use Contao\CoreBundle\Framework\ContaoFrameworkInterface as ContaoFramework; -use Traversable; /** - * Class LibrariesConfiguration + * Class LibrariesConfiguration. * * @package Netzmacht\Contao\Leaflet\Frontend\Assets */ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess { /** + * Contao framework. + * * @var ContaoFramework */ private $framework; @@ -32,7 +33,7 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess /** * LibrariesConfiguration constructor. * - * @param ContaoFramework $framework + * @param ContaoFramework $framework Contao framework. */ public function __construct(ContaoFramework $framework) { @@ -70,6 +71,8 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess */ public function offsetGet($offset) { + $this->framework->initialize(); + return $GLOBALS['LEAFLET_LIBRARIES'][$offset]; } @@ -80,6 +83,8 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess */ public function offsetSet($offset, $value) { + $this->framework->initialize(); + $GLOBALS['LEAFLET_LIBRARIES'][$offset] = $value; } @@ -90,6 +95,8 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess */ public function offsetUnset($offset) { + $this->framework->initialize(); + unset($GLOBALS['LEAFLET_LIBRARIES'][$offset]); } } diff --git a/src/MapProvider.php b/src/MapProvider.php index 99192ee..631b404 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -95,7 +95,7 @@ class MapProvider * @param DefinitionMapper $mapper The definition mapper. * @param Leaflet $leaflet The Leaflet instance. * @param EventDispatcher $eventDispatcher The Contao event dispatcher. - * @param Input $input Thw request input. + * @param Input $input Thw request input. * @param ContaoAssets $assets Assets handler. * @param Cache $cache Cache. * @param array $filters Request filters configuration. diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index 2e00219..8d928ec 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -88,6 +88,7 @@ $GLOBALS['TL_MODELS']['tl_leaflet_vector'] = \Netzmacht\Contao\Leaflet\Model\Ve /* * Hooks. */ + $GLOBALS['TL_HOOKS']['initializeSystem'][] = [ 'netzmacht.contao_leaflet_maps.listeners.register_libraries', 'onInitializeSystem' From b898aafe5184497387dede3f6bf441eee0b5afde Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 16:05:34 +0200 Subject: [PATCH 072/152] Rearrange assets. --- .gitattributes | 1 + assets/js/.keep | 0 assets/maps/contao-leaflet.js | 1 - gulpfile.js | 4 ++-- {assets/maps/src => js}/Contao.js | 0 {assets/maps/src => js}/Mixin.Attribution.js | 0 {assets/maps/src => js}/Mixin.GeoJSON.js | 0 {assets/maps/src => js}/Mixin.Map.js | 0 {assets/maps/src => js}/OverpassLayer.js | 0 src/Listener/LoadAssetsListener.php | 2 +- 10 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 assets/js/.keep delete mode 100644 assets/maps/contao-leaflet.js rename {assets/maps/src => js}/Contao.js (100%) rename {assets/maps/src => js}/Mixin.Attribution.js (100%) rename {assets/maps/src => js}/Mixin.GeoJSON.js (100%) rename {assets/maps/src => js}/Mixin.Map.js (100%) rename {assets/maps/src => js}/OverpassLayer.js (100%) diff --git a/.gitattributes b/.gitattributes index 06d085f..618a292 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,4 @@ build.xml export-ignore phpunit.xml.dist export-ignore /tests export-ignore /specs export-ignore +/js export-ignore diff --git a/assets/js/.keep b/assets/js/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/assets/maps/contao-leaflet.js b/assets/maps/contao-leaflet.js deleted file mode 100644 index 9414982..0000000 --- a/assets/maps/contao-leaflet.js +++ /dev/null @@ -1 +0,0 @@ -L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return"undefined"==typeof this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if("undefined"==typeof window.XMLHttpRequest)return o(Error("Browser not supported"));if("undefined"==typeof e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index cd55cd9..c2f3cd3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,8 +5,8 @@ var concat = require('gulp-concat'); var paths = { minified: 'contao-leaflet.js', - scripts: ['assets/maps/src/*.js'], - dest: 'assets/maps' + scripts: ['js/*.js'], + dest: 'src/Resources/public/js' }; gulp.task('clear', function() { diff --git a/assets/maps/src/Contao.js b/js/Contao.js similarity index 100% rename from assets/maps/src/Contao.js rename to js/Contao.js diff --git a/assets/maps/src/Mixin.Attribution.js b/js/Mixin.Attribution.js similarity index 100% rename from assets/maps/src/Mixin.Attribution.js rename to js/Mixin.Attribution.js diff --git a/assets/maps/src/Mixin.GeoJSON.js b/js/Mixin.GeoJSON.js similarity index 100% rename from assets/maps/src/Mixin.GeoJSON.js rename to js/Mixin.GeoJSON.js diff --git a/assets/maps/src/Mixin.Map.js b/js/Mixin.Map.js similarity index 100% rename from assets/maps/src/Mixin.Map.js rename to js/Mixin.Map.js diff --git a/assets/maps/src/OverpassLayer.js b/js/OverpassLayer.js similarity index 100% rename from assets/maps/src/OverpassLayer.js rename to js/OverpassLayer.js diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 58535d6..6ddf39e 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -72,7 +72,7 @@ class LoadAssetsListener public function onGetJavascriptEvent(): void { $this->assets->addJavascript( - 'web/bundles/netzmachtcontaoleaflet/js/contao-leaflet.js', + 'bundles/netzmachtcontaoleaflet/js/contao-leaflet.js', ContaoAssets::TYPE_FILE ); From a2a6d31259053be318f72d5460e610671e49e26b Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 16:09:39 +0200 Subject: [PATCH 073/152] Update packages.json and run gulp command. --- .gitignore | 3 +++ package.json | 4 ++-- src/Resources/public/js/contao-leaflet.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a4e22b1..5e9c70f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ build.properties # Translations .tx + +# NPM +package-lock.json diff --git a/package.json b/package.json index 96a0656..187700b 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,10 @@ "description": "Leaflet maps for Contao", "main": "gulpfile.js", "dependencies": { - "del": "^2.2.2", + "del": "^3.0.0", "gulp": "^3.9.1", "gulp-concat": "^2.6.0", - "gulp-uglify": "^2.0.0" + "gulp-uglify": "^3.0.0" }, "devDependencies": {}, "scripts": { diff --git a/src/Resources/public/js/contao-leaflet.js b/src/Resources/public/js/contao-leaflet.js index 9414982..54acca1 100644 --- a/src/Resources/public/js/contao-leaflet.js +++ b/src/Resources/public/js/contao-leaflet.js @@ -1 +1 @@ -L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return"undefined"==typeof this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if("undefined"==typeof window.XMLHttpRequest)return o(Error("Browser not supported"));if("undefined"==typeof e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file +L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return void 0===this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if(void 0===window.XMLHttpRequest)return o(Error("Browser not supported"));if(void 0===e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file From cd88c2992b729cb3bac4349012753f0ab71249ab Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 16:53:22 +0200 Subject: [PATCH 074/152] Fix type options. --- src/Listener/Dca/IconDcaListener.php | 50 +++++++++++++++++++ src/Listener/Dca/StyleDcaListener.php | 50 +++++++++++++++++++ src/Listener/Dca/VectorDcaListener.php | 31 ++++++++++++ src/Resources/config/listeners.yml | 11 ++++ src/Resources/contao/dca/tl_leaflet_icon.php | 2 +- src/Resources/contao/dca/tl_leaflet_style.php | 2 +- .../contao/dca/tl_leaflet_vector.php | 2 +- 7 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 src/Listener/Dca/IconDcaListener.php create mode 100644 src/Listener/Dca/StyleDcaListener.php diff --git a/src/Listener/Dca/IconDcaListener.php b/src/Listener/Dca/IconDcaListener.php new file mode 100644 index 0000000..89b1dc2 --- /dev/null +++ b/src/Listener/Dca/IconDcaListener.php @@ -0,0 +1,50 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Listener\Dca; + +/** + * Class IconDcaListener. + * + * @package Netzmacht\Contao\Leaflet\Listener\Dca + */ +class IconDcaListener +{ + /** + * Icon type options. + * + * @var array + */ + private $icons; + + /** + * IconDcaListener constructor. + * + * @param array $icons Icon type options. + */ + public function __construct(array $icons) + { + $this->icons = $icons; + } + + /** + * Get icon options. + * + * @return array + */ + public function getIconOptions(): array + { + return $this->icons; + } +} diff --git a/src/Listener/Dca/StyleDcaListener.php b/src/Listener/Dca/StyleDcaListener.php new file mode 100644 index 0000000..c3389eb --- /dev/null +++ b/src/Listener/Dca/StyleDcaListener.php @@ -0,0 +1,50 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Listener\Dca; + +/** + * Class StyleDcaListener. + * + * @package Netzmacht\Contao\Leaflet\Listener\Dca + */ +class StyleDcaListener +{ + /** + * Style type options. + * + * @var array + */ + private $icons; + + /** + * StyleDcaListener constructor. + * + * @param array $styles Styles options. + */ + public function __construct(array $styles) + { + $this->icons = $styles; + } + + /** + * Get style options. + * + * @return array + */ + public function getStyleOptions(): array + { + return $this->icons; + } +} diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php index 4db7baa..4bc9571 100644 --- a/src/Listener/Dca/VectorDcaListener.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -14,6 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; +use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\StyleModel; @@ -31,6 +32,36 @@ class VectorDcaListener extends AbstractListener */ protected static $name = 'tl_leaflet_vector'; + /** + * Vector options. + * + * @var array + */ + private $vectors; + + /** + * Construct. + * + * @param Manager $dcaManager Data container manager. + * @param array $vectors Vectors. + */ + public function __construct(Manager $dcaManager, array $vectors) + { + parent::__construct($dcaManager); + + $this->vectors = $vectors; + } + + /** + * Get the vector options. + * + * @return array + */ + public function getVectorOptions(): array + { + return $this->vectors; + } + /** * Generate the row label. * diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 8a3a924..38fd9f2 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -48,6 +48,17 @@ services: class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' + - '%netzmacht.contao_leaflet_maps.vectors%' + + netzmacht.contao_leaflet_maps.listeners.dca.icon: + class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener + arguments: + - '%netzmacht.contao_leaflet_maps.icons%' + + netzmacht.contao_leaflet_maps.listeners.dca.style: + class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener + arguments: + - '%netzmacht.contao_leaflet_maps.styles%' netzmacht.contao_leaflet_maps.listeners.geo_json_subscriber: class: Netzmacht\Contao\Leaflet\Subscriber\GeoJsonSubscriber diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index 17be690..e42238c 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -222,7 +222,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'submitOnChange' => true, 'chosen' => true, ), - 'options' => &$GLOBALS['LEAFLET_ICONS'], + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.icon', 'getIconOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_icon'], 'sql' => "varchar(32) NOT NULL default ''" ), diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index 39c19d2..dec0168 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -188,7 +188,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'submitOnChange' => true, 'chosen' => true, ), - 'options' => &$GLOBALS['LEAFLET_STYLES'], + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.style', 'getStyleOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_style'], 'sql' => "varchar(32) NOT NULL default ''" ), diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index d5a13c9..99d0263 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -235,7 +235,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'chosen' => true, 'helpwizard' => true, ), - 'options' => &$GLOBALS['LEAFLET_VECTORS'], + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getVectorOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_vector'], 'sql' => "varchar(32) NOT NULL default ''" ), From 95046b65e06a0b0ee45e19a2365756a069dee861 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 16:54:32 +0200 Subject: [PATCH 075/152] Switch to short array syntax. --- src/Resources/contao/dca/tl_content.php | 84 +-- .../contao/dca/tl_leaflet_control.php | 572 +++++++-------- .../contao/dca/tl_leaflet_control_layer.php | 67 +- src/Resources/contao/dca/tl_leaflet_icon.php | 565 +++++++------- src/Resources/contao/dca/tl_leaflet_layer.php | 42 +- src/Resources/contao/dca/tl_leaflet_map.php | 689 ++++++++---------- .../contao/dca/tl_leaflet_map_layer.php | 60 +- .../contao/dca/tl_leaflet_marker.php | 482 ++++++------ src/Resources/contao/dca/tl_leaflet_popup.php | 390 +++++----- src/Resources/contao/dca/tl_leaflet_style.php | 406 +++++------ .../contao/dca/tl_leaflet_vector.php | 562 +++++++------- src/Resources/contao/dca/tl_module.php | 84 +-- 12 files changed, 1849 insertions(+), 2154 deletions(-) diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php index 1cb40be..77b4fa6 100644 --- a/src/Resources/contao/dca/tl_content.php +++ b/src/Resources/contao/dca/tl_content.php @@ -10,76 +10,76 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_content']['metapalettes']['leaflet'] = array( - 'type' => array('type', 'headline'), - 'leaflet' => array('leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height', 'leaflet_template'), - 'templates' => array(':hide', 'customTpl'), - 'protected' => array(':hide', 'protected'), - 'expert' => array(':hide', 'guests', 'cssID', 'space'), - 'invisible' => array(':hide', 'invisible', 'start', 'start') -); +$GLOBALS['TL_DCA']['tl_content']['metapalettes']['leaflet'] = [ + 'type' => ['type', 'headline'], + 'leaflet' => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height', 'leaflet_template'], + 'templates' => [':hide', 'customTpl'], + 'protected' => [':hide', 'protected'], + 'expert' => [':hide', 'guests', 'cssID', 'space'], + 'invisible' => [':hide', 'invisible', 'start', 'start'], +]; -$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_map'] = array( +$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_map'], 'inputType' => 'select', 'exclude' => true, 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'], - 'wizard' => array( + 'wizard' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'], - ), - 'eval' => array( + ], + 'eval' => [ 'tl_class' => 'w50 wizard', 'chosen' => true, - ), - 'sql' => "int(10) unsigned NOT NULL default '0'" -); + ], + 'sql' => "int(10) unsigned NOT NULL default '0'", +]; -$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_mapId'] = array( - 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_mapId'], - 'inputType' => 'text', - 'exclude' => true, - 'eval' => array( +$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_mapId'] = [ + 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_mapId'], + 'inputType' => 'text', + 'exclude' => true, + 'eval' => [ 'tl_class' => 'w50', 'chosen' => true, 'maxlength' => 16, - ), - 'sql' => "varchar(16) NOT NULL default ''" -); + ], + 'sql' => "varchar(16) NOT NULL default ''", +]; -$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_width'] = array( +$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_width'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_width'], 'inputType' => 'inputUnit', - 'options' => array('px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'), + 'options' => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'], 'search' => false, 'exclude' => true, - 'eval' => array('rgxp' => 'digit', 'tl_class' => 'clr w50'), - 'sql' => "varchar(64) NOT NULL default ''" -); + 'eval' => ['rgxp' => 'digit', 'tl_class' => 'clr w50'], + 'sql' => "varchar(64) NOT NULL default ''", +]; -$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_height'] = array( +$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_height'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_height'], 'inputType' => 'inputUnit', - 'options' => array('px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'), + 'options' => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'], 'search' => false, 'exclude' => true, - 'eval' => array('rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "varchar(64) NOT NULL default ''" -); + 'eval' => ['rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "varchar(64) NOT NULL default ''", +]; -$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_template'] = array( +$GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_template'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_template'], 'inputType' => 'select', 'exclude' => true, 'options_callback' => ['netzmacht.contao_toolkit.dca.listeners.template_options', 'handleOptionsCallback'], - 'eval' => array( + 'eval' => [ 'tl_class' => 'w50', 'chosen' => true, - ), - 'toolkit' => [ - 'template_options' => [ - 'prefix' => 'leaflet_map_js' - ] ], - 'sql' => "varchar(64) NOT NULL default ''" -); + 'toolkit' => [ + 'template_options' => [ + 'prefix' => 'leaflet_map_js', + ], + ], + 'sql' => "varchar(64) NOT NULL default ''", +]; diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index 2499498..c2e594f 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -10,448 +10,400 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_control'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'enableVersioning' => true, - 'ptable' => 'tl_leaflet_map', - 'sql' => array - ( - 'keys' => array - ( - 'id' => 'primary', - 'pid' => 'index', - ) - ), - 'onload_callback' => array( +$GLOBALS['TL_DCA']['tl_leaflet_control'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'enableVersioning' => true, + 'ptable' => 'tl_leaflet_map', + 'sql' => [ + 'keys' => [ + 'id' => 'primary', + 'pid' => 'index', + ], + ], + 'onload_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], - ), + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), + ], // List configuration - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 4, - 'fields' => array('sorting'), - 'headerFields' => array('title'), - 'flag' => 1, - 'sorting' => 2, - 'panelLayout' => 'filter,sort;search,limit', - 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'generateRow'], - ), - 'label' => array - ( - 'fields' => array('title'), - 'format' => '%s', - ), - 'global_operations' => array - ( - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ) - ), - 'operations' => array - ( - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['edit'], - 'href' => 'act=edit', - 'icon' => 'header.gif' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] - . '\'))return false;Backend.getScrollOffset()"' - ), - 'toggle' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['toggle'], - 'icon' => 'visible.gif', - 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', + 'list' => [ + 'sorting' => [ + 'mode' => 4, + 'fields' => ['sorting'], + 'headerFields' => ['title'], + 'flag' => 1, + 'sorting' => 2, + 'panelLayout' => 'filter,sort;search,limit', + 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'generateRow'], + ], + 'label' => [ + 'fields' => ['title'], + 'format' => '%s', + ], + 'global_operations' => [ + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + ], + 'operations' => [ + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['edit'], + 'href' => 'act=edit', + 'icon' => 'header.gif', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'toggle' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['toggle'], + 'icon' => 'visible.gif', + 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', - 'handleButtonCallback' + 'handleButtonCallback', ], - 'toolkit' => [ + 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'] - ] + 'stateColumn' => ['active'], + ], ], - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'palettes' => array( - '__selector__' => array('type') - ), + 'palettes' => [ + '__selector__' => ['type'], + ], - 'metapalettes' => array( - 'default' => array( - 'name' => array('title', 'alias', 'type', 'position'), - 'config' => array(), - 'active' => array('active'), - ), - 'zoom extends default' => array( - 'config' => array('zoomInText', 'zoomOutText', 'zoomInTitle', 'zoomOutTitle'), - ), - 'layers extends default' => array( - 'config' => array('layers', 'collapsed', 'autoZIndex') - ), - 'scale extends default' => array( - 'config' => array('maxWidth', 'metric', 'imperial', 'updateWhenIdle') - ), - 'attribution extends default' => array( - 'config' => array('attributions', 'prefix', 'disableDefault') - ), - 'loading extends default' => array( - 'config' => array('separate', 'zoomControl', 'spinjs') - ), - 'fullscreen extends default' => array( - 'config' => array('buttonTitle', 'separate', 'simulateFullScreen') - ), - ), + 'metapalettes' => [ + 'default' => [ + 'name' => ['title', 'alias', 'type', 'position'], + 'config' => [], + 'active' => ['active'], + ], + 'zoom extends default' => [ + 'config' => ['zoomInText', 'zoomOutText', 'zoomInTitle', 'zoomOutTitle'], + ], + 'layers extends default' => [ + 'config' => ['layers', 'collapsed', 'autoZIndex'], + ], + 'scale extends default' => [ + 'config' => ['maxWidth', 'metric', 'imperial', 'updateWhenIdle'], + ], + 'attribution extends default' => [ + 'config' => ['attributions', 'prefix', 'disableDefault'], + ], + 'loading extends default' => [ + 'config' => ['separate', 'zoomControl', 'spinjs'], + ], + 'fullscreen extends default' => [ + 'config' => ['buttonTitle', 'separate', 'simulateFullScreen'], + ], + ], - 'metasubpalettes' => array( - 'spinjs' => array('spin') - ), + 'metasubpalettes' => [ + 'spinjs' => ['spin'], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'pid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'sorting' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'", - 'sorting' => true, - ), - 'title' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'pid' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'sorting' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + 'sorting' => true, + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['title'], 'exclude' => true, 'inputType' => 'text', 'sorting' => true, 'search' => true, 'flag' => 1, - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['alias'], 'exclude' => true, 'inputType' => 'text', 'search' => true, - 'save_callback' => array( + 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], - ), - 'eval' => array( + ], + 'eval' => [ 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'toolkit' => [ + ], + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_parent', - 'fields' => ['title'] + 'fields' => ['title'], ], ], - 'sql' => 'varchar(255) NULL' - ), - 'type' => array - ( + 'sql' => 'varchar(255) NULL', + ], + 'type' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['type'], 'exclude' => true, 'inputType' => 'select', 'filter' => true, 'sorting' => true, - 'eval' => array( + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, 'submitOnChange' => true, 'chosen' => true, 'helpwizard' => true, - ), + ], 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getControlTypes'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_control'], 'sql' => "varchar(32) NOT NULL default ''", - ), - 'position' => array - ( + ], + 'position' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['position'], 'exclude' => true, 'inputType' => 'select', 'filter' => true, 'sorting' => true, - 'options' => array('topleft', 'topright', 'bottomleft', 'bottomright'), + 'options' => ['topleft', 'topright', 'bottomleft', 'bottomright'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'], - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50', 'helpwizard' => true), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'active' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['active'], - 'exclude' => true, - 'inputType' => 'checkbox', - 'filter' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''", + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50', 'helpwizard' => true], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'active' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['active'], + 'exclude' => true, + 'inputType' => 'checkbox', + 'filter' => true, + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), - 'zoomInText' => array - ( + ], + 'zoomInText' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomInText'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'zoomOutText' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'zoomOutText' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomInText'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'zoomInTitle' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'zoomInTitle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomInTitle'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'zoomOutTitle' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'zoomOutTitle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomOutTitle'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'collapsed' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'collapsed' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['collapsed'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => '1', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'autoZIndex' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'autoZIndex' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['autoZIndex'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => '1', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'layers' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layers'], - 'exclude' => true, - 'inputType' => 'multiColumnWizard', - 'load_callback' => array( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'layers' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layers'], + 'exclude' => true, + 'inputType' => 'multiColumnWizard', + 'load_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'loadLayerRelations'], - ), - 'save_callback' => array( + ], + 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'saveLayerRelations'], - ), - 'eval' => array - ( + ], + 'eval' => [ 'tl_class' => 'clr', - 'columnFields' => array - ( - 'layer' => array - ( + 'columnFields' => [ + 'layer' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layer'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getLayers'], - 'eval' => array( - 'style' => 'width: 300px', - 'chosen' => true, - 'includeBlankOption' => true - ), - ), - 'mode' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layerMode'], - 'exclude' => true, - 'inputType' => 'select', - 'options' => array('base', 'overlay'), - 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'], - 'eval' => array( - 'style' => 'width: 200px', + 'eval' => [ + 'style' => 'width: 300px', + 'chosen' => true, + 'includeBlankOption' => true, + ], + ], + 'mode' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layerMode'], + 'exclude' => true, + 'inputType' => 'select', + 'options' => ['base', 'overlay'], + 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'], + 'eval' => [ + 'style' => 'width: 200px', 'helpwizard' => true, - ), - ), - ) - ), - 'sql' => 'mediumblob NULL' - ), - 'maxWidth' => array - ( + ], + ], + ], + ], + 'sql' => 'mediumblob NULL', + ], + 'maxWidth' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['maxWidth'], 'exclude' => true, 'inputType' => 'text', 'default' => 100, - 'eval' => array('tl_class' => 'w50', 'rgxp' => 'digit'), - 'sql' => "int(5) NOT NULL default '100'" - ), - 'metric' => array - ( + 'eval' => ['tl_class' => 'w50', 'rgxp' => 'digit'], + 'sql' => "int(5) NOT NULL default '100'", + ], + 'metric' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['metric'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => '1', - 'eval' => array('tl_class' => 'w50 clr'), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'imperial' => array - ( + 'eval' => ['tl_class' => 'w50 clr'], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'imperial' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['imperial'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => '1', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'updateWhenIdle' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'updateWhenIdle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['updateWhenIdle'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'prefix' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'prefix' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['prefix'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'attributions' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'attributions' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['attributions'], 'exclude' => true, 'inputType' => 'listWizard', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'clr', 'allowHtml' => true), - 'sql' => 'mediumblob NULL' - ), - 'separate' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'clr', 'allowHtml' => true], + 'sql' => 'mediumblob NULL', + ], + 'separate' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['separate'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'w50 m12'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'zoomControl' => array - ( + 'eval' => ['tl_class' => 'w50 m12'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'zoomControl' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomControl'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getZoomControls'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'], - 'eval' => array( + 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', 'chosen' => true, - 'includeBlankOption' => true - ), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'spinjs' => array - ( + 'includeBlankOption' => true, + ], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'spinjs' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['spinjs'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'spin' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'spin' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['spin'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'style' => 'height:60px', - 'preserveTags' => true, - 'decodeEntities' => true, - 'allowHtml' => true, - 'rte' => 'ace|json', - 'tl_class' => 'clr' - ), - 'sql' => 'mediumtext NULL' - ), - 'simulateFullScreen' => array - ( + 'preserveTags' => true, + 'decodeEntities' => true, + 'allowHtml' => true, + 'rte' => 'ace|json', + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'simulateFullScreen' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['simulateFullScreen'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'w50 m12'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'buttonTitle' => array - ( + 'eval' => ['tl_class' => 'w50 m12'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'buttonTitle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['buttonTitle'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'disableDefault' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'disableDefault' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['disableDefault'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50 m12'), - 'sql' => "char(1) NOT NULL default ''" - ), - ), -); + 'eval' => ['tl_class' => 'w50 m12'], + 'sql' => "char(1) NOT NULL default ''", + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_control_layer.php b/src/Resources/contao/dca/tl_leaflet_control_layer.php index d67c65b..e669d64 100644 --- a/src/Resources/contao/dca/tl_leaflet_control_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_control_layer.php @@ -10,44 +10,35 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_control_layer'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_control_layer'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'cid,lid' => 'unique', - ) - ) - ), + ], + ], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'sorting' => array( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'cid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'lid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'mode' => array - ( - 'sql' => "varchar(16) NOT NULL default ''" - ) - ) -); + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'sorting' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'cid' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'lid' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'mode' => [ + 'sql' => "varchar(16) NOT NULL default ''", + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index e42238c..f42a10e 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -10,427 +10,388 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_icon'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'enableVersioning' => true, - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'enableVersioning' => true, + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'alias' => 'unique', - ) - ), + ], + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), + ], - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 1, - 'fields' => array('title'), - 'flag' => 1, - 'panelLayout' => 'limit', - 'headerFields' => array('title', 'type'), - ), - 'label' => array - ( - 'fields' => array('title', 'type'), - 'format' => '%s [%s]', - ), - 'global_operations' => array - ( - 'layers' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['layersBtn'], - 'href' => 'table=tl_leaflet_layer', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - 'styles' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['styles'], - 'href' => 'table=tl_leaflet_style', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'popups' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['popups'], - 'href' => 'table=tl_leaflet_popup', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - ), - 'operations' => array - ( - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['edit'], - 'href' => 'act=edit', - 'icon' => 'edit.gif' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] - . '\'))return false;Backend.getScrollOffset()"' - ), - 'toggle' => array - ( + 'list' => [ + 'sorting' => [ + 'mode' => 1, + 'fields' => ['title'], + 'flag' => 1, + 'panelLayout' => 'limit', + 'headerFields' => ['title', 'type'], + ], + 'label' => [ + 'fields' => ['title', 'type'], + 'format' => '%s [%s]', + ], + 'global_operations' => [ + 'layers' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['layersBtn'], + 'href' => 'table=tl_leaflet_layer', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + 'styles' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['styles'], + 'href' => 'table=tl_leaflet_style', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'popups' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['popups'], + 'href' => 'table=tl_leaflet_popup', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + ], + 'operations' => [ + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['edit'], + 'href' => 'act=edit', + 'icon' => 'edit.gif', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'toggle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', - 'handleButtonCallback' + 'handleButtonCallback', ], - 'toolkit' => [ + 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'] - ] + 'stateColumn' => ['active'], + ], ], - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'palettes' => array( - '__selector__' => array('type') - ), + 'palettes' => [ + '__selector__' => ['type'], + ], - 'metapalettes' => array( - 'default' => array( - 'title' => array('title', 'alias', 'type'), - ), - 'image extends default' => array( - 'config' => array( + 'metapalettes' => [ + 'default' => [ + 'title' => ['title', 'alias', 'type'], + ], + 'image extends default' => [ + 'config' => [ 'iconImage', 'iconRetinaImage', 'iconAnchor', 'popupAnchor', 'className', - ), - 'shadow' => array( + ], + 'shadow' => [ 'shadowImage', 'shadowRetinaImage', 'shadowAnchor', - ), - 'active' => array( - 'active' - ) - ), + ], + 'active' => [ + 'active', + ], + ], - 'div extends default' => array( - 'config' => array( + 'div extends default' => [ + 'config' => [ 'html', 'iconSize', 'iconAnchor', 'popupAnchor', 'className', - ), - 'active' => array( - 'active' - ) - ), + ], + 'active' => [ + 'active', + ], + ], - 'extra extends default' => array( - 'config' => array( + 'extra extends default' => [ + 'config' => [ 'icon', 'prefix', 'shape', 'markerColor', 'number', 'iconColor', - ), - 'active' => array( - 'active' - ) - ), - ), + ], + 'active' => [ + 'active', + ], + ], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'title' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['title'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['alias'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( + 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], - ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'toolkit' => [ + ], + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', - 'fields' => ['title'] + 'fields' => ['title'], ], ], - 'sql' => 'varchar(255) NULL' - ), - 'type' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['type'], - 'exclude' => true, - 'inputType' => 'select', - 'eval' => array( + 'sql' => 'varchar(255) NULL', + ], + 'type' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['type'], + 'exclude' => true, + 'inputType' => 'select', + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, 'submitOnChange' => true, 'chosen' => true, - ), + ], 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.icon', 'getIconOptions'], - 'reference' => &$GLOBALS['TL_LANG']['leaflet_icon'], - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'active' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['active'], - 'exclude' => true, - 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''", + 'reference' => &$GLOBALS['TL_LANG']['leaflet_icon'], + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'active' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['active'], + 'exclude' => true, + 'inputType' => 'checkbox', + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), - 'iconImage' => array - ( + ], + 'iconImage' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconImage'], 'exclude' => true, 'inputType' => 'fileTree', - 'eval' => array( + 'eval' => [ 'filesOnly' => true, - 'fieldType' => 'radio', - 'mandatory' => true, - 'tl_class' => 'clr', - 'extensions' => 'gif,png,svg,jpg' - ), + 'fieldType' => 'radio', + 'mandatory' => true, + 'tl_class' => 'clr', + 'extensions' => 'gif,png,svg,jpg', + ], 'sql' => 'binary(16) NULL', - ), - 'iconRetinaImage' => array - ( + ], + 'iconRetinaImage' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconRetinaImage'], 'exclude' => true, 'inputType' => 'fileTree', - 'eval' => array( - 'filesOnly' => true, - 'fieldType' => 'radio', - 'mandatory' => false, - 'tl_class' => 'clr', - 'extensions' => 'gif,png,svg,jpg' - ), + 'eval' => [ + 'filesOnly' => true, + 'fieldType' => 'radio', + 'mandatory' => false, + 'tl_class' => 'clr', + 'extensions' => 'gif,png,svg,jpg', + ], 'sql' => 'binary(16) NULL', - ), - 'shadowImage' => array - ( + ], + 'shadowImage' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowImage'], 'exclude' => true, 'inputType' => 'fileTree', - 'eval' => array( + 'eval' => [ 'filesOnly' => true, 'fieldType' => 'radio', 'mandatory' => false, 'tl_class' => 'clr', - 'extensions' => 'gif,png,svg,jpg' - ), + 'extensions' => 'gif,png,svg,jpg', + ], 'sql' => 'binary(16) NULL', - ), - 'shadowRetinaImage' => array - ( + ], + 'shadowRetinaImage' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowRetinaImage'], 'exclude' => true, 'inputType' => 'fileTree', - 'eval' => array( + 'eval' => [ 'filesOnly' => true, 'fieldType' => 'radio', 'mandatory' => false, 'tl_class' => 'clr', - 'extensions' => 'gif,png,svg,jpg' - ), + 'extensions' => 'gif,png,svg,jpg', + ], 'sql' => 'binary(16) NULL', - ), - 'iconAnchor' => array - ( + ], + 'iconAnchor' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconAnchor'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] - ), - 'eval' => array( + 'save_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ], + 'eval' => [ 'maxlength' => 255, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(255) NULL' - ), - 'shadowAnchor' => array - ( + ], + 'sql' => 'varchar(255) NULL', + ], + 'shadowAnchor' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowAnchor'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] - ), - 'eval' => array( + 'save_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ], + 'eval' => [ 'maxlength' => 255, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(255) NULL' - ), - 'popupAnchor' => array - ( + ], + 'sql' => 'varchar(255) NULL', + ], + 'popupAnchor' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['popupAnchor'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] - ), - 'eval' => array( + 'save_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ], + 'eval' => [ 'maxlength' => 255, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(255) NULL' - ), - 'className' => array - ( + ], + 'sql' => 'varchar(255) NULL', + ], + 'className' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['className'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 64, 'tl_class' => 'w50'), - 'sql' => "varchar(64) NOT NULL default ''" - ), - 'iconSize' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconSize'], - 'exclude' => true, - 'inputType' => 'text', - 'eval' => array( + 'eval' => ['mandatory' => false, 'maxlength' => 64, 'tl_class' => 'w50'], + 'sql' => "varchar(64) NOT NULL default ''", + ], + 'iconSize' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconSize'], + 'exclude' => true, + 'inputType' => 'text', + 'eval' => [ 'maxlength' => 64, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(64) NULL' - ), - 'html' => array - ( + ], + 'sql' => 'varchar(64) NULL', + ], + 'html' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['html'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array( + 'eval' => [ 'style' => 'height:60px', 'preserveTags' => true, 'decodeEntities' => true, 'allowHtml' => true, 'rte' => 'ace|html', - 'tl_class' => 'clr' - ), - 'sql' => 'mediumtext NULL' - ), - 'icon' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['icon'], - 'exclude' => true, - 'inputType' => 'text', - 'eval' => array( + 'tl_class' => 'clr', + ], + 'sql' => 'mediumtext NULL', + ], + 'icon' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['icon'], + 'exclude' => true, + 'inputType' => 'text', + 'eval' => [ 'maxlength' => 64, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(64) NULL' - ), - 'prefix' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['prefix'], - 'exclude' => true, - 'inputType' => 'text', - 'eval' => array( + ], + 'sql' => 'varchar(64) NULL', + ], + 'prefix' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['prefix'], + 'exclude' => true, + 'inputType' => 'text', + 'eval' => [ 'maxlength' => 64, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(64) NULL' - ), - 'shape' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['shape'], - 'exclude' => true, - 'inputType' => 'select', - 'default' => 'circle', - 'options' => ['circle', 'square', 'star', 'penta'], - 'eval' => array( - 'tl_class' => 'w50', - ), - 'sql' => 'varchar(64) NULL' - ), - 'iconColor' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconColor'], - 'exclude' => true, - 'inputType' => 'text', - 'wizard' => array( + ], + 'sql' => 'varchar(64) NULL', + ], + 'shape' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['shape'], + 'exclude' => true, + 'inputType' => 'select', + 'default' => 'circle', + 'options' => ['circle', 'square', 'star', 'penta'], + 'eval' => [ + 'tl_class' => 'w50', + ], + 'sql' => 'varchar(64) NULL', + ], + 'iconColor' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconColor'], + 'exclude' => true, + 'inputType' => 'text', + 'wizard' => [ ['netzmacht.contao_toolkit.dca.listeners.color_picker', 'handleWizardCallback'], - ), - 'eval' => array( + ], + 'eval' => [ 'maxlength' => 64, 'tl_class' => 'w50 wizard', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(16) NULL' - ), - 'markerColor' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['markerColor'], - 'exclude' => true, - 'inputType' => 'select', - 'default' => 'circle', - 'options' => [ + ], + 'sql' => 'varchar(16) NULL', + ], + 'markerColor' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['markerColor'], + 'exclude' => true, + 'inputType' => 'select', + 'default' => 'circle', + 'options' => [ 'blue', 'red', 'orange-dark', @@ -445,13 +406,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'green', 'green-light', 'black', - 'white' + 'white', ], - 'eval' => array( + 'eval' => [ 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(16) NULL' - ), - ), -); + ], + 'sql' => 'varchar(16) NULL', + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 50d0f30..0af696c 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -25,9 +25,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'alias' => 'unique', ], ], - 'onload_callback' => array( + 'onload_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], - ), + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], @@ -114,12 +114,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', - 'handleButtonCallback' + 'handleButtonCallback', ], - 'toolkit' => [ + 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'] - ] + 'stateColumn' => ['active'], + ], ], ], 'show' => [ @@ -265,20 +265,20 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], - 'toolkit' => [ + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', - 'fields' => ['title'] + 'fields' => ['title'], ], ], 'sql' => 'varchar(255) NULL', ], 'type' => [ - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['type'], - 'exclude' => true, - 'inputType' => 'select', - 'filter' => true, - 'eval' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['type'], + 'exclude' => true, + 'inputType' => 'select', + 'filter' => true, + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, @@ -286,9 +286,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'chosen' => true, 'helpwizard' => true, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayerOptions'], - 'reference' => &$GLOBALS['TL_LANG']['leaflet_layer'], - 'sql' => "varchar(32) NOT NULL default ''", + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayerOptions'], + 'reference' => &$GLOBALS['TL_LANG']['leaflet_layer'], + 'sql' => "varchar(32) NOT NULL default ''", ], 'active' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['active'], @@ -302,10 +302,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], ], 'tile_provider' => [ - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider'], - 'exclude' => true, - 'inputType' => 'select', - 'eval' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider'], + 'exclude' => true, + 'inputType' => 'select', + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50 clr', 'includeBlankOption' => true, @@ -313,7 +313,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'chosen' => true, ], 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getProviderOptions'], - 'sql' => "varchar(32) NOT NULL default ''", + 'sql' => "varchar(32) NOT NULL default ''", ], 'tile_provider_variant' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_variant'], diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php index 1574705..9a24940 100644 --- a/src/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Resources/contao/dca/tl_leaflet_map.php @@ -10,577 +10,524 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_map'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'enableVersioning' => true, - 'ctable' => array('tl_leaflet_control'), - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_map'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'enableVersioning' => true, + 'ctable' => ['tl_leaflet_control'], + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'alias' => 'unique', - ) - ), - 'onload_callback' => array( + ], + ], + 'onload_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], - ), + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), + ], - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 1, - 'fields' => array('title'), - 'panelLayout' => 'search,limit', - 'flag' => 1, - ), - 'label' => array - ( - 'fields' => array('title', 'alias'), - 'format' => '%s [%s]' - ), - 'global_operations' => array - ( - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - ), - 'operations' => array - ( - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'], - 'href' => 'act=edit', - 'icon' => 'header.gif' - ), - 'controls' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'], - 'href' => 'table=tl_leaflet_control', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/control.png', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] - . '\'))return false;Backend.getScrollOffset()"' - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + 'list' => [ + 'sorting' => [ + 'mode' => 1, + 'fields' => ['title'], + 'panelLayout' => 'search,limit', + 'flag' => 1, + ], + 'label' => [ + 'fields' => ['title', 'alias'], + 'format' => '%s [%s]', + ], + 'global_operations' => [ + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + ], + 'operations' => [ + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'], + 'href' => 'act=edit', + 'icon' => 'header.gif', + ], + 'controls' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'], + 'href' => 'table=tl_leaflet_control', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/control.png', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'metapalettes' => array( - 'default' => array( - 'title' => array('title', 'alias'), - 'zoom' => array('center', 'zoom', 'adjustZoomExtra', 'adjustBounds', 'dynamicLoad', 'boundsPadding'), - 'locate' => array('locate'), - 'layers' => array('layers'), - 'interaction' => array( + 'metapalettes' => [ + 'default' => [ + 'title' => ['title', 'alias'], + 'zoom' => ['center', 'zoom', 'adjustZoomExtra', 'adjustBounds', 'dynamicLoad', 'boundsPadding'], + 'locate' => ['locate'], + 'layers' => ['layers'], + 'interaction' => [ 'dragging', 'touchZoom', 'scrollWheelZoom', 'doubleClickZoom', 'boxZoom', 'tap', - 'keyboard' - ), - 'behaviour' => array( + 'keyboard', + ], + 'behaviour' => [ 'zoomControl', 'trackResize', 'closeOnClick', - 'bounceAtZoomLimits' - ), - 'expert' => array( + 'bounceAtZoomLimits', + ], + 'expert' => [ 'options', 'cache', - ) - ), - ), - 'metasubpalettes' => array( - 'keyboard' => array( + ], + ], + ], + 'metasubpalettes' => [ + 'keyboard' => [ 'keyboardPanOffset', - 'keyboardZoomOffset' - ), - 'adjustZoomExtra' => array( + 'keyboardZoomOffset', + ], + 'adjustZoomExtra' => [ 'minZoom', 'maxZoom', 'zoomSnap', 'zoomDelta', - ), - 'locate' => array( + ], + 'locate' => [ ':hide', 'locateWatch', 'locateSetView', 'locateMaxZoom', 'locateTimeout', 'locateMaximumAge', - 'enableHighAccuracy' - ), - 'cache' => array( - 'cacheLifeTime' - ) - ), + 'enableHighAccuracy', + ], + 'cache' => [ + 'cacheLifeTime', + ], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'title' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['title'], 'exclude' => true, 'inputType' => 'text', 'search' => true, - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'], - 'exclude' => true, - 'inputType' => 'text', - 'search' => true, - 'save_callback' => array( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'], + 'exclude' => true, + 'inputType' => 'text', + 'search' => true, + 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'] - ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'toolkit' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ], + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', - 'fields' => ['title'] - ] + 'fields' => ['title'], + ], ], - 'sql' => 'varchar(255) NULL' - ), - 'center' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['center'], - 'exclude' => true, - 'inputType' => 'text', - 'save_callback' => array( + 'sql' => 'varchar(255) NULL', + ], + 'center' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['center'], + 'exclude' => true, + 'inputType' => 'text', + 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], - ), - 'wizard' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] - ), - 'eval' => array( - 'maxlength' => 255, - 'tl_class' => 'long clr', + ], + 'wizard' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'], + ], + 'eval' => [ + 'maxlength' => 255, + 'tl_class' => 'long clr', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(255) NULL' - ), - 'layers' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'], - 'exclude' => true, - 'inputType' => 'multiColumnWizard', - 'load_callback' => array( + ], + 'sql' => 'varchar(255) NULL', + ], + 'layers' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'], + 'exclude' => true, + 'inputType' => 'multiColumnWizard', + 'load_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'loadLayerRelations'], - ), - 'save_callback' => array( + ], + 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'saveLayerRelations'], - ), - 'eval' => array( - 'multiple' => true, - 'doNotSaveEmpty' => true, - 'columnFields' => array( - 'reference' => array - ( + ], + 'eval' => [ + 'multiple' => true, + 'doNotSaveEmpty' => true, + 'columnFields' => [ + 'reference' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['reference'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'getLayers'], - 'eval' => array( + 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', 'chosen' => true, 'includeBlankOption' => true, - 'style' => 'width: 300px' - ), + 'style' => 'width: 300px', + ], 'sql' => "int(10) unsigned NOT NULL default '0'", - ), - ), - 'flatArray' => true - ), - 'sql' => 'mediumblob NULL' - ), - 'zoom' => array - ( + ], + ], + 'flatArray' => true, + ], + 'sql' => 'mediumblob NULL', + ], + 'zoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], 'default' => null, - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => 'int(4) NULL' - ), - 'adjustZoomExtra' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'adjustZoomExtra' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'minZoom' => array - ( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'minZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => 'int(4) NULL' - ), - 'maxZoom' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'maxZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => 'int(4) NULL' - ), - 'zoomSnap' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'], - 'exclude' => true, - 'inputType' => 'text', - 'eval' => array( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'zoomSnap' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'], + 'exclude' => true, + 'inputType' => 'text', + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => 'varchar(4) NULL' - ), - 'zoomDelta' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'], - 'exclude' => true, - 'inputType' => 'text', - 'eval' => array( + 'nullIfEmpty' => true, + ], + 'sql' => 'varchar(4) NULL', + ], + 'zoomDelta' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'], + 'exclude' => true, + 'inputType' => 'text', + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => 'varchar(4) NULL' - ), - 'dragging' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'varchar(4) NULL', + ], + 'dragging' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'touchZoom' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'touchZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'scrollWheelZoom' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'scrollWheelZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'], 'exclude' => true, 'inputType' => 'select', - 'options' => array('1', 'center'), + 'options' => ['1', 'center'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'], 'default' => true, - 'eval' => array( + 'eval' => [ 'tl_class' => 'w50', 'helpwizard' => true, 'includeBlankOption' => true, - 'blankOptionLabel' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'][''][0] - ), - 'sql' => "char(6) NOT NULL default ''" - ), - 'doubleClickZoom' => array - ( + 'blankOptionLabel' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'][''][0], + ], + 'sql' => "char(6) NOT NULL default ''", + ], + 'doubleClickZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'], 'exclude' => true, 'inputType' => 'select', - 'options' => array('1', 'center'), + 'options' => ['1', 'center'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'], 'default' => true, - 'eval' => array( + 'eval' => [ 'tl_class' => 'w50', 'helpwizard' => true, 'includeBlankOption' => true, - 'blankOptionLabel' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'][''][0] - ), - 'sql' => "char(6) NOT NULL default ''" - ), - 'boxZoom' => array - ( + 'blankOptionLabel' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'][''][0], + ], + 'sql' => "char(6) NOT NULL default ''", + ], + 'boxZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'tap' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'tap' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'trackResize' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'trackResize' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'bounceAtZoomLimits' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'bounceAtZoomLimits' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'closeOnClick' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'closeOnClick' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'keyboard' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'keyboard' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'keyboardPanOffset' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'keyboardPanOffset' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'], 'exclude' => true, 'inputType' => 'text', 'default' => 80, - 'eval' => array('mandatory' => true, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'clr w50'), - 'sql' => "int(4) NOT NULL default '80'" - ), - 'keyboardZoomOffset' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'clr w50'], + 'sql' => "int(4) NOT NULL default '80'", + ], + 'keyboardZoomOffset' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'], 'exclude' => true, 'inputType' => 'text', 'default' => 1, - 'eval' => array('mandatory' => true, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "int(4) NOT NULL default '1'" - ), - 'zoomControl' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "int(4) NOT NULL default '1'", + ], + 'zoomControl' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'options' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'options' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['options'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array('tl_class' => 'clr lng', - 'allowHtml' => true, - 'style' => 'min-height: 40px;', - 'rte' => 'ace|json' - ), - 'sql' => 'text NULL' - ), - 'adjustBounds' => array - ( + 'eval' => [ + 'tl_class' => 'clr lng', + 'allowHtml' => true, + 'style' => 'min-height: 40px;', + 'rte' => 'ace|json', + ], + 'sql' => 'text NULL', + ], + 'adjustBounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'options' => array('load', 'deferred'), + 'options' => ['load', 'deferred'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions'], - 'eval' => array('tl_class' => 'clr w50', 'multiple' => true, 'helpwizard' => true), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'dynamicLoad' => array - ( + 'eval' => ['tl_class' => 'clr w50', 'multiple' => true, 'helpwizard' => true], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'dynamicLoad' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'clr w50', 'submitOnChange' => false), - 'sql' => "char(1) NOT NULL default ''" - ), - 'boundsPadding' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'], - 'exclude' => true, - 'inputType' => 'text', - 'eval' => array( + 'eval' => ['tl_class' => 'clr w50', 'submitOnChange' => false], + 'sql' => "char(1) NOT NULL default ''", + ], + 'boundsPadding' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'], + 'exclude' => true, + 'inputType' => 'text', + 'eval' => [ 'maxlength' => 32, 'tl_class' => 'w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => 'varchar(32) NULL' - ), - 'locate' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'varchar(32) NULL', + ], + 'locate' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'locateWatch' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'locateWatch' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'locateSetView' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'locateSetView' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false), - 'sql' => "char(1) NOT NULL default ''" - ), - 'locateTimeout' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false], + 'sql' => "char(1) NOT NULL default ''", + ], + 'locateTimeout' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => 'int(9) NULL' - ), - 'locateMaximumAge' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true], + 'sql' => 'int(9) NULL', + ], + 'locateMaximumAge' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true), - 'sql' => 'int(9) NULL' - ), - 'enableHighAccuracy' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50', 'nullIfEmpty' => true], + 'sql' => 'int(9) NULL', + ], + 'enableHighAccuracy' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50 m12'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'locateMaxZoom' => array - ( + 'eval' => ['tl_class' => 'w50 m12'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'locateMaxZoom' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'], 'exclude' => true, 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], - 'eval' => array( + 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'clr w50', 'includeBlankOption' => true, - 'nullIfEmpty' => true - ), - 'sql' => 'int(4) NULL' - ), - 'cache' => array - ( + 'nullIfEmpty' => true, + ], + 'sql' => 'int(4) NULL', + ], + 'cache' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'cacheLifeTime' => array - ( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'cacheLifeTime' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'], 'exclude' => true, 'inputType' => 'text', 'default' => 0, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "int(9) NOT NULL default '0'" - ), - ), -); + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "int(9) NOT NULL default '0'", + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_map_layer.php b/src/Resources/contao/dca/tl_leaflet_map_layer.php index ab8a034..842a22e 100644 --- a/src/Resources/contao/dca/tl_leaflet_map_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_map_layer.php @@ -10,40 +10,32 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_map_layer'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_map_layer'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'mid,lid' => 'unique', - ) - ) - ), + ], + ], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'sorting' => array( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'mid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'lid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - ) -); + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'sorting' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'mid' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'lid' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index 81efd2b..099a385 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -10,120 +10,104 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_marker'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'enableVersioning' => true, - 'ptable' => 'tl_leaflet_layer', - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'enableVersioning' => true, + 'ptable' => 'tl_leaflet_layer', + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'pid' => 'index', 'alias' => 'unique', - ) - ), - 'onload_callback' => array( + ], + ], + 'onload_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'initialize'], - ), + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), + ], - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 4, - 'fields' => array('sorting'), - 'flag' => 1, - 'panelLayout' => 'sort,filter;search,limit', - 'headerFields' => array('title', 'type'), - 'child_record_callback' => array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'generateRow'), - ), - 'label' => array - ( - 'fields' => array('title'), - 'format' => '%s', - ), - 'global_operations' => array - ( - 'icons' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icons'], - 'href' => 'table=tl_leaflet_icon&id=', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - 'popups' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popups'], - 'href' => 'table=tl_leaflet_popup', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - ), - 'operations' => array - ( - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['edit'], - 'href' => 'act=edit', - 'icon' => 'edit.gif' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] - . '\'))return false;Backend.getScrollOffset()"' - ), - 'toggle' => array - ( + 'list' => [ + 'sorting' => [ + 'mode' => 4, + 'fields' => ['sorting'], + 'flag' => 1, + 'panelLayout' => 'sort,filter;search,limit', + 'headerFields' => ['title', 'type'], + 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'generateRow'], + ], + 'label' => [ + 'fields' => ['title'], + 'format' => '%s', + ], + 'global_operations' => [ + 'icons' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icons'], + 'href' => 'table=tl_leaflet_icon&id=', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + 'popups' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popups'], + 'href' => 'table=tl_leaflet_popup', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + ], + 'operations' => [ + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['edit'], + 'href' => 'act=edit', + 'icon' => 'edit.gif', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'toggle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', - 'handleButtonCallback' + 'handleButtonCallback', ], - 'toolkit' => [ + 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'] - ] + 'stateColumn' => ['active'], + ], ], - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'metapalettes' => array( - 'default' => array( - 'title' => array('title', 'alias', 'coordinates'), - 'content' => array('tooltip', 'alt', 'addPopup'), - 'config' => array( + 'metapalettes' => [ + 'default' => [ + 'title' => ['title', 'alias', 'coordinates'], + 'content' => ['tooltip', 'alt', 'addPopup'], + 'config' => [ ':hide', 'clickable', 'draggable', @@ -133,250 +117,226 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'riseOnHover', 'riseOffset', 'customIcon', - ), - 'expert' => array(':hide', 'featureData'), - 'active' => array('active', 'ignoreForBounds') - ), - ), - 'metasubpalettes' => array( - 'addPopup' => array('popup', 'popupContent'), - 'customIcon' => array('icon') - ), + ], + 'expert' => [':hide', 'featureData'], + 'active' => ['active', 'ignoreForBounds'], + ], + ], + 'metasubpalettes' => [ + 'addPopup' => ['popup', 'popupContent'], + 'customIcon' => ['icon'], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'sorting' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ 'sql' => "int(10) unsigned NOT NULL default '0'", - 'sorting' => true, - ), - 'pid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'title' => array - ( + ], + 'sorting' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + 'sorting' => true, + ], + 'pid' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['title'], 'exclude' => true, 'search' => true, 'sorting' => true, 'flag' => 1, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['alias'], 'exclude' => true, 'inputType' => 'text', 'search' => true, - 'save_callback' => array( + 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], - ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'toolkit' => [ + ], + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', - 'fields' => ['title'] + 'fields' => ['title'], ], ], - 'sql' => 'varchar(255) NULL' - ), - 'coordinates' => array - ( + 'sql' => 'varchar(255) NULL', + ], + 'coordinates' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['coordinates'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( + 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], - array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'saveCoordinates') - ), - 'load_callback' => array( - array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'loadCoordinates') - ), - 'wizard' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] - ), - 'eval' => array( + ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'saveCoordinates'], + ], + 'load_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'loadCoordinates'], + ], + 'wizard' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'], + ], + 'eval' => [ 'maxlength' => 255, 'tl_class' => 'long clr', 'nullIfEmpty' => true, 'doNotSaveEmpty' => true, - ), - ), - 'latitude' => array - ( + ], + ], + 'latitude' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['latitude'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => 'decimal(10,8) NULL' - ), - 'longitude' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => 'decimal(10,8) NULL', + ], + 'longitude' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['longitude'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => 'decimal(11,8) NULL' - ), - 'altitude' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => 'decimal(11,8) NULL', + ], + 'altitude' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['altitude'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => 'float NULL' - ), - 'active' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['active'], - 'exclude' => true, - 'filter' => true, - 'sorting' => true, - 'flag' => 12, - 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''", + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => 'float NULL', + ], + 'active' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['active'], + 'exclude' => true, + 'filter' => true, + 'sorting' => true, + 'flag' => 12, + 'inputType' => 'checkbox', + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), - 'tooltip' => array - ( + ], + 'tooltip' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['tooltip'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alt' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alt' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['alt'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'addPopup' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'addPopup' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['addPopup'], 'exclude' => true, 'inputType' => 'checkbox', 'filter' => true, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'popup' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popup'], - 'exclude' => true, - 'inputType' => 'select', + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'popup' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popup'], + 'exclude' => true, + 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getPopups'], - 'eval' => array( + 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', 'chosen' => true, 'includeBlankOption' => true, - ), - 'sql' => "int(10) unsigned NOT NULL default '0'", - ), - 'popupContent' => array - ( + ], + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'popupContent' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popupContent'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'rte' => 'tinyMCE', 'helpwizard' => true, 'tl_class' => 'clr'), + 'eval' => ['mandatory' => true, 'rte' => 'tinyMCE', 'helpwizard' => true, 'tl_class' => 'clr'], 'explanation' => 'insertTags', - 'sql' => 'mediumtext NULL' - ), - 'customIcon' => array - ( + 'sql' => 'mediumtext NULL', + ], + 'customIcon' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['customIcon'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'clr w50 m12', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'icon' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'], - 'exclude' => true, - 'inputType' => 'select', - 'options_callback' => array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getIcons'), - 'eval' => array( - 'mandatory' => true, - 'tl_class' => 'w50', - 'chosen' => true, - ), - 'sql' => "int(10) unsigned NOT NULL default '0'", - ), - 'draggable' => array - ( + 'eval' => ['tl_class' => 'clr w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'icon' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'], + 'exclude' => true, + 'inputType' => 'select', + 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getIcons'], + 'eval' => [ + 'mandatory' => true, + 'tl_class' => 'w50', + 'chosen' => true, + ], + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'draggable' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['draggable'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'clickable' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'clickable' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['clickable'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'keyboard' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'keyboard' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['keyboard'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'zIndexOffset' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'zIndexOffset' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['zIndexOffset'], 'exclude' => true, 'inputType' => 'text', 'default' => 0, - 'eval' => array('maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'clr w50', 'nullIfEmpty' => true), - 'sql' => 'int(5) NULL' - ), - 'ignoreForBounds' => array - ( + 'eval' => ['maxlength' => 5, 'rgxp' => 'digit', 'tl_class' => 'clr w50', 'nullIfEmpty' => true], + 'sql' => 'int(5) NULL', + ], + 'ignoreForBounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['ignoreForBounds'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'featureData' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'featureData' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['featureData'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array('tl_class' => 'clr lng', - 'allowHtml' => true, - 'style' => 'min-height: 40px;', - 'rte' => 'ace|json' - ), - 'sql' => 'text NULL' - ), - ), -); + 'eval' => [ + 'tl_class' => 'clr lng', + 'allowHtml' => true, + 'style' => 'min-height: 40px;', + 'rte' => 'ace|json', + ], + 'sql' => 'text NULL', + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index 1b595cc..dff2b01 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -10,125 +10,108 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_popup'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'enableVersioning' => true, - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_popup'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'enableVersioning' => true, + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'alias' => 'unique', - ) - ), + ], + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), + ], - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 1, - 'fields' => array('title'), - 'flag' => 1, - 'panelLayout' => 'limit', - 'headerFields' => array('title', 'type'), - ), - 'label' => array - ( - 'fields' => array('title', 'type'), - 'format' => '%s [%s]', - ), - 'global_operations' => array - ( - 'layers' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn'], - 'href' => 'table=tl_leaflet_layer', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - 'styles' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'], - 'href' => 'table=tl_leaflet_style', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'icons' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'], - 'href' => 'table=tl_leaflet_icon', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - ), - 'operations' => array - ( - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['edit'], - 'href' => 'act=edit', - 'icon' => 'edit.gif' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] - . '\'))return false;Backend.getScrollOffset()"' - ), - 'toggle' => array - ( + 'list' => [ + 'sorting' => [ + 'mode' => 1, + 'fields' => ['title'], + 'flag' => 1, + 'panelLayout' => 'limit', + 'headerFields' => ['title', 'type'], + ], + 'label' => [ + 'fields' => ['title', 'type'], + 'format' => '%s [%s]', + ], + 'global_operations' => [ + 'layers' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn'], + 'href' => 'table=tl_leaflet_layer', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + 'styles' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'], + 'href' => 'table=tl_leaflet_style', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'icons' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'], + 'href' => 'table=tl_leaflet_icon', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + ], + 'operations' => [ + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['edit'], + 'href' => 'act=edit', + 'icon' => 'edit.gif', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'toggle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', - 'handleButtonCallback' + 'handleButtonCallback', ], - 'toolkit' => [ + 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'] - ] + 'stateColumn' => ['active'], + ], ], - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'palettes' => array( - '__selector__' => array('type') - ), + 'palettes' => [ + '__selector__' => ['type'], + ], - 'metapalettes' => array( - 'default' => array( - 'title' => array('title', 'alias'), - 'size' => array('maxWidth', 'minWidth', 'maxHeight'), - 'config' => array( + 'metapalettes' => [ + 'default' => [ + 'title' => ['title', 'alias'], + 'size' => ['maxWidth', 'minWidth', 'maxHeight'], + 'config' => [ ':hide', 'closeButton', 'keepInView', @@ -136,175 +119,158 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'zoomAnimation', 'offset', 'className', - 'autoPan' - ), - 'active' => array('active'), - ), - ), + 'autoPan', + ], + 'active' => ['active'], + ], + ], - 'metasubpalettes' => array( - 'autoPan' => array('autoPanPadding') - ), + 'metasubpalettes' => [ + 'autoPan' => ['autoPanPadding'], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'title' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['title'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['alias'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( + 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], - ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'toolkit' => [ + ], + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', - 'fields' => ['title'] + 'fields' => ['title'], ], ], - 'sql' => 'varchar(255) NULL' - ), - 'maxWidth' => array - ( + 'sql' => 'varchar(255) NULL', + ], + 'maxWidth' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['maxWidth'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => 'int(4) NULL' - ), - 'minWidth' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => 'int(4) NULL', + ], + 'minWidth' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['minWidth'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => 'int(4) NULL' - ), - 'maxHeight' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => 'int(4) NULL', + ], + 'maxHeight' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['maxHeight'], 'exclude' => true, 'inputType' => 'text', 'default' => null, - 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => 'int(4) NULL' - ), - 'autoPan' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => 'int(4) NULL', + ], + 'autoPan' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['autoPan'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'keepInView' => array - ( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'keepInView' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['keepInView'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false), - 'sql' => "char(1) NOT NULL default ''" - ), - 'closeButton' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false], + 'sql' => "char(1) NOT NULL default ''", + ], + 'closeButton' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['closeButton'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'offset' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'offset' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['offset'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] - ), - 'eval' => array( + 'save_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ], + 'eval' => [ 'maxlength' => 255, 'tl_class' => 'w50', 'nullIfEmpty' => true, - ), - 'sql' => 'varchar(255) NULL' - ), - 'autoPanPadding' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['autoPanPadding'], - 'exclude' => true, - 'inputType' => 'text', - 'eval' => array( + ], + 'sql' => 'varchar(255) NULL', + ], + 'autoPanPadding' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['autoPanPadding'], + 'exclude' => true, + 'inputType' => 'text', + 'eval' => [ 'maxlength' => 255, 'tl_class' => 'w50', 'nullIfEmpty' => true, 'multiple' => true, 'size' => 2, - ), - 'sql' => 'varchar(255) NULL' - ), - 'zoomAnimation' => array - ( + ], + 'sql' => 'varchar(255) NULL', + ], + 'zoomAnimation' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['zoomAnimation'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'closeOnClick' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'closeOnClick' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['closeOnClick'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => false), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'className' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => false], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'className' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['className'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 64, 'tl_class' => 'w50'), - 'sql' => "varchar(64) NOT NULL default ''" - ), - 'active' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['active'], - 'exclude' => true, - 'inputType' => 'checkbox', - 'filter' => true, - 'sorting' => true, - 'search' => false, - 'flag' => 12, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''", + 'eval' => ['mandatory' => false, 'maxlength' => 64, 'tl_class' => 'w50'], + 'sql' => "varchar(64) NOT NULL default ''", + ], + 'active' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['active'], + 'exclude' => true, + 'inputType' => 'checkbox', + 'filter' => true, + 'sorting' => true, + 'search' => false, + 'flag' => 12, + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), - ), -); + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index dec0168..f929d5c 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -10,309 +10,275 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_style'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'enableVersioning' => true, - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_style'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'enableVersioning' => true, + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'alias' => 'unique', - ) - ), + ], + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), + ], - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 1, - 'fields' => array('title'), - 'flag' => 1, - 'panelLayout' => 'limit', - 'headerFields' => array('title', 'type'), - ), - 'label' => array - ( - 'fields' => array('title', 'type'), - 'format' => '%s [%s]', - ), - 'global_operations' => array - ( - 'layers' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['layersBtn'], - 'href' => 'table=tl_leaflet_layer', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - 'icons' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['icons'], - 'href' => 'table=tl_leaflet_icon', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'popups' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'], - 'href' => 'table=tl_leaflet_popup', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - ), - 'operations' => array - ( - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['edit'], - 'href' => 'act=edit', - 'icon' => 'edit.gif' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] - . '\'))return false;Backend.getScrollOffset()"' - ), - 'toggle' => array - ( + 'list' => [ + 'sorting' => [ + 'mode' => 1, + 'fields' => ['title'], + 'flag' => 1, + 'panelLayout' => 'limit', + 'headerFields' => ['title', 'type'], + ], + 'label' => [ + 'fields' => ['title', 'type'], + 'format' => '%s [%s]', + ], + 'global_operations' => [ + 'layers' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['layersBtn'], + 'href' => 'table=tl_leaflet_layer', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + 'icons' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['icons'], + 'href' => 'table=tl_leaflet_icon', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/icons.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'popups' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'], + 'href' => 'table=tl_leaflet_popup', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + ], + 'operations' => [ + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['edit'], + 'href' => 'act=edit', + 'icon' => 'edit.gif', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'toggle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', - 'handleButtonCallback' + 'handleButtonCallback', ], - 'toolkit' => [ + 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'] - ] + 'stateColumn' => ['active'], + ], ], - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'palettes' => array( - '__selector__' => array('type') - ), + 'palettes' => [ + '__selector__' => ['type'], + ], - 'metapalettes' => array( - 'default' => array( - 'title' => array('title', 'alias', 'type'), - 'config' => array(), - 'active' => array('active'), - ), - 'fixed extends default' => array( - 'config' => array('stroke', 'fill'), - ), - ), + 'metapalettes' => [ + 'default' => [ + 'title' => ['title', 'alias', 'type'], + 'config' => [], + 'active' => ['active'], + ], + 'fixed extends default' => [ + 'config' => ['stroke', 'fill'], + ], + ], - 'metasubpalettes' => array( - 'stroke' => array('color', 'weight', 'opacity', 'dashArray', 'lineCap', 'lineJoin'), - 'fill' => array('fillColor', 'fillOpacity',) - ), + 'metasubpalettes' => [ + 'stroke' => ['color', 'weight', 'opacity', 'dashArray', 'lineCap', 'lineJoin'], + 'fill' => ['fillColor', 'fillOpacity',], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'title' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['title'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['alias'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( + 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], - ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'toolkit' => [ + ], + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', - 'fields' => ['title'] + 'fields' => ['title'], ], ], - 'sql' => 'varchar(255) NULL' - ), - 'type' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['type'], - 'exclude' => true, - 'inputType' => 'select', - 'eval' => array( + 'sql' => 'varchar(255) NULL', + ], + 'type' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['type'], + 'exclude' => true, + 'inputType' => 'select', + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, 'submitOnChange' => true, 'chosen' => true, - ), + ], 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.style', 'getStyleOptions'], - 'reference' => &$GLOBALS['TL_LANG']['leaflet_style'], - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'stroke' => array - ( + 'reference' => &$GLOBALS['TL_LANG']['leaflet_style'], + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'stroke' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['stroke'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'w50', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default '1'" - ), - 'color' => array - ( + 'eval' => ['tl_class' => 'w50', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default '1'", + ], + 'color' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['color'], 'exclude' => true, 'inputType' => 'text', - 'wizard' => array( + 'wizard' => [ ['netzmacht.contao_toolkit.dca.listeners.color_picker', 'handleWizardCallback'], - ), - 'eval' => array( + ], + 'eval' => [ 'tl_class' => 'w50 wizard clr', 'maxlength' => 7, - 'decodeEntities' => true - ), - 'sql' => "varchar(8) NOT NULL default ''" - ), - 'weight' => array - ( + 'decodeEntities' => true, + ], + 'sql' => "varchar(8) NOT NULL default ''", + ], + 'weight' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['weight'], 'exclude' => true, 'inputType' => 'text', 'default' => 5, - 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "int(4) NOT NULL default '5'" - ), - 'opacity' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "int(4) NOT NULL default '5'", + ], + 'opacity' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['opacity'], 'exclude' => true, 'inputType' => 'text', 'default' => '0.5', - 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "varchar(4) NOT NULL default '0.5'" - ), - 'fill' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "varchar(4) NOT NULL default '0.5'", + ], + 'fill' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['fill'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => array('tl_class' => 'clr w50', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'fillColor' => array - ( + 'eval' => ['tl_class' => 'clr w50', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'fillColor' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['fillColor'], 'exclude' => true, 'inputType' => 'text', - 'wizard' => array( + 'wizard' => [ ['netzmacht.contao_toolkit.dca.listeners.color_picker', 'handleWizardCallback'], - ), - 'eval' => array( + ], + 'eval' => [ 'tl_class' => 'clr w50 wizard', 'maxlength' => 7, - 'decodeEntities' => true - ), - 'sql' => "varchar(8) NOT NULL default ''" - ), - 'fillOpacity' => array - ( + 'decodeEntities' => true, + ], + 'sql' => "varchar(8) NOT NULL default ''", + ], + 'fillOpacity' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['fillOpacity'], 'exclude' => true, 'inputType' => 'text', 'default' => '0.2', - 'eval' => array('mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "varchar(4) NOT NULL default '0.2'" - ), - 'dashArray' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 4, 'rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "varchar(4) NOT NULL default '0.2'", + ], + 'dashArray' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['dashArray'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 32, 'tl_class' => 'w50'), - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'lineCap' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 32, 'tl_class' => 'w50'], + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'lineCap' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['lineCap'], 'exclude' => true, 'inputType' => 'select', - 'options' => array('butt', 'round', 'square', 'inherit'), + 'options' => ['butt', 'round', 'square', 'inherit'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['lineCaps'], - 'eval' => array( + 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50 clr', 'includeBlankOption' => true, 'helpwizard' => true, - ), + ], 'sql' => "varchar(8) NOT NULL default ''", - ), - 'lineJoin' => array - ( + ], + 'lineJoin' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['lineJoin'], 'exclude' => true, 'inputType' => 'select', - 'options' => array('miter', 'round', 'bevel', 'inherit'), + 'options' => ['miter', 'round', 'bevel', 'inherit'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['lineJoins'], - 'eval' => array('mandatory' => false, 'tl_class' => 'w50', 'includeBlankOption' => true, 'helpwizard'), - 'sql' => "varchar(8) NOT NULL default ''" - ), - 'active' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['active'], - 'exclude' => true, - 'inputType' => 'checkbox', - 'filter' => true, - 'sorting' => true, - 'search' => false, - 'flag' => 12, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''", + 'eval' => ['mandatory' => false, 'tl_class' => 'w50', 'includeBlankOption' => true, 'helpwizard'], + 'sql' => "varchar(8) NOT NULL default ''", + ], + 'active' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['active'], + 'exclude' => true, + 'inputType' => 'checkbox', + 'filter' => true, + 'sorting' => true, + 'search' => false, + 'flag' => 12, + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), - ), -); + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index 99d0263..9883a2c 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -10,185 +10,162 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_leaflet_vector'] = array -( - 'config' => array( - 'dataContainer' => 'Table', - 'enableVersioning' => true, - 'ptable' => 'tl_leaflet_layer', - 'sql' => array - ( - 'keys' => array - ( +$GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ + 'config' => [ + 'dataContainer' => 'Table', + 'enableVersioning' => true, + 'ptable' => 'tl_leaflet_layer', + 'sql' => [ + 'keys' => [ 'id' => 'primary', 'pid' => 'index', 'alias' => 'unique', - ) - ), - 'onload_callback' => array( + ], + ], + 'onload_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], - ), + ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), + ], - 'list' => array - ( - 'sorting' => array - ( - 'mode' => 4, - 'fields' => array('sorting'), - 'flag' => 1, - 'panelLayout' => 'sort,filter;search,limit', - 'headerFields' => array('title', 'type'), - 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'generateRow'], - ), - 'label' => array - ( - 'fields' => array('title'), - 'format' => '%s', - ), - 'global_operations' => array - ( - 'styles' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['styles'], - 'href' => 'table=tl_leaflet_style', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'popups' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popups'], - 'href' => 'table=tl_leaflet_popup', - 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', - 'attributes' => 'onclick="Backend.getScrollOffset();"' - ), - 'all' => array - ( - 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], - 'href' => 'act=select', - 'class' => 'header_edit_all', - 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' - ), - ), - 'operations' => array - ( - 'edit' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['edit'], - 'href' => 'act=edit', - 'icon' => 'edit.gif' - ), - 'copy' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['copy'], - 'href' => 'act=copy', - 'icon' => 'copy.gif' - ), - 'cut' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['cut'], - 'href' => 'act=paste&mode=cut', - 'icon' => 'cut.gif', - 'attributes' => 'onclick="Backend.getScrollOffset()"', - ), - 'delete' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['delete'], - 'href' => 'act=delete', - 'icon' => 'delete.gif', - 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] - . '\'))return false;Backend.getScrollOffset()"' - ), - 'toggle' => array - ( + 'list' => [ + 'sorting' => [ + 'mode' => 4, + 'fields' => ['sorting'], + 'flag' => 1, + 'panelLayout' => 'sort,filter;search,limit', + 'headerFields' => ['title', 'type'], + 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'generateRow'], + ], + 'label' => [ + 'fields' => ['title'], + 'format' => '%s', + ], + 'global_operations' => [ + 'styles' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['styles'], + 'href' => 'table=tl_leaflet_style', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/style.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'popups' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popups'], + 'href' => 'table=tl_leaflet_popup', + 'icon' => 'bundles/netzmachtcontaoleaflet/img/popup.png', + 'attributes' => 'onclick="Backend.getScrollOffset();"', + ], + 'all' => [ + 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], + 'href' => 'act=select', + 'class' => 'header_edit_all', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"', + ], + ], + 'operations' => [ + 'edit' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['edit'], + 'href' => 'act=edit', + 'icon' => 'edit.gif', + ], + 'copy' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['copy'], + 'href' => 'act=copy', + 'icon' => 'copy.gif', + ], + 'cut' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['cut'], + 'href' => 'act=paste&mode=cut', + 'icon' => 'cut.gif', + 'attributes' => 'onclick="Backend.getScrollOffset()"', + ], + 'delete' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['delete'], + 'href' => 'act=delete', + 'icon' => 'delete.gif', + 'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] + . '\'))return false;Backend.getScrollOffset()"', + ], + 'toggle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['toggle'], 'icon' => 'visible.gif', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', - 'handleButtonCallback' + 'handleButtonCallback', ], - 'toolkit' => [ + 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'] - ] + 'stateColumn' => ['active'], + ], ], - ), - 'show' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['show'], - 'href' => 'act=show', - 'icon' => 'show.gif' - ) - ) - ), + ], + 'show' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['show'], + 'href' => 'act=show', + 'icon' => 'show.gif', + ], + ], + ], - 'palettes' => array( - '__selector__' => array('type') - ), + 'palettes' => [ + '__selector__' => ['type'], + ], - 'metapalettes' => array( - 'default' => array( - 'title' => array('title', 'alias', 'type'), - 'data' => array(), - 'popup' => array(':hide','addPopup'), - 'config' => array(':hide', 'style', 'className', 'clickable'), - 'expert' => array(':hide', 'featureData'), - 'active' => array('active', 'ignoreForBounds') - ), + 'metapalettes' => [ + 'default' => [ + 'title' => ['title', 'alias', 'type'], + 'data' => [], + 'popup' => [':hide', 'addPopup'], + 'config' => [':hide', 'style', 'className', 'clickable'], + 'expert' => [':hide', 'featureData'], + 'active' => ['active', 'ignoreForBounds'], + ], - 'polyline extends default' => array( - '+config' => array('smoothFactor', 'noClip'), - 'data' => array('data') - ), + 'polyline extends default' => [ + '+config' => ['smoothFactor', 'noClip'], + 'data' => ['data'], + ], - 'multiPolyline extends polyline' => array( - 'data' => array('multiData') - ), + 'multiPolyline extends polyline' => [ + 'data' => ['multiData'], + ], - 'polygon extends polyline' => array(), + 'polygon extends polyline' => [], - 'multiPolygon extends multiPolyline' => array( - ), + 'multiPolygon extends multiPolyline' => [ + ], - 'rectangle extends polygon' => array( - 'data' => array('bounds'), - ), + 'rectangle extends polygon' => [ + 'data' => ['bounds'], + ], - 'circle extends default' => array( - '+data' => array('coordinates', 'radius'), - ), + 'circle extends default' => [ + '+data' => ['coordinates', 'radius'], + ], - 'circleMarker extends circle' => array(), - ), - 'metasubpalettes' => array( - 'addPopup' => array('popup', 'popupContent'), - ), + 'circleMarker extends circle' => [], + ], + 'metasubpalettes' => [ + 'addPopup' => ['popup', 'popupContent'], + ], - 'fields' => array - ( - 'id' => array - ( - 'sql' => 'int(10) unsigned NOT NULL auto_increment' - ), - 'tstamp' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'pid' => array - ( - 'sql' => "int(10) unsigned NOT NULL default '0'" - ), - 'sorting' => array - ( + 'fields' => [ + 'id' => [ + 'sql' => 'int(10) unsigned NOT NULL auto_increment', + ], + 'tstamp' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'pid' => [ + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'sorting' => [ 'sql' => "int(10) unsigned NOT NULL default '0'", 'sorting' => true, - ), - 'title' => array - ( + ], + 'title' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['title'], 'exclude' => true, 'inputType' => 'text', @@ -196,226 +173,209 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'sorting' => true, 'search' => true, 'flag' => 1, - 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), - 'sql' => "varchar(255) NOT NULL default ''" - ), - 'alias' => array - ( + 'eval' => ['mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'], + 'sql' => "varchar(255) NOT NULL default ''", + ], + 'alias' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['alias'], 'exclude' => true, 'inputType' => 'text', 'search' => true, - 'save_callback' => array( + 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], - ), - 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), - 'toolkit' => [ + ], + 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], + 'toolkit' => [ 'alias_generator' => [ 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', - 'fields' => ['title'] + 'fields' => ['title'], ], ], - 'sql' => 'varchar(255) NULL' - ), - 'type' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['type'], - 'exclude' => true, - 'inputType' => 'select', - 'filter' => true, - 'sorting' => true, - 'search' => false, - 'flag' => 1, - 'eval' => array( + 'sql' => 'varchar(255) NULL', + ], + 'type' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['type'], + 'exclude' => true, + 'inputType' => 'select', + 'filter' => true, + 'sorting' => true, + 'search' => false, + 'flag' => 1, + 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, 'submitOnChange' => true, 'chosen' => true, 'helpwizard' => true, - ), + ], 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getVectorOptions'], - 'reference' => &$GLOBALS['TL_LANG']['leaflet_vector'], - 'sql' => "varchar(32) NOT NULL default ''" - ), - 'active' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['active'], - 'exclude' => true, - 'inputType' => 'checkbox', - 'filter' => true, - 'sorting' => true, - 'search' => false, - 'flag' => 12, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''", + 'reference' => &$GLOBALS['TL_LANG']['leaflet_vector'], + 'sql' => "varchar(32) NOT NULL default ''", + ], + 'active' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['active'], + 'exclude' => true, + 'inputType' => 'checkbox', + 'filter' => true, + 'sorting' => true, + 'search' => false, + 'flag' => 12, + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], ], - ), - 'addPopup' => array - ( + ], + 'addPopup' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['addPopup'], 'exclude' => true, 'inputType' => 'checkbox', 'filter' => true, - 'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true), - 'sql' => "char(1) NOT NULL default ''" - ), - 'popup' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popup'], - 'exclude' => true, - 'inputType' => 'select', - 'options_callback' => array('Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener', 'getPopups'), - 'eval' => array( + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", + ], + 'popup' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popup'], + 'exclude' => true, + 'inputType' => 'select', + 'options_callback' => ['Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener', 'getPopups'], + 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', 'chosen' => true, 'includeBlankOption' => true, - ), - 'sql' => "int(10) unsigned NOT NULL default '0'", - ), - 'popupContent' => array - ( + ], + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'popupContent' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popupContent'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => true, 'rte' => 'tinyMCE', 'helpwizard' => true, 'tl_class' => 'clr'), + 'eval' => ['mandatory' => true, 'rte' => 'tinyMCE', 'helpwizard' => true, 'tl_class' => 'clr'], 'explanation' => 'insertTags', - 'sql' => 'mediumtext NULL' - ), - 'style' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['style'], - 'exclude' => true, - 'inputType' => 'select', + 'sql' => 'mediumtext NULL', + ], + 'style' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['style'], + 'exclude' => true, + 'inputType' => 'select', 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getStyles'], - 'eval' => array( - 'mandatory' => false, - 'tl_class' => 'w50', - 'chosen' => true, + 'eval' => [ + 'mandatory' => false, + 'tl_class' => 'w50', + 'chosen' => true, 'includeBlankOption' => true, - ), - 'sql' => "int(10) unsigned NOT NULL default '0'", - ), - 'clickable' => array - ( + ], + 'sql' => "int(10) unsigned NOT NULL default '0'", + ], + 'clickable' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['clickable'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => true, - 'eval' => array('tl_class' => 'm12 w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'className' => array - ( + 'eval' => ['tl_class' => 'm12 w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'className' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['className'], 'exclude' => true, 'inputType' => 'text', - 'eval' => array('mandatory' => false, 'maxlength' => 64, 'tl_class' => 'w50'), - 'sql' => "varchar(64) NOT NULL default ''" - ), - 'coordinates' => array - ( + 'eval' => ['mandatory' => false, 'maxlength' => 64, 'tl_class' => 'w50'], + 'sql' => "varchar(64) NOT NULL default ''", + ], + 'coordinates' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['coordinates'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'] - ), - 'wizard' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'] - ), - 'eval' => array( + 'save_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ], + 'wizard' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'], + ], + 'eval' => [ 'maxlength' => 255, 'tl_class' => 'long clr', 'nullIfEmpty' => true, 'mandatory' => true, - ), - 'sql' => 'varchar(255) NULL' - ), - 'radius' => array - ( + ], + 'sql' => 'varchar(255) NULL', + ], + 'radius' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['radius'], 'exclude' => true, 'inputType' => 'text', 'default' => 5, - 'eval' => array('mandatory' => false, 'maxlength' => 10, 'rgxp' => 'digit', 'tl_class' => 'clr w50'), - 'sql' => "int(10) NOT NULL default '5'" - ), - 'data' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['data'], - 'inputType' => 'textarea', - 'search' => false, - 'eval' => array('mandatory' => true, 'alwaysSave' => true), - 'save_callback' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinates'] - ), - 'sql' => 'longblob NULL' - ), - 'multiData' => array - ( - 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['multiData'], - 'inputType' => 'multiColumnWizard', - 'search' => false, - 'eval' => array( + 'eval' => ['mandatory' => false, 'maxlength' => 10, 'rgxp' => 'digit', 'tl_class' => 'clr w50'], + 'sql' => "int(10) NOT NULL default '5'", + ], + 'data' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['data'], + 'inputType' => 'textarea', + 'search' => false, + 'eval' => ['mandatory' => true, 'alwaysSave' => true], + 'save_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinates'], + ], + 'sql' => 'longblob NULL', + ], + 'multiData' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['multiData'], + 'inputType' => 'multiColumnWizard', + 'search' => false, + 'eval' => [ 'mandatory' => true, 'alwaysSave' => true, 'flatArray' => true, - 'columnFields' => array - ( - 'data' => array - ( + 'columnFields' => [ + 'data' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['data'], 'inputType' => 'textarea', 'search' => false, - 'eval' => array('alwaysSave' => true, 'style' => 'width:600px'), - ) - ) - ), - 'save_callback' => array( - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinateSets'] - ), - 'sql' => 'longblob NULL' - ), - 'bounds' => array - ( + 'eval' => ['alwaysSave' => true, 'style' => 'width:600px'], + ], + ], + ], + 'save_callback' => [ + ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinateSets'], + ], + 'sql' => 'longblob NULL', + ], + 'bounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['bounds'], 'exclude' => true, 'inputType' => 'text', - 'save_callback' => array(), - 'eval' => array( + 'save_callback' => [], + 'eval' => [ 'maxlength' => 255, 'multiple' => true, 'size' => 2, 'tl_class' => 'long clr', 'nullIfEmpty' => true, - ), - 'sql' => 'mediumblob NULL' - ), - 'ignoreForBounds' => array - ( + ], + 'sql' => 'mediumblob NULL', + ], + 'ignoreForBounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['ignoreForBounds'], 'exclude' => true, 'inputType' => 'checkbox', 'default' => false, - 'eval' => array('tl_class' => 'w50'), - 'sql' => "char(1) NOT NULL default ''" - ), - 'featureData' => array - ( + 'eval' => ['tl_class' => 'w50'], + 'sql' => "char(1) NOT NULL default ''", + ], + 'featureData' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['featureData'], 'exclude' => true, 'inputType' => 'textarea', - 'eval' => array('tl_class' => 'clr lng', - 'allowHtml' => true, - 'style' => 'min-height: 40px;', - 'rte' => 'ace|json' - ), - 'sql' => 'text NULL' - ), - ), -); + 'eval' => [ + 'tl_class' => 'clr lng', + 'allowHtml' => true, + 'style' => 'min-height: 40px;', + 'rte' => 'ace|json', + ], + 'sql' => 'text NULL', + ], + ], +]; diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php index a48bacd..e99cfbb 100644 --- a/src/Resources/contao/dca/tl_module.php +++ b/src/Resources/contao/dca/tl_module.php @@ -10,76 +10,76 @@ * @filesource */ -$GLOBALS['TL_DCA']['tl_module']['metapalettes']['leaflet'] = array( - 'type' => array('name', 'type', 'headline'), - 'leaflet' => array('leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height', 'leaflet_template'), - 'templates' => array(':hide', 'customTpl'), - 'protected' => array(':hide', 'protected'), - 'expert' => array(':hide', 'guests', 'cssID', 'space'), - 'invisible' => array(':hide', 'invisible', 'start', 'start') -); +$GLOBALS['TL_DCA']['tl_module']['metapalettes']['leaflet'] = [ + 'type' => ['name', 'type', 'headline'], + 'leaflet' => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height', 'leaflet_template'], + 'templates' => [':hide', 'customTpl'], + 'protected' => [':hide', 'protected'], + 'expert' => [':hide', 'guests', 'cssID', 'space'], + 'invisible' => [':hide', 'invisible', 'start', 'start'], +]; -$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_map'] = array( +$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_map'], 'inputType' => 'select', 'exclude' => true, 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'], - 'wizard' => array( + 'wizard' => [ ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'], - ), - 'eval' => array( + ], + 'eval' => [ 'tl_class' => 'w50 wizard', 'chosen' => true, - ), - 'sql' => "int(10) unsigned NOT NULL default '0'" -); + ], + 'sql' => "int(10) unsigned NOT NULL default '0'", +]; -$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_mapId'] = array( - 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_mapId'], - 'inputType' => 'text', - 'exclude' => true, - 'eval' => array( +$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_mapId'] = [ + 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_mapId'], + 'inputType' => 'text', + 'exclude' => true, + 'eval' => [ 'tl_class' => 'w50', 'chosen' => true, 'maxlength' => 16, - ), - 'sql' => "varchar(16) NOT NULL default ''" -); + ], + 'sql' => "varchar(16) NOT NULL default ''", +]; -$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_width'] = array( +$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_width'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_width'], 'inputType' => 'inputUnit', - 'options' => array('px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'), + 'options' => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'], 'search' => false, 'exclude' => true, - 'eval' => array('rgxp' => 'digit', 'tl_class' => 'clr w50'), - 'sql' => "varchar(64) NOT NULL default ''" -); + 'eval' => ['rgxp' => 'digit', 'tl_class' => 'clr w50'], + 'sql' => "varchar(64) NOT NULL default ''", +]; -$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_height'] = array( +$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_height'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_height'], 'inputType' => 'inputUnit', - 'options' => array('px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'), + 'options' => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'], 'search' => false, 'exclude' => true, - 'eval' => array('rgxp' => 'digit', 'tl_class' => 'w50'), - 'sql' => "varchar(64) NOT NULL default ''" -); + 'eval' => ['rgxp' => 'digit', 'tl_class' => 'w50'], + 'sql' => "varchar(64) NOT NULL default ''", +]; -$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_template'] = array( +$GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_template'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_template'], 'inputType' => 'select', 'exclude' => true, 'options_callback' => ['netzmacht.contao_toolkit.dca.listeners.template_options', 'handleOptionsCallback'], - 'eval' => array( + 'eval' => [ 'tl_class' => 'w50', 'chosen' => true, - ), - 'toolkit' => [ - 'template_options' => [ - 'prefix' => 'leaflet_map_js' - ] ], - 'sql' => "varchar(64) NOT NULL default ''" -); + 'toolkit' => [ + 'template_options' => [ + 'prefix' => 'leaflet_map_js', + ], + ], + 'sql' => "varchar(64) NOT NULL default ''", +]; From 6b646243e12fe488093ca00d69e1f13236efcb84 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 17:02:25 +0200 Subject: [PATCH 076/152] Detect if empty values are supported. --- src/Listener/Dca/Validator.php | 61 +++++++++++++++++++++++++----- src/Resources/config/listeners.yml | 1 + 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/src/Listener/Dca/Validator.php b/src/Listener/Dca/Validator.php index 2fc5ef3..53d5cc3 100644 --- a/src/Listener/Dca/Validator.php +++ b/src/Listener/Dca/Validator.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; +use Contao\DataContainer; +use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\LeafletPHP\Value\LatLng; use Symfony\Component\Translation\TranslatorInterface as Translator; @@ -29,26 +31,41 @@ class Validator */ private $translator; + /** + * Data container manager. + * + * @var Manager + */ + private $dcaManager; + /** * Validator constructor. * + * @param Manager $dcaManager Data container manager. * @param Translator $translator Translator. */ - public function __construct(Translator $translator) + public function __construct(Manager $dcaManager, Translator $translator) { $this->translator = $translator; + $this->dcaManager = $dcaManager; } /** * Validate coordinates. * - * @param mixed $value Given value. + * @param mixed $value Given value. + * @param DataContainer $dataContainer Data container driver. * * @return mixed - * @throws \InvalidArgumentException When invalid coordinates give. + * + * @throws \InvalidArgumentException When invalid coordinates given. */ - public function validateCoordinates($value) + public function validateCoordinates($value, $dataContainer) { + if (!$value && !$this->isRequired($dataContainer)) { + return $value; + } + try { LatLng::fromString($value); } catch (\Exception $e) { @@ -65,11 +82,14 @@ class Validator /** * Validate multiple coordinates. * - * @param mixed $values Given value. + * @param mixed $values Given value. + * @param DataContainer $dataContainer Data container driver. * * @return mixed + * + * @throws \InvalidArgumentException When invalid coordinates given. */ - public function validateMultipleCoordinates($values) + public function validateMultipleCoordinates($values, $dataContainer) { if (!is_array($values)) { $lines = explode("\n", $values); @@ -78,7 +98,7 @@ class Validator } foreach ($lines as $coordinate) { - $this->validateCoordinates($coordinate); + $this->validateCoordinates($coordinate, $dataContainer); } return $values; @@ -87,15 +107,18 @@ class Validator /** * Validate multiple coordinate sets. * - * @param mixed $values Given value. + * @param mixed $values Given value. + * @param DataContainer $dataContainer Data container driver. * * @return mixed + * + * @throws \InvalidArgumentException When invalid coordinates given. */ - public function validateMultipleCoordinateSets($values) + public function validateMultipleCoordinateSets($values, $dataContainer) { $sets = deserialize($values, true); foreach ($sets as $lines) { - $this->validateMultipleCoordinates($lines); + $this->validateMultipleCoordinates($lines, $dataContainer); } return $values; @@ -119,4 +142,22 @@ class Validator return $value; } + + /** + * Check if value is required. + * + * @param DataContainer $dataContainer Data container driver. + * + * @return bool + */ + private function isRequired($dataContainer): bool + { + $definition = $this->dcaManager->getDefinition($dataContainer->table); + + if ($definition->get(['fields', $dataContainer->field, 'eval', 'mandatory'])) { + return true; + } + + return false; + } } diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index 38fd9f2..d90ef29 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -8,6 +8,7 @@ services: netzmacht.contao_leaflet_maps.listeners.dca.validator: class: Netzmacht\Contao\Leaflet\Listener\Dca\Validator arguments: + - '@netzmacht.contao_toolkit.dca.manager' - '@translator' netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration: From 6004138e4ed34431f5a301f60e38a1f2c1f1101e Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 17:06:04 +0200 Subject: [PATCH 077/152] Fix paths. --- src/Backend/About.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Backend/About.php b/src/Backend/About.php index 50abf88..7862b43 100644 --- a/src/Backend/About.php +++ b/src/Backend/About.php @@ -82,8 +82,8 @@ class About */ private function extractFromComposer() { - $extFile = TL_ROOT . '/composer/vendor/netzmacht/contao-leaflet-maps/composer.json'; - $lockFile = TL_ROOT . '/composer/composer.lock'; + $extFile = TL_ROOT . '/vendor/netzmacht/contao-leaflet-maps/composer.json'; + $lockFile = TL_ROOT . '/composer.lock'; if (!file_exists($extFile) || !file_exists($lockFile)) { return array(); From 5167318c43f7359fb17673fd3c53153c1a7d6082 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 9 Oct 2017 17:09:52 +0200 Subject: [PATCH 078/152] Add request token to the paste button. --- src/Listener/Dca/LayerDcaListener.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 162b119..e156c4a 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -14,6 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\Controller; use Contao\Image; +use Contao\RequestToken; use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer; @@ -224,6 +225,7 @@ class LayerDcaListener extends AbstractListener $pasteAfterUrl = \Controller::addToUrl( 'act='.$children['mode'].'&mode=1&pid='.$row['id'] .(!is_array($children['id']) ? '&id='.$children['id'] : '') + . '&rt=' . RequestToken::get() ); $buffer = sprintf( From 8f45bf925a7da41f927a7e11841795ac71cb8e6f Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 10 Oct 2017 15:25:35 +0200 Subject: [PATCH 079/152] Rework components to support latest toolkit changes. --- src/Frontend/AbstractMapHybrid.php | 58 +++++++++---------- .../ContentElement/MapElementFactory.php | 3 +- src/Frontend/Module/MapModuleFactory.php | 3 +- src/Resources/config/services.yml | 2 + src/Resources/contao/config/config.php | 18 ------ 5 files changed, 31 insertions(+), 53 deletions(-) diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index 4c807d3..e4ba0b7 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -22,7 +22,7 @@ use Contao\Model\Collection; use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid; -use Netzmacht\Contao\Toolkit\View\Template\TemplateFactory; +use Symfony\Component\Templating\EngineInterface as TemplateEngine; use Symfony\Component\Translation\TranslatorInterface as Translator; /** @@ -56,24 +56,24 @@ abstract class AbstractMapHybrid extends AbstractHybrid /** * HybridTrait constructor. * - * @param Result|Model|Collection $model Component model. - * @param TemplateFactory $templateFactory Template factory. - * @param Translator $translator Translator. - * @param MapProvider $mapProvider Map provider. - * @param Input $input Request Input. - * @param Config $config Config. - * @param string $column Column in which the element appears. + * @param Result|Model|Collection $model Component model. + * @param TemplateEngine $templateEngine Template engine. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param Input $input Request Input. + * @param Config $config Config. + * @param string $column Column in which the element appears. */ public function __construct( $model, - TemplateFactory $templateFactory, + TemplateEngine $templateEngine, Translator $translator, MapProvider $mapProvider, $input, $config, $column = null ) { - parent::__construct($model, $templateFactory, $translator, $column); + parent::__construct($model, $templateEngine, $translator, $column); $this->mapProvider = $mapProvider; $this->input = $input; @@ -90,44 +90,38 @@ abstract class AbstractMapHybrid extends AbstractHybrid $this->mapProvider->handleAjaxRequest($this->getIdentifier()); if (TL_MODE === 'BE') { - $model = MapModel::findByPk($this->get('leaflet_map')); - - $template = $this->getTemplateFactory()->createBackendTemplate('be_wildcard'); + $model = MapModel::findByPk($this->get('leaflet_map')); + $parameters = [ + 'title' => $this->get('headline'), + ]; if ($model) { - $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id; + $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id;; - $template->set('wildcard', '### LEAFLET MAP ' . $model->title . ' ###'); - $template->set('title', $this->get('headline')); - $template->set('id', $model->id); - $template->set('link', $model->title); - $template->set('href', $href); + $parameters['wildcard'] = '### LEAFLET MAP ' . $model->title . ' ###'; + $parameters['id'] = $model->id; + $parameters['link'] = $model->title; + $parameters['href'] = $href; } - return $template->parse(); + return $this->render('toolkit:be:be_wildcard.html5', $parameters); } return parent::generate(); } /** - * Do the frontend integration compiling. - * - * @return void - * - * @throws \Exception If the map could not be created. - * - * @SuppressWarnings(PHPMD.Superglobals) + * {@inheritdoc} */ - protected function compile(): void + protected function prepareTemplateData(array $data): array { try { $template = $this->get('leaflet_template') ?: 'leaflet_map_js'; $mapId = $this->getIdentifier(); $map = $this->mapProvider->generate($this->get('leaflet_map'), null, $mapId, $template); - $this->template->set('javascript', $map); - $this->template->set('mapId', $mapId); + $data['javascript'] = $map; + $data['mapId'] = $mapId; $style = ''; $height = deserialize($this->get('leaflet_height'), true); @@ -141,10 +135,12 @@ abstract class AbstractMapHybrid extends AbstractHybrid $style .= 'height:' . $height['value'] . $height['unit'] . ';'; } - $this->template->set('mapStyle', $style); + $data['mapStyle'] = $style; } catch (\Exception $e) { throw $e; } + + return $data; } /** diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index 30e525d..8c4d33b 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\ContentElement; -use Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElement; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; use Psr\Container\ContainerInterface as Container; @@ -58,7 +57,7 @@ class MapElementFactory implements ComponentFactory { return new MapElement( $model, - $this->container->get('netzmacht.contao_toolkit.view.template_factory'), + $this->container->get('templating'), $this->container->get('translator'), $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), $this->container->get('netzmacht.contao_toolkit.contao.input'), diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index 9622258..34c9d70 100644 --- a/src/Frontend/Module/MapModuleFactory.php +++ b/src/Frontend/Module/MapModuleFactory.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\Module; -use Netzmacht\Contao\Leaflet\Frontend\Module\MapModule; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; use Psr\Container\ContainerInterface as Container; @@ -58,7 +57,7 @@ class MapModuleFactory implements ComponentFactory { return new MapModule( $model, - $this->container->get('netzmacht.contao_toolkit.view.template_factory'), + $this->container->get('templating'), $this->container->get('translator'), $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), $this->container->get('netzmacht.contao_toolkit.contao.input'), diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index 6ddfc8b..e5f9d87 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -83,6 +83,7 @@ services: - '@service_container' tags: - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } + - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'include' } netzmacht.contao_leaflet_maps.frontend.module_factory: class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory @@ -90,6 +91,7 @@ services: - '@service_container' tags: - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } + - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: include } netzmacht.contao_leaflet_maps.frontend.insert_tag: class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index 8d928ec..d373225 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -10,9 +10,6 @@ * @filesource */ -use Netzmacht\Contao\Toolkit\Component\ContentElement\ContentElementDecorator; -use Netzmacht\Contao\Toolkit\Component\Module\ModuleDecorator; - /* * Backend module. */ @@ -57,21 +54,6 @@ array_insert( ) ); - -/* - * Content elements. - */ - -$GLOBALS['TL_CTE']['includes']['leaflet'] = ContentElementDecorator::class; - - -/* - * Frontend modules - */ - -$GLOBALS['FE_MOD']['includes']['leaflet'] = ModuleDecorator::class; - - /* * Models. */ From 6408796b560e851eb6aa169f59960af7a53c733d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 10 Oct 2017 15:25:59 +0200 Subject: [PATCH 080/152] Add bundle namespace. --- src/ContaoManager/Plugin.php | 2 +- src/NetzmachtContaoLeafletBundle.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php index c9985b7..4a3c6f5 100644 --- a/src/ContaoManager/Plugin.php +++ b/src/ContaoManager/Plugin.php @@ -17,7 +17,7 @@ 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\Toolkit\NetzmachtContaoToolkitBundle; +use Netzmacht\Contao\Toolkit\Bundle\NetzmachtContaoToolkitBundle; /** * Contao manager plugin. diff --git a/src/NetzmachtContaoLeafletBundle.php b/src/NetzmachtContaoLeafletBundle.php index e83d149..fd683ba 100644 --- a/src/NetzmachtContaoLeafletBundle.php +++ b/src/NetzmachtContaoLeafletBundle.php @@ -17,7 +17,7 @@ namespace Netzmacht\Contao\Leaflet; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterLibrariesPass; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterDefinitionMapperPass; use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterEncodersPass; -use Netzmacht\Contao\Toolkit\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass; +use Netzmacht\Contao\Toolkit\Bundle\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; From 5a1ea75623f08c67c0b728e5aabb6e19801b16b0 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 10 Oct 2017 16:07:16 +0200 Subject: [PATCH 081/152] Fix state column value. --- src/Resources/contao/dca/tl_leaflet_control.php | 2 +- src/Resources/contao/dca/tl_leaflet_icon.php | 2 +- src/Resources/contao/dca/tl_leaflet_layer.php | 2 +- src/Resources/contao/dca/tl_leaflet_marker.php | 2 +- src/Resources/contao/dca/tl_leaflet_popup.php | 2 +- src/Resources/contao/dca/tl_leaflet_style.php | 2 +- src/Resources/contao/dca/tl_leaflet_vector.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php index c2e594f..c0ef6fc 100644 --- a/src/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Resources/contao/dca/tl_leaflet_control.php @@ -80,7 +80,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ ], 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'], + 'stateColumn' => 'active', ], ], ], diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php index f42a10e..aa080fc 100644 --- a/src/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Resources/contao/dca/tl_leaflet_icon.php @@ -91,7 +91,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ ], 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'], + 'stateColumn' => 'active', ], ], ], diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php index 0af696c..8de855b 100644 --- a/src/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Resources/contao/dca/tl_leaflet_layer.php @@ -118,7 +118,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'], + 'stateColumn' => 'active', ], ], ], diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php index 099a385..a5d9018 100644 --- a/src/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Resources/contao/dca/tl_leaflet_marker.php @@ -91,7 +91,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ ], 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'], + 'stateColumn' => 'active', ], ], ], diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php index dff2b01..173db63 100644 --- a/src/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Resources/contao/dca/tl_leaflet_popup.php @@ -91,7 +91,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [ ], 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'], + 'stateColumn' => 'active', ], ], ], diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php index f929d5c..01a28f5 100644 --- a/src/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Resources/contao/dca/tl_leaflet_style.php @@ -91,7 +91,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [ ], 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'], + 'stateColumn' => 'active', ], ], ], diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php index 9883a2c..a5866a2 100644 --- a/src/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Resources/contao/dca/tl_leaflet_vector.php @@ -97,7 +97,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ ], 'toolkit' => [ 'state_button' => [ - 'stateColumn' => ['active'], + 'stateColumn' => 'active', ], ], ], From 572d2e74a02fa7523dcd1bd10d514610740dc132 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:11:30 +0200 Subject: [PATCH 082/152] Rewrite the insert tag replacer using the new toolkit 3.0 features. --- .../InsertTag/LeafletInsertTagParser.php | 39 ++++++++++++------- src/Resources/config/services.yml | 2 +- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/Frontend/InsertTag/LeafletInsertTagParser.php b/src/Frontend/InsertTag/LeafletInsertTagParser.php index 53aa54e..2415984 100644 --- a/src/Frontend/InsertTag/LeafletInsertTagParser.php +++ b/src/Frontend/InsertTag/LeafletInsertTagParser.php @@ -15,7 +15,9 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\InsertTag; use Netzmacht\Contao\Leaflet\MapProvider; -use Netzmacht\Contao\Toolkit\InsertTag\Parser; +use Netzmacht\Contao\Toolkit\InsertTag\AbstractSingleInsertTagParser; +use Netzmacht\Contao\Toolkit\InsertTag\ArgumentParser; +use Netzmacht\Contao\Toolkit\InsertTag\ArgumentParserPlugin; /** * LeafletInsertTagParser parses the leaflet insert tag. @@ -29,8 +31,17 @@ use Netzmacht\Contao\Toolkit\InsertTag\Parser; * * @package Netzmacht\Contao\Leaflet\Frontend\InsertTag */ -class LeafletInsertTagParser implements Parser +final class LeafletInsertTagParser extends AbstractSingleInsertTagParser { + use ArgumentParserPlugin; + + /** + * Insert tag name. + * + * @var string + */ + protected $tagName = 'leaflet'; + /** * The map service. * @@ -60,26 +71,24 @@ class LeafletInsertTagParser implements Parser /** * {@inheritDoc} */ - public function supports(string $tag): bool + protected function parseTag(array $arguments, string $tag, string $raw) { - return $tag === 'leaflet'; + if (empty($arguments['mapId'])) { + return ''; + } + + $style = empty($arguments['style']) ? 'width:400px;height:300px' : $arguments['style']; + $template = empty($arguments['template']) ? 'leaflet_map_html' : $arguments['template']; + + return $this->generateMap($arguments['mapId'], $template, $style); } /** * {@inheritDoc} */ - public function parse(string $raw, string $tag, string $params = null, bool $cache = true): string + protected function createArgumentParser(): ArgumentParser { - $parts = explode('::', $params); - - if (empty($parts[0])) { - return ''; - } - - $style = empty($parts[1]) ? 'width:400px;height:300px' : $parts[1]; - $template = empty($parts[2]) ? 'leaflet_map_html' : $parts[2]; - - return $this->generateMap($parts[0], $template, $style); + return ArgumentParser::create()->splitBy('::', ['mapId', 'style', 'template']); } /** diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index e5f9d87..d69c5ac 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -99,4 +99,4 @@ services: - '@netzmacht.contao_leaflet_maps.map.provider' - '%kernel.debug%' tags: - - { name: 'netzmacht.contao_toolkit.insert_tag_parser' } + - { name: 'contao.hook', hook: 'replaceInsertTags', method: 'replace' } From f5b984407e65457a10edcdbe4dd010e30a9c892b Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:21:16 +0200 Subject: [PATCH 083/152] Fix arguments order of doGenerate() call. --- src/MapProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MapProvider.php b/src/MapProvider.php index 631b404..38cbfa8 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -203,7 +203,7 @@ class MapProvider } } - $buffer = $this->doGenerate($mapId, $filter, $elementId, $template, $model, $style); + $buffer = $this->doGenerate($model, $filter, $elementId, $template, $style); if ($model->cache) { $this->cache->save( From 3c660b5bbd3dcb88ee0fd33f56eb9ccbf55b4234 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:32:25 +0200 Subject: [PATCH 084/152] Fix: Support collapsed setting. --- src/Mapper/Control/LayersControlMapper.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index 0b2269c..5ad08ce 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -63,4 +63,14 @@ class LayersControlMapper extends AbstractControlMapper return $arguments; } + + /** + * {@inheritDoc} + */ + protected function initialize() + { + parent::initialize(); + + $this->optionsBuilder->addOption('collapsed'); + } } From d36d613e37f2516fba407f43830be4394f0c3725 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:35:58 +0200 Subject: [PATCH 085/152] Also add autoZIndex option. --- src/Mapper/Control/LayersControlMapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index 5ad08ce..78aade6 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -71,6 +71,6 @@ class LayersControlMapper extends AbstractControlMapper { parent::initialize(); - $this->optionsBuilder->addOption('collapsed'); + $this->optionsBuilder->addOptions(['collapsed', 'autoZIndex']); } } From 1df16407efa3953abd77a8980657a59181be359c Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:39:23 +0200 Subject: [PATCH 086/152] Support PHP 7.0. --- .travis.yml | 1 + composer.json | 2 +- src/Listener/Dca/LeafletDcaListener.php | 2 +- src/Listener/Dca/MarkerDcaListener.php | 2 +- src/Listener/LoadAssetsListener.php | 4 ++-- src/Listener/RegisterLibrariesListener.php | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd5f744..b90fbc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: php php: + - "7.0" - "7.1" env: diff --git a/composer.json b/composer.json index 69b8194..7203a8e 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "source": "https://github.com/netzmacht/contao-leaflet-maps" }, "require": { - "php": ">=7.1", + "php": ">=7.0", "contao/core-bundle": "^4.4", "netzmacht/contao-leaflet-libraries": "^1.0", "netzmacht/php-javascript-builder": "^1.0", diff --git a/src/Listener/Dca/LeafletDcaListener.php b/src/Listener/Dca/LeafletDcaListener.php index 99d89c8..c081e38 100644 --- a/src/Listener/Dca/LeafletDcaListener.php +++ b/src/Listener/Dca/LeafletDcaListener.php @@ -56,7 +56,7 @@ class LeafletDcaListener * * @return void */ - public function loadLanguageFile(): void + public function loadLanguageFile() { Controller::loadLanguageFile('leaflet'); } diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php index 6d3716c..dcb3260 100644 --- a/src/Listener/Dca/MarkerDcaListener.php +++ b/src/Listener/Dca/MarkerDcaListener.php @@ -47,7 +47,7 @@ class MarkerDcaListener * * @return void */ - public function initialize(): void + public function initialize() { Controller::loadLanguageFile('leaflet'); } diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 6ddf39e..2aec697 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -69,7 +69,7 @@ class LoadAssetsListener * * @return void */ - public function onGetJavascriptEvent(): void + public function onGetJavascriptEvent() { $this->assets->addJavascript( 'bundles/netzmachtcontaoleaflet/js/contao-leaflet.js', @@ -117,7 +117,7 @@ class LoadAssetsListener * * @return void */ - protected function loadIconsLibraries($icon): void + protected function loadIconsLibraries($icon) { foreach ($icon::getRequiredLibraries() as $library) { if (!isset($this->libraries[$library])) { diff --git a/src/Listener/RegisterLibrariesListener.php b/src/Listener/RegisterLibrariesListener.php index fc5ea75..e753e94 100644 --- a/src/Listener/RegisterLibrariesListener.php +++ b/src/Listener/RegisterLibrariesListener.php @@ -56,7 +56,7 @@ final class RegisterLibrariesListener * * @return void */ - public function onInitializeSystem(): void + public function onInitializeSystem() { foreach ($this->libraries as $name => $assets) { if (!empty($assets['css'])) { From 1dce4bc1c6b956aa6ea8874a7afb0f3c92f82700 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:46:19 +0200 Subject: [PATCH 087/152] Move bundle files to Bundle namespace. --- composer.json | 2 +- src/{ => Bundle}/ContaoManager/Plugin.php | 6 +- .../NetzmachtContaoLeafletExtension.php | 4 +- .../Pass/RegisterDefinitionMapperPass.php | 2 +- .../Pass/RegisterEncodersPass.php | 2 +- .../Pass/RegisterLibrariesPass.php | 2 +- .../NetzmachtContaoLeafletBundle.php | 8 +- .../Resources/config/amenities.yml | 0 src/{ => Bundle}/Resources/config/config.yml | 0 .../Resources/config/encoders.yml | 0 src/{ => Bundle}/Resources/config/filters.yml | 0 src/{ => Bundle}/Resources/config/layers.yml | 0 .../Resources/config/listeners.yml | 0 src/{ => Bundle}/Resources/config/mappers.yml | 0 .../Resources/config/providers.yml | 0 .../Resources/config/services.yml | 0 .../Resources/contao/config/config.php | 0 .../Resources/contao/dca/tl_content.php | 0 .../contao/dca/tl_leaflet_control.php | 0 .../contao/dca/tl_leaflet_control_layer.php | 0 .../Resources/contao/dca/tl_leaflet_icon.php | 0 .../Resources/contao/dca/tl_leaflet_layer.php | 0 .../Resources/contao/dca/tl_leaflet_map.php | 0 .../contao/dca/tl_leaflet_map_layer.php | 0 .../contao/dca/tl_leaflet_marker.php | 0 .../Resources/contao/dca/tl_leaflet_popup.php | 0 .../Resources/contao/dca/tl_leaflet_style.php | 0 .../contao/dca/tl_leaflet_vector.php | 0 .../Resources/contao/dca/tl_module.php | 0 .../Resources/contao/languages/de/leaflet.php | 0 .../Resources/contao/languages/de/modules.php | 0 .../contao/languages/de/tl_content.php | 0 .../languages/de/tl_leaflet_control.php | 0 .../contao/languages/de/tl_leaflet_icon.php | 0 .../contao/languages/de/tl_leaflet_layer.php | 0 .../contao/languages/de/tl_leaflet_map.php | 0 .../contao/languages/de/tl_leaflet_marker.php | 0 .../contao/languages/de/tl_leaflet_popup.php | 0 .../contao/languages/de/tl_leaflet_style.php | 0 .../contao/languages/de/tl_leaflet_vector.php | 0 .../contao/languages/de/tl_module.php | 0 .../Resources/contao/languages/en/leaflet.php | 0 .../Resources/contao/languages/en/modules.php | 0 .../contao/languages/en/tl_content.php | 0 .../languages/en/tl_leaflet_control.php | 0 .../contao/languages/en/tl_leaflet_icon.php | 0 .../contao/languages/en/tl_leaflet_layer.php | 0 .../contao/languages/en/tl_leaflet_map.php | 0 .../contao/languages/en/tl_leaflet_marker.php | 0 .../contao/languages/en/tl_leaflet_popup.php | 0 .../contao/languages/en/tl_leaflet_style.php | 0 .../contao/languages/en/tl_leaflet_vector.php | 0 .../contao/languages/en/tl_module.php | 0 .../Resources/contao/public/.htaccess | 0 .../contao/templates/be_leaflet_about.html5 | 0 .../contao/templates/be_leaflet_geocode.html5 | 0 .../contao/templates/ce_leaflet_map.html5 | 0 .../contao/templates/leaflet_map_html.html5 | 0 .../contao/templates/leaflet_map_js.html5 | 0 .../contao/templates/mod_leaflet_map.html5 | 0 .../Resources/public/css/about.css | 0 .../Resources/public/css/backend.css | 0 .../Resources/public/img/about.png | Bin .../Resources/public/img/cluster.png | Bin .../Resources/public/img/cluster_1.png | Bin .../Resources/public/img/control.png | Bin .../Resources/public/img/fol-placeholder.gif | Bin .../Resources/public/img/group.png | Bin .../Resources/public/img/group_1.png | Bin .../Resources/public/img/icons.png | Bin .../Resources/public/img/layers.png | Bin .../Resources/public/img/logo.png | Bin src/{ => Bundle}/Resources/public/img/map.png | Bin .../Resources/public/img/markers.png | Bin .../Resources/public/img/markers_1.png | Bin .../Resources/public/img/overpass.png | Bin .../Resources/public/img/popup.png | Bin .../Resources/public/img/provider.png | Bin .../Resources/public/img/provider_1.png | Bin .../Resources/public/img/reference.png | Bin .../Resources/public/img/reference_1.png | Bin .../Resources/public/img/style.png | Bin .../Resources/public/img/tile.png | Bin .../Resources/public/img/tile_1.png | Bin .../Resources/public/img/vectors.png | Bin .../Resources/public/img/vectors_1.png | Bin .../Resources/public/js/contao-leaflet.js | 0 src/DependencyInjection/LeafletServices.php | 108 ------------------ 88 files changed, 15 insertions(+), 119 deletions(-) rename src/{ => Bundle}/ContaoManager/Plugin.php (87%) rename src/{ => Bundle}/DependencyInjection/NetzmachtContaoLeafletExtension.php (94%) rename src/{ => Bundle}/DependencyInjection/Pass/RegisterDefinitionMapperPass.php (95%) rename src/{ => Bundle}/DependencyInjection/Pass/RegisterEncodersPass.php (95%) rename src/{ => Bundle}/DependencyInjection/Pass/RegisterLibrariesPass.php (96%) rename src/{ => Bundle}/NetzmachtContaoLeafletBundle.php (80%) rename src/{ => Bundle}/Resources/config/amenities.yml (100%) rename src/{ => Bundle}/Resources/config/config.yml (100%) rename src/{ => Bundle}/Resources/config/encoders.yml (100%) rename src/{ => Bundle}/Resources/config/filters.yml (100%) rename src/{ => Bundle}/Resources/config/layers.yml (100%) rename src/{ => Bundle}/Resources/config/listeners.yml (100%) rename src/{ => Bundle}/Resources/config/mappers.yml (100%) rename src/{ => Bundle}/Resources/config/providers.yml (100%) rename src/{ => Bundle}/Resources/config/services.yml (100%) rename src/{ => Bundle}/Resources/contao/config/config.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_content.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_control.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_control_layer.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_icon.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_layer.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_map.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_map_layer.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_marker.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_popup.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_style.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_leaflet_vector.php (100%) rename src/{ => Bundle}/Resources/contao/dca/tl_module.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/leaflet.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/modules.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_content.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_control.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_icon.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_layer.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_map.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_marker.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_popup.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_style.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_leaflet_vector.php (100%) rename src/{ => Bundle}/Resources/contao/languages/de/tl_module.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/leaflet.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/modules.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_content.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_control.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_icon.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_layer.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_map.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_marker.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_popup.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_style.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_leaflet_vector.php (100%) rename src/{ => Bundle}/Resources/contao/languages/en/tl_module.php (100%) rename src/{ => Bundle}/Resources/contao/public/.htaccess (100%) rename src/{ => Bundle}/Resources/contao/templates/be_leaflet_about.html5 (100%) rename src/{ => Bundle}/Resources/contao/templates/be_leaflet_geocode.html5 (100%) rename src/{ => Bundle}/Resources/contao/templates/ce_leaflet_map.html5 (100%) rename src/{ => Bundle}/Resources/contao/templates/leaflet_map_html.html5 (100%) rename src/{ => Bundle}/Resources/contao/templates/leaflet_map_js.html5 (100%) rename src/{ => Bundle}/Resources/contao/templates/mod_leaflet_map.html5 (100%) rename src/{ => Bundle}/Resources/public/css/about.css (100%) rename src/{ => Bundle}/Resources/public/css/backend.css (100%) rename src/{ => Bundle}/Resources/public/img/about.png (100%) rename src/{ => Bundle}/Resources/public/img/cluster.png (100%) rename src/{ => Bundle}/Resources/public/img/cluster_1.png (100%) rename src/{ => Bundle}/Resources/public/img/control.png (100%) rename src/{ => Bundle}/Resources/public/img/fol-placeholder.gif (100%) rename src/{ => Bundle}/Resources/public/img/group.png (100%) rename src/{ => Bundle}/Resources/public/img/group_1.png (100%) rename src/{ => Bundle}/Resources/public/img/icons.png (100%) rename src/{ => Bundle}/Resources/public/img/layers.png (100%) rename src/{ => Bundle}/Resources/public/img/logo.png (100%) rename src/{ => Bundle}/Resources/public/img/map.png (100%) rename src/{ => Bundle}/Resources/public/img/markers.png (100%) rename src/{ => Bundle}/Resources/public/img/markers_1.png (100%) rename src/{ => Bundle}/Resources/public/img/overpass.png (100%) rename src/{ => Bundle}/Resources/public/img/popup.png (100%) rename src/{ => Bundle}/Resources/public/img/provider.png (100%) rename src/{ => Bundle}/Resources/public/img/provider_1.png (100%) rename src/{ => Bundle}/Resources/public/img/reference.png (100%) rename src/{ => Bundle}/Resources/public/img/reference_1.png (100%) rename src/{ => Bundle}/Resources/public/img/style.png (100%) rename src/{ => Bundle}/Resources/public/img/tile.png (100%) rename src/{ => Bundle}/Resources/public/img/tile_1.png (100%) rename src/{ => Bundle}/Resources/public/img/vectors.png (100%) rename src/{ => Bundle}/Resources/public/img/vectors_1.png (100%) rename src/{ => Bundle}/Resources/public/js/contao-leaflet.js (100%) delete mode 100644 src/DependencyInjection/LeafletServices.php 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'; -} From 86bcae2f718ea3cb5609bb41968579a68ffff48c Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:47:21 +0200 Subject: [PATCH 088/152] Use contao_leaflet as reference for services and tags instead of contao_leaflet_maps. --- .../Pass/RegisterDefinitionMapperPass.php | 6 +- .../Pass/RegisterEncodersPass.php | 6 +- .../Pass/RegisterLibrariesPass.php | 8 +- src/Bundle/NetzmachtContaoLeafletBundle.php | 4 +- src/Bundle/Resources/config/amenities.yml | 2 +- src/Bundle/Resources/config/config.yml | 10 +- src/Bundle/Resources/config/encoders.yml | 32 ++--- src/Bundle/Resources/config/filters.yml | 8 +- src/Bundle/Resources/config/layers.yml | 24 ++-- src/Bundle/Resources/config/listeners.yml | 58 ++++---- src/Bundle/Resources/config/mappers.yml | 130 +++++++++--------- src/Bundle/Resources/config/providers.yml | 2 +- src/Bundle/Resources/config/services.yml | 62 ++++----- src/Bundle/Resources/contao/config/config.php | 2 +- .../Resources/contao/dca/tl_content.php | 4 +- .../contao/dca/tl_leaflet_control.php | 22 +-- .../Resources/contao/dca/tl_leaflet_icon.php | 16 +-- .../Resources/contao/dca/tl_leaflet_layer.php | 44 +++--- .../Resources/contao/dca/tl_leaflet_map.php | 26 ++-- .../contao/dca/tl_leaflet_marker.php | 24 ++-- .../Resources/contao/dca/tl_leaflet_popup.php | 10 +- .../Resources/contao/dca/tl_leaflet_style.php | 10 +- .../contao/dca/tl_leaflet_vector.php | 24 ++-- src/Bundle/Resources/contao/dca/tl_module.php | 4 +- .../ContentElement/MapElementFactory.php | 2 +- src/Frontend/Module/MapModuleFactory.php | 2 +- 26 files changed, 271 insertions(+), 271 deletions(-) diff --git a/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php index 86226d2..4cc31b2 100644 --- a/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php @@ -30,12 +30,12 @@ class RegisterDefinitionMapperPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { - if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.mapper')) { + if (!$container->hasDefinition('netzmacht.contao_leaflet.definition.mapper')) { return; } - $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.mapper'); - $taggedServices = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.mapper'); + $definition = $container->getDefinition('netzmacht.contao_leaflet.definition.mapper'); + $taggedServices = $container->findTaggedServiceIds('netzmacht.contao_leaflet.mapper'); foreach ($taggedServices as $serviceId => $tags) { foreach ($tags as $attributes) { diff --git a/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php index af92cbb..809c787 100644 --- a/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php @@ -30,12 +30,12 @@ class RegisterEncodersPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { - if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher')) { + if (!$container->hasDefinition('netzmacht.contao_leaflet.definition.builder.event_dispatcher')) { return; } - $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher'); - $serviceIds = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.encoder'); + $definition = $container->getDefinition('netzmacht.contao_leaflet.definition.builder.event_dispatcher'); + $serviceIds = $container->findTaggedServiceIds('netzmacht.contao_leaflet.encoder'); foreach (array_keys($serviceIds) as $serviceId) { $definition->addMethodCall('addSubscriber', [new Reference($serviceId)]); diff --git a/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php index b05416b..d1778c5 100644 --- a/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php @@ -30,16 +30,16 @@ class RegisterLibrariesPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { - if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.builder')) { + if (!$container->hasDefinition('netzmacht.contao_leaflet.definition.builder')) { return; } - if (!$container->hasParameter('netzmacht.contao_leaflet_maps.libraries')) { + if (!$container->hasParameter('netzmacht.contao_leaflet.libraries')) { return; } - $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.builder'); - $libraries = $container->getParameter('netzmacht.contao_leaflet_maps.libraries'); + $definition = $container->getDefinition('netzmacht.contao_leaflet.definition.builder'); + $libraries = $container->getParameter('netzmacht.contao_leaflet.libraries'); foreach ($libraries as $name => $assets) { if (!empty($assets['css'])) { diff --git a/src/Bundle/NetzmachtContaoLeafletBundle.php b/src/Bundle/NetzmachtContaoLeafletBundle.php index d3ebd7a..601bdea 100644 --- a/src/Bundle/NetzmachtContaoLeafletBundle.php +++ b/src/Bundle/NetzmachtContaoLeafletBundle.php @@ -38,8 +38,8 @@ class NetzmachtContaoLeafletBundle extends Bundle $container->addCompilerPass(new RegisterLibrariesPass()); $container->addCompilerPass( new AddTaggedServicesAsArgumentPass( - 'netzmacht.contao_leaflet_maps.layer_label_renderer', - 'netzmacht.contao_leaflet_maps.layer_label_renderer' + 'netzmacht.contao_leaflet.layer_label_renderer', + 'netzmacht.contao_leaflet.layer_label_renderer' ) ); } diff --git a/src/Bundle/Resources/config/amenities.yml b/src/Bundle/Resources/config/amenities.yml index fa8ff6b..1c063eb 100644 --- a/src/Bundle/Resources/config/amenities.yml +++ b/src/Bundle/Resources/config/amenities.yml @@ -1,5 +1,5 @@ parameters: - netzmacht.contao_leaflet_maps.amenities: + netzmacht.contao_leaflet.amenities: - 'administration' - 'advertising' - 'alm' diff --git a/src/Bundle/Resources/config/config.yml b/src/Bundle/Resources/config/config.yml index 1624280..bbc7d26 100644 --- a/src/Bundle/Resources/config/config.yml +++ b/src/Bundle/Resources/config/config.yml @@ -2,7 +2,7 @@ parameters: # leaflet controls. # # Supported leaflet control types. Register your type for the database driven definition here. - netzmacht.contao_leaflet_maps.controls: + netzmacht.contao_leaflet.controls: - 'zoom' - 'layers' - 'scale' @@ -13,7 +13,7 @@ parameters: # Leaflet icons. # # Supported leaflet icon types. Register you type for the database driven definition here. - netzmacht.contao_leaflet_maps.icons: + netzmacht.contao_leaflet.icons: - 'image' - 'div' - 'extra' @@ -23,13 +23,13 @@ parameters: # # The goal is to provide different style strategies. For instance a random style chooser, one which uses a color # range and so one. - netzmacht.contao_leaflet_maps.styles: + netzmacht.contao_leaflet.styles: - 'fixed' # Leaflet vectors. # # Supported leaflet vector types. Register you type for the database driven definition here. - netzmacht.contao_leaflet_maps.vectors: + netzmacht.contao_leaflet.vectors: - 'polyline' - 'polygon' - 'multiPolyline' @@ -48,7 +48,7 @@ parameters: # - array: Use deserialize before adding the value # - file: Thread value a uuid and find the path. # - files: Thread values as a list of file uuids and get an array of paths. - netzmacht.contao_leaflet_maps.feature_model_properties: + netzmacht.contao_leaflet.feature_model_properties: tl_leaflet_marker: - 'id' - 'title' diff --git a/src/Bundle/Resources/config/encoders.yml b/src/Bundle/Resources/config/encoders.yml index 1d9c81f..b4ac73e 100644 --- a/src/Bundle/Resources/config/encoders.yml +++ b/src/Bundle/Resources/config/encoders.yml @@ -6,42 +6,42 @@ services: _defaults: public: false - netzmacht.contao_leaflet_maps.encoder.map: + netzmacht.contao_leaflet.encoder.map: class: Netzmacht\LeafletPHP\Encoder\MapEncoder tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } - netzmacht.contao_leaflet_maps.encoder.control: + netzmacht.contao_leaflet.encoder.control: class: Netzmacht\LeafletPHP\Encoder\ControlEncoder tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } - netzmacht.contao_leaflet_maps.encoder.group: + netzmacht.contao_leaflet.encoder.group: class: Netzmacht\LeafletPHP\Encoder\GroupEncoder tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } - netzmacht.contao_leaflet_maps.encoder.raster: + netzmacht.contao_leaflet.encoder.raster: class: Netzmacht\LeafletPHP\Encoder\RasterEncoder tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } - netzmacht.contao_leaflet_maps.encoder.vector: + netzmacht.contao_leaflet.encoder.vector: class: Netzmacht\LeafletPHP\Encoder\VectorEncoder tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } - netzmacht.contao_leaflet_maps.encoder.ui: + netzmacht.contao_leaflet.encoder.ui: class: Netzmacht\LeafletPHP\Encoder\UIEncoder tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } - netzmacht.contao_leaflet_maps.encoder.type: + netzmacht.contao_leaflet.encoder.type: class: Netzmacht\LeafletPHP\Encoder\TypeEncoder tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } - netzmacht.contao_leaflet_maps.encoder.subscriber: + netzmacht.contao_leaflet.encoder.subscriber: class: Netzmacht\Contao\Leaflet\Subscriber\EncoderSubscriber tags: - - { name: netzmacht.contao_leaflet_maps.encoder } + - { name: netzmacht.contao_leaflet.encoder } diff --git a/src/Bundle/Resources/config/filters.yml b/src/Bundle/Resources/config/filters.yml index 3a8bf82..7f3cb2e 100644 --- a/src/Bundle/Resources/config/filters.yml +++ b/src/Bundle/Resources/config/filters.yml @@ -1,11 +1,11 @@ services: # Filters can be passed to a data request to get only specific data from a layer. - netzmacht.contao_leaflet_maps.filter.bbox: + netzmacht.contao_leaflet.filter.bbox: class: Netzmacht\Contao\Leaflet\Filter\BboxFilter tags: - - { name: 'netzmacht.contao_leaflet_maps.filter', alias: 'bbox' } + - { name: 'netzmacht.contao_leaflet.filter', alias: 'bbox' } - netzmacht.contao_leaflet_maps.filter.distance: + netzmacht.contao_leaflet.filter.distance: class: Netzmacht\Contao\Leaflet\Filter\DistanceFilter tags: - - { name: 'netzmacht.contao_leaflet_maps.filter', alias: 'distance' } + - { name: 'netzmacht.contao_leaflet.filter', alias: 'distance' } diff --git a/src/Bundle/Resources/config/layers.yml b/src/Bundle/Resources/config/layers.yml index 6026489..4716389 100644 --- a/src/Bundle/Resources/config/layers.yml +++ b/src/Bundle/Resources/config/layers.yml @@ -2,7 +2,7 @@ # # The type is used for the database driven definitions. parameters: - netzmacht.contao_leaflet_maps.layers: + netzmacht.contao_leaflet.layers: provider: children: false icon: 'bundles/netzmachtcontaoleaflet/img/provider.png' @@ -49,32 +49,32 @@ services: _defaults: public: false - netzmacht.contao_leaflet_maps.layer_label_renderer: + netzmacht.contao_leaflet.layer_label_renderer: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ChainRenderer arguments: - [] - netzmacht.contao_leaflet_maps.layer_label_renderer.markers: + netzmacht.contao_leaflet.layer_label_renderer.markers: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\MarkersLabelRenderer tags: - - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } - netzmacht.contao_leaflet_maps.layer_label_renderer.overpass: + netzmacht.contao_leaflet.layer_label_renderer.overpass: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\OverpassLabelRenderer tags: - - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } - netzmacht.contao_leaflet_maps.layer_label_renderer.provider: + netzmacht.contao_leaflet.layer_label_renderer.provider: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ProviderLabelRenderer tags: - - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } - netzmacht.contao_leaflet_maps.layer_label_renderer.reference: + netzmacht.contao_leaflet.layer_label_renderer.reference: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ReferenceLabelRenderer tags: - - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } - netzmacht.contao_leaflet_maps.layer_label_renderer.vectors: + netzmacht.contao_leaflet.layer_label_renderer.vectors: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\VectorsLabelRenderer tags: - - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' } + - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index d90ef29..944f15d 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -1,90 +1,90 @@ services: - netzmacht.contao_leaflet_maps.listeners.dca.leaflet: + netzmacht.contao_leaflet.listeners.dca.leaflet: class: Netzmacht\Contao\Leaflet\Listener\Dca\LeafletDcaListener arguments: - '@filesystem' - - '%netzmacht.contao_leaflet_maps.cache_dir%' + - '%netzmacht.contao_leaflet.cache_dir%' - netzmacht.contao_leaflet_maps.listeners.dca.validator: + netzmacht.contao_leaflet.listeners.dca.validator: class: Netzmacht\Contao\Leaflet\Listener\Dca\Validator arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@translator' - netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration: + netzmacht.contao_leaflet.listeners.dca.frontend_integration: class: Netzmacht\Contao\Leaflet\Listener\Dca\FrontendIntegrationListener arguments: - '@translator' - netzmacht.contao_leaflet_maps.listeners.dca.map: + netzmacht.contao_leaflet.listeners.dca.map: class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' - netzmacht.contao_leaflet_maps.listeners.dca.control: + netzmacht.contao_leaflet.listeners.dca.control: class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' - - '%netzmacht.contao_leaflet_maps.controls%' + - '%netzmacht.contao_leaflet.controls%' - netzmacht.contao_leaflet_maps.listeners.dca.layer: + netzmacht.contao_leaflet.listeners.dca.layer: class: Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' - '@translator' - - '@netzmacht.contao_leaflet_maps.layer_label_renderer' - - '%netzmacht.contao_leaflet_maps.layers%' - - '%netzmacht.contao_leaflet_maps.providers%' - - '%netzmacht.contao_leaflet_maps.amenities%' + - '@netzmacht.contao_leaflet.layer_label_renderer' + - '%netzmacht.contao_leaflet.layers%' + - '%netzmacht.contao_leaflet.providers%' + - '%netzmacht.contao_leaflet.amenities%' - netzmacht.contao_leaflet_maps.listeners.dca.marker: + netzmacht.contao_leaflet.listeners.dca.marker: class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener arguments: - '@database_connection' - netzmacht.contao_leaflet_maps.listeners.dca.vector: + netzmacht.contao_leaflet.listeners.dca.vector: class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' - - '%netzmacht.contao_leaflet_maps.vectors%' + - '%netzmacht.contao_leaflet.vectors%' - netzmacht.contao_leaflet_maps.listeners.dca.icon: + netzmacht.contao_leaflet.listeners.dca.icon: class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener arguments: - - '%netzmacht.contao_leaflet_maps.icons%' + - '%netzmacht.contao_leaflet.icons%' - netzmacht.contao_leaflet_maps.listeners.dca.style: + netzmacht.contao_leaflet.listeners.dca.style: class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener arguments: - - '%netzmacht.contao_leaflet_maps.styles%' + - '%netzmacht.contao_leaflet.styles%' - netzmacht.contao_leaflet_maps.listeners.geo_json_subscriber: + netzmacht.contao_leaflet.listeners.geo_json_subscriber: class: Netzmacht\Contao\Leaflet\Subscriber\GeoJsonSubscriber arguments: - - '%netzmacht.contao_leaflet_maps.feature_model_properties%' + - '%netzmacht.contao_leaflet.feature_model_properties%' tags: - { name: 'kernel.event_subscriber' } - netzmacht.contao_leaflet_maps.listeners.hash_subscriber: + netzmacht.contao_leaflet.listeners.hash_subscriber: class: Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber tags: - { name: 'kernel.event_subscriber' } - netzmacht.contao_leaflet_maps.listeners.load_assets: + netzmacht.contao_leaflet.listeners.load_assets: class: Netzmacht\Contao\Leaflet\Listener\LoadAssetsListener arguments: - - '@netzmacht.contao_leaflet_maps.map.assets' - - '@netzmacht.contao_leaflet_maps.definition.mapper' - - '@netzmacht.contao_leaflet_maps.libraries' + - '@netzmacht.contao_leaflet.map.assets' + - '@netzmacht.contao_leaflet.definition.mapper' + - '@netzmacht.contao_leaflet.libraries' tags: - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript', method: 'onGetJavascriptEvent' } - netzmacht.contao_leaflet_maps.listeners.register_libraries: + netzmacht.contao_leaflet.listeners.register_libraries: class: Netzmacht\Contao\Leaflet\Listener\RegisterLibrariesListener arguments: - - '@netzmacht.contao_leaflet_maps.libraries' - - '@netzmacht.contao_leaflet_maps.definition.builder' + - '@netzmacht.contao_leaflet.libraries' + - '@netzmacht.contao_leaflet.definition.builder' diff --git a/src/Bundle/Resources/config/mappers.yml b/src/Bundle/Resources/config/mappers.yml index 5265dde..9a50e51 100644 --- a/src/Bundle/Resources/config/mappers.yml +++ b/src/Bundle/Resources/config/mappers.yml @@ -7,171 +7,171 @@ services: # Map mapper - netzmacht.contao_leaflet_maps.mapper.map: + netzmacht.contao_leaflet.mapper.map: class: Netzmacht\Contao\Leaflet\Mapper\MapMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } # Layer mappers - netzmacht.contao_leaflet_maps.mapper.tile_layer: + netzmacht.contao_leaflet.mapper.tile_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\TileLayerMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.provider_layer: + netzmacht.contao_leaflet.mapper.provider_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\ProviderLayerMapper arguments: - - '%netzmacht.contao_leaflet_maps.providers%' + - '%netzmacht.contao_leaflet.providers%' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.markers_layer: + netzmacht.contao_leaflet.mapper.markers_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkersLayerMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.group_layer: + netzmacht.contao_leaflet.mapper.group_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\GroupLayerMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.vectors_layer: + netzmacht.contao_leaflet.mapper.vectors_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\VectorsLayerMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.reference_layer: + netzmacht.contao_leaflet.mapper.reference_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\ReferenceLayerMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.overpass_layer: + netzmacht.contao_leaflet.mapper.overpass_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\OverpassLayerMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.marker_cluster_layer: + netzmacht.contao_leaflet.mapper.marker_cluster_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkerClusterLayerMapper arguments: - - '@netzmacht.contao_leaflet_maps.map.assets' + - '@netzmacht.contao_leaflet.map.assets' tags: - { name: netzmacht.contao_leflet_maps.mapper } # Control mappers - netzmacht.contao_leaflet_maps.mapper.zoom_control: + netzmacht.contao_leaflet.mapper.zoom_control: class: Netzmacht\Contao\Leaflet\Mapper\Control\ZoomControlMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.scale_control: + netzmacht.contao_leaflet.mapper.scale_control: class: Netzmacht\Contao\Leaflet\Mapper\Control\ScaleControlMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.layers_control: + netzmacht.contao_leaflet.mapper.layers_control: class: Netzmacht\Contao\Leaflet\Mapper\Control\LayersControlMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.attribution_control: + netzmacht.contao_leaflet.mapper.attribution_control: class: Netzmacht\Contao\Leaflet\Mapper\Control\AttributionControlMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.loading_control: + netzmacht.contao_leaflet.mapper.loading_control: class: Netzmacht\Contao\Leaflet\Mapper\Control\LoadingControlMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.fullscreen_control: + netzmacht.contao_leaflet.mapper.fullscreen_control: class: Netzmacht\Contao\Leaflet\Mapper\Control\FullscreenControlMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } # Vector mappers - netzmacht.contao_leaflet_maps.mapper.polyline: + netzmacht.contao_leaflet.mapper.polyline: class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolylineMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.multi_polyline: + netzmacht.contao_leaflet.mapper.multi_polyline: class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolylineMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.polygon: + netzmacht.contao_leaflet.mapper.polygon: class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolygonMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.multi_polygon: + netzmacht.contao_leaflet.mapper.multi_polygon: class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolygonMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.circle: + netzmacht.contao_leaflet.mapper.circle: class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.circle_mapper: + netzmacht.contao_leaflet.mapper.circle_mapper: class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMarkerMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.rectangle_mapper: + netzmacht.contao_leaflet.mapper.rectangle_mapper: class: Netzmacht\Contao\Leaflet\Mapper\Vector\RectangleMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } # Miscellaneous mappers - netzmacht.contao_leaflet_maps.mapper.popup: + netzmacht.contao_leaflet.mapper.popup: class: Netzmacht\Contao\Leaflet\Mapper\UI\PopupMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.image_icon: + netzmacht.contao_leaflet.mapper.image_icon: class: Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.div_icon: + netzmacht.contao_leaflet.mapper.div_icon: class: Netzmacht\Contao\Leaflet\Mapper\Type\DivIconMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.extra_markers: + netzmacht.contao_leaflet.mapper.extra_markers: class: Netzmacht\Contao\Leaflet\Mapper\Type\ExtraMarkersIconMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.fixed_style: + netzmacht.contao_leaflet.mapper.fixed_style: class: Netzmacht\Contao\Leaflet\Mapper\Style\FixedStyleMapper tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } - netzmacht.contao_leaflet_maps.mapper.marker: + netzmacht.contao_leaflet.mapper.marker: class: Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper arguments: - - '@netzmacht.contao_leaflet_maps.frontend.value_filter' + - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - - { name: netzmacht.contao_leaflet_maps.mapper } + - { name: netzmacht.contao_leaflet.mapper } diff --git a/src/Bundle/Resources/config/providers.yml b/src/Bundle/Resources/config/providers.yml index 6b61706..880ddde 100644 --- a/src/Bundle/Resources/config/providers.yml +++ b/src/Bundle/Resources/config/providers.yml @@ -1,5 +1,5 @@ parameters: - netzmacht.contao_leaflet_maps.providers: + netzmacht.contao_leaflet.providers: OpenStreetMap: variants: ['Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH'] diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index d69c5ac..f7b8634 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -1,83 +1,83 @@ parameters: - netzmacht.contao_leaflet_maps.cache_dir: '%kernel.cache_dir%/leaflet' + netzmacht.contao_leaflet.cache_dir: '%kernel.cache_dir%/leaflet' # JSON_UNESCAPED_SLASHES ^ Netzmacht\JavascriptBuilder\Flags::BUILD_STACK - netzmacht.contao_leaflet_maps.encoding_flags: 16448 + netzmacht.contao_leaflet.encoding_flags: 16448 services: - netzmacht.contao_leaflet_maps.map.provider: + netzmacht.contao_leaflet.map.provider: class: Netzmacht\Contao\Leaflet\MapProvider arguments: - - '@netzmacht.contao_leaflet_maps.definition.mapper' - - '@netzmacht.contao_leaflet_maps.definition.builder' + - '@netzmacht.contao_leaflet.definition.mapper' + - '@netzmacht.contao_leaflet.definition.builder' - '@event_dispatcher' - '@netzmacht.contao_toolkit.contao.input' - - '@netzmacht.contao_leaflet_maps.map.assets' - - '@netzmacht.contao_leaflet_maps.cache' + - '@netzmacht.contao_leaflet.map.assets' + - '@netzmacht.contao_leaflet.cache' - [] # TODO: Rework filter handling. - '%kernel.debug%' - netzmacht.contao_leaflet_maps.libraries: + netzmacht.contao_leaflet.libraries: class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration arguments: - '@contao.framework' - netzmacht.contao_leaflet_maps.cache: - alias: 'netzmacht.contao_leaflet_maps.cache.default' + netzmacht.contao_leaflet.cache: + alias: 'netzmacht.contao_leaflet.cache.default' - netzmacht.contao_leaflet_maps.cache.default: + netzmacht.contao_leaflet.cache.default: class: Doctrine\Common\Cache\FilesystemCache arguments: - - '%netzmacht.contao_leaflet_maps.cache_dir%' + - '%netzmacht.contao_leaflet.cache_dir%' - netzmacht.contao_leaflet_maps.cache.debug: + netzmacht.contao_leaflet.cache.debug: class: Doctrine\Common\Cache\ArrayCache - netzmacht.contao_leaflet_maps.frontend.value_filter: + netzmacht.contao_leaflet.frontend.value_filter: class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter - netzmacht.contao_leaflet_maps.map.assets: + netzmacht.contao_leaflet.map.assets: class: Netzmacht\Contao\Leaflet\ContaoAssets arguments: - '@netzmacht.contao_toolkit.assets_manager' - netzmacht.contao_leaflet_maps.definition.builder: + netzmacht.contao_leaflet.definition.builder: class: Netzmacht\LeafletPHP\Leaflet arguments: - - '@netzmacht.contao_leaflet_maps.definition.builder.javascript_builder' - - '@netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher' + - '@netzmacht.contao_leaflet.definition.builder.javascript_builder' + - '@netzmacht.contao_leaflet.definition.builder.event_dispatcher' - [] - - '%netzmacht.contao_leaflet_maps.encoding_flags%' + - '%netzmacht.contao_leaflet.encoding_flags%' - netzmacht.contao_leaflet_maps.definition.builder.javascript_builder: + netzmacht.contao_leaflet.definition.builder.javascript_builder: class: Netzmacht\JavascriptBuilder\Builder arguments: - - '@netzmacht.contao_leaflet_maps.definition.encoder_factory' + - '@netzmacht.contao_leaflet.definition.encoder_factory' - netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher: + netzmacht.contao_leaflet.definition.builder.event_dispatcher: class: Symfony\Component\EventDispatcher\EventDispatcher - netzmacht.contao_leaflet_maps.definition.mapper: + netzmacht.contao_leaflet.definition.mapper: class: Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper arguments: - '@event_dispatcher' - netzmacht.contao_leaflet_maps.definition.encoder_factory: + netzmacht.contao_leaflet.definition.encoder_factory: class: Netzmacht\Contao\Leaflet\Encoder\EncoderFactory arguments: - - '@netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher' + - '@netzmacht.contao_leaflet.definition.builder.event_dispatcher' - netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default: + netzmacht.contao_leaflet.definition.alias_generator.factory_default: class: Netzmacht\Contao\Leaflet\Alias\DefaultAliasGeneratorFactory arguments: - '@database_connection' - netzmacht.contao_leaflet_maps.definition.alias_generator.factory_parent: + netzmacht.contao_leaflet.definition.alias_generator.factory_parent: class: Netzmacht\Contao\Leaflet\Alias\ParentAliasGeneratorFactory arguments: - '@database_connection' - netzmacht.contao_leaflet_maps.frontend.element_factory: + netzmacht.contao_leaflet.frontend.element_factory: class: Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElementFactory arguments: - '@service_container' @@ -85,7 +85,7 @@ services: - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'include' } - netzmacht.contao_leaflet_maps.frontend.module_factory: + netzmacht.contao_leaflet.frontend.module_factory: class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory arguments: - '@service_container' @@ -93,10 +93,10 @@ services: - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: include } - netzmacht.contao_leaflet_maps.frontend.insert_tag: + netzmacht.contao_leaflet.frontend.insert_tag: class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser arguments: - - '@netzmacht.contao_leaflet_maps.map.provider' + - '@netzmacht.contao_leaflet.map.provider' - '%kernel.debug%' tags: - { name: 'contao.hook', hook: 'replaceInsertTags', method: 'replace' } diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index d373225..5c21f12 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -72,6 +72,6 @@ $GLOBALS['TL_MODELS']['tl_leaflet_vector'] = \Netzmacht\Contao\Leaflet\Model\Ve */ $GLOBALS['TL_HOOKS']['initializeSystem'][] = [ - 'netzmacht.contao_leaflet_maps.listeners.register_libraries', + 'netzmacht.contao_leaflet.listeners.register_libraries', 'onInitializeSystem' ]; diff --git a/src/Bundle/Resources/contao/dca/tl_content.php b/src/Bundle/Resources/contao/dca/tl_content.php index 77b4fa6..c0127d2 100644 --- a/src/Bundle/Resources/contao/dca/tl_content.php +++ b/src/Bundle/Resources/contao/dca/tl_content.php @@ -23,9 +23,9 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_content']['leaflet_map'], 'inputType' => 'select', 'exclude' => true, - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getMaps'], 'wizard' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'], + ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getEditMapLink'], ], 'eval' => [ 'tl_class' => 'w50 wizard', diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php index c0ef6fc..0169793 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php @@ -22,10 +22,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ ], ], 'onload_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], @@ -38,7 +38,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ 'flag' => 1, 'sorting' => 2, 'panelLayout' => 'filter,sort;search,limit', - 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'generateRow'], + 'child_record_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'generateRow'], ], 'label' => [ 'fields' => ['title'], @@ -157,7 +157,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ 'search' => true, 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => [ 'mandatory' => false, @@ -167,7 +167,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ ], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_parent', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_parent', 'fields' => ['title'], ], ], @@ -187,7 +187,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ 'chosen' => true, 'helpwizard' => true, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getControlTypes'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'getControlTypes'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_control'], 'sql' => "varchar(32) NOT NULL default ''", ], @@ -210,7 +210,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], 'zoomInText' => [ @@ -262,10 +262,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ 'exclude' => true, 'inputType' => 'multiColumnWizard', 'load_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'loadLayerRelations'], + ['netzmacht.contao_leaflet.listeners.dca.control', 'loadLayerRelations'], ], 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'saveLayerRelations'], + ['netzmacht.contao_leaflet.listeners.dca.control', 'saveLayerRelations'], ], 'eval' => [ 'tl_class' => 'clr', @@ -274,7 +274,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layer'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getLayers'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'getLayers'], 'eval' => [ 'style' => 'width: 300px', 'chosen' => true, @@ -352,7 +352,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomControl'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getZoomControls'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'getZoomControls'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'], 'eval' => [ 'mandatory' => false, diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php index aa080fc..d3c2543 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php @@ -21,7 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ ], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], @@ -177,12 +177,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ 'inputType' => 'text', 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default', 'fields' => ['title'], ], ], @@ -199,7 +199,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ 'submitOnChange' => true, 'chosen' => true, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.icon', 'getIconOptions'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.icon', 'getIconOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_icon'], 'sql' => "varchar(32) NOT NULL default ''", ], @@ -210,7 +210,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], 'iconImage' => [ @@ -270,7 +270,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ 'exclude' => true, 'inputType' => 'text', 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'], ], 'eval' => [ 'maxlength' => 255, @@ -284,7 +284,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ 'exclude' => true, 'inputType' => 'text', 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'], ], 'eval' => [ 'maxlength' => 255, @@ -298,7 +298,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [ 'exclude' => true, 'inputType' => 'text', 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'], ], 'eval' => [ 'maxlength' => 255, diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 8de855b..03fe1d8 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -16,7 +16,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'enableVersioning' => true, 'ctable' => ['tl_leaflet_vector', 'tl_leaflet_marker'], 'ondelete_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'deleteRelations'], + ['netzmacht.contao_leaflet.listeners.dca.layer', 'deleteRelations'], ], 'sql' => [ 'keys' => [ @@ -26,10 +26,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], ], 'onload_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], 'list' => [ @@ -39,12 +39,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'flag' => 1, 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', 'panelLayout' => 'filter;search,limit', - 'paste_button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getPasteButtons'], + 'paste_button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getPasteButtons'], ], 'label' => [ 'fields' => ['title'], 'format' => '%s', - 'label_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateRow'], + 'label_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateRow'], ], 'global_operations' => [ 'styles' => [ @@ -77,13 +77,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['markers'], 'href' => 'table=tl_leaflet_marker', 'icon' => 'edit.gif', - 'button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateMarkersButton'], + 'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateMarkersButton'], ], 'vectors' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['vectors'], 'href' => 'table=tl_leaflet_vector', 'icon' => 'edit.gif', - 'button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateVectorsButton'], + 'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateVectorsButton'], ], 'edit' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'], @@ -262,12 +262,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'search' => true, 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default', 'fields' => ['title'], ], ], @@ -286,7 +286,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'chosen' => true, 'helpwizard' => true, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayerOptions'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getLayerOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_layer'], 'sql' => "varchar(32) NOT NULL default ''", ], @@ -298,7 +298,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], 'tile_provider' => [ @@ -312,7 +312,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'submitOnChange' => true, 'chosen' => true, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getProviderOptions'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getProviderOptions'], 'sql' => "varchar(32) NOT NULL default ''", ], 'tile_provider_variant' => [ @@ -325,7 +325,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'submitOnChange' => true, 'chosen' => false, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getVariants'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getVariants'], 'sql' => "varchar(32) NOT NULL default ''", ], 'tile_provider_key' => [ @@ -369,7 +369,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['reference'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayers'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getLayers'], 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', @@ -456,7 +456,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['disableClusteringAtZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'default' => null, 'eval' => [ 'maxlength' => 4, @@ -529,7 +529,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['boundsMode'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getBoundsModes'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getBoundsModes'], 'eval' => ['tl_class' => 'w50', 'includeBlankOption' => true], 'sql' => "varchar(6) NOT NULL default ''", ], @@ -545,7 +545,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['minZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', @@ -559,7 +559,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', @@ -573,7 +573,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxNativeZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', @@ -807,14 +807,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcons'], 'exclude' => true, 'inputType' => 'multiColumnWizard', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getIcons'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getIcons'], 'eval' => [ 'columnFields' => [ 'amenity' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getAmenities'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getAmenities'], 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', @@ -826,7 +826,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getIcons'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getIcons'], 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php index 9a24940..7ef86c3 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php @@ -22,10 +22,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ ], ], 'onload_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], @@ -154,12 +154,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'search' => true, 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default', 'fields' => ['title'], ], ], @@ -170,10 +170,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'exclude' => true, 'inputType' => 'text', 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'], ], 'wizard' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getGeocoder'], ], 'eval' => [ 'maxlength' => 255, @@ -187,10 +187,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'exclude' => true, 'inputType' => 'multiColumnWizard', 'load_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'loadLayerRelations'], + ['netzmacht.contao_leaflet.listeners.dca.map', 'loadLayerRelations'], ], 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'saveLayerRelations'], + ['netzmacht.contao_leaflet.listeners.dca.map', 'saveLayerRelations'], ], 'eval' => [ 'multiple' => true, @@ -200,7 +200,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['reference'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'getLayers'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.map', 'getLayers'], 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', @@ -219,7 +219,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'default' => null, 'eval' => [ 'maxlength' => 4, @@ -242,7 +242,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', @@ -256,7 +256,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', @@ -503,7 +503,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'], 'eval' => [ 'maxlength' => 4, 'rgxp' => 'digit', diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php index a5d9018..ef8abd5 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php @@ -23,10 +23,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ ], ], 'onload_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'initialize'], + ['netzmacht.contao_leaflet.listeners.dca.marker', 'initialize'], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], @@ -37,7 +37,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ 'flag' => 1, 'panelLayout' => 'sort,filter;search,limit', 'headerFields' => ['title', 'type'], - 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'generateRow'], + 'child_record_callback' => ['netzmacht.contao_leaflet.listeners.dca.marker', 'generateRow'], ], 'label' => [ 'fields' => ['title'], @@ -158,12 +158,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ 'search' => true, 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default', 'fields' => ['title'], ], ], @@ -174,14 +174,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ 'exclude' => true, 'inputType' => 'text', 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], - ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'saveCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.marker', 'saveCoordinates'], ], 'load_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'loadCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.marker', 'loadCoordinates'], ], 'wizard' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getGeocoder'], ], 'eval' => [ 'maxlength' => 255, @@ -221,7 +221,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], 'tooltip' => [ @@ -250,7 +250,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popup'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getPopups'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.marker', 'getPopups'], 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', @@ -278,7 +278,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getIcons'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.marker', 'getIcons'], 'eval' => [ 'mandatory' => true, 'tl_class' => 'w50', diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php index 173db63..e531b79 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php @@ -21,7 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [ ], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], @@ -149,12 +149,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [ 'inputType' => 'text', 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default', 'fields' => ['title'], ], ], @@ -213,7 +213,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [ 'exclude' => true, 'inputType' => 'text', 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'], ], 'eval' => [ 'maxlength' => 255, @@ -269,7 +269,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], ], diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php index 01a28f5..67d0d46 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php @@ -21,7 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [ ], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], @@ -143,12 +143,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [ 'inputType' => 'text', 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default', 'fields' => ['title'], ], ], @@ -165,7 +165,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [ 'submitOnChange' => true, 'chosen' => true, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.style', 'getStyleOptions'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.style', 'getStyleOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_style'], 'sql' => "varchar(32) NOT NULL default ''", ], @@ -277,7 +277,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], ], diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php index a5866a2..83bc535 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php @@ -23,10 +23,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ ], ], 'onload_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'], ], 'onsubmit_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], @@ -37,7 +37,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'flag' => 1, 'panelLayout' => 'sort,filter;search,limit', 'headerFields' => ['title', 'type'], - 'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'generateRow'], + 'child_record_callback' => ['netzmacht.contao_leaflet.listeners.dca.vector', 'generateRow'], ], 'label' => [ 'fields' => ['title'], @@ -183,12 +183,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'search' => true, 'save_callback' => [ ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'], - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'], ], 'eval' => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true], 'toolkit' => [ 'alias_generator' => [ - 'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default', + 'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default', 'fields' => ['title'], ], ], @@ -210,7 +210,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'chosen' => true, 'helpwizard' => true, ], - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getVectorOptions'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.vector', 'getVectorOptions'], 'reference' => &$GLOBALS['TL_LANG']['leaflet_vector'], 'sql' => "varchar(32) NOT NULL default ''", ], @@ -225,7 +225,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'eval' => ['tl_class' => 'w50'], 'sql' => "char(1) NOT NULL default ''", 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], ], ], 'addPopup' => [ @@ -261,7 +261,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['style'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getStyles'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.vector', 'getStyles'], 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', @@ -290,10 +290,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'exclude' => true, 'inputType' => 'text', 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'], ], 'wizard' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getGeocoder'], ], 'eval' => [ 'maxlength' => 255, @@ -317,7 +317,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'search' => false, 'eval' => ['mandatory' => true, 'alwaysSave' => true], 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinates'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateMultipleCoordinates'], ], 'sql' => 'longblob NULL', ], @@ -339,7 +339,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ ], ], 'save_callback' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinateSets'], + ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateMultipleCoordinateSets'], ], 'sql' => 'longblob NULL', ], diff --git a/src/Bundle/Resources/contao/dca/tl_module.php b/src/Bundle/Resources/contao/dca/tl_module.php index e99cfbb..d9d1375 100644 --- a/src/Bundle/Resources/contao/dca/tl_module.php +++ b/src/Bundle/Resources/contao/dca/tl_module.php @@ -23,9 +23,9 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_map'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_module']['leaflet_map'], 'inputType' => 'select', 'exclude' => true, - 'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getMaps'], 'wizard' => [ - ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'], + ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getEditMapLink'], ], 'eval' => [ 'tl_class' => 'w50 wizard', diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index 8c4d33b..3ce5b4f 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -59,7 +59,7 @@ class MapElementFactory implements ComponentFactory $model, $this->container->get('templating'), $this->container->get('translator'), - $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), + $this->container->get('netzmacht.contao_leaflet.map.provider'), $this->container->get('netzmacht.contao_toolkit.contao.input'), $this->container->get('netzmacht.contao_toolkit.contao.config'), $column diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index 34c9d70..cac0205 100644 --- a/src/Frontend/Module/MapModuleFactory.php +++ b/src/Frontend/Module/MapModuleFactory.php @@ -59,7 +59,7 @@ class MapModuleFactory implements ComponentFactory $model, $this->container->get('templating'), $this->container->get('translator'), - $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), + $this->container->get('netzmacht.contao_leaflet.map.provider'), $this->container->get('netzmacht.contao_toolkit.contao.input'), $this->container->get('netzmacht.contao_toolkit.contao.config'), $column From 13eec4ba2e95b0e257c801c28d97b6953382f6c7 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 11:53:32 +0200 Subject: [PATCH 089/152] Code style. --- build.default.properties | 2 +- src/Frontend/AbstractMapHybrid.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.default.properties b/build.default.properties index c08524f..384a373 100644 --- a/build.default.properties +++ b/build.default.properties @@ -1,4 +1,4 @@ phpcs.standard = ${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml phpmd.ruleset = ${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml -phpcs.excluded = src/Resources/contao/languages,src/Resources/public/js +phpcs.excluded = src/Bundle/Resources/contao/languages,src/Bundle/Resources/public/js phpcpd.excluded = contao diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index e4ba0b7..59b6e47 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -96,7 +96,7 @@ abstract class AbstractMapHybrid extends AbstractHybrid ]; if ($model) { - $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id;; + $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id; $parameters['wildcard'] = '### LEAFLET MAP ' . $model->title . ' ###'; $parameters['id'] = $model->id; @@ -112,6 +112,8 @@ abstract class AbstractMapHybrid extends AbstractHybrid /** * {@inheritdoc} + * + * @throws \Exception If map could not be created. */ protected function prepareTemplateData(array $data): array { From 58a7ccc815d1c235fa5dc050ae4aa6c46d295a16 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 12:08:31 +0200 Subject: [PATCH 090/152] Use input adapter. --- src/Bundle/Resources/config/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index f7b8634..6927752 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -11,7 +11,7 @@ services: - '@netzmacht.contao_leaflet.definition.mapper' - '@netzmacht.contao_leaflet.definition.builder' - '@event_dispatcher' - - '@netzmacht.contao_toolkit.contao.input' + - '@netzmacht.contao_toolkit.contao.input_adapter' - '@netzmacht.contao_leaflet.map.assets' - '@netzmacht.contao_leaflet.cache' - [] # TODO: Rework filter handling. From abaf24821fc68ed6b9305ea704c2c485f853e9f4 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 14:27:11 +0200 Subject: [PATCH 091/152] Apply service names changes. --- src/Frontend/ContentElement/MapElementFactory.php | 4 ++-- src/Frontend/Module/MapModuleFactory.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index 3ce5b4f..efe1eac 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -60,8 +60,8 @@ class MapElementFactory implements ComponentFactory $this->container->get('templating'), $this->container->get('translator'), $this->container->get('netzmacht.contao_leaflet.map.provider'), - $this->container->get('netzmacht.contao_toolkit.contao.input'), - $this->container->get('netzmacht.contao_toolkit.contao.config'), + $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'), + $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'), $column ); } diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index cac0205..2ce6364 100644 --- a/src/Frontend/Module/MapModuleFactory.php +++ b/src/Frontend/Module/MapModuleFactory.php @@ -60,8 +60,8 @@ class MapModuleFactory implements ComponentFactory $this->container->get('templating'), $this->container->get('translator'), $this->container->get('netzmacht.contao_leaflet.map.provider'), - $this->container->get('netzmacht.contao_toolkit.contao.input'), - $this->container->get('netzmacht.contao_toolkit.contao.config'), + $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'), + $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'), $column ); } From bf0fb35b21c5a3daeec636eb95a7d42dceec3d52 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 14:27:37 +0200 Subject: [PATCH 092/152] Rework filter handling to overcome static map identifier setting. --- src/Event/BuildDefinitionEvent.php | 20 +++--- src/Frontend/RequestUrl.php | 37 +++------- src/MapProvider.php | 13 ++-- src/Mapper/AbstractMapper.php | 51 ++++++------- src/Mapper/AbstractTypeMapper.php | 4 +- .../Control/AttributionControlMapper.php | 7 +- src/Mapper/Control/LayersControlMapper.php | 11 +-- src/Mapper/Control/LoadingControlMapper.php | 11 +-- src/Mapper/DefinitionMapper.php | 20 +++--- src/Mapper/GeoJsonMapper.php | 11 +-- src/Mapper/Layer/GroupLayerMapper.php | 9 +-- src/Mapper/Layer/MarkerClusterLayerMapper.php | 10 +-- src/Mapper/Layer/MarkersLayerMapper.php | 31 ++++---- src/Mapper/Layer/OverpassLayerMapper.php | 6 +- src/Mapper/Layer/ProviderLayerMapper.php | 13 ++-- src/Mapper/Layer/ReferenceLayerMapper.php | 6 +- src/Mapper/Layer/TileLayerMapper.php | 28 ++++---- src/Mapper/Layer/VectorsLayerMapper.php | 31 ++++---- src/Mapper/MapMapper.php | 41 ++++++----- src/Mapper/Mapper.php | 15 ++-- src/Mapper/OptionsBuilder.php | 3 +- src/Mapper/Style/FixedStyleMapper.php | 1 + src/Mapper/Type/DivIconMapper.php | 9 +-- src/Mapper/Type/ExtraMarkersIconMapper.php | 9 +-- src/Mapper/Type/ImageIconMapper.php | 13 ++-- src/Mapper/UI/MarkerMapper.php | 15 ++-- src/Mapper/UI/PopupMapper.php | 9 +-- src/Mapper/Vector/AbstractVectorMapper.php | 21 +++--- src/Mapper/Vector/CircleMapper.php | 10 +-- src/Mapper/Vector/MultiPolygonMapper.php | 9 +-- src/Mapper/Vector/MultiPolylineMapper.php | 13 ++-- src/Mapper/Vector/PolylineMapper.php | 9 +-- src/Mapper/Vector/RectangleMapper.php | 10 +-- src/Model/AbstractActiveModel.php | 6 +- src/Request/Request.php | 71 +++++++++++++++++++ 35 files changed, 331 insertions(+), 252 deletions(-) create mode 100644 src/Request/Request.php diff --git a/src/Event/BuildDefinitionEvent.php b/src/Event/BuildDefinitionEvent.php index a463659..7e63160 100644 --- a/src/Event/BuildDefinitionEvent.php +++ b/src/Event/BuildDefinitionEvent.php @@ -12,8 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Event; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Value\LatLngBounds; use Symfony\Component\EventDispatcher\Event; /** @@ -40,24 +40,24 @@ class BuildDefinitionEvent extends Event private $model; /** - * Optional bounds where elements should be in. + * Building request. * - * @var LatLngBounds + * @var Request|null */ - private $bounds; + private $request; /** * Construct. * * @param Definition $definition The leaflet definition. * @param \Model $model The definition model. - * @param LatLngBounds $bounds Optional bounds where elements should be in. + * @param Request|null $request Building request. */ - public function __construct(Definition $definition, \Model $model, LatLngBounds $bounds = null) + public function __construct(Definition $definition, \Model $model, Request $request = null) { $this->definition = $definition; $this->model = $model; - $this->bounds = $bounds; + $this->request = $request; } /** @@ -83,10 +83,10 @@ class BuildDefinitionEvent extends Event /** * Get the bounds. * - * @return LatLngBounds|null + * @return Request|null */ - public function getBounds() + public function getRequest() { - return $this->bounds; + return $this->request; } } diff --git a/src/Frontend/RequestUrl.php b/src/Frontend/RequestUrl.php index 9fc849a..a6d38d9 100644 --- a/src/Frontend/RequestUrl.php +++ b/src/Frontend/RequestUrl.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Frontend; use Netzmacht\Contao\Leaflet\Filter\Filter; +use Netzmacht\Contao\Leaflet\Request\Request; /** * Class RequestUrl creates the request url. @@ -21,13 +22,6 @@ use Netzmacht\Contao\Leaflet\Filter\Filter; */ class RequestUrl implements \JsonSerializable { - /** - * The for param is the identifier to the responsible frontend module or content element. - * - * @var string - */ - private static $for; - /** * The leaflet hash. * @@ -54,17 +48,17 @@ class RequestUrl implements \JsonSerializable * * It combines the params and creates an hash for it. * - * @param int $dataId The data object id. - * @param string|null $type Object type. If empty it assumes a layer. - * @param string|null $format Data format. If empty it assumes geojson. - * @param Filter $filter Optional filter. + * @param int $dataId The data object id. + * @param string|null $type Object type. If empty it assumes a layer. + * @param string|null $format Data format. If empty it assumes geojson. + * @param Request $request Optional building request. * * @return RequestUrl */ - public static function create($dataId, $type = null, $format = null, Filter $filter = null) + public static function create($dataId, $type = null, $format = null, Request $request = null) { $params = array( - 'for' => static::$for, + 'for' => $request ? $request->getMapIdentifier() : null, 'type' => $type != 'layer' ? $type : null, 'id' => $dataId, 'format' => $format != 'geojson' ? $format : null @@ -73,25 +67,14 @@ class RequestUrl implements \JsonSerializable $hash = base64_encode(implode(',', $params)); $query = 'leaflet=' . $hash; - if ($filter) { + if ($request && $request->getFilter()) { + $filter = $request->getFilter(); $query .= '&f=' . $filter->getName() . '&v=' . $filter->toRequest(); } $url = \Config::get('websitePath') . '/' . \Frontend::addToUrl($query, false); - return new static($url, $hash, $filter); - } - - /** - * Set the for param. - * - * @param string $for The identifier which has the responsibility listen to the request. - * - * @return void - */ - public static function setFor($for) - { - static::$for = $for; + return new static($url, $hash, $request); } /** diff --git a/src/MapProvider.php b/src/MapProvider.php index 38cbfa8..27ba28e 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -17,10 +17,10 @@ use Doctrine\Common\Cache\Cache; use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Frontend\DataController; -use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\MapModel; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Leaflet; @@ -139,9 +139,8 @@ class MapProvider $model = $this->getModel($mapId); } - RequestUrl::setFor($elementId ?: $mapId); - $definition = $this->mapper->reset()->handle($model, $filter, $elementId); - RequestUrl::setFor(null); + $request = new Request($elementId ?: $mapId, $filter); + $definition = $this->mapper->reset()->handle($model, $request, $elementId); return $definition; } @@ -241,8 +240,10 @@ class MapProvider throw new \InvalidArgumentException(sprintf('Could not find layer "%s"', $layerId)); } + $request = new Request('', $filter); + if (!$model->cache) { - return $this->mapper->handleGeoJson($model, $filter); + return $this->mapper->handleGeoJson($model, $request); } $cacheKey = 'feature_layer_' . $model->id; @@ -254,7 +255,7 @@ class MapProvider return $this->cache->fetch($cacheKey); } - $collection = $this->mapper->handleGeoJson($model, $filter); + $collection = $this->mapper->handleGeoJson($model, $request); $this->cache->save($cacheKey, $collection, $model->cacheLifeTime); return $collection; diff --git a/src/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php index b773ae7..b129f65 100644 --- a/src/Mapper/AbstractMapper.php +++ b/src/Mapper/AbstractMapper.php @@ -12,7 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; /** @@ -63,14 +64,14 @@ abstract class AbstractMapper implements Mapper public function handle( $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null, Definition $parent = null ) { - $definition = $this->createInstance($model, $mapper, $filter, $elementId); + $definition = $this->createInstance($model, $mapper, $request, $elementId); $this->optionsBuilder->build($definition, $model); - $this->build($definition, $model, $mapper, $filter, $parent); + $this->build($definition, $model, $mapper, $request, $parent); return $definition; } @@ -78,7 +79,7 @@ abstract class AbstractMapper implements Mapper /** * {@inheritdoc} */ - public function match($model, Filter $filter = null) + public function match($model, Request $request = null) { $modelClass = static::$modelClass; @@ -98,9 +99,9 @@ abstract class AbstractMapper implements Mapper * Use for specific build methods. * * @param Definition $definition The definition being built. - * @param \Model $model The model. + * @param Model $model The model. * @param DefinitionMapper $mapper The definition mapper. - * @param Filter|null $filter Optional request filter. + * @param Request $request Optional building request. * @param Definition|null $parent The parent object. * * @return void @@ -109,9 +110,9 @@ abstract class AbstractMapper implements Mapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { } @@ -119,21 +120,21 @@ abstract class AbstractMapper implements Mapper /** * Create a new definition instance. * - * @param \Model $model The model. + * @param Model $model The model. * @param DefinitionMapper $mapper The definition mapper. - * @param Filter $filter Optional request filter. + * @param Request $request Optional building request. * @param string|null $elementId Optional element id. * * @return Definition */ protected function createInstance( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { - $reflector = new \ReflectionClass($this->getClassName($model, $mapper, $filter)); - $instance = $reflector->newInstanceArgs($this->buildConstructArguments($model, $mapper, $filter, $elementId)); + $reflector = new \ReflectionClass($this->getClassName($model, $mapper, $request)); + $instance = $reflector->newInstanceArgs($this->buildConstructArguments($model, $mapper, $request, $elementId)); return $instance; } @@ -141,9 +142,9 @@ abstract class AbstractMapper implements Mapper /** * Get construct arguments. * - * @param \Model $model The model. + * @param Model $model The model. * @param DefinitionMapper $mapper The definition mapper. - * @param Filter $filter Optional request filter. + * @param Request $request Optional building request. * @param string|null $elementId Optional element id. * * @return array @@ -151,9 +152,9 @@ abstract class AbstractMapper implements Mapper * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { return array( @@ -164,15 +165,15 @@ abstract class AbstractMapper implements Mapper /** * Get definition class name. * - * @param \Model $model The model. - * @param DefinitionMapper $mapper The definition mapper. - * @param Filter $filter Optional request filter. + * @param Model $model The model. + * @param DefinitionMapper $mapper The definition mapper. + * @param Request $request Optional building request. * * @return string * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { return static::$definitionClass; } @@ -180,12 +181,12 @@ abstract class AbstractMapper implements Mapper /** * Create element id for the model. * - * @param \Model $model The model being passed. + * @param Model $model The model being passed. * @param string|null $elementId Optional forced id. * * @return string */ - protected function getElementId(\Model $model, $elementId = null) + protected function getElementId(Model $model, $elementId = null) { if ($elementId) { return $elementId; diff --git a/src/Mapper/AbstractTypeMapper.php b/src/Mapper/AbstractTypeMapper.php index 81bc4e9..8df9034 100644 --- a/src/Mapper/AbstractTypeMapper.php +++ b/src/Mapper/AbstractTypeMapper.php @@ -12,7 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Netzmacht\Contao\Leaflet\Request\Request; /** * Class AbstractTypeMapper is the base mapper for tables containing different types of definitins. @@ -31,7 +31,7 @@ abstract class AbstractTypeMapper extends AbstractMapper /** * {@inheritdoc} */ - public function match($model, Filter $filter = null) + public function match($model, Request $request = null) { return parent::match($model) && $model->type === static::$type; } diff --git a/src/Mapper/Control/AttributionControlMapper.php b/src/Mapper/Control/AttributionControlMapper.php index f2613a2..3817069 100644 --- a/src/Mapper/Control/AttributionControlMapper.php +++ b/src/Mapper/Control/AttributionControlMapper.php @@ -12,8 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Control\Attribution; use Netzmacht\LeafletPHP\Definition\Map; @@ -54,9 +55,9 @@ class AttributionControlMapper extends AbstractControlMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if (!$definition instanceof Attribution) { diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index 78aade6..d7912f4 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -12,9 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\ControlModel; +use Netzmacht\Contao\Leaflet\Request\Request; /** * Class LayersControlMapper maps the control model to the layers control definition. @@ -41,12 +42,12 @@ class LayersControlMapper extends AbstractControlMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { - $arguments = parent::buildConstructArguments($model, $mapper, $filter, $elementId); + $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); $arguments[1] = array(); $arguments[2] = array(); @@ -57,7 +58,7 @@ class LayersControlMapper extends AbstractControlMapper foreach ($collection as $layer) { $argument = ($layer->controlMode === 'overlay') ? 2 : 1; - $arguments[$argument][] = $mapper->handle($layer, $filter); + $arguments[$argument][] = $mapper->handle($layer, $request); } } diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php index 76be93f..9e92f47 100644 --- a/src/Mapper/Control/LoadingControlMapper.php +++ b/src/Mapper/Control/LoadingControlMapper.php @@ -12,9 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; -use Netzmacht\Contao\Leaflet\Filter\Filter; +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; use Netzmacht\LeafletPHP\Definition\Control\Zoom; use Netzmacht\LeafletPHP\Plugins\Loading\LoadingControl; @@ -37,7 +38,7 @@ class LoadingControlMapper extends AbstractControlMapper /** * {@inheritdoc} */ - protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->spinjs) { return 'Netzmacht\LeafletPHP\Plugins\Loading\SpinJsLoadingControl'; @@ -61,12 +62,12 @@ class LoadingControlMapper extends AbstractControlMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof SpinJsLoadingControl && $model->spin) { $config = json_decode($model->spin, true); diff --git a/src/Mapper/DefinitionMapper.php b/src/Mapper/DefinitionMapper.php index 6522d99..54ce353 100644 --- a/src/Mapper/DefinitionMapper.php +++ b/src/Mapper/DefinitionMapper.php @@ -15,7 +15,7 @@ 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\Filter\Filter; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Value\GeoJson\ConvertsToGeoJsonFeature; use Netzmacht\LeafletPHP\Value\GeoJson\Feature; @@ -94,24 +94,24 @@ class DefinitionMapper * Build a model. * * @param mixed $model The definition model. - * @param Filter $filter Optional request filter. - * @param string $elementId Optional element id. If none given the mapId or alias is used. + * @param Request|null $request The map request. + * @param string|null $elementId Optional element id. If none given the model id or alias is used. * @param Definition|null $parent Optional pass the parent object. * * @return Definition|null * * @throws \RuntimeException If model could not be mapped to a definition. */ - public function handle($model, Filter $filter = null, $elementId = null, $parent = null) + public function handle($model, Request $request = null, $elementId = null, $parent = null) { $hash = $this->hash($model, $elementId); if (!isset($this->mapped[$hash])) { $mapper = $this->getMapper($model); - $definition = $mapper->handle($model, $this, $filter, $elementId, $parent); + $definition = $mapper->handle($model, $this, $request, $elementId, $parent); if ($definition) { - $event = new BuildDefinitionEvent($definition, $model, $filter); + $event = new BuildDefinitionEvent($definition, $model, $request); $this->eventDispatcher->dispatch($event::NAME, $event); } @@ -124,19 +124,19 @@ class DefinitionMapper /** * Build a model. * - * @param mixed $model The definition model. - * @param Filter $filter Optional request filter. + * @param mixed $model The definition model. + * @param Request $request Optional building request. * * @return FeatureCollection|Feature|null * * @throws \RuntimeException If a model could not be mapped to the GeoJSON representation. */ - public function handleGeoJson($model, Filter $filter = null) + public function handleGeoJson($model, Request $request = null) { $mapper = $this->getMapper($model); if ($mapper instanceof GeoJsonMapper) { - return $mapper->handleGeoJson($model, $this, $filter); + return $mapper->handleGeoJson($model, $this, $request); } throw new \RuntimeException( diff --git a/src/Mapper/GeoJsonMapper.php b/src/Mapper/GeoJsonMapper.php index f0ac257..322d061 100644 --- a/src/Mapper/GeoJsonMapper.php +++ b/src/Mapper/GeoJsonMapper.php @@ -12,7 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonFeature; /** @@ -25,11 +26,11 @@ interface GeoJsonMapper /** * Hanle the GeoJSON creation. * - * @param \Model $model The model being mapped. - * @param DefinitionMapper $mapper The definition mapper. - * @param Filter $filter Optional request filter. + * @param Model $model The model being mapped. + * @param DefinitionMapper $mapper The definition mapper. + * @param Request $request Optional building request. * * @return GeoJsonFeature|null */ - public function handleGeoJson(\Model $model, DefinitionMapper $mapper, Filter $filter = null); + public function handleGeoJson(Model $model, DefinitionMapper $mapper, Request $request = null); } diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php index 27d6987..172cdab 100644 --- a/src/Mapper/Layer/GroupLayerMapper.php +++ b/src/Mapper/Layer/GroupLayerMapper.php @@ -12,9 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; 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\LayerGroup; use Netzmacht\LeafletPHP\Definition\Layer; @@ -36,7 +37,7 @@ class GroupLayerMapper extends AbstractLayerMapper /** * {@inheritdoc} */ - protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->groupType === 'feature') { return 'Netzmacht\LeafletPHP\Definition\Group\FeatureGroup'; @@ -50,9 +51,9 @@ class GroupLayerMapper extends AbstractLayerMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if (!$definition instanceof LayerGroup) { diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index b5b27f5..a71b8c2 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -12,11 +12,11 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; +use Contao\Model; use Netzmacht\Contao\Leaflet\ContaoAssets; -use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\AnonymousFunction; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; @@ -86,12 +86,12 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter, $parent); + parent::build($definition, $model, $mapper, $request, $parent); /** @var MarkerClusterGroup $definition */ diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index a8731c8..79a8b5f 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -12,11 +12,12 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper; use Netzmacht\Contao\Leaflet\Model\MarkerModel; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; @@ -39,7 +40,7 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper /** * {@inheritdoc} */ - protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->deferred) { return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson'; @@ -52,9 +53,9 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { if ($model->deferred) { @@ -71,7 +72,7 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper return array( $this->getElementId($model, $elementId), - RequestUrl::create($model->id, null, null, $filter), + RequestUrl::create($model->id, null, null, $request), array(), $layer ); @@ -79,11 +80,11 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper return array( $this->getElementId($model, $elementId), - RequestUrl::create($model->id, null, null, $filter) + RequestUrl::create($model->id, null, null, $request) ); } - return parent::buildConstructArguments($model, $mapper, $filter, $elementId); + return parent::buildConstructArguments($model, $mapper, $request, $elementId); } /** @@ -91,9 +92,9 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if ($definition instanceof GeoJson) { @@ -123,10 +124,10 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper /** * {@inheritdoc} */ - public function handleGeoJson(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + public function handleGeoJson(Model $model, DefinitionMapper $mapper, Request $request = null) { $feature = new FeatureCollection(); - $collection = $this->loadMarkerModels($model, $filter); + $collection = $this->loadMarkerModels($model, $request); if ($collection) { foreach ($collection as $item) { @@ -145,15 +146,15 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper /** * Load all layer markers. * - * @param \Model $model The layer model. - * @param Filter $filter The request filter. + * @param Model $model The layer model. + * @param Request $request Optional building request. * * @return \Model\Collection|null */ - protected function loadMarkerModels(\Model $model, Filter $filter = null) + protected function loadMarkerModels(Model $model, Request $request = null) { if ($model->boundsMode == 'fit') { - return MarkerModel::findByFilter($model->id, $filter); + return MarkerModel::findByFilter($model->id, $request->getFilter()); } return MarkerModel::findByFilter($model->id); diff --git a/src/Mapper/Layer/OverpassLayerMapper.php b/src/Mapper/Layer/OverpassLayerMapper.php index 587b9d7..c830662 100644 --- a/src/Mapper/Layer/OverpassLayerMapper.php +++ b/src/Mapper/Layer/OverpassLayerMapper.php @@ -12,11 +12,11 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; -use Model; +use Contao\Model; use Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer; -use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; @@ -62,7 +62,7 @@ class OverpassLayerMapper extends AbstractLayerMapper Definition $definition, Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if (!$definition instanceof OverpassLayer) { diff --git a/src/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php index 2f9f40b..9da9870 100644 --- a/src/Mapper/Layer/ProviderLayerMapper.php +++ b/src/Mapper/Layer/ProviderLayerMapper.php @@ -12,9 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\OptionsBuilder; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; /** @@ -53,7 +54,7 @@ class ProviderLayerMapper extends AbstractLayerMapper /** * {@inheritdoc} */ - protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if (isset($this->providers[$model->tile_provider]['class'])) { return $this->providers[$model->tile_provider]['class']; @@ -67,9 +68,9 @@ class ProviderLayerMapper extends AbstractLayerMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if (!empty($this->providers[$model->tile_provider]['options'])) { @@ -85,9 +86,9 @@ class ProviderLayerMapper extends AbstractLayerMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { return array( diff --git a/src/Mapper/Layer/ReferenceLayerMapper.php b/src/Mapper/Layer/ReferenceLayerMapper.php index 220e836..a45cb38 100644 --- a/src/Mapper/Layer/ReferenceLayerMapper.php +++ b/src/Mapper/Layer/ReferenceLayerMapper.php @@ -12,9 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; -use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; /** @@ -37,7 +37,7 @@ class ReferenceLayerMapper extends AbstractLayerMapper public function handle( $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null, Definition $parent = null ) { @@ -49,6 +49,6 @@ class ReferenceLayerMapper extends AbstractLayerMapper $elementId = $model->standalone ? $this->getElementId($model, $elementId) : null; - return $mapper->handle($reference, $filter, $elementId); + return $mapper->handle($reference, $request, $elementId); } } diff --git a/src/Mapper/Layer/TileLayerMapper.php b/src/Mapper/Layer/TileLayerMapper.php index dcfac16..03d407a 100644 --- a/src/Mapper/Layer/TileLayerMapper.php +++ b/src/Mapper/Layer/TileLayerMapper.php @@ -12,8 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; +use Contao\StringUtil; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Raster\TileLayer; use Netzmacht\LeafletPHP\Value\LatLngBounds; @@ -64,12 +66,12 @@ class TileLayerMapper extends AbstractLayerMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { - $arguments = parent::buildConstructArguments($model, $mapper, $filter, $elementId); + $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); $arguments[] = $model->tileUrl; @@ -81,26 +83,26 @@ class TileLayerMapper extends AbstractLayerMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter, $parent); + parent::build($definition, $model, $mapper, $request, $parent); /** @var TileLayer $definition */ - $filter = deserialize($model->bounds); + $bounds = StringUtil::deserialize($model->bounds); - if ($filter[0] && $filter[1]) { - $filter = array_map( + if ($request[0] && $request[1]) { + $bounds = array_map( function ($value) { return explode(',', $value, 3); }, - $filter + $bounds ); - $filter = LatLngBounds::fromArray($filter); - $definition->setBounds($filter); + $bounds = LatLngBounds::fromArray($bounds); + $definition->setBounds($bounds); } } } diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index 7aa6d90..88e7e95 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -12,16 +12,17 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; +use Contao\Model\Collection; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper; use Netzmacht\Contao\Leaflet\Model\VectorModel; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; -use Netzmacht\LeafletPHP\Definition\Vector; /** * Class VectorsLayerMapper maps the layer model for the Vectors layer definition. @@ -40,7 +41,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper /** * {@inheritdoc} */ - protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null) { if ($model->deferred) { return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson'; @@ -53,9 +54,9 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { if ($model->deferred) { @@ -79,7 +80,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper return array( $this->getElementId($model, $elementId), - RequestUrl::create($model->id, null, null, $filter), + RequestUrl::create($model->id, null, null, $request), array(), $layer ); @@ -87,11 +88,11 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper return array( $this->getElementId($model, $elementId), - RequestUrl::create($model->id, null, null, $filter) + RequestUrl::create($model->id, null, null, $request) ); } - return parent::buildConstructArguments($model, $mapper, $filter, $elementId); + return parent::buildConstructArguments($model, $mapper, $request, $elementId); } /** @@ -99,9 +100,9 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if ($definition instanceof GeoJson) { @@ -129,7 +130,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper /** * {@inheritdoc} */ - public function handleGeoJson(\Model $model, DefinitionMapper $mapper, Filter $filter = null) + public function handleGeoJson(Model $model, DefinitionMapper $mapper, Request $request = null) { $definition = new FeatureCollection(); $collection = $this->loadVectorModels($model); @@ -151,13 +152,13 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper /** * Load vector models. * - * @param \Model $model The layer model. + * @param Model $model The layer model. * - * @return \Model\Collection|null + * @return Collection|null */ - protected function loadVectorModels(\Model $model) + protected function loadVectorModels(Model $model) { - return VectorModel::findActiveBy('pid', $model->id, array('order' => 'sorting')); + return VectorModel::findActiveBy('pid', $model->id, ['order' => 'sorting']); } /** diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 334963d..84e4dde 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -12,10 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Mapper; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Model\ControlModel; use Netzmacht\Contao\Leaflet\Model\MapModel; -use Netzmacht\JavascriptBuilder\Type\Expression; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Control; use Netzmacht\LeafletPHP\Definition\Layer; @@ -60,15 +60,15 @@ class MapMapper extends AbstractMapper */ protected function build( Definition $map, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if ($map instanceof Map && $model instanceof MapModel) { $this->buildCustomOptions($map, $model); - $this->buildControls($map, $model, $mapper, $filter); - $this->buildLayers($map, $model, $mapper, $filter); + $this->buildControls($map, $model, $mapper, $request); + $this->buildLayers($map, $model, $mapper, $request); $this->buildBoundsCalculation($map, $model); $this->buildLocate($map, $model); } @@ -78,9 +78,9 @@ class MapMapper extends AbstractMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { return array( @@ -113,14 +113,14 @@ class MapMapper extends AbstractMapper /** * Build map controls. * - * @param Map $map The map being built. - * @param MapModel $model The map model. - * @param DefinitionMapper $mapper The definition mapper. - * @param Filter $filter Optional request filter. + * @param Map $map The map being built. + * @param MapModel $model The map model. + * @param DefinitionMapper $mapper The definition mapper. + * @param Request $request Optional building request. * * @return void */ - private function buildControls(Map $map, MapModel $model, DefinitionMapper $mapper, Filter $filter = null) + private function buildControls(Map $map, MapModel $model, DefinitionMapper $mapper, Request $request = null) { $collection = ControlModel::findActiveBy('pid', $model->id, array('order' => 'sorting')); @@ -129,7 +129,7 @@ class MapMapper extends AbstractMapper } foreach ($collection as $control) { - $control = $mapper->handle($control, $filter, null, $map); + $control = $mapper->handle($control, $request, null, $map); if ($control instanceof Control) { $control->addTo($map); @@ -140,14 +140,14 @@ class MapMapper extends AbstractMapper /** * Build map layers. * - * @param Map $map The map being built. - * @param MapModel $model The map model. - * @param DefinitionMapper $mapper Definition mapper. - * @param Filter $filter Optional request filter. + * @param Map $map The map being built. + * @param MapModel $model The map model. + * @param DefinitionMapper $mapper Definition mapper. + * @param Request $request Optional building request. * * @return void */ - private function buildLayers(Map $map, MapModel $model, DefinitionMapper $mapper, Filter $filter = null) + private function buildLayers(Map $map, MapModel $model, DefinitionMapper $mapper, Request $request = null) { $collection = $model->findActiveLayers(); @@ -157,7 +157,7 @@ class MapMapper extends AbstractMapper continue; } - $layer = $mapper->handle($layer, $filter, null, $map); + $layer = $mapper->handle($layer, $request, null, $map); if ($layer instanceof Layer) { $layer->addTo($map); } @@ -197,7 +197,6 @@ class MapMapper extends AbstractMapper } } - /** * Build map bounds calculations. * diff --git a/src/Mapper/Mapper.php b/src/Mapper/Mapper.php index f4a651f..c19caf7 100644 --- a/src/Mapper/Mapper.php +++ b/src/Mapper/Mapper.php @@ -12,7 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; /** @@ -25,9 +26,9 @@ interface Mapper /** * Map model to the definition. * - * @param \Model|mixed $model The model being built. Usually a contao model, but can be anything. + * @param Model|mixed $model The model being built. Usually a contao model, but can be anything. * @param DefinitionMapper $mapper The definition builder. - * @param Filter $filter Optional filter bounds. + * @param Request $request Optional building request. * @param string $elementId Optional element. * @param Definition|null $parent Optional passed parent. * @@ -36,7 +37,7 @@ interface Mapper public function handle( $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null, Definition $parent = null ); @@ -44,10 +45,10 @@ interface Mapper /** * Check if mapper is responsible for the model. * - * @param \Model $model The model being build. - * @param Filter $filter Optional filter bounds. + * @param Model $model The model being build. + * @param Request $request Optional building request. * * @return bool */ - public function match($model, Filter $filter = null); + public function match($model, Request $request = null); } diff --git a/src/Mapper/OptionsBuilder.php b/src/Mapper/OptionsBuilder.php index 0f13cbd..76ad217 100644 --- a/src/Mapper/OptionsBuilder.php +++ b/src/Mapper/OptionsBuilder.php @@ -11,6 +11,7 @@ */ namespace Netzmacht\Contao\Leaflet\Mapper; +use Contao\Model; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\HasOptions; @@ -199,7 +200,7 @@ class OptionsBuilder * * @param array $options The options. * @param Definition $definition The definition being built. - * @param \Model $model The model. + * @param Model $model The model. * * @return void */ diff --git a/src/Mapper/Style/FixedStyleMapper.php b/src/Mapper/Style/FixedStyleMapper.php index 4fa1ed2..6212eb9 100644 --- a/src/Mapper/Style/FixedStyleMapper.php +++ b/src/Mapper/Style/FixedStyleMapper.php @@ -9,6 +9,7 @@ * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ + namespace Netzmacht\Contao\Leaflet\Mapper\Style; /** diff --git a/src/Mapper/Type/DivIconMapper.php b/src/Mapper/Type/DivIconMapper.php index c7a596b..4509839 100644 --- a/src/Mapper/Type/DivIconMapper.php +++ b/src/Mapper/Type/DivIconMapper.php @@ -12,8 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\DivIcon; @@ -53,12 +54,12 @@ class DivIconMapper extends AbstractIconMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof DivIcon && $model->iconSize) { $definition->setIconSize(explode(',', $model->iconSize, 2)); diff --git a/src/Mapper/Type/ExtraMarkersIconMapper.php b/src/Mapper/Type/ExtraMarkersIconMapper.php index ac768dd..82660ae 100644 --- a/src/Mapper/Type/ExtraMarkersIconMapper.php +++ b/src/Mapper/Type/ExtraMarkersIconMapper.php @@ -12,8 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\DivIcon; @@ -53,12 +54,12 @@ class ExtraMarkersIconMapper extends AbstractIconMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof DivIcon && $model->iconSize) { $definition->setIconSize(explode(',', $model->iconSize, 2)); diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index 830a525..d444da9 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -12,9 +12,10 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; @@ -43,12 +44,12 @@ class ImageIconMapper extends AbstractIconMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { - $arguments = parent::buildConstructArguments($model, $mapper, $filter, $elementId); + $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); if ($model->iconImage) { $file = \FilesModel::findByUuid($model->iconImage); @@ -66,9 +67,9 @@ class ImageIconMapper extends AbstractIconMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if ($definition instanceof ImageIcon) { diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php index 1581100..a055f31 100644 --- a/src/Mapper/UI/MarkerMapper.php +++ b/src/Mapper/UI/MarkerMapper.php @@ -12,12 +12,13 @@ namespace Netzmacht\Contao\Leaflet\Mapper\UI; -use Netzmacht\Contao\Leaflet\Filter\Filter; +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\Model\IconModel; 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; @@ -67,12 +68,12 @@ class MarkerMapper extends AbstractMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { - $arguments = parent::buildConstructArguments($model, $mapper, $filter, $elementId); + $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); $arguments[] = array($model->latitude, $model->longitude, $model->altitude ?: null) ?: null; return $arguments; @@ -95,9 +96,9 @@ class MarkerMapper extends AbstractMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { if ($definition instanceof Marker) { @@ -109,7 +110,7 @@ class MarkerMapper extends AbstractMapper $popupModel = PopupModel::findActiveByPK($model->popup); if ($popupModel) { - $popup = $mapper->handle($popupModel, $filter, null, $definition); + $popup = $mapper->handle($popupModel, $request, null, $definition); } } diff --git a/src/Mapper/UI/PopupMapper.php b/src/Mapper/UI/PopupMapper.php index 48bd9bb..6b4eb05 100644 --- a/src/Mapper/UI/PopupMapper.php +++ b/src/Mapper/UI/PopupMapper.php @@ -12,10 +12,11 @@ namespace Netzmacht\Contao\Leaflet\Mapper\UI; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\AbstractMapper; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\PopupModel; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\UI\Popup; @@ -60,12 +61,12 @@ class PopupMapper extends AbstractMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter, $parent); + parent::build($definition, $model, $mapper, $request, $parent); /** @var Popup $definition */ /** @var PopupModel $model */ diff --git a/src/Mapper/Vector/AbstractVectorMapper.php b/src/Mapper/Vector/AbstractVectorMapper.php index 5fbce8f..23ee469 100644 --- a/src/Mapper/Vector/AbstractVectorMapper.php +++ b/src/Mapper/Vector/AbstractVectorMapper.php @@ -12,13 +12,14 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; +use Contao\Model; use Netzmacht\Contao\Leaflet\Definition\Style; -use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Frontend\ValueFilter; use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\PopupModel; use Netzmacht\Contao\Leaflet\Model\StyleModel; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Popup; @@ -62,12 +63,12 @@ class AbstractVectorMapper extends AbstractTypeMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof Path && $model->style) { $styleModel = StyleModel::findActiveByPK($model->style); @@ -81,24 +82,24 @@ class AbstractVectorMapper extends AbstractTypeMapper } } - $this->buildPopup($definition, $model, $mapper, $filter); + $this->buildPopup($definition, $model, $mapper, $request); } /** * Build the popup. * * @param Definition $definition The definition. - * @param \Model $model The model. + * @param Model $model The model. * @param DefinitionMapper $mapper The definition mapper. - * @param Filter $filter The filter. + * @param Request $request Optional building request. * * @return void */ protected function buildPopup( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null + Request $request = null ) { if ($definition instanceof HasPopup && $model->addPopup) { $popup = null; @@ -108,7 +109,7 @@ class AbstractVectorMapper extends AbstractTypeMapper $popupModel = PopupModel::findActiveByPK($model->popup); if ($popupModel) { - $popup = $mapper->handle($popupModel, $filter, null, $definition); + $popup = $mapper->handle($popupModel, $request, null, $definition); } } diff --git a/src/Mapper/Vector/CircleMapper.php b/src/Mapper/Vector/CircleMapper.php index d8cfa3e..2eff2df 100644 --- a/src/Mapper/Vector/CircleMapper.php +++ b/src/Mapper/Vector/CircleMapper.php @@ -12,12 +12,12 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker; use Netzmacht\LeafletPHP\Value\LatLng; -use Netzmacht\LeafletPHP\Definition\Vector\Circle; /** * Class CircleMapper maps the database model to the circle definition. @@ -55,12 +55,12 @@ class CircleMapper extends AbstractVectorMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof CircleMarker) { $definition->setLatLng(LatLng::fromString($model->coordinates)); diff --git a/src/Mapper/Vector/MultiPolygonMapper.php b/src/Mapper/Vector/MultiPolygonMapper.php index 25642e9..db1309e 100644 --- a/src/Mapper/Vector/MultiPolygonMapper.php +++ b/src/Mapper/Vector/MultiPolygonMapper.php @@ -12,8 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Vector\Polygon; @@ -43,12 +44,12 @@ class MultiPolygonMapper extends MultiPolylineMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof Polygon) { $this->createLatLngs($definition, $model); diff --git a/src/Mapper/Vector/MultiPolylineMapper.php b/src/Mapper/Vector/MultiPolylineMapper.php index 93736a7..6d1ec0e 100644 --- a/src/Mapper/Vector/MultiPolylineMapper.php +++ b/src/Mapper/Vector/MultiPolylineMapper.php @@ -12,8 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Vector\Polyline; use Netzmacht\LeafletPHP\Value\LatLng; @@ -44,12 +45,12 @@ class MultiPolylineMapper extends AbstractVectorMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof Polyline) { $this->createLatLngs($definition, $model); @@ -60,11 +61,11 @@ class MultiPolylineMapper extends AbstractVectorMapper * Create lat lngs for the definition. * * @param Polyline $definition The multi polyline. - * @param \Model $model The definition model. + * @param Model $model The definition model. * * @return void */ - protected function createLatLngs(Polyline $definition, \Model $model) + protected function createLatLngs(Polyline $definition, Model $model) { foreach (deserialize($model->multiData, true) as $ring => $data) { $latLngs = array_map( diff --git a/src/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php index d7e3b09..57ab68f 100644 --- a/src/Mapper/Vector/PolylineMapper.php +++ b/src/Mapper/Vector/PolylineMapper.php @@ -12,8 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Definition\Vector\Polyline; @@ -44,12 +45,12 @@ class PolylineMapper extends AbstractVectorMapper */ protected function build( Definition $definition, - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, Definition $parent = null ) { - parent::build($definition, $model, $mapper, $filter); + parent::build($definition, $model, $mapper, $request); if ($definition instanceof Polyline) { array_map( diff --git a/src/Mapper/Vector/RectangleMapper.php b/src/Mapper/Vector/RectangleMapper.php index 3d4757c..4b178c7 100644 --- a/src/Mapper/Vector/RectangleMapper.php +++ b/src/Mapper/Vector/RectangleMapper.php @@ -12,9 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Vector; -use Netzmacht\Contao\Leaflet\Filter\Filter; +use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; -use Netzmacht\LeafletPHP\Definition; +use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Value\LatLngBounds; @@ -43,9 +43,9 @@ class RectangleMapper extends AbstractVectorMapper * {@inheritdoc} */ protected function buildConstructArguments( - \Model $model, + Model $model, DefinitionMapper $mapper, - Filter $filter = null, + Request $request = null, $elementId = null ) { $latLngs = array_map( @@ -55,7 +55,7 @@ class RectangleMapper extends AbstractVectorMapper deserialize($model->bounds, true) ); - $arguments = parent::buildConstructArguments($model, $mapper, $filter, $elementId); + $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); $arguments[] = new LatLngBounds($latLngs[0], $latLngs[1]); return $arguments; diff --git a/src/Model/AbstractActiveModel.php b/src/Model/AbstractActiveModel.php index 7ec2c9a..c493711 100644 --- a/src/Model/AbstractActiveModel.php +++ b/src/Model/AbstractActiveModel.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Model; +use Contao\Model\Collection; + /** * Class AbstractActiveModel is the base model for models with an active field. * @@ -39,7 +41,7 @@ abstract class AbstractActiveModel extends \Model * @param mixed $value The column value. * @param array $options The options. * - * @return \Model|null + * @return Collection|null */ public static function findActiveBy($column, $value, $options = array()) { @@ -57,7 +59,7 @@ abstract class AbstractActiveModel extends \Model * * @param array $options The query options. * - * @return \Model\Collection|null + * @return Collection|null */ public static function findActives($options = array()) { diff --git a/src/Request/Request.php b/src/Request/Request.php new file mode 100644 index 0000000..5ae967d --- /dev/null +++ b/src/Request/Request.php @@ -0,0 +1,71 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Request; + +use Netzmacht\Contao\Leaflet\Filter\Filter; + +/** + * Class MapRequest + * + * @package Netzmacht\Contao\Leaflet\Request + */ +class Request +{ + /** + * Map identifier. + * + * @var string + */ + private $identifier; + + /** + * Request filter. + * + * @var Filter|null + */ + private $filter; + + /** + * Request constructor. + * + * @param string $identifier Map identifier. + * @param Filter|null $filter Filter. + */ + public function __construct($identifier, Filter $filter = null) + { + $this->identifier = $identifier; + $this->filter = $filter; + } + + /** + * Get the map identifier. + * + * @return string + */ + public function getMapIdentifier(): string + { + return $this->identifier; + } + + /** + * Get the filter. + * + * @return Filter|null + */ + public function getFilter() + { + return $this->filter; + } +} From e1685f65c576ea4ee6bdbfb23882625342b5b8a9 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 14:28:05 +0200 Subject: [PATCH 093/152] Ignore node modules. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5e9c70f..107dd49 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ build.properties .tx # NPM +node_modules package-lock.json From 5ce9d517bc16bc8c7aa6e939966b3698d1a3980f Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 14:40:01 +0200 Subject: [PATCH 094/152] Rework filter handling (Fixes #50). --- .../NetzmachtContaoLeafletExtension.php | 1 - src/Bundle/Resources/config/config.yml | 5 ++ src/Bundle/Resources/config/filters.yml | 11 ---- src/Bundle/Resources/config/services.yml | 7 ++- src/Filter/FilterFactory.php | 59 +++++++++++++++++++ src/Frontend/DataController.php | 49 +++++---------- src/MapProvider.php | 15 ++--- 7 files changed, 92 insertions(+), 55 deletions(-) delete mode 100644 src/Bundle/Resources/config/filters.yml create mode 100644 src/Filter/FilterFactory.php diff --git a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php index 98b88fb..6e56b9c 100644 --- a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php +++ b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php @@ -46,7 +46,6 @@ class NetzmachtContaoLeafletExtension extends Extension $loader->load('providers.yml'); // Other services - $loader->load('filters.yml'); $loader->load('mappers.yml'); $loader->load('encoders.yml'); $loader->load('layers.yml'); diff --git a/src/Bundle/Resources/config/config.yml b/src/Bundle/Resources/config/config.yml index bbc7d26..41da04e 100644 --- a/src/Bundle/Resources/config/config.yml +++ b/src/Bundle/Resources/config/config.yml @@ -58,3 +58,8 @@ parameters: - 'id' - 'title' - 'alias' + + # Filters can be passed to a data request to get only specific data from a layer. + netzmacht.contao_leaflet.filters: + bbox: Netzmacht\Contao\Leaflet\Filter\BboxFilter + distance: Netzmacht\Contao\Leaflet\Filter\DistanceFilter diff --git a/src/Bundle/Resources/config/filters.yml b/src/Bundle/Resources/config/filters.yml deleted file mode 100644 index 7f3cb2e..0000000 --- a/src/Bundle/Resources/config/filters.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - # Filters can be passed to a data request to get only specific data from a layer. - netzmacht.contao_leaflet.filter.bbox: - class: Netzmacht\Contao\Leaflet\Filter\BboxFilter - tags: - - { name: 'netzmacht.contao_leaflet.filter', alias: 'bbox' } - - netzmacht.contao_leaflet.filter.distance: - class: Netzmacht\Contao\Leaflet\Filter\DistanceFilter - tags: - - { name: 'netzmacht.contao_leaflet.filter', alias: 'distance' } diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index 6927752..e5c8290 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -14,7 +14,7 @@ services: - '@netzmacht.contao_toolkit.contao.input_adapter' - '@netzmacht.contao_leaflet.map.assets' - '@netzmacht.contao_leaflet.cache' - - [] # TODO: Rework filter handling. + - '@netzmacht.contao_leaflet.filter_factory' - '%kernel.debug%' netzmacht.contao_leaflet.libraries: @@ -22,6 +22,11 @@ services: arguments: - '@contao.framework' + netzmacht.contao_leaflet.filter_factory: + class: Netzmacht\Contao\Leaflet\Filter\FilterFactory + arguments: + - '%netzmacht.contao_leaflet.filters%' + netzmacht.contao_leaflet.cache: alias: 'netzmacht.contao_leaflet.cache.default' diff --git a/src/Filter/FilterFactory.php b/src/Filter/FilterFactory.php new file mode 100644 index 0000000..9909db9 --- /dev/null +++ b/src/Filter/FilterFactory.php @@ -0,0 +1,59 @@ + + * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Filter; + +/** + * Class FilterFactory. + * + * @package Netzmacht\Contao\Leaflet\Filter + */ +final class FilterFactory +{ + /** + * Map of filter classes. + * + * @var array + */ + private $filters; + + /** + * FilterFactory constructor. + * + * @param array $filters Map of filter classes. + */ + public function __construct(array $filters) + { + $this->filters = $filters; + } + + /** + * Create a filter. + * + * @param string $filter Filter name. + * @param string $values Filter values. + * + * @return Filter + * + * @throws \RuntimeException When filter is not supported. + */ + public function create(string $filter, string $values): Filter + { + if (isset($this->filters[$filter])) { + return call_user_func([$filter, 'fromRequest'], $values); + } + + throw new \RuntimeException(sprintf('Creating filter failed. Unsupported filter "%s"', $filter)); + } +} diff --git a/src/Frontend/DataController.php b/src/Frontend/DataController.php index abf8eca..b15fba5 100644 --- a/src/Frontend/DataController.php +++ b/src/Frontend/DataController.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Frontend; use Netzmacht\Contao\Leaflet\Filter\Filter; +use Netzmacht\Contao\Leaflet\Filter\FilterFactory; use Netzmacht\Contao\Leaflet\MapProvider; /** @@ -41,13 +42,6 @@ class DataController 'filter' => null, 'values' => null ); - - /** - * Filters configuration. - * - * @var array - */ - private $filters; /** * Display errors. @@ -56,18 +50,25 @@ class DataController */ private $displayErrors; + /** + * Filter factory. + * + * @var FilterFactory + */ + private $filterFactory; + /** * Construct. * - * @param MapProvider $mapProvider The map provider. - * @param array $filters Filters configuration. - * @param bool $displayErrors Display errors. + * @param MapProvider $mapProvider The map provider. + * @param FilterFactory $filterFactory Filter factory. + * @param bool $displayErrors Display errors. */ - public function __construct(MapProvider $mapProvider, array $filters, $displayErrors) + public function __construct(MapProvider $mapProvider, FilterFactory $filterFactory, $displayErrors) { $this->mapProvider = $mapProvider; - $this->filters = $filters; $this->displayErrors = $displayErrors; + $this->filterFactory = $filterFactory; } /** @@ -85,7 +86,7 @@ class DataController try { if ($input['filter']) { - $filter = $this->createFilter($input); + $filter = $this->filterFactory->create($input['filter'], $input['values']); } else { $filter = null; } @@ -152,26 +153,4 @@ class DataController return array($data, $error); } - - /** - * Create a filter. - * - * @param array $input The user input as array. - * - * @return Filter - * @throws \RuntimeException If the filter is not defined. - * - * @SuppressWarnings(PHPMD.Superglobals) - */ - private function createFilter($input) - { - if (!isset($this->filters[$input['filter']])) { - throw new \RuntimeException(sprintf('Undefined filter "%s".', $input['filter'])); - } - - /** @var Filter $filter */ - $filter = $this->filters[$input['filter']]; - - return $filter::fromRequest($input['values']); - } } diff --git a/src/MapProvider.php b/src/MapProvider.php index 27ba28e..41f2ab5 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -16,6 +16,7 @@ use Contao\Input; use Doctrine\Common\Cache\Cache; use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent; use Netzmacht\Contao\Leaflet\Filter\Filter; +use Netzmacht\Contao\Leaflet\Filter\FilterFactory; use Netzmacht\Contao\Leaflet\Frontend\DataController; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; @@ -69,11 +70,11 @@ class MapProvider private $assets; /** - * Request filters configuration. + * Filter factory. * - * @var array + * @var FilterFactory */ - private $filters; + private $filterFactory; /** * Display errors setting. @@ -98,7 +99,7 @@ class MapProvider * @param Input $input Thw request input. * @param ContaoAssets $assets Assets handler. * @param Cache $cache Cache. - * @param array $filters Request filters configuration. + * @param FilterFactory $filterFactory Filter factory. * @param bool $displayErrors Display errors setting. */ public function __construct( @@ -108,7 +109,7 @@ class MapProvider $input, ContaoAssets $assets, Cache $cache, - array $filters, + FilterFactory $filterFactory, $displayErrors ) { $this->mapper = $mapper; @@ -116,7 +117,7 @@ class MapProvider $this->eventDispatcher = $eventDispatcher; $this->input = $input; $this->assets = $assets; - $this->filters = $filters; + $this->filterFactory = $filterFactory; $this->displayErrors = $displayErrors; $this->cache = $cache; } @@ -293,7 +294,7 @@ class MapProvider return; } - $controller = new DataController($this, $this->filters, $this->displayErrors); + $controller = new DataController($this, $this->filterFactory, $this->displayErrors); $controller->execute($data); if ($exit) { From 8c6f4c429103495138e9dbe76b3919691df9daf9 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 14:43:25 +0200 Subject: [PATCH 095/152] Add request token to the paste into button. --- src/Listener/Dca/LayerDcaListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index e156c4a..004f286 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -245,7 +245,7 @@ class LayerDcaListener extends AbstractListener $children['mode'], $row['id'], !is_array($children['id']) ? '&id='.$children['id'] : '' - ) + ) . '&rt=' . RequestToken::get() ); $buffer .= sprintf( From f09929fae7406f4bd2a908c6958e9fd9b335d3e4 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 14:50:14 +0200 Subject: [PATCH 096/152] Use PHP's ::class constant. --- src/Bundle/Resources/contao/config/config.php | 2 +- .../Resources/contao/dca/tl_leaflet_vector.php | 2 +- src/Listener/Dca/VectorDcaListener.php | 14 ++++++++++++++ src/Mapper/Control/AbstractControlMapper.php | 3 ++- src/Mapper/Layer/AbstractLayerMapper.php | 3 ++- src/Mapper/Layer/OverpassLayerMapper.php | 2 +- src/Mapper/MapMapper.php | 2 +- src/Mapper/Style/AbstractStyleMapper.php | 3 ++- src/Mapper/Style/FixedStyleMapper.php | 4 +++- src/Mapper/Type/AbstractIconMapper.php | 3 ++- src/Mapper/UI/MarkerMapper.php | 5 +++-- src/Mapper/UI/PopupMapper.php | 4 ++-- src/Mapper/Vector/AbstractVectorMapper.php | 3 ++- 13 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index 5c21f12..156ba04 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -46,7 +46,7 @@ array_insert( ), 'leaflet_about' => array ( - 'callback' => 'Netzmacht\Contao\Leaflet\Backend\About', + 'callback' => Netzmacht\Contao\Leaflet\Backend\About::class, 'icon' => 'bundles/netzmachtcontaoleaflet/img/about.png', 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/about.css', ) diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php index 83bc535..a33443a 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php @@ -240,7 +240,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popup'], 'exclude' => true, 'inputType' => 'select', - 'options_callback' => ['Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener', 'getPopups'], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.vector', 'getPopups'], 'eval' => [ 'mandatory' => false, 'tl_class' => 'w50', diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php index 4bc9571..0076737 100644 --- a/src/Listener/Dca/VectorDcaListener.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Leaflet\Model\PopupModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; @@ -107,4 +108,17 @@ class VectorDcaListener extends AbstractListener return $builder->getOptions(); } + + /** + * Get all popups. + * + * @return array + */ + public function getPopups() + { + $collection = PopupModel::findAll(array('order' => 'title')); + $builder = OptionsBuilder::fromCollection($collection, 'title'); + + return $builder->getOptions(); + } } diff --git a/src/Mapper/Control/AbstractControlMapper.php b/src/Mapper/Control/AbstractControlMapper.php index e7664a3..0d744b4 100644 --- a/src/Mapper/Control/AbstractControlMapper.php +++ b/src/Mapper/Control/AbstractControlMapper.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Control; use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper; +use Netzmacht\Contao\Leaflet\Model\ControlModel; /** * Class AbstractControlMapper is the base mapper for the control model. @@ -26,7 +27,7 @@ class AbstractControlMapper extends AbstractTypeMapper * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\ControlModel'; + protected static $modelClass = ControlModel::class; /** * {@inheritdoc} diff --git a/src/Mapper/Layer/AbstractLayerMapper.php b/src/Mapper/Layer/AbstractLayerMapper.php index c8cc96e..8f79cf2 100644 --- a/src/Mapper/Layer/AbstractLayerMapper.php +++ b/src/Mapper/Layer/AbstractLayerMapper.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper; +use Netzmacht\Contao\Leaflet\Model\LayerModel; /** * Class AbstractLayerMapper is the base mapper for the layer model. @@ -26,7 +27,7 @@ class AbstractLayerMapper extends AbstractTypeMapper * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\LayerModel'; + protected static $modelClass = LayerModel::class; /** * {@inheritdoc} diff --git a/src/Mapper/Layer/OverpassLayerMapper.php b/src/Mapper/Layer/OverpassLayerMapper.php index c830662..3d4a7f2 100644 --- a/src/Mapper/Layer/OverpassLayerMapper.php +++ b/src/Mapper/Layer/OverpassLayerMapper.php @@ -39,7 +39,7 @@ class OverpassLayerMapper extends AbstractLayerMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer'; + protected static $definitionClass = OverpassLayer::class; /** * {@inheritdoc} diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 84e4dde..42f1b23 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -33,7 +33,7 @@ class MapMapper extends AbstractMapper * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\MapModel'; + protected static $modelClass = MapModel::class; /** * Class of the definition being created. diff --git a/src/Mapper/Style/AbstractStyleMapper.php b/src/Mapper/Style/AbstractStyleMapper.php index 6561d68..5c97117 100644 --- a/src/Mapper/Style/AbstractStyleMapper.php +++ b/src/Mapper/Style/AbstractStyleMapper.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Style; use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper; +use Netzmacht\Contao\Leaflet\Model\StyleModel; /** * Class AbstractStyleMapper is the base mapper for the style model. @@ -26,5 +27,5 @@ abstract class AbstractStyleMapper extends AbstractTypeMapper * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\StyleModel'; + protected static $modelClass = StyleModel::class; } diff --git a/src/Mapper/Style/FixedStyleMapper.php b/src/Mapper/Style/FixedStyleMapper.php index 6212eb9..c54d7cb 100644 --- a/src/Mapper/Style/FixedStyleMapper.php +++ b/src/Mapper/Style/FixedStyleMapper.php @@ -12,6 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Style; +use Netzmacht\Contao\Leaflet\Definition\Style\FixedStyle; + /** * Class FixedStyleMapper maps the fixed style to the corresponding definition. * @@ -24,7 +26,7 @@ class FixedStyleMapper extends AbstractStyleMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\Contao\Leaflet\Definition\Style\FixedStyle'; + protected static $definitionClass = FixedStyle::class; /** * Style type. diff --git a/src/Mapper/Type/AbstractIconMapper.php b/src/Mapper/Type/AbstractIconMapper.php index 181a659..1bb7117 100644 --- a/src/Mapper/Type/AbstractIconMapper.php +++ b/src/Mapper/Type/AbstractIconMapper.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper; +use Netzmacht\Contao\Leaflet\Model\IconModel; /** * Class AbstractIconMapper is the base mapper for the icon model. @@ -26,7 +27,7 @@ class AbstractIconMapper extends AbstractTypeMapper * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\IconModel'; + protected static $modelClass = IconModel::class; /** * {@inheritdoc} diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php index a055f31..b18122f 100644 --- a/src/Mapper/UI/MarkerMapper.php +++ b/src/Mapper/UI/MarkerMapper.php @@ -17,6 +17,7 @@ use Netzmacht\Contao\Leaflet\Frontend\ValueFilter; use Netzmacht\Contao\Leaflet\Mapper\AbstractMapper; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; 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; @@ -36,14 +37,14 @@ class MarkerMapper extends AbstractMapper * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\MarkerModel'; + protected static $modelClass = MarkerModel::class; /** * Class of the definition being created. * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\UI\Marker'; + protected static $definitionClass = Marker::class; /** * Frontend filter. diff --git a/src/Mapper/UI/PopupMapper.php b/src/Mapper/UI/PopupMapper.php index 6b4eb05..529afec 100644 --- a/src/Mapper/UI/PopupMapper.php +++ b/src/Mapper/UI/PopupMapper.php @@ -32,14 +32,14 @@ class PopupMapper extends AbstractMapper * * @var string */ - protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\UI\Popup'; + protected static $definitionClass = Popup::class; /** * The model class. * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\PopupModel'; + protected static $modelClass = PopupModel::class; /** * {@inheritdoc} diff --git a/src/Mapper/Vector/AbstractVectorMapper.php b/src/Mapper/Vector/AbstractVectorMapper.php index 23ee469..61a938a 100644 --- a/src/Mapper/Vector/AbstractVectorMapper.php +++ b/src/Mapper/Vector/AbstractVectorMapper.php @@ -19,6 +19,7 @@ use Netzmacht\Contao\Leaflet\Mapper\AbstractTypeMapper; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; 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; @@ -37,7 +38,7 @@ class AbstractVectorMapper extends AbstractTypeMapper * * @var string */ - protected static $modelClass = 'Netzmacht\Contao\Leaflet\Model\VectorModel'; + protected static $modelClass = VectorModel::class; /** * Frontend filter. From da8613ca0b630b1cfcb6d05df620c10d649d7b07 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 14:53:04 +0200 Subject: [PATCH 097/152] Move assets class to encoder namespace. --- src/Bundle/Resources/config/services.yml | 2 +- src/{ => Encoder}/ContaoAssets.php | 2 +- src/Listener/LoadAssetsListener.php | 2 +- src/MapProvider.php | 1 + src/Mapper/Layer/MarkerClusterLayerMapper.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename src/{ => Encoder}/ContaoAssets.php (98%) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index e5c8290..462c77e 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -42,7 +42,7 @@ services: class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter netzmacht.contao_leaflet.map.assets: - class: Netzmacht\Contao\Leaflet\ContaoAssets + class: Netzmacht\Contao\Leaflet\Encoder\ContaoAssets arguments: - '@netzmacht.contao_toolkit.assets_manager' diff --git a/src/ContaoAssets.php b/src/Encoder/ContaoAssets.php similarity index 98% rename from src/ContaoAssets.php rename to src/Encoder/ContaoAssets.php index 6b43f1b..6f95aed 100644 --- a/src/ContaoAssets.php +++ b/src/Encoder/ContaoAssets.php @@ -10,7 +10,7 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet; +namespace Netzmacht\Contao\Leaflet\Encoder; use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager; use Netzmacht\LeafletPHP\Assets; diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 2aec697..1781aae 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Listener; -use Netzmacht\Contao\Leaflet\ContaoAssets; +use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets; use Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\IconModel; diff --git a/src/MapProvider.php b/src/MapProvider.php index 41f2ab5..8d9ba9b 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -14,6 +14,7 @@ namespace Netzmacht\Contao\Leaflet; use Contao\Input; use Doctrine\Common\Cache\Cache; +use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets; use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent; use Netzmacht\Contao\Leaflet\Filter\Filter; use Netzmacht\Contao\Leaflet\Filter\FilterFactory; diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index a71b8c2..28e5016 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -13,7 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; -use Netzmacht\Contao\Leaflet\ContaoAssets; +use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Request\Request; From df541fe433d0d05d0bec3b2e674c103d9859827d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 15:00:48 +0200 Subject: [PATCH 098/152] Fix copyright year. --- src/Alias/DefaultAliasFilter.php | 2 +- src/Alias/DefaultAliasGeneratorFactory.php | 2 +- src/Alias/ParentAliasGeneratorFactory.php | 2 +- src/Backend/About.php | 2 +- src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php | 2 +- src/Backend/Renderer/Label/Layer/ChainRenderer.php | 2 +- src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php | 2 +- src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php | 2 +- src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php | 2 +- src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php | 2 +- src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php | 2 +- src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php | 2 +- src/Bundle/ContaoManager/Plugin.php | 2 +- .../DependencyInjection/NetzmachtContaoLeafletExtension.php | 2 +- .../DependencyInjection/Pass/RegisterDefinitionMapperPass.php | 2 +- src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php | 2 +- src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php | 2 +- src/Bundle/NetzmachtContaoLeafletBundle.php | 2 +- src/Bundle/Resources/contao/config/config.php | 2 +- src/Bundle/Resources/contao/dca/tl_content.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_control.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_control_layer.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_icon.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_layer.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_map.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_map_layer.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_marker.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_popup.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_style.php | 2 +- src/Bundle/Resources/contao/dca/tl_leaflet_vector.php | 2 +- src/Bundle/Resources/contao/dca/tl_module.php | 2 +- src/Bundle/Resources/contao/languages/en/leaflet.php | 2 +- src/Bundle/Resources/contao/languages/en/modules.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_content.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_icon.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php | 2 +- src/Bundle/Resources/contao/languages/en/tl_module.php | 2 +- src/Definition/Layer/OverpassLayer.php | 2 +- src/Definition/Style.php | 2 +- src/Definition/Style/FixedStyle.php | 2 +- src/Encoder/ContaoAssets.php | 2 +- src/Encoder/EncoderFactory.php | 2 +- src/Event/BuildDefinitionEvent.php | 2 +- src/Event/ConvertToGeoJsonEvent.php | 2 +- src/Event/GetHashEvent.php | 2 +- src/Event/GetJavascriptEvent.php | 2 +- src/Filter/BboxFilter.php | 2 +- src/Filter/DistanceFilter.php | 2 +- src/Filter/Filter.php | 2 +- src/Filter/FilterFactory.php | 2 +- src/Frontend/AbstractMapHybrid.php | 2 +- src/Frontend/Assets/LibrariesConfiguration.php | 2 +- src/Frontend/ContentElement/MapElement.php | 2 +- src/Frontend/ContentElement/MapElementFactory.php | 2 +- src/Frontend/DataController.php | 2 +- src/Frontend/InsertTag/LeafletInsertTagParser.php | 2 +- src/Frontend/Module/MapModule.php | 2 +- src/Frontend/Module/MapModuleFactory.php | 2 +- src/Frontend/RequestUrl.php | 2 +- src/Frontend/ValueFilter.php | 2 +- src/Listener/Dca/ControlDcaListener.php | 2 +- src/Listener/Dca/FrontendIntegrationListener.php | 2 +- src/Listener/Dca/IconDcaListener.php | 2 +- src/Listener/Dca/LayerDcaListener.php | 2 +- src/Listener/Dca/LeafletDcaListener.php | 2 +- src/Listener/Dca/MapDcaListener.php | 2 +- src/Listener/Dca/MarkerDcaListener.php | 2 +- src/Listener/Dca/StyleDcaListener.php | 2 +- src/Listener/Dca/Validator.php | 2 +- src/Listener/Dca/VectorDcaListener.php | 2 +- src/Listener/LoadAssetsListener.php | 2 +- src/Listener/RegisterLibrariesListener.php | 2 +- src/MapProvider.php | 2 +- src/Mapper/AbstractMapper.php | 2 +- src/Mapper/AbstractTypeMapper.php | 2 +- src/Mapper/Control/AbstractControlMapper.php | 2 +- src/Mapper/Control/AttributionControlMapper.php | 2 +- src/Mapper/Control/FullscreenControlMapper.php | 2 +- src/Mapper/Control/LayersControlMapper.php | 2 +- src/Mapper/Control/LoadingControlMapper.php | 2 +- src/Mapper/Control/ScaleControlMapper.php | 2 +- src/Mapper/Control/ZoomControlMapper.php | 2 +- src/Mapper/DefinitionMapper.php | 2 +- src/Mapper/GeoJsonMapper.php | 2 +- src/Mapper/Layer/AbstractLayerMapper.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 | 2 +- src/Mapper/Mapper.php | 2 +- src/Mapper/OptionsBuilder.php | 2 +- src/Mapper/Style/AbstractStyleMapper.php | 2 +- src/Mapper/Style/FixedStyleMapper.php | 2 +- src/Mapper/Type/AbstractIconMapper.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/CircleMarkerMapper.php | 2 +- src/Mapper/Vector/MultiPolygonMapper.php | 2 +- src/Mapper/Vector/MultiPolylineMapper.php | 2 +- src/Mapper/Vector/PolygonMapper.php | 2 +- src/Mapper/Vector/PolylineMapper.php | 2 +- src/Mapper/Vector/RectangleMapper.php | 2 +- src/Model/AbstractActiveModel.php | 2 +- src/Model/ControlModel.php | 2 +- src/Model/IconModel.php | 2 +- src/Model/LayerModel.php | 2 +- src/Model/MapModel.php | 2 +- src/Model/MarkerModel.php | 2 +- src/Model/PopupModel.php | 2 +- src/Model/StyleModel.php | 2 +- src/Model/VectorModel.php | 2 +- src/Request/Request.php | 2 +- src/Subscriber/EncoderSubscriber.php | 2 +- src/Subscriber/GeoJsonSubscriber.php | 2 +- src/Subscriber/HashSubscriber.php | 2 +- 131 files changed, 131 insertions(+), 131 deletions(-) diff --git a/src/Alias/DefaultAliasFilter.php b/src/Alias/DefaultAliasFilter.php index 8653421..51f1b4a 100644 --- a/src/Alias/DefaultAliasFilter.php +++ b/src/Alias/DefaultAliasFilter.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Alias/DefaultAliasGeneratorFactory.php b/src/Alias/DefaultAliasGeneratorFactory.php index 5c486c8..7a00ec7 100644 --- a/src/Alias/DefaultAliasGeneratorFactory.php +++ b/src/Alias/DefaultAliasGeneratorFactory.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Alias/ParentAliasGeneratorFactory.php b/src/Alias/ParentAliasGeneratorFactory.php index 5a2a8b6..d5d3990 100644 --- a/src/Alias/ParentAliasGeneratorFactory.php +++ b/src/Alias/ParentAliasGeneratorFactory.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/About.php b/src/Backend/About.php index 7862b43..c969717 100644 --- a/src/Backend/About.php +++ b/src/Backend/About.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php b/src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php index 7b18795..b89ba38 100644 --- a/src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/AbstractLabelRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/ChainRenderer.php b/src/Backend/Renderer/Label/Layer/ChainRenderer.php index 3a8963d..9fa24e8 100644 --- a/src/Backend/Renderer/Label/Layer/ChainRenderer.php +++ b/src/Backend/Renderer/Label/Layer/ChainRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php b/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php index dbefd3d..4c5a71d 100644 --- a/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php index 20b6cd7..442d9f0 100644 --- a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php b/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php index 93542b5..4c291ad 100644 --- a/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php b/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php index 7d6b08a..9148b97 100644 --- a/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php b/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php index 7968928..f7fbb6f 100644 --- a/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php index f91ce66..01f96d1 100644 --- a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/ContaoManager/Plugin.php b/src/Bundle/ContaoManager/Plugin.php index e278f18..a9facf6 100644 --- a/src/Bundle/ContaoManager/Plugin.php +++ b/src/Bundle/ContaoManager/Plugin.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php index 6e56b9c..0a894ec 100644 --- a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php +++ b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php index 4cc31b2..823d50d 100644 --- a/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php index 809c787..4add7f7 100644 --- a/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php index d1778c5..84b4bdc 100644 --- a/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php +++ b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/NetzmachtContaoLeafletBundle.php b/src/Bundle/NetzmachtContaoLeafletBundle.php index 601bdea..8ed759e 100644 --- a/src/Bundle/NetzmachtContaoLeafletBundle.php +++ b/src/Bundle/NetzmachtContaoLeafletBundle.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index 156ba04..c7bf145 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_content.php b/src/Bundle/Resources/contao/dca/tl_content.php index c0127d2..38e10f3 100644 --- a/src/Bundle/Resources/contao/dca/tl_content.php +++ b/src/Bundle/Resources/contao/dca/tl_content.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php index 0169793..e79ee22 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_control_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_control_layer.php index e669d64..4322636 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_control_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_control_layer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php index d3c2543..3e99465 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 03fe1d8..275c9c9 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php index 7ef86c3..26e5c62 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_map_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_map_layer.php index 842a22e..6cb18f9 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_map_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_map_layer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php index ef8abd5..6524efa 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php index e531b79..b40f21d 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php index 67d0d46..8a10177 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php index a33443a..34d4260 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/dca/tl_module.php b/src/Bundle/Resources/contao/dca/tl_module.php index d9d1375..b4c9dd1 100644 --- a/src/Bundle/Resources/contao/dca/tl_module.php +++ b/src/Bundle/Resources/contao/dca/tl_module.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/leaflet.php b/src/Bundle/Resources/contao/languages/en/leaflet.php index 92e53cd..bd79aa6 100644 --- a/src/Bundle/Resources/contao/languages/en/leaflet.php +++ b/src/Bundle/Resources/contao/languages/en/leaflet.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/modules.php b/src/Bundle/Resources/contao/languages/en/modules.php index 4625146..81c3839 100644 --- a/src/Bundle/Resources/contao/languages/en/modules.php +++ b/src/Bundle/Resources/contao/languages/en/modules.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_content.php b/src/Bundle/Resources/contao/languages/en/tl_content.php index f999863..6adc2ac 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_content.php +++ b/src/Bundle/Resources/contao/languages/en/tl_content.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php index be1d648..d831d2f 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_icon.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_icon.php index a8a0de6..086b1d6 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_icon.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_icon.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php index 5a9b0db..9c5ddc7 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php index 0c3393e..d11b6f5 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php index e6c9b41..b4bf310 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php index de9b890..a2bc878 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php index b354fd2..d360310 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php index ebbdb3b..0d57c68 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Bundle/Resources/contao/languages/en/tl_module.php b/src/Bundle/Resources/contao/languages/en/tl_module.php index 76c1734..9949922 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_module.php +++ b/src/Bundle/Resources/contao/languages/en/tl_module.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Definition/Layer/OverpassLayer.php b/src/Definition/Layer/OverpassLayer.php index dfee41b..b120d5b 100644 --- a/src/Definition/Layer/OverpassLayer.php +++ b/src/Definition/Layer/OverpassLayer.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Definition/Style.php b/src/Definition/Style.php index 40f2abc..e7e07a4 100644 --- a/src/Definition/Style.php +++ b/src/Definition/Style.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Definition/Style/FixedStyle.php b/src/Definition/Style/FixedStyle.php index c33309d..13db1c4 100644 --- a/src/Definition/Style/FixedStyle.php +++ b/src/Definition/Style/FixedStyle.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Encoder/ContaoAssets.php b/src/Encoder/ContaoAssets.php index 6f95aed..e3e39cc 100644 --- a/src/Encoder/ContaoAssets.php +++ b/src/Encoder/ContaoAssets.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Encoder/EncoderFactory.php b/src/Encoder/EncoderFactory.php index 3d690c7..30a7df1 100644 --- a/src/Encoder/EncoderFactory.php +++ b/src/Encoder/EncoderFactory.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Event/BuildDefinitionEvent.php b/src/Event/BuildDefinitionEvent.php index 7e63160..c840a6a 100644 --- a/src/Event/BuildDefinitionEvent.php +++ b/src/Event/BuildDefinitionEvent.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Event/ConvertToGeoJsonEvent.php b/src/Event/ConvertToGeoJsonEvent.php index 581f4f5..de71b21 100644 --- a/src/Event/ConvertToGeoJsonEvent.php +++ b/src/Event/ConvertToGeoJsonEvent.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Event/GetHashEvent.php b/src/Event/GetHashEvent.php index b857bbb..fac4a51 100644 --- a/src/Event/GetHashEvent.php +++ b/src/Event/GetHashEvent.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Event/GetJavascriptEvent.php b/src/Event/GetJavascriptEvent.php index 32339a6..52099a0 100644 --- a/src/Event/GetJavascriptEvent.php +++ b/src/Event/GetJavascriptEvent.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Filter/BboxFilter.php b/src/Filter/BboxFilter.php index c7d418c..d319abe 100644 --- a/src/Filter/BboxFilter.php +++ b/src/Filter/BboxFilter.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Filter/DistanceFilter.php b/src/Filter/DistanceFilter.php index 4cfb87b..590ce57 100644 --- a/src/Filter/DistanceFilter.php +++ b/src/Filter/DistanceFilter.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Filter/Filter.php b/src/Filter/Filter.php index c88e2ab..6cd4e17 100644 --- a/src/Filter/Filter.php +++ b/src/Filter/Filter.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Filter/FilterFactory.php b/src/Filter/FilterFactory.php index 9909db9..62b27f8 100644 --- a/src/Filter/FilterFactory.php +++ b/src/Filter/FilterFactory.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index 59b6e47..27efb8d 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/Assets/LibrariesConfiguration.php b/src/Frontend/Assets/LibrariesConfiguration.php index 94ad1b9..54929d8 100644 --- a/src/Frontend/Assets/LibrariesConfiguration.php +++ b/src/Frontend/Assets/LibrariesConfiguration.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/ContentElement/MapElement.php b/src/Frontend/ContentElement/MapElement.php index 72eb6fa..9b9b723 100644 --- a/src/Frontend/ContentElement/MapElement.php +++ b/src/Frontend/ContentElement/MapElement.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index efe1eac..55de776 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/DataController.php b/src/Frontend/DataController.php index b15fba5..1d037a5 100644 --- a/src/Frontend/DataController.php +++ b/src/Frontend/DataController.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/InsertTag/LeafletInsertTagParser.php b/src/Frontend/InsertTag/LeafletInsertTagParser.php index 2415984..1c05b03 100644 --- a/src/Frontend/InsertTag/LeafletInsertTagParser.php +++ b/src/Frontend/InsertTag/LeafletInsertTagParser.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/Module/MapModule.php b/src/Frontend/Module/MapModule.php index f3239f3..e356b3d 100644 --- a/src/Frontend/Module/MapModule.php +++ b/src/Frontend/Module/MapModule.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index 2ce6364..2ff69ba 100644 --- a/src/Frontend/Module/MapModuleFactory.php +++ b/src/Frontend/Module/MapModuleFactory.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/RequestUrl.php b/src/Frontend/RequestUrl.php index a6d38d9..f08cc96 100644 --- a/src/Frontend/RequestUrl.php +++ b/src/Frontend/RequestUrl.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Frontend/ValueFilter.php b/src/Frontend/ValueFilter.php index 206fdb6..66c2c60 100644 --- a/src/Frontend/ValueFilter.php +++ b/src/Frontend/ValueFilter.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index 2c10308..8a48e71 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/FrontendIntegrationListener.php b/src/Listener/Dca/FrontendIntegrationListener.php index c5e7846..4d9685d 100644 --- a/src/Listener/Dca/FrontendIntegrationListener.php +++ b/src/Listener/Dca/FrontendIntegrationListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/IconDcaListener.php b/src/Listener/Dca/IconDcaListener.php index 89b1dc2..ae82090 100644 --- a/src/Listener/Dca/IconDcaListener.php +++ b/src/Listener/Dca/IconDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 004f286..5fdf1fc 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/LeafletDcaListener.php b/src/Listener/Dca/LeafletDcaListener.php index c081e38..d9f5126 100644 --- a/src/Listener/Dca/LeafletDcaListener.php +++ b/src/Listener/Dca/LeafletDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php index 2c20b8e..acc2c47 100644 --- a/src/Listener/Dca/MapDcaListener.php +++ b/src/Listener/Dca/MapDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php index dcb3260..5bf6593 100644 --- a/src/Listener/Dca/MarkerDcaListener.php +++ b/src/Listener/Dca/MarkerDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/StyleDcaListener.php b/src/Listener/Dca/StyleDcaListener.php index c3389eb..95e276c 100644 --- a/src/Listener/Dca/StyleDcaListener.php +++ b/src/Listener/Dca/StyleDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/Validator.php b/src/Listener/Dca/Validator.php index 53d5cc3..89ad56e 100644 --- a/src/Listener/Dca/Validator.php +++ b/src/Listener/Dca/Validator.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php index 0076737..f88d082 100644 --- a/src/Listener/Dca/VectorDcaListener.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 1781aae..652bf14 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Listener/RegisterLibrariesListener.php b/src/Listener/RegisterLibrariesListener.php index e753e94..96fbc85 100644 --- a/src/Listener/RegisterLibrariesListener.php +++ b/src/Listener/RegisterLibrariesListener.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/MapProvider.php b/src/MapProvider.php index 8d9ba9b..c60c656 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php index b129f65..cfc0096 100644 --- a/src/Mapper/AbstractMapper.php +++ b/src/Mapper/AbstractMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/AbstractTypeMapper.php b/src/Mapper/AbstractTypeMapper.php index 8df9034..1c60591 100644 --- a/src/Mapper/AbstractTypeMapper.php +++ b/src/Mapper/AbstractTypeMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Control/AbstractControlMapper.php b/src/Mapper/Control/AbstractControlMapper.php index 0d744b4..10a3720 100644 --- a/src/Mapper/Control/AbstractControlMapper.php +++ b/src/Mapper/Control/AbstractControlMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Control/AttributionControlMapper.php b/src/Mapper/Control/AttributionControlMapper.php index 3817069..4a75922 100644 --- a/src/Mapper/Control/AttributionControlMapper.php +++ b/src/Mapper/Control/AttributionControlMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Control/FullscreenControlMapper.php b/src/Mapper/Control/FullscreenControlMapper.php index e0705e2..a455031 100644 --- a/src/Mapper/Control/FullscreenControlMapper.php +++ b/src/Mapper/Control/FullscreenControlMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index d7912f4..4771285 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php index 9e92f47..b523083 100644 --- a/src/Mapper/Control/LoadingControlMapper.php +++ b/src/Mapper/Control/LoadingControlMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Control/ScaleControlMapper.php b/src/Mapper/Control/ScaleControlMapper.php index d68caf8..56268b3 100644 --- a/src/Mapper/Control/ScaleControlMapper.php +++ b/src/Mapper/Control/ScaleControlMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Control/ZoomControlMapper.php b/src/Mapper/Control/ZoomControlMapper.php index 1bed566..5d80f0b 100644 --- a/src/Mapper/Control/ZoomControlMapper.php +++ b/src/Mapper/Control/ZoomControlMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/DefinitionMapper.php b/src/Mapper/DefinitionMapper.php index 54ce353..4ebb38c 100644 --- a/src/Mapper/DefinitionMapper.php +++ b/src/Mapper/DefinitionMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/GeoJsonMapper.php b/src/Mapper/GeoJsonMapper.php index 322d061..f98516a 100644 --- a/src/Mapper/GeoJsonMapper.php +++ b/src/Mapper/GeoJsonMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/AbstractLayerMapper.php b/src/Mapper/Layer/AbstractLayerMapper.php index 8f79cf2..20bc61b 100644 --- a/src/Mapper/Layer/AbstractLayerMapper.php +++ b/src/Mapper/Layer/AbstractLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php index 172cdab..eedd003 100644 --- a/src/Mapper/Layer/GroupLayerMapper.php +++ b/src/Mapper/Layer/GroupLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index 28e5016..ec1a675 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index 79a8b5f..1e81c22 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/OverpassLayerMapper.php b/src/Mapper/Layer/OverpassLayerMapper.php index 3d4a7f2..ffa0cf6 100644 --- a/src/Mapper/Layer/OverpassLayerMapper.php +++ b/src/Mapper/Layer/OverpassLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php index 9da9870..041e38f 100644 --- a/src/Mapper/Layer/ProviderLayerMapper.php +++ b/src/Mapper/Layer/ProviderLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/ReferenceLayerMapper.php b/src/Mapper/Layer/ReferenceLayerMapper.php index a45cb38..3c2fc37 100644 --- a/src/Mapper/Layer/ReferenceLayerMapper.php +++ b/src/Mapper/Layer/ReferenceLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/TileLayerMapper.php b/src/Mapper/Layer/TileLayerMapper.php index 03d407a..6288b31 100644 --- a/src/Mapper/Layer/TileLayerMapper.php +++ b/src/Mapper/Layer/TileLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index 88e7e95..1155299 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 42f1b23..38d42c2 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Mapper.php b/src/Mapper/Mapper.php index c19caf7..5f8ad7b 100644 --- a/src/Mapper/Mapper.php +++ b/src/Mapper/Mapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/OptionsBuilder.php b/src/Mapper/OptionsBuilder.php index 76ad217..01522f4 100644 --- a/src/Mapper/OptionsBuilder.php +++ b/src/Mapper/OptionsBuilder.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Style/AbstractStyleMapper.php b/src/Mapper/Style/AbstractStyleMapper.php index 5c97117..8114a48 100644 --- a/src/Mapper/Style/AbstractStyleMapper.php +++ b/src/Mapper/Style/AbstractStyleMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Style/FixedStyleMapper.php b/src/Mapper/Style/FixedStyleMapper.php index c54d7cb..16ad970 100644 --- a/src/Mapper/Style/FixedStyleMapper.php +++ b/src/Mapper/Style/FixedStyleMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Type/AbstractIconMapper.php b/src/Mapper/Type/AbstractIconMapper.php index 1bb7117..b49ad0a 100644 --- a/src/Mapper/Type/AbstractIconMapper.php +++ b/src/Mapper/Type/AbstractIconMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Type/DivIconMapper.php b/src/Mapper/Type/DivIconMapper.php index 4509839..3fa0af5 100644 --- a/src/Mapper/Type/DivIconMapper.php +++ b/src/Mapper/Type/DivIconMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Type/ExtraMarkersIconMapper.php b/src/Mapper/Type/ExtraMarkersIconMapper.php index 82660ae..f94d751 100644 --- a/src/Mapper/Type/ExtraMarkersIconMapper.php +++ b/src/Mapper/Type/ExtraMarkersIconMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index d444da9..511bbce 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php index b18122f..c92ae64 100644 --- a/src/Mapper/UI/MarkerMapper.php +++ b/src/Mapper/UI/MarkerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/UI/PopupMapper.php b/src/Mapper/UI/PopupMapper.php index 529afec..7debb13 100644 --- a/src/Mapper/UI/PopupMapper.php +++ b/src/Mapper/UI/PopupMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/AbstractVectorMapper.php b/src/Mapper/Vector/AbstractVectorMapper.php index 61a938a..1eea233 100644 --- a/src/Mapper/Vector/AbstractVectorMapper.php +++ b/src/Mapper/Vector/AbstractVectorMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/CircleMapper.php b/src/Mapper/Vector/CircleMapper.php index 2eff2df..7286cde 100644 --- a/src/Mapper/Vector/CircleMapper.php +++ b/src/Mapper/Vector/CircleMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/CircleMarkerMapper.php b/src/Mapper/Vector/CircleMarkerMapper.php index 4a0c633..9e1ade9 100644 --- a/src/Mapper/Vector/CircleMarkerMapper.php +++ b/src/Mapper/Vector/CircleMarkerMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/MultiPolygonMapper.php b/src/Mapper/Vector/MultiPolygonMapper.php index db1309e..d1ae9c3 100644 --- a/src/Mapper/Vector/MultiPolygonMapper.php +++ b/src/Mapper/Vector/MultiPolygonMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/MultiPolylineMapper.php b/src/Mapper/Vector/MultiPolylineMapper.php index 6d1ec0e..e97e6b2 100644 --- a/src/Mapper/Vector/MultiPolylineMapper.php +++ b/src/Mapper/Vector/MultiPolylineMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/PolygonMapper.php b/src/Mapper/Vector/PolygonMapper.php index cbffbb5..b695e11 100644 --- a/src/Mapper/Vector/PolygonMapper.php +++ b/src/Mapper/Vector/PolygonMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php index 57ab68f..2b6babd 100644 --- a/src/Mapper/Vector/PolylineMapper.php +++ b/src/Mapper/Vector/PolylineMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Mapper/Vector/RectangleMapper.php b/src/Mapper/Vector/RectangleMapper.php index 4b178c7..0cc7869 100644 --- a/src/Mapper/Vector/RectangleMapper.php +++ b/src/Mapper/Vector/RectangleMapper.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/AbstractActiveModel.php b/src/Model/AbstractActiveModel.php index c493711..a9aaf75 100644 --- a/src/Model/AbstractActiveModel.php +++ b/src/Model/AbstractActiveModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/ControlModel.php b/src/Model/ControlModel.php index 77c32ea..0dd623b 100644 --- a/src/Model/ControlModel.php +++ b/src/Model/ControlModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/IconModel.php b/src/Model/IconModel.php index 02aaff7..0931373 100644 --- a/src/Model/IconModel.php +++ b/src/Model/IconModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/LayerModel.php b/src/Model/LayerModel.php index 3a06557..1d09d95 100644 --- a/src/Model/LayerModel.php +++ b/src/Model/LayerModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/MapModel.php b/src/Model/MapModel.php index 9d5ba61..8b9baf7 100644 --- a/src/Model/MapModel.php +++ b/src/Model/MapModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/MarkerModel.php b/src/Model/MarkerModel.php index d9908b6..9a91110 100644 --- a/src/Model/MarkerModel.php +++ b/src/Model/MarkerModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/PopupModel.php b/src/Model/PopupModel.php index addfdb7..b26f02a 100644 --- a/src/Model/PopupModel.php +++ b/src/Model/PopupModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/StyleModel.php b/src/Model/StyleModel.php index a81ff61..006106c 100644 --- a/src/Model/StyleModel.php +++ b/src/Model/StyleModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Model/VectorModel.php b/src/Model/VectorModel.php index 608a3d1..2344e8b 100644 --- a/src/Model/VectorModel.php +++ b/src/Model/VectorModel.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Request/Request.php b/src/Request/Request.php index 5ae967d..66260ed 100644 --- a/src/Request/Request.php +++ b/src/Request/Request.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Subscriber/EncoderSubscriber.php b/src/Subscriber/EncoderSubscriber.php index ecbd87f..259c1d3 100644 --- a/src/Subscriber/EncoderSubscriber.php +++ b/src/Subscriber/EncoderSubscriber.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Subscriber/GeoJsonSubscriber.php b/src/Subscriber/GeoJsonSubscriber.php index a66bbd6..30ce1d6 100644 --- a/src/Subscriber/GeoJsonSubscriber.php +++ b/src/Subscriber/GeoJsonSubscriber.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ diff --git a/src/Subscriber/HashSubscriber.php b/src/Subscriber/HashSubscriber.php index add011f..94419f3 100644 --- a/src/Subscriber/HashSubscriber.php +++ b/src/Subscriber/HashSubscriber.php @@ -5,7 +5,7 @@ * * @package contao-leaflet-maps * @author David Molineus - * @copyright 2016-2017 netzmacht David Molineus. All rights reserved. + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ From c374a2ce5d1d319b98c879af0078635fecad8d63 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 15:24:20 +0200 Subject: [PATCH 099/152] Drop Events mixin by extending L.Evented so that deprecated warning is not visible anymore in browser console. --- gulpfile.js | 2 +- js/Contao.js | 4 +--- src/Bundle/Resources/public/js/contao-leaflet.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index c2f3cd3..384c1d6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,7 +6,7 @@ var concat = require('gulp-concat'); var paths = { minified: 'contao-leaflet.js', scripts: ['js/*.js'], - dest: 'src/Resources/public/js' + dest: 'src/Bundle/Resources/public/js' }; gulp.task('clear', function() { diff --git a/js/Contao.js b/js/Contao.js index 5912337..268f341 100644 --- a/js/Contao.js +++ b/js/Contao.js @@ -3,9 +3,7 @@ * * This class provides some helpers for loading layer data manages maps and map objects. */ -L.Contao = L.Class.extend({ - includes: L.Mixin.Events, - +L.Contao = L.Evented.extend({ statics: { /** * Contao extension attribution. diff --git a/src/Bundle/Resources/public/js/contao-leaflet.js b/src/Bundle/Resources/public/js/contao-leaflet.js index 54acca1..6e70ebc 100644 --- a/src/Bundle/Resources/public/js/contao-leaflet.js +++ b/src/Bundle/Resources/public/js/contao-leaflet.js @@ -1 +1 @@ -L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return void 0===this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if(void 0===window.XMLHttpRequest)return o(Error("Browser not supported"));if(void 0===e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file +L.Contao=L.Evented.extend({statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return void 0===this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if(void 0===window.XMLHttpRequest)return o(Error("Browser not supported"));if(void 0===e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file From 6bfaf63d4ffec0438b3ff62bee942511c32521ee Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 15:24:45 +0200 Subject: [PATCH 100/152] Require Contao 4.4.7. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9400e5a..6c0fc50 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require": { "php": ">=7.0", - "contao/core-bundle": "^4.4", + "contao/core-bundle": "^4.4.7", "netzmacht/contao-leaflet-libraries": "^1.0", "netzmacht/php-javascript-builder": "^1.0", "netzmacht/php-leaflet": "^1.0.1", From 56a68175feb50905dcfda98a8c9a93422d12b5ef Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 15:42:49 +0200 Subject: [PATCH 101/152] Make the data controller a service. --- src/Bundle/Resources/config/services.yml | 9 ++++-- src/Frontend/DataController.php | 40 ++++++++++-------------- src/MapProvider.php | 36 ++++++++------------- 3 files changed, 36 insertions(+), 49 deletions(-) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index 462c77e..e85b22a 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -14,8 +14,7 @@ services: - '@netzmacht.contao_toolkit.contao.input_adapter' - '@netzmacht.contao_leaflet.map.assets' - '@netzmacht.contao_leaflet.cache' - - '@netzmacht.contao_leaflet.filter_factory' - - '%kernel.debug%' + - '@netzmacht.contao_leaflet.frontend.data_controller' netzmacht.contao_leaflet.libraries: class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration @@ -105,3 +104,9 @@ services: - '%kernel.debug%' tags: - { name: 'contao.hook', hook: 'replaceInsertTags', method: 'replace' } + + netzmacht.contao_leaflet.frontend.data_controller: + class: Netzmacht\Contao\Leaflet\Frontend\DataController + arguments: + - '@netzmacht.contao_leaflet.filter_factory' + - '%kernel.debug%' diff --git a/src/Frontend/DataController.php b/src/Frontend/DataController.php index 1d037a5..166f522 100644 --- a/src/Frontend/DataController.php +++ b/src/Frontend/DataController.php @@ -23,13 +23,6 @@ use Netzmacht\Contao\Leaflet\MapProvider; */ class DataController { - /** - * The map provider. - * - * @var MapProvider - */ - private $mapProvider; - /** * The user input data. * @@ -44,11 +37,11 @@ class DataController ); /** - * Display errors. + * Debug mode. * * @var bool */ - private $displayErrors; + private $debugMode; /** * Filter factory. @@ -60,27 +53,25 @@ class DataController /** * Construct. * - * @param MapProvider $mapProvider The map provider. * @param FilterFactory $filterFactory Filter factory. - * @param bool $displayErrors Display errors. + * @param bool $debugMode Debug mode. */ - public function __construct(MapProvider $mapProvider, FilterFactory $filterFactory, $displayErrors) + public function __construct(FilterFactory $filterFactory, $debugMode) { - $this->mapProvider = $mapProvider; - $this->displayErrors = $displayErrors; + $this->debugMode = $debugMode; $this->filterFactory = $filterFactory; } /** * Execute the controller and create the data response. * - * @param array $input The user input as array. + * @param array $input The user input as array. + * @param MapProvider $mapProvider Map provider. * * @return void - * * @throws \Exception If anything went wrong. */ - public function execute(array $input) + public function execute(array $input, MapProvider $mapProvider) { $input = array_merge($this->input, $input); @@ -91,10 +82,10 @@ class DataController $filter = null; } - list($data, $error) = $this->loadData($input['type'], $input['id'], $filter); + list($data, $error) = $this->loadData($mapProvider, $input['type'], $input['id'], $filter); $this->encodeData($input['format'], $data); } catch (\Exception $e) { - if ($this->displayErrors) { + if ($this->debugMode) { throw $e; } $error = true; @@ -129,20 +120,21 @@ class DataController /** * Load the data. * - * @param string $type The data type. - * @param mixed $dataId The data id. - * @param Filter $filter Optional request filter. + * @param MapProvider $mapProvider Map provider. + * @param string $type The data type. + * @param mixed $dataId The data id. + * @param Filter $filter Optional request filter. * * @return array */ - public function loadData($type, $dataId, Filter $filter = null) + public function loadData(MapProvider $mapProvider, $type, $dataId, Filter $filter = null) { $error = false; $data = null; switch ($type) { case 'layer': - $data = $this->mapProvider->getFeatureCollection($dataId, $filter); + $data = $mapProvider->getFeatureCollection($dataId, $filter); break; default: diff --git a/src/MapProvider.php b/src/MapProvider.php index c60c656..2163c90 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -17,7 +17,6 @@ use Doctrine\Common\Cache\Cache; use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets; use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent; use Netzmacht\Contao\Leaflet\Filter\Filter; -use Netzmacht\Contao\Leaflet\Filter\FilterFactory; use Netzmacht\Contao\Leaflet\Frontend\DataController; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; @@ -70,20 +69,6 @@ class MapProvider */ private $assets; - /** - * Filter factory. - * - * @var FilterFactory - */ - private $filterFactory; - - /** - * Display errors setting. - * - * @var bool - */ - private $displayErrors; - /** * Cache. * @@ -91,6 +76,13 @@ class MapProvider */ private $cache; + /** + * Data controller. + * + * @var DataController + */ + private $dataController; + /** * Construct. * @@ -100,8 +92,9 @@ class MapProvider * @param Input $input Thw request input. * @param ContaoAssets $assets Assets handler. * @param Cache $cache Cache. - * @param FilterFactory $filterFactory Filter factory. - * @param bool $displayErrors Display errors setting. + * @param DataController $dataController Data controller. + * + * @internal param FilterFactory $filterFactory Filter factory. */ public function __construct( DefinitionMapper $mapper, @@ -110,17 +103,15 @@ class MapProvider $input, ContaoAssets $assets, Cache $cache, - FilterFactory $filterFactory, - $displayErrors + DataController $dataController ) { $this->mapper = $mapper; $this->leaflet = $leaflet; $this->eventDispatcher = $eventDispatcher; $this->input = $input; $this->assets = $assets; - $this->filterFactory = $filterFactory; - $this->displayErrors = $displayErrors; $this->cache = $cache; + $this->dataController = $dataController; } /** @@ -295,8 +286,7 @@ class MapProvider return; } - $controller = new DataController($this, $this->filterFactory, $this->displayErrors); - $controller->execute($data); + $this->dataController->execute($data, $this); if ($exit) { exit; From a8491bdc4bbab455c5d8a8ae8d51a9b688720dc9 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 11 Oct 2017 17:57:48 +0200 Subject: [PATCH 102/152] Use the framework. --- src/Bundle/Resources/config/services.yml | 2 ++ src/Frontend/ValueFilter.php | 44 ++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index e85b22a..5fdad99 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -39,6 +39,8 @@ services: netzmacht.contao_leaflet.frontend.value_filter: class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter + arguments: + - '@contao.framework' netzmacht.contao_leaflet.map.assets: class: Netzmacht\Contao\Leaflet\Encoder\ContaoAssets diff --git a/src/Frontend/ValueFilter.php b/src/Frontend/ValueFilter.php index 66c2c60..7efe103 100644 --- a/src/Frontend/ValueFilter.php +++ b/src/Frontend/ValueFilter.php @@ -12,7 +12,8 @@ namespace Netzmacht\Contao\Leaflet\Frontend; -use Contao\Controller; +use Contao\CoreBundle\Framework\ContaoFrameworkInterface as ContaoFramework; +use Contao\InsertTags; /** * Class ValueFilter is a service class which can be used to filter values before passing them to an definition object. @@ -21,6 +22,45 @@ use Contao\Controller; */ class ValueFilter { + /** + * Contao framework. + * + * @var ContaoFramework + */ + private $framework; + + /** + * Insert tags. + * + * @var InsertTags + */ + private $replacer; + + /** + * ValueFilter constructor. + * + * @param ContaoFramework $framework Contao framework. + */ + public function __construct(ContaoFramework $framework) + { + $this->framework = $framework; + } + + /** + * Get the replacer. + * + * @return InsertTags + */ + private function getReplacer(): InsertTags + { + if ($this->replacer === null) { + $this->framework->initialize(); + $this->replacer = $this->framework->createInstance(InsertTags::class); + } + + return $this->replacer; + } + /** * Filter a value so it can be passed to the frontend. * @@ -33,6 +73,6 @@ class ValueFilter */ public function filter($value) { - return Controller::replaceInsertTags($value); + return $this->getReplacer()->replace($value); } } From 35227cef8255319b32914c41cf238419eec52494 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 12 Oct 2017 10:55:14 +0200 Subject: [PATCH 103/152] Fix delete sql statement. --- src/Listener/Dca/LayerDcaListener.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 5fdf1fc..4a020c6 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -323,14 +323,14 @@ class LayerDcaListener extends AbstractListener $undo = $statement->fetch(); - $result = $this->connection - ->prepare('SELECT * FROM tl_leaflet_map_layer WHERE lid=?') - ->execute($dataContainer->id); + $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE lid=:lid'); + $statement->bindValue('lid', $dataContainer->id); + $statement->execute(); $undo['data'] = deserialize($undo['data'], true); - while ($result->next()) { - $undo['data']['tl_leaflet_map_layer'][] = $result->row(); + while ($row = $statement->fetch()) { + $undo['data']['tl_leaflet_map_layer'][] = $row; } $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_control_layer WHERE lid=:lid'); From 505dc45dd621689619adc33c529273e6610e658a Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 12 Oct 2017 10:57:04 +0200 Subject: [PATCH 104/152] Fix category. --- src/Bundle/Resources/config/services.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index 5fdad99..54676f8 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -89,7 +89,7 @@ services: - '@service_container' tags: - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } - - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'include' } + - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'includes' } netzmacht.contao_leaflet.frontend.module_factory: class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory @@ -97,7 +97,7 @@ services: - '@service_container' tags: - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } - - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: include } + - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: 'includes' } netzmacht.contao_leaflet.frontend.insert_tag: class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser From d952e6fc486743a8a656eb8b3047b793a9e74307 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 12 Oct 2017 10:59:17 +0200 Subject: [PATCH 105/152] Move map template to template section. --- src/Bundle/Resources/contao/dca/tl_content.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/Resources/contao/dca/tl_content.php b/src/Bundle/Resources/contao/dca/tl_content.php index 38e10f3..8c922c5 100644 --- a/src/Bundle/Resources/contao/dca/tl_content.php +++ b/src/Bundle/Resources/contao/dca/tl_content.php @@ -12,8 +12,8 @@ $GLOBALS['TL_DCA']['tl_content']['metapalettes']['leaflet'] = [ 'type' => ['type', 'headline'], - 'leaflet' => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height', 'leaflet_template'], - 'templates' => [':hide', 'customTpl'], + 'leaflet' => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height'], + 'templates' => [':hide', 'customTpl', 'leaflet_template'], 'protected' => [':hide', 'protected'], 'expert' => [':hide', 'guests', 'cssID', 'space'], 'invisible' => [':hide', 'invisible', 'start', 'start'], From 03896940aca28799a54f7efc3da8cf99094e0eae Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 12 Oct 2017 12:06:51 +0200 Subject: [PATCH 106/152] Fix the icon toggling. --- src/Bundle/Resources/contao/config/config.php | 1 + .../Resources/contao/dca/tl_leaflet_layer.php | 3 +- src/Bundle/Resources/public/js/backend.js | 64 +++++++++++++++++++ src/Listener/Dca/LayerDcaListener.php | 16 ++++- 4 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 src/Bundle/Resources/public/js/backend.js diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index c7bf145..38abba6 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -43,6 +43,7 @@ array_insert( ), 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/backend.css', + 'javascript' => 'bundles/netzmachtcontaoleaflet/js/backend.js' ), 'leaflet_about' => array ( diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 275c9c9..303f954 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -111,7 +111,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'toggle' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['toggle'], 'icon' => 'visible.gif', - 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', + 'attributes' => 'onclick="Backend.getScrollOffset(); + return ContaoLeafletAjaxRequest.toggleVisibility(this,%s)"', 'button_callback' => [ 'netzmacht.contao_toolkit.dca.listeners.state_button_callback', 'handleButtonCallback', diff --git a/src/Bundle/Resources/public/js/backend.js b/src/Bundle/Resources/public/js/backend.js new file mode 100644 index 0000000..1e5f383 --- /dev/null +++ b/src/Bundle/Resources/public/js/backend.js @@ -0,0 +1,64 @@ +/** + * Contao Open Source CMS + * + * Copyright (c) 2005-2017 Leo Feyer + * + * @license LGPL-3.0+ + */ + + +/** + * Provide methods to handle Ajax requests. + * + * @author Leo Feyer + */ +var ContaoLeafletAjaxRequest = { + /** + * Toggle the visibility of an element + * + * @param {object} el The DOM element + * @param {string} id The ID of the target element + * @param {string} table The table name + * + * @returns {boolean} + */ + toggleVisibility: function (el, id, table) { + el.blur(); + + var img = null, + image = $(el).getFirst('img'), + published = (image.get('data-state') == 1), + div = el.getParent('div'), + index, next, icon, icond, pa; + img = div.getParent('li').getFirst('.tl_left img.list-icon'); + + // Change the icon + if (img !== null && img.nodeName.toLowerCase() == 'img') { + icon = img.get('data-icon'); + icond = img.get('data-icon-disabled'); + + img.src = !published ? icon : icond; + } + + // Send request + if (!published) { + image.src = AjaxRequest.themePath + 'icons/visible.svg'; + image.set('data-state', 1); + new Request.Contao({'url': window.location.href, 'followRedirects': false}).get({ + 'tid': id, + 'state': 1, + 'rt': Contao.request_token + }); + } else { + image.src = AjaxRequest.themePath + 'icons/invisible.svg'; + image.set('data-state', 0); + new Request.Contao({'url': window.location.href, 'followRedirects': false}).get({ + 'tid': id, + 'state': 0, + 'rt': Contao.request_token + }); + } + + return false; + } +}; diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 4a020c6..7df607e 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -168,12 +168,22 @@ class LayerDcaListener extends AbstractListener $src = 'iconPLAIN.gif'; } + $activeIcon = $src; + $disabledIcon = preg_replace('/(\.[^\.]+)$/', '_1$1', $src); + if (!$row['active']) { - $src = preg_replace('/(\.[^\.]+)$/', '_1$1', $src); + $src = $disabledIcon; } - $alt = $this->getFormatter()->formatValue('type', $row['type']); - $icon = Image::getHtml($src, $alt, sprintf('title="%s"', StringUtil::specialchars(strip_tags($alt)))); + $alt = $this->getFormatter()->formatValue('type', $row['type']); + $attributes = sprintf( + 'class="list-icon" title="%s" data-icon="%s" data-icon-disabled="%s"', + StringUtil::specialchars(strip_tags($alt)), + $activeIcon, + $disabledIcon + ); + + $icon = Image::getHtml($src, $alt, $attributes); $label = $this->labelRenderer->render($row, $label, $this->translator); return $icon . ' ' . $label; From cda48b956750ff5c3bad22fc3c8574a277bcafe5 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 12 Oct 2017 12:07:16 +0200 Subject: [PATCH 107/152] Open for Contao 4.4. Toolkit workarounds the issue. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6c0fc50..507d83b 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require": { "php": ">=7.0", - "contao/core-bundle": "^4.4.7", + "contao/core-bundle": "~4.4", "netzmacht/contao-leaflet-libraries": "^1.0", "netzmacht/php-javascript-builder": "^1.0", "netzmacht/php-leaflet": "^1.0.1", From e6689d4d45fc0923d2048c2b488a336eb6250c2e Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 12 Oct 2017 12:08:30 +0200 Subject: [PATCH 108/152] Improve styling. --- src/Bundle/Resources/public/css/backend.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/Resources/public/css/backend.css b/src/Bundle/Resources/public/css/backend.css index 62c126d..256a3c8 100644 --- a/src/Bundle/Resources/public/css/backend.css +++ b/src/Bundle/Resources/public/css/backend.css @@ -1,6 +1,6 @@ .tl_listing_container.tree_view ul > li.tl_file { - background: url('./../img/fol-placeholder.gif') no-repeat 6px 1px; + background: url('./../img/fol-placeholder.gif') no-repeat 6px 4px; } .tl_listing_container.tree_view ul > li.tl_file > div { From c2fd00e6a0db1867ba7ecec9f9743e2957e75e42 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 16 Oct 2017 16:58:17 +0200 Subject: [PATCH 109/152] Add styles for the mcw (Fix #51). --- .../contao/dca/tl_leaflet_control.php | 2 +- .../Resources/contao/dca/tl_leaflet_layer.php | 1 + .../Resources/contao/dca/tl_leaflet_map.php | 2 +- .../contao/dca/tl_leaflet_vector.php | 1 + src/Bundle/Resources/public/css/backend.css | 32 +++++++++++++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php index e79ee22..b5403f1 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php @@ -268,7 +268,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [ ['netzmacht.contao_leaflet.listeners.dca.control', 'saveLayerRelations'], ], 'eval' => [ - 'tl_class' => 'clr', + 'tl_class' => 'leaflet-mcw leaflet-mcw-control-layers', 'columnFields' => [ 'layer' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layer'], diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 303f954..9e77edb 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -810,6 +810,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'inputType' => 'multiColumnWizard', 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getIcons'], 'eval' => [ + 'tl_class' => 'leaflet-mcw leaflet-mcw-amenity-icons', 'columnFields' => [ 'amenity' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'], diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php index 26e5c62..6b701f2 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php @@ -195,6 +195,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'eval' => [ 'multiple' => true, 'doNotSaveEmpty' => true, + 'tl_class' => 'leaflet-mcw leaflet-mcw-map-layers', 'columnFields' => [ 'reference' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['reference'], @@ -206,7 +207,6 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [ 'tl_class' => 'w50', 'chosen' => true, 'includeBlankOption' => true, - 'style' => 'width: 300px', ], 'sql' => "int(10) unsigned NOT NULL default '0'", ], diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php index 34d4260..977b3ac 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php @@ -326,6 +326,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'inputType' => 'multiColumnWizard', 'search' => false, 'eval' => [ + 'tl_class' => 'leaflet-mcw', 'mandatory' => true, 'alwaysSave' => true, 'flatArray' => true, diff --git a/src/Bundle/Resources/public/css/backend.css b/src/Bundle/Resources/public/css/backend.css index 256a3c8..36cc7b9 100644 --- a/src/Bundle/Resources/public/css/backend.css +++ b/src/Bundle/Resources/public/css/backend.css @@ -26,3 +26,35 @@ .long .tl_text_2 { width: 325px; } + +.leaflet-mcw { + clear: both; +} + +.leaflet-mcw .tl_modulewizard { + width: 100%; +} + +.leaflet-mcw .multicolumnwizard textarea, +.leaflet-mcw .multicolumnwizard .tl_select { + width: 100% !important; +} + +.leaflet-mcw .tl_modulewizard td:first-child { + width: auto; +} + +@media screen and (min-width: 768px) { + .leaflet-mcw .tl_modulewizard { + max-width: 75%; + } + + .leaflet-mcw-map-layers .tl_modulewizard { + max-width: 45%; + } + + .leaflet-mcw-amenity-icons td:nth-child(1), + .leaflet-mcw-control-layers td:nth-child(2) { + width: 35%; + } +} From 59df74c3f98267a13f4afd24e8069b9f00e9ee07 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 13:51:09 +0200 Subject: [PATCH 110/152] Replace string class names with the ::class attribute. --- src/Mapper/Control/AttributionControlMapper.php | 2 +- src/Mapper/Control/FullscreenControlMapper.php | 4 +++- src/Mapper/Control/LayersControlMapper.php | 3 ++- src/Mapper/Control/LoadingControlMapper.php | 4 ++-- src/Mapper/Control/ScaleControlMapper.php | 4 +++- src/Mapper/Control/ZoomControlMapper.php | 4 +++- src/Mapper/Layer/GroupLayerMapper.php | 5 +++-- src/Mapper/Layer/MarkerClusterLayerMapper.php | 2 +- src/Mapper/Layer/MarkersLayerMapper.php | 5 +++-- src/Mapper/Layer/ProviderLayerMapper.php | 3 ++- src/Mapper/Layer/TileLayerMapper.php | 2 +- src/Mapper/Layer/VectorsLayerMapper.php | 5 +++-- src/Mapper/MapMapper.php | 2 +- src/Mapper/Type/DivIconMapper.php | 2 +- src/Mapper/Type/ExtraMarkersIconMapper.php | 3 ++- src/Mapper/Type/ImageIconMapper.php | 2 +- src/Mapper/Vector/CircleMapper.php | 3 ++- src/Mapper/Vector/CircleMarkerMapper.php | 4 +++- src/Mapper/Vector/MultiPolygonMapper.php | 2 +- src/Mapper/Vector/MultiPolylineMapper.php | 2 +- src/Mapper/Vector/PolygonMapper.php | 4 +++- src/Mapper/Vector/PolylineMapper.php | 2 +- src/Mapper/Vector/RectangleMapper.php | 3 ++- 23 files changed, 45 insertions(+), 27 deletions(-) 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. From 31a5cc40a54af7a610b02d5d515a5d03aafe3003 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 16:22:24 +0200 Subject: [PATCH 111/152] Optimize import statements. --- src/Subscriber/EncoderSubscriber.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Subscriber/EncoderSubscriber.php b/src/Subscriber/EncoderSubscriber.php index 259c1d3..bf0aae6 100644 --- a/src/Subscriber/EncoderSubscriber.php +++ b/src/Subscriber/EncoderSubscriber.php @@ -13,11 +13,10 @@ namespace Netzmacht\Contao\Leaflet\Subscriber; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; -use Netzmacht\JavascriptBuilder\Encoder; -use Netzmacht\JavascriptBuilder\Flags; -use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeValueEvent; -use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeReferenceEvent; use Netzmacht\JavascriptBuilder\Exception\EncodeValueFailed; +use Netzmacht\JavascriptBuilder\Flags; +use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeReferenceEvent; +use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeValueEvent; use Netzmacht\LeafletPHP\Definition\Type\Icon; use Netzmacht\LeafletPHP\Plugins\Omnivore\OmnivoreLayer; use Symfony\Component\EventDispatcher\EventSubscriberInterface; From d1f26056e92d5a2c31547d7aaecb1d1b654b0568 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 16:50:29 +0200 Subject: [PATCH 112/152] Implement a file layer for gpx,kml,wkt support. --- composer.json | 2 +- src/Bundle/Resources/config/layers.yml | 4 + src/Bundle/Resources/config/mappers.yml | 4 + .../Resources/contao/dca/tl_leaflet_layer.php | 21 +++ .../Resources/contao/languages/en/leaflet.php | 2 + .../contao/languages/en/tl_leaflet_layer.php | 2 + src/Bundle/Resources/public/img/file.png | Bin 0 -> 619 bytes src/Bundle/Resources/public/img/file_1.png | Bin 0 -> 546 bytes src/Mapper/Layer/FileLayerMapper.php | 136 ++++++++++++++++++ 9 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/Resources/public/img/file.png create mode 100644 src/Bundle/Resources/public/img/file_1.png create mode 100644 src/Mapper/Layer/FileLayerMapper.php diff --git a/composer.json b/composer.json index 507d83b..c1962f9 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "contao/core-bundle": "~4.4", "netzmacht/contao-leaflet-libraries": "^1.0", "netzmacht/php-javascript-builder": "^1.0", - "netzmacht/php-leaflet": "^1.0.1", + "netzmacht/php-leaflet": "^1.0.2", "netzmacht/contao-toolkit": "^3.0@dev", "contao-community-alliance/meta-palettes": "^1.5", "menatwork/contao-multicolumnwizard": "^3.2", diff --git a/src/Bundle/Resources/config/layers.yml b/src/Bundle/Resources/config/layers.yml index 4716389..9350a9f 100644 --- a/src/Bundle/Resources/config/layers.yml +++ b/src/Bundle/Resources/config/layers.yml @@ -45,6 +45,10 @@ parameters: extend: true fit: true + file: + children: false + icon: 'bundles/netzmachtcontaoleaflet/img/file.png' + services: _defaults: public: false diff --git a/src/Bundle/Resources/config/mappers.yml b/src/Bundle/Resources/config/mappers.yml index 9a50e51..6aa5fe8 100644 --- a/src/Bundle/Resources/config/mappers.yml +++ b/src/Bundle/Resources/config/mappers.yml @@ -58,6 +58,10 @@ services: tags: - { name: netzmacht.contao_leflet_maps.mapper } + netzmacht.contao_leaflet.mapper.file_layer: + class: Netzmacht\Contao\Leaflet\Mapper\Layer\FileLayerMapper + tags: + - { name: netzmacht.contao_leaflet.mapper } # Control mappers netzmacht.contao_leaflet.mapper.zoom_control: diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 9e77edb..4aa8745 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -217,6 +217,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'pointToLayer', ], ], + + 'file extends default' => [ + '+config' => ['file'], + '+expert' => [ + 'onEachFeature', + 'pointToLayer', + ], + ], ], 'metasubselectpalettes' => [ @@ -853,5 +861,18 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], 'sql' => 'mediumtext NULL', ], + 'file' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'], + 'exclude' => true, + 'inputType' => 'fileTree', + 'eval' => [ + 'filesOnly' => true, + 'fieldType' => 'radio', + 'mandatory' => true, + 'extensions' => 'gpx,kml,wkt', + 'tl_class' => 'clr', + ], + 'sql' => 'binary(16) NULL', + ], ], ]; diff --git a/src/Bundle/Resources/contao/languages/en/leaflet.php b/src/Bundle/Resources/contao/languages/en/leaflet.php index bd79aa6..a268eec 100644 --- a/src/Bundle/Resources/contao/languages/en/leaflet.php +++ b/src/Bundle/Resources/contao/languages/en/leaflet.php @@ -39,6 +39,8 @@ $GLOBALS['TL_LANG']['leaflet_layer']['tile'][0] = 'Tile layer'; $GLOBALS['TL_LANG']['leaflet_layer']['tile'][1] = 'Tile layer with full config options.'; $GLOBALS['TL_LANG']['leaflet_layer']['overpass'][0] = 'Overpass API'; $GLOBALS['TL_LANG']['leaflet_layer']['overpass'][1] = 'Overpass API data layer.'; +$GLOBALS['TL_LANG']['leaflet_layer']['file'][0] = 'File'; +$GLOBALS['TL_LANG']['leaflet_layer']['file'][1] = 'Geo data from a file (gpx,kml,wkt).'; $GLOBALS['TL_LANG']['leaflet_vector']['polyline'][0] = 'Polyline'; $GLOBALS['TL_LANG']['leaflet_vector']['polyline'][1] = 'Polyline overlay. For more details read the Leaflet documentation.'; diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php index 9c5ddc7..8f0f70d 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php @@ -145,6 +145,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'][0] = 'Amen $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'][1] = 'OSM amenity.'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'][1] = 'Icon'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'][0] = 'Icon style'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'][0] = 'File'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'][1] = 'Choose a file containing geodata. Supported formats are gpx,kml and wkt.'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][0] = 'Layer group'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][1] = 'Basic layer group.
See http://leafletjs.com/reference.html#layergroup'; diff --git a/src/Bundle/Resources/public/img/file.png b/src/Bundle/Resources/public/img/file.png new file mode 100644 index 0000000000000000000000000000000000000000..7a7227e42420813717992e68fc676cc55f71809a GIT binary patch literal 619 zcmV-x0+juUP)}rr!GT2pI4b|HvKOFZ(<{S`Fc$8EsSHcHlI$zaU2W{3_Qx@atl!s9u=!0gn*Pm z=-eEl7OJj`?ohCvEKf^3sNWd)tU9X93VbcMLYSFLn%Q#0uc3ey#1UCxWWel^cudw-f zgKm=7TjZQ0X18N>=H4PbPPA-+Q$d@Qrg-M@6e?~7p6`((7=$GeZzJ-|+QZfamSso+ zZ5-$20`B*{Xgc#@e-`0<8`sz%;3fhvoR#zSy}7+7n0}YU@5(6<4!WVBwm{N#3qd)< zdG#zX)2FAH9)62tB88uSzMH)!1$sEa40w&pwBxdp$@hP3W8>fr#`~V3TVkEL@@IF_F~-b zxCX_-e^kcuoKm;!e%ySybtg)I7PvtXLu(YM_UNww0|1~;(IQ!3#2o+t002ovPDHLk FV1noz8u9=D literal 0 HcmV?d00001 diff --git a/src/Bundle/Resources/public/img/file_1.png b/src/Bundle/Resources/public/img/file_1.png new file mode 100644 index 0000000000000000000000000000000000000000..502668df29b9a63b9584e41c5dcebdbb3718b4d1 GIT binary patch literal 546 zcmV+-0^R+IP)*U7 z;CY^{75A?IQc4gJgb>hLgNSfGpY6Wux^Nr^|Fux7)!_R+;y4BoSvx`qIF5t)eEtI9 z>8=H>HR3qNbUH-7>;6uno+Xlww$e!oW?#~2QWNYnIs3POlKVHno) zJhvm%T0=^S)oO)ivxy{0kR%BjjfVXoneh + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +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\JavascriptBuilder\Type\Expression; +use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Definition\Group\FeatureGroup; +use Netzmacht\LeafletPHP\Definition\Group\GeoJson; +use Netzmacht\LeafletPHP\Plugins\Omnivore\Gpx; +use Netzmacht\LeafletPHP\Plugins\Omnivore\Kml; +use Netzmacht\LeafletPHP\Plugins\Omnivore\OmnivoreLayer; +use Netzmacht\LeafletPHP\Plugins\Omnivore\Wkt; + +/** + * Class FileLayerMapper. + * + * @package Netzmacht\Contao\Leaflet\Mapper\Layer + */ +class FileLayerMapper extends AbstractLayerMapper +{ + /** + * The definition type. + * + * @var string + */ + protected static $type = 'file'; + + /** + * Class of the model being build. + * + * @var string + */ + protected static $definitionClass = FeatureGroup::class; + + /** + * {@inheritDoc} + */ + public function handle( + $model, + DefinitionMapper $mapper, + Request $request = null, + $elementId = null, + Definition $parent = null + ) { + $fileModel = FilesModel::findByPk($model->file); + $definition = $this->createInstance($model, $mapper, $request, $elementId, $fileModel); + + $this->optionsBuilder->build($definition, $model); + $this->build($definition, $model, $mapper, $request, $parent); + + return $definition; + } + + /** + * {@inheritDoc} + */ + protected function createInstance( + Model $model, + DefinitionMapper $mapper, + Request $request = null, + $elementId = null, + FilesModel $fileModel = null + ) { + $layerId = $this->getElementId($model, $elementId); + + if ($fileModel instanceof FilesModel && $fileModel->type === 'file') { + switch ($fileModel->extension) { + case 'gpx': + $layer = new Gpx($layerId, $fileModel->path, []); + break; + + case 'kml': + $layer = new Kml($layerId, $fileModel->path, []); + break; + + case 'wkt': + $layer = new Wkt($layerId, $fileModel->path, []); + break; + + default: + return parent::createInstance($model, $mapper, $request, $elementId); + } + + $customId = $layerId . '_data'; + $customLayer = new GeoJson($customId); + + $layer->setCustomLayer($customLayer); + + return $layer; + } + + return parent::createInstance($model, $mapper, $request, $elementId); + } + + /** + * {@inheritDoc} + */ + protected function build( + Definition $definition, + Model $model, + DefinitionMapper $mapper, + Request $request = null, + Definition $parent = null + ) { + if (!$definition instanceof OmnivoreLayer) { + return; + } + + $customLayer = $definition->getCustomLayer(); + if ($customLayer instanceof GeoJson) { + if ($model->pointToLayer) { + $customLayer->setPointToLayer(new Expression($model->pointToLayer)); + } + + if ($model->onEachFeature) { + $customLayer->setOnEachFeature(new Expression($model->onEachFeature)); + } + } + } +} From 50465e402606222b63a6fae0d1bbee4104d6a06d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:09:00 +0200 Subject: [PATCH 113/152] Bypass filesystem cache in debug mode. --- .../NetzmachtContaoLeafletExtension.php | 8 ++++++++ src/Bundle/Resources/config/services.yml | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php index 0a894ec..ef67a2e 100644 --- a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php +++ b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php @@ -49,5 +49,13 @@ class NetzmachtContaoLeafletExtension extends Extension $loader->load('mappers.yml'); $loader->load('encoders.yml'); $loader->load('layers.yml'); + + if (!$container->hasDefinition('netzmacht.contao_leaflet.cache')) { + if ($container->getParameter('kernel.debug')) { + $container->setAlias('netzmacht.contao_leaflet.cache', 'netzmacht.contao_leaflet.cache.debug'); + } else { + $container->setAlias('netzmacht.contao_leaflet.cache', 'netzmacht.contao_leaflet.cache.default'); + } + } } } diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index 54676f8..c4e6fc3 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -26,9 +26,6 @@ services: arguments: - '%netzmacht.contao_leaflet.filters%' - netzmacht.contao_leaflet.cache: - alias: 'netzmacht.contao_leaflet.cache.default' - netzmacht.contao_leaflet.cache.default: class: Doctrine\Common\Cache\FilesystemCache arguments: From 734aecf73821111d3ad0577c3d7ef0985239df39 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:09:29 +0200 Subject: [PATCH 114/152] Add changelog. --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..56727f0 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,14 @@ + +Changelog +========= + +3.0.0-beta2 (YYYY-MM-DD) +------------------------ + +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...2.0.0-beta2) + +Implemented enhancements + + - New file layer for gpx,kml,wkt files added + - Bypass filesystem cache in debug mode + - Changelog added From 01b3962b789d45b969e9f258f3b8b571ebf0bbdf Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:11:35 +0200 Subject: [PATCH 115/152] Optimize use statements. --- src/Bundle/NetzmachtContaoLeafletBundle.php | 2 +- src/Listener/Dca/ControlDcaListener.php | 4 ++-- src/Listener/Dca/FrontendIntegrationListener.php | 2 +- src/Listener/Dca/LayerDcaListener.php | 2 +- src/Listener/Dca/MarkerDcaListener.php | 2 +- src/Listener/Dca/VectorDcaListener.php | 2 +- src/MapProvider.php | 2 +- src/Mapper/Layer/MarkersLayerMapper.php | 4 ++-- src/Mapper/Layer/VectorsLayerMapper.php | 4 ++-- src/Mapper/Vector/PolylineMapper.php | 2 +- src/Subscriber/GeoJsonSubscriber.php | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Bundle/NetzmachtContaoLeafletBundle.php b/src/Bundle/NetzmachtContaoLeafletBundle.php index 8ed759e..305463c 100644 --- a/src/Bundle/NetzmachtContaoLeafletBundle.php +++ b/src/Bundle/NetzmachtContaoLeafletBundle.php @@ -14,9 +14,9 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Bundle; -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\Leaflet\Bundle\DependencyInjection\Pass\RegisterLibrariesPass; use Netzmacht\Contao\Toolkit\Bundle\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index 8a48e71..f9f33f4 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -14,11 +14,11 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\StringUtil; use Doctrine\DBAL\Connection; +use Netzmacht\Contao\Leaflet\Model\ControlModel; +use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\Leaflet\Model\ControlModel; -use Netzmacht\Contao\Leaflet\Model\LayerModel; /** * Class Control is the helper for the tl_leaflet_control dca. diff --git a/src/Listener/Dca/FrontendIntegrationListener.php b/src/Listener/Dca/FrontendIntegrationListener.php index 4d9685d..b47bc47 100644 --- a/src/Listener/Dca/FrontendIntegrationListener.php +++ b/src/Listener/Dca/FrontendIntegrationListener.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\MapModel; +use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Symfony\Component\Translation\TranslatorInterface as Translator; /** diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 7df607e..d1ce1cd 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -19,10 +19,10 @@ use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer; use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\Leaflet\Model\LayerModel; use Symfony\Component\Translation\TranslatorInterface as Translator; /** diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php index 5bf6593..4fa565b 100644 --- a/src/Listener/Dca/MarkerDcaListener.php +++ b/src/Listener/Dca/MarkerDcaListener.php @@ -14,9 +14,9 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\Controller; use Doctrine\DBAL\Connection; -use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; +use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; /** * Class Marker is the dca helper class for the tl_leaflet_marker dca. diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php index f88d082..a8aec5d 100644 --- a/src/Listener/Dca/VectorDcaListener.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -14,10 +14,10 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; +use Netzmacht\Contao\Leaflet\Model\StyleModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\Leaflet\Model\StyleModel; /** * Helper class for the tl_leaflet_vector dca. diff --git a/src/MapProvider.php b/src/MapProvider.php index 2163c90..dd3b74a 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -22,9 +22,9 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Leaflet\Request\Request; -use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Leaflet; +use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; /** diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index 453291f..9cde83c 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -13,16 +13,16 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; 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\Model\MarkerModel; -use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Definition\Group\GeoJson; use Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson as OmnivoreGeoJson; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; -use Netzmacht\LeafletPHP\Definition\Group\GeoJson; /** * Class MarkersLayerMapper maps the layer model to the markers definition. diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index b2d4697..9f632cc 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -14,16 +14,16 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; 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\Model\VectorModel; -use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Definition\Group\GeoJson; use Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson as OmnivoreGeoJson; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; -use Netzmacht\LeafletPHP\Definition\Group\GeoJson; /** * Class VectorsLayerMapper maps the layer model for the Vectors layer definition. diff --git a/src/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php index 7a5367f..f7ef6b3 100644 --- a/src/Mapper/Vector/PolylineMapper.php +++ b/src/Mapper/Vector/PolylineMapper.php @@ -16,8 +16,8 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Definition\Vector\Polyline; +use Netzmacht\LeafletPHP\Value\LatLng; /** * Class PolylineMapper maps the database model to the polyline definition. diff --git a/src/Subscriber/GeoJsonSubscriber.php b/src/Subscriber/GeoJsonSubscriber.php index 30ce1d6..a478314 100644 --- a/src/Subscriber/GeoJsonSubscriber.php +++ b/src/Subscriber/GeoJsonSubscriber.php @@ -14,12 +14,12 @@ namespace Netzmacht\Contao\Leaflet\Subscriber; use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\LeafletPHP\Definition\Vector; -use Netzmacht\LeafletPHP\Value\GeoJson\Feature; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Marker; +use Netzmacht\LeafletPHP\Definition\Vector; use Netzmacht\LeafletPHP\Definition\Vector\Circle; use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker; +use Netzmacht\LeafletPHP\Value\GeoJson\Feature; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** From 46e6dcc2fadef70c042103d0ef786859ea268a42 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:43:12 +0200 Subject: [PATCH 116/152] Support bounds changing after files got loaded. --- js/Contao.js | 18 ++++++++++++++++-- src/Bundle/Resources/config/layers.yml | 2 ++ .../Resources/contao/dca/tl_leaflet_layer.php | 2 +- .../Resources/public/js/contao-leaflet.js | 2 +- src/Mapper/Layer/FileLayerMapper.php | 4 ++++ src/Subscriber/EncoderSubscriber.php | 8 ++++---- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/js/Contao.js b/js/Contao.js index 268f341..004d65e 100644 --- a/js/Contao.js +++ b/js/Contao.js @@ -124,8 +124,22 @@ L.Contao = L.Evented.extend({ * @param map Pass a map object so that the data loading events are passed to the map. */ load: function (hash, type, options, customLayer, map) { - var url = this.createRequestUrl(hash, map), - layer = omnivore[type](url, options, customLayer); + var url = this.createRequestUrl(hash, map); + + return this.loadFile(url, type, options, customLayer, map); + }, + + /** + * Load data from an url into a layer using omnivore. + * + * @param url A file url. + * @param type The response content format. + * @param options Parser options + * @param customLayer optional custom layer. + * @param map Pass a map object so that the data loading events are passed to the map. + */ + loadFile: function (url, type, options, customLayer, map) { + var layer = omnivore[type](url, options, customLayer); if (map) { // Required because Control.Loading tries to get _leafet_id which is created here. diff --git a/src/Bundle/Resources/config/layers.yml b/src/Bundle/Resources/config/layers.yml index 9350a9f..6a36bf1 100644 --- a/src/Bundle/Resources/config/layers.yml +++ b/src/Bundle/Resources/config/layers.yml @@ -48,6 +48,8 @@ parameters: file: children: false icon: 'bundles/netzmachtcontaoleaflet/img/file.png' + boundsMode: + extend: true services: _defaults: diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 4aa8745..3f2ff03 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -219,7 +219,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], 'file extends default' => [ - '+config' => ['file'], + '+config' => ['file', 'boundsMode'], '+expert' => [ 'onEachFeature', 'pointToLayer', diff --git a/src/Bundle/Resources/public/js/contao-leaflet.js b/src/Bundle/Resources/public/js/contao-leaflet.js index 6e70ebc..e26d02d 100644 --- a/src/Bundle/Resources/public/js/contao-leaflet.js +++ b/src/Bundle/Resources/public/js/contao-leaflet.js @@ -1 +1 @@ -L.Contao=L.Evented.extend({statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return void 0===this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if(void 0===window.XMLHttpRequest)return o(Error("Browser not supported"));if(void 0===e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file +L.Contao=L.Evented.extend({statics:{ATTRIBUTION:' | netzmacht'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return void 0===this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if(void 0===window.XMLHttpRequest)return o(Error("Browser not supported"));if(void 0===e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}}); \ No newline at end of file diff --git a/src/Mapper/Layer/FileLayerMapper.php b/src/Mapper/Layer/FileLayerMapper.php index f58e764..e1f619a 100644 --- a/src/Mapper/Layer/FileLayerMapper.php +++ b/src/Mapper/Layer/FileLayerMapper.php @@ -124,6 +124,10 @@ class FileLayerMapper extends AbstractLayerMapper $customLayer = $definition->getCustomLayer(); if ($customLayer instanceof GeoJson) { + if ($model->boundsMode) { + $customLayer->setOption('boundsMode', $model->boundsMode); + } + if ($model->pointToLayer) { $customLayer->setPointToLayer(new Expression($model->pointToLayer)); } diff --git a/src/Subscriber/EncoderSubscriber.php b/src/Subscriber/EncoderSubscriber.php index bf0aae6..7890246 100644 --- a/src/Subscriber/EncoderSubscriber.php +++ b/src/Subscriber/EncoderSubscriber.php @@ -89,16 +89,15 @@ class EncoderSubscriber implements EventSubscriberInterface { $value = $event->getValue(); $encoder = $event->getEncoder(); - $template = 'L.contao.load(%s, %s, %s, %s, map);'; + $template = 'L.contao.%s(%s, %s, %s, %s, map);'; + $method = 'loadFile'; if ($value instanceof OmnivoreLayer) { $url = $value->getUrl(); if ($url instanceof RequestUrl) { $url = $url->getHash(); - } elseif (strpos($url, '/') !== false) { - // Slash found, not a Contao leaflet hash, do not replace encoding. - return; + $method = 'load'; } if ($value->getCustomLayer()) { @@ -111,6 +110,7 @@ class EncoderSubscriber implements EventSubscriberInterface $event->addLine( sprintf( $template, + $method, $encoder->encodeValue($url), $encoder->encodeValue(strtolower(str_replace('Omnivore.', '', $value->getType()))), $encoder->encodeArray($value->getOptions(), JSON_FORCE_OBJECT), From 57fe57b8ea988e131e10bc0a458b080a8eceb25b Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:48:14 +0200 Subject: [PATCH 117/152] Move encoder subscriber to encoder namespace. --- src/Bundle/Resources/config/encoders.yml | 2 +- src/{ => Encoder}/Subscriber/EncoderSubscriber.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/{ => Encoder}/Subscriber/EncoderSubscriber.php (98%) diff --git a/src/Bundle/Resources/config/encoders.yml b/src/Bundle/Resources/config/encoders.yml index b4ac73e..62b6890 100644 --- a/src/Bundle/Resources/config/encoders.yml +++ b/src/Bundle/Resources/config/encoders.yml @@ -42,6 +42,6 @@ services: - { name: netzmacht.contao_leaflet.encoder } netzmacht.contao_leaflet.encoder.subscriber: - class: Netzmacht\Contao\Leaflet\Subscriber\EncoderSubscriber + class: Netzmacht\Contao\Leaflet\Encoder\Subscriber\EncoderSubscriber tags: - { name: netzmacht.contao_leaflet.encoder } diff --git a/src/Subscriber/EncoderSubscriber.php b/src/Encoder/Subscriber/EncoderSubscriber.php similarity index 98% rename from src/Subscriber/EncoderSubscriber.php rename to src/Encoder/Subscriber/EncoderSubscriber.php index 7890246..74b01d6 100644 --- a/src/Subscriber/EncoderSubscriber.php +++ b/src/Encoder/Subscriber/EncoderSubscriber.php @@ -10,7 +10,7 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Subscriber; +namespace Netzmacht\Contao\Leaflet\Encoder\Subscriber; use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\JavascriptBuilder\Exception\EncodeValueFailed; From d261e8b4babc261f5dfacc04eaba5fc09b51bb78 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:57:40 +0200 Subject: [PATCH 118/152] Refactor GeoJsonSubscriber to an listener. --- src/Bundle/Resources/config/listeners.yml | 6 +- .../GeoJsonListener.php} | 68 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) rename src/{Subscriber/GeoJsonSubscriber.php => Listener/GeoJsonListener.php} (79%) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index 944f15d..d3838c2 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -61,12 +61,12 @@ services: arguments: - '%netzmacht.contao_leaflet.styles%' - netzmacht.contao_leaflet.listeners.geo_json_subscriber: - class: Netzmacht\Contao\Leaflet\Subscriber\GeoJsonSubscriber + netzmacht.contao_leaflet.listeners.geo_json_listener: + class: Netzmacht\Contao\Leaflet\Listener\GeoJsonListener arguments: - '%netzmacht.contao_leaflet.feature_model_properties%' tags: - - { name: 'kernel.event_subscriber' } + - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.mapper.convert_to_geojson', method: 'handle' } netzmacht.contao_leaflet.listeners.hash_subscriber: class: Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber diff --git a/src/Subscriber/GeoJsonSubscriber.php b/src/Listener/GeoJsonListener.php similarity index 79% rename from src/Subscriber/GeoJsonSubscriber.php rename to src/Listener/GeoJsonListener.php index a478314..c1f26f1 100644 --- a/src/Subscriber/GeoJsonSubscriber.php +++ b/src/Listener/GeoJsonListener.php @@ -10,24 +10,28 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Subscriber; +declare(strict_types=1); +namespace Netzmacht\Contao\Leaflet\Listener; + +use Contao\Model; use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\LeafletPHP\Definition as LeafletDefinition; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Marker; use Netzmacht\LeafletPHP\Definition\Vector; use Netzmacht\LeafletPHP\Definition\Vector\Circle; use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker; use Netzmacht\LeafletPHP\Value\GeoJson\Feature; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonObject; /** * Class GeoJsonSubscriber provides subscribers when a definition is converted to a geo json feature. * * @package Netzmacht\Contao\Leaflet\Subscriber */ -class GeoJsonSubscriber implements EventSubscriberInterface +final class GeoJsonListener { /** * Property mapping between models and features. @@ -47,32 +51,34 @@ class GeoJsonSubscriber implements EventSubscriberInterface } /** - * {@inheritdoc} + * Handle the event. + * + * @param ConvertToGeoJsonEvent $event The event. + * + * @return void */ - public static function getSubscribedEvents() + public function handle(ConvertToGeoJsonEvent $event) { - return array( - ConvertToGeoJsonEvent::NAME => array( - array('addPopup'), - array('enrichObjects'), - array('enrichCircle'), - array('setModelData') - ) - ); + $feature = $event->getGeoJson(); + $definition = $event->getDefinition(); + $model = $event->getModel(); + + $this->addPopup($feature, $definition); + $this->enrichObjects($feature, $definition, $model); + $this->enrichCircle($feature, $definition); + $this->setModelData($feature, $model); } /** * Add popup property for definitions with an popup. * - * @param ConvertToGeoJsonEvent $event The subscribed event. + * @param GeoJsonObject $feature The geojson feature object. + * @param LeafletDefinition $definition The definition. * * @return void */ - public function addPopup(ConvertToGeoJsonEvent $event) + public function addPopup(GeoJsonObject $feature, LeafletDefinition $definition) { - $feature = $event->getGeoJson(); - $definition = $event->getDefinition(); - if ($definition instanceof HasPopup && $feature instanceof Feature) { if ($definition->getPopup()) { $feature->setProperty('popup', $definition->getPopup()); @@ -91,16 +97,14 @@ class GeoJsonSubscriber implements EventSubscriberInterface /** * Enrich map object with feature data and bounds information. * - * @param ConvertToGeoJsonEvent $event The subscribed event. + * @param GeoJsonObject $feature The geojson feature object. + * @param LeafletDefinition $definition The definition. + * @param Model|object $model The data model. * * @return void */ - public function enrichObjects(ConvertToGeoJsonEvent $event) + public function enrichObjects(GeoJsonObject $feature, LeafletDefinition $definition, $model) { - $feature = $event->getGeoJson(); - $definition = $event->getDefinition(); - $model = $event->getModel(); - if (($definition instanceof Marker || $definition instanceof Vector) && $model instanceof \Model && $feature instanceof Feature) { $this->setDataProperty($model, $feature); @@ -111,15 +115,13 @@ class GeoJsonSubscriber implements EventSubscriberInterface /** * Enrich the the circle with constructor arguments. * - * @param ConvertToGeoJsonEvent $event The subscribed events. + * @param GeoJsonObject $feature The geojson feature object. + * @param LeafletDefinition $definition The definition. * * @return void */ - public function enrichCircle(ConvertToGeoJsonEvent $event) + public function enrichCircle(GeoJsonObject $feature, LeafletDefinition $definition) { - $feature = $event->getGeoJson(); - $definition = $event->getDefinition(); - if ($definition instanceof Circle && !$definition instanceof CircleMarker && $feature instanceof Feature) { $feature->setProperty('arguments', array($definition->getLatLng(), $definition->getRadius())); } @@ -128,15 +130,13 @@ class GeoJsonSubscriber implements EventSubscriberInterface /** * Pass configured properties on an model to the properties.model key. * - * @param ConvertToGeoJsonEvent $event The subscribed events. + * @param GeoJsonObject $feature The geojson feature object. + * @param Model|object $model The data model. * * @return void */ - public function setModelData(ConvertToGeoJsonEvent $event) + public function setModelData(GeoJsonObject $feature, $model) { - $feature = $event->getGeoJson(); - $model = $event->getModel(); - if (!$model instanceof \Model || !$feature instanceof Feature || empty($this->featureModelProperties[$model->getTable()])) { return; From 8dbe464ca81b7f4adc91d1c14c98b4ca9d53cae9 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:58:55 +0200 Subject: [PATCH 119/152] Move hash subscriber to the listener namespace. --- src/Bundle/Resources/config/listeners.yml | 2 +- src/{Subscriber => Listener}/HashSubscriber.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/{Subscriber => Listener}/HashSubscriber.php (97%) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index d3838c2..89ba6f8 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -69,7 +69,7 @@ services: - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.mapper.convert_to_geojson', method: 'handle' } netzmacht.contao_leaflet.listeners.hash_subscriber: - class: Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber + class: Netzmacht\Contao\Leaflet\Listener\HashSubscriber tags: - { name: 'kernel.event_subscriber' } diff --git a/src/Subscriber/HashSubscriber.php b/src/Listener/HashSubscriber.php similarity index 97% rename from src/Subscriber/HashSubscriber.php rename to src/Listener/HashSubscriber.php index 94419f3..bd4a9a8 100644 --- a/src/Subscriber/HashSubscriber.php +++ b/src/Listener/HashSubscriber.php @@ -10,7 +10,7 @@ * @filesource */ -namespace Netzmacht\Contao\Leaflet\Subscriber; +namespace Netzmacht\Contao\Leaflet\Listener; use Netzmacht\Contao\Leaflet\Event\GetHashEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; From ae5fe11d2070a9b0412b48ef247719cd2fdc5de3 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 18:03:42 +0200 Subject: [PATCH 120/152] 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; From 6ded7441d9bd6cc17bef709f50070c849f1fb7d4 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 18:03:49 +0200 Subject: [PATCH 121/152] Code style. --- src/Encoder/Subscriber/EncoderSubscriber.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Encoder/Subscriber/EncoderSubscriber.php b/src/Encoder/Subscriber/EncoderSubscriber.php index 74b01d6..db11ad0 100644 --- a/src/Encoder/Subscriber/EncoderSubscriber.php +++ b/src/Encoder/Subscriber/EncoderSubscriber.php @@ -33,13 +33,13 @@ class EncoderSubscriber implements EventSubscriberInterface */ public static function getSubscribedEvents() { - return array( - EncodeValueEvent::NAME => array( - array('encodeIcons', 1000), - array('loadLayer', 100), - ), - EncodeReferenceEvent::NAME => array('referenceIcon', 100), - ); + return [ + EncodeValueEvent::NAME => [ + ['encodeIcons', 1000], + ['loadLayer', 100], + ], + EncodeReferenceEvent::NAME => ['referenceIcon', 100], + ]; } /** @@ -96,7 +96,7 @@ class EncoderSubscriber implements EventSubscriberInterface $url = $value->getUrl(); if ($url instanceof RequestUrl) { - $url = $url->getHash(); + $url = $url->getHash(); $method = 'load'; } From c465b724f44c27251affe6a284fd1749b86d987d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 18:11:28 +0200 Subject: [PATCH 122/152] Convert array syntax and other minor code style adjustments. --- src/Backend/About.php | 16 +- src/Bundle/ContaoManager/Plugin.php | 2 +- .../NetzmachtContaoLeafletExtension.php | 2 +- src/Bundle/Resources/contao/config/config.php | 38 ++- .../Resources/contao/dca/tl_leaflet_layer.php | 2 +- .../Resources/contao/languages/de/leaflet.php | 4 +- .../Resources/contao/languages/de/modules.php | 4 +- .../contao/languages/de/tl_content.php | 4 +- .../languages/de/tl_leaflet_control.php | 4 +- .../contao/languages/de/tl_leaflet_icon.php | 4 +- .../contao/languages/de/tl_leaflet_layer.php | 4 +- .../contao/languages/de/tl_leaflet_map.php | 4 +- .../contao/languages/de/tl_leaflet_marker.php | 4 +- .../contao/languages/de/tl_leaflet_popup.php | 4 +- .../contao/languages/de/tl_leaflet_style.php | 4 +- .../contao/languages/de/tl_leaflet_vector.php | 4 +- .../contao/languages/de/tl_module.php | 4 +- .../Resources/contao/languages/en/modules.php | 8 +- .../languages/en/tl_leaflet_control.php | 4 +- .../contao/languages/en/tl_leaflet_map.php | 168 ++++++------ .../contao/languages/en/tl_leaflet_marker.php | 2 +- .../contao/languages/en/tl_leaflet_vector.php | 2 +- .../contao/templates/be_leaflet_about.html5 | 239 ++++++++++-------- .../contao/templates/be_leaflet_geocode.html5 | 12 +- .../contao/templates/ce_leaflet_map.html5 | 2 +- .../contao/templates/leaflet_map_html.html5 | 8 +- .../contao/templates/mod_leaflet_map.html5 | 2 +- src/Bundle/Resources/public/css/about.css | 3 +- src/Bundle/Resources/public/css/backend.css | 10 +- src/Bundle/Resources/public/js/backend.js | 2 +- src/Encoder/ContaoAssets.php | 2 +- src/Encoder/Subscriber/EncoderSubscriber.php | 2 +- src/Filter/BboxFilter.php | 2 +- src/Filter/DistanceFilter.php | 6 +- src/Frontend/DataController.php | 10 +- src/Frontend/RequestUrl.php | 6 +- src/Listener/Dca/ControlDcaListener.php | 8 +- src/Listener/Dca/LayerDcaListener.php | 14 +- src/Listener/Dca/LeafletDcaListener.php | 4 +- src/Listener/Dca/MapDcaListener.php | 4 +- src/Listener/Dca/MarkerDcaListener.php | 10 +- src/Listener/Dca/VectorDcaListener.php | 6 +- src/Listener/GeoJsonListener.php | 4 +- src/Listener/HashSubscriber.php | 12 +- src/Listener/LoadAssetsListener.php | 4 +- src/MapProvider.php | 6 +- src/Mapper/AbstractMapper.php | 6 +- src/Mapper/Control/LayersControlMapper.php | 4 +- src/Mapper/Control/LoadingControlMapper.php | 4 +- src/Mapper/DefinitionMapper.php | 6 +- src/Mapper/Layer/GroupLayerMapper.php | 6 +- src/Mapper/Layer/MarkerClusterLayerMapper.php | 6 +- src/Mapper/Layer/MarkersLayerMapper.php | 14 +- src/Mapper/Layer/ProviderLayerMapper.php | 6 +- src/Mapper/Layer/VectorsLayerMapper.php | 16 +- src/Mapper/MapMapper.php | 22 +- src/Mapper/OptionsBuilder.php | 7 +- src/Mapper/Style/FixedStyleMapper.php | 2 +- src/Mapper/Type/ImageIconMapper.php | 10 +- src/Mapper/UI/MarkerMapper.php | 8 +- src/Model/AbstractActiveModel.php | 6 +- src/Model/LayerModel.php | 8 +- src/Model/MarkerModel.php | 16 +- 63 files changed, 413 insertions(+), 404 deletions(-) diff --git a/src/Backend/About.php b/src/Backend/About.php index c969717..50c9e13 100644 --- a/src/Backend/About.php +++ b/src/Backend/About.php @@ -48,10 +48,10 @@ class About return array_map( function ($library) { $library = array_merge( - array( + [ 'homepage' => null, 'version' => null, - ), + ], $library ); @@ -86,30 +86,30 @@ class About $lockFile = TL_ROOT . '/composer.lock'; if (!file_exists($extFile) || !file_exists($lockFile)) { - return array(); + return []; } $extension = json_decode(file_get_contents($extFile), true); $installed = json_decode(file_get_contents($lockFile), true); - $deps = array(); + $deps = []; $version = null; foreach ($installed['packages'] as $package) { if ($package['name'] === 'netzmacht/contao-leaflet-maps') { $version = $package['version']; } elseif (isset($extension['require'][$package['name']])) { - $deps[] = array( + $deps[] = [ 'name' => $package['name'], 'version' => $package['version'], 'license' => !empty($package['license']) ? implode(', ', $package['license']) : '', 'homepage' => sprintf( 'Visit packagist', $package['name'] - ) - ); + ), + ]; } } - return array($version, $deps); + return [$version, $deps]; } } diff --git a/src/Bundle/ContaoManager/Plugin.php b/src/Bundle/ContaoManager/Plugin.php index a9facf6..8033179 100644 --- a/src/Bundle/ContaoManager/Plugin.php +++ b/src/Bundle/ContaoManager/Plugin.php @@ -36,7 +36,7 @@ class Plugin implements BundlePluginInterface return [ BundleConfig::create(NetzmachtContaoLeafletBundle::class) ->setLoadAfter([ContaoCoreBundle::class, NetzmachtContaoToolkitBundle::class]) - ->setReplace(['leaflet']) + ->setReplace(['leaflet']), ]; } } diff --git a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php index ef67a2e..2dc6a92 100644 --- a/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php +++ b/src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php @@ -33,7 +33,7 @@ class NetzmachtContaoLeafletExtension extends Extension { $loader = new YamlFileLoader( $container, - new FileLocator(dirname(__DIR__) .'/Resources/config') + new FileLocator(dirname(__DIR__) . '/Resources/config') ); // Common config, services and listeners diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index 38abba6..a823af9 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -17,42 +17,36 @@ array_insert( $GLOBALS['BE_MOD'], 1, - array( - 'leaflet' => array - ( - 'leaflet_map' => array - ( - 'tables' => array - ( + [ + 'leaflet' => [ + 'leaflet_map' => [ + 'tables' => [ 'tl_leaflet_map', 'tl_leaflet_control', - ), + ], 'icon' => 'bundles/netzmachtcontaoleaflet/img/map.png', 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/backend.css', - ), - 'leaflet_layer' => array - ( - 'tables' => array - ( + ], + 'leaflet_layer' => [ + 'tables' => [ 'tl_leaflet_layer', 'tl_leaflet_marker', 'tl_leaflet_vector', 'tl_leaflet_icon', 'tl_leaflet_style', 'tl_leaflet_popup', - ), + ], 'icon' => 'bundles/netzmachtcontaoleaflet/img/layers.png', 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/backend.css', - 'javascript' => 'bundles/netzmachtcontaoleaflet/js/backend.js' - ), - 'leaflet_about' => array - ( + 'javascript' => 'bundles/netzmachtcontaoleaflet/js/backend.js', + ], + 'leaflet_about' => [ 'callback' => Netzmacht\Contao\Leaflet\Backend\About::class, 'icon' => 'bundles/netzmachtcontaoleaflet/img/about.png', 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/about.css', - ) - ) - ) + ], + ], + ] ); /* @@ -74,5 +68,5 @@ $GLOBALS['TL_MODELS']['tl_leaflet_vector'] = \Netzmacht\Contao\Leaflet\Model\Ve $GLOBALS['TL_HOOKS']['initializeSystem'][] = [ 'netzmacht.contao_leaflet.listeners.register_libraries', - 'onInitializeSystem' + 'onInitializeSystem', ]; diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 3f2ff03..836b266 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -861,7 +861,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], 'sql' => 'mediumtext NULL', ], - 'file' => [ + 'file' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'], 'exclude' => true, 'inputType' => 'fileTree', diff --git a/src/Bundle/Resources/contao/languages/de/leaflet.php b/src/Bundle/Resources/contao/languages/de/leaflet.php index 8bbaeb8..ede2d01 100644 --- a/src/Bundle/Resources/contao/languages/de/leaflet.php +++ b/src/Bundle/Resources/contao/languages/de/leaflet.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/modules.php b/src/Bundle/Resources/contao/languages/de/modules.php index 1e72d97..84f21aa 100644 --- a/src/Bundle/Resources/contao/languages/de/modules.php +++ b/src/Bundle/Resources/contao/languages/de/modules.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_content.php b/src/Bundle/Resources/contao/languages/de/tl_content.php index 7d8f63e..5681a37 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_content.php +++ b/src/Bundle/Resources/contao/languages/de/tl_content.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php index 2b477aa..526a8dd 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php index f25261d..85f126e 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php index 044f407..0815d93 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php index 65f5080..26c78e6 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php index d98e0bc..a9ec43c 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php index e7e0249..e3f782b 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php index 32a1b0d..0602c3f 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_vector.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_vector.php index 81a76ad..5d1424e 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_vector.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/de/tl_module.php b/src/Bundle/Resources/contao/languages/de/tl_module.php index 4cbe8f3..2e4f5f4 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_module.php +++ b/src/Bundle/Resources/contao/languages/de/tl_module.php @@ -3,8 +3,8 @@ * Translations are managed using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * @link http://help.transifex.com/intro/translating.html - * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ + * @link http://help.transifex.com/intro/translating.html + * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * diff --git a/src/Bundle/Resources/contao/languages/en/modules.php b/src/Bundle/Resources/contao/languages/en/modules.php index 81c3839..f2b1520 100644 --- a/src/Bundle/Resources/contao/languages/en/modules.php +++ b/src/Bundle/Resources/contao/languages/en/modules.php @@ -25,8 +25,8 @@ $GLOBALS['TL_LANG']['MOD']['tl_leaflet_icon'] = 'Icons'; $GLOBALS['TL_LANG']['MOD']['tl_leaflet_marker'] = 'Markers'; $GLOBALS['TL_LANG']['MOD']['tl_leaflet_control'] = 'Controls'; -$GLOBALS['TL_LANG']['FMD']['leaflet'][0] = 'Leaflet Map'; -$GLOBALS['TL_LANG']['FMD']['leaflet'][1] = 'Integrate leaflet map as frontend module.'; +$GLOBALS['TL_LANG']['FMD']['leaflet'][0] = 'Leaflet Map'; +$GLOBALS['TL_LANG']['FMD']['leaflet'][1] = 'Integrate leaflet map as frontend module.'; -$GLOBALS['TL_LANG']['CTE']['leaflet'][0] = 'Leaflet Map'; -$GLOBALS['TL_LANG']['CTE']['leaflet'][1] = 'Integrate leaflet map as content element.'; +$GLOBALS['TL_LANG']['CTE']['leaflet'][0] = 'Leaflet Map'; +$GLOBALS['TL_LANG']['CTE']['leaflet'][1] = 'Integrate leaflet map as content element.'; diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php index d831d2f..c295e58 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_control.php @@ -99,5 +99,5 @@ $GLOBALS['TL_LANG']['tl_leaflet_control']['topright'][1] = 'Top right of the $GLOBALS['TL_LANG']['tl_leaflet_control']['base'][0] = 'Base layer'; $GLOBALS['TL_LANG']['tl_leaflet_control']['base'][1] = 'Base layers will be switched with radio buttons. Note that all base layers should be passed in the base layers object, but only one should be added to the map during map instantiation'; -$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][0] = 'Overlay'; -$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][1] = 'Overlays will be switched with checkboxes.'; +$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][0] = 'Overlay'; +$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][1] = 'Overlays will be switched with checkboxes.'; diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php index d11b6f5..e1cc78c 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php @@ -18,91 +18,91 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['layers_legend'] = 'Default layers'; $GLOBALS['TL_LANG']['tl_leaflet_map']['expert_legend'] = 'Expert settings'; $GLOBALS['TL_LANG']['tl_leaflet_map']['behaviour_legend'] = 'Behaviour'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][0] = 'Create map'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][1] = 'Create new map'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][0] = 'Edit map'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][1] = 'Edit map ID %s'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][0] = 'Copy map'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][1] = 'Copy map ID %s'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][0] = 'Manage controls'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][1] = 'Manage controls of map ID %s'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][0] = 'Delete map'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][1] = 'Delete map ID %s'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][0] = 'Show details'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][1] = 'Show map ID %s details'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][0] = 'Create map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][1] = 'Create new map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][0] = 'Edit map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][1] = 'Edit map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][0] = 'Copy map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][1] = 'Copy map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][0] = 'Manage controls'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][1] = 'Manage controls of map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][0] = 'Delete map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][1] = 'Delete map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][0] = 'Show details'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][1] = 'Show map ID %s details'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][0] = 'Title'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][1] = 'Title of the map.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][0] = 'Alias'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][1] = 'Alias of the map.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][0] = 'Center'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][1] = 'Initial geographical center of the map. Comma separated coordinates.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][0] = 'Dragging'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][1] = 'Whether the map be draggable with mouse/touch or not.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][0] = 'Touch zoom'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][1] = 'Whether the map can be zoomed by touch-dragging with two fingers.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][0] = 'Scroll wheel zoom'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][1] = 'Whether the map can be zoomed by using the mouse wheel.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][0] = 'Double click zoom'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][1] = 'Whether the map can be zoomed in by double clicking on it and zoomed out by double clicking while holding shift.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][0] = 'Box zoom'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][1] = 'Whether the map can be zoomed to a rectangular area specified by dragging the mouse while pressing shift.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][0] = 'Instant taps'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][1] = 'Enables mobile hacks for supporting instant taps.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][0] = 'Track window resize'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][1] = 'Whether the map automatically handles browser window resize to update itself.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][0] = 'Close popup on click'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][1] = 'Disable if you don\'t want popups to close when user clicks the map'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][0] = 'Keyboard navigation'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][1] = 'Makes the map focusable and allows users to navigate the map with keyboard arrows and +/- keys'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][0] = 'Keyboard pan offset'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][1] = 'Amount of pixels to pan when pressing an arrow key.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][0] = 'Keyboard zoom offset'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][1] = 'Number of zoom levels to change when pressing + or - key.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][0] = 'Zoom level'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][1] = 'Initial map zoom.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][0] = 'Minimum zoom level'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][1] = 'Minimum zoom level of the map. Overrides any minZoom set on map layers.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][0] = 'Maximum zoom level'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][1] = 'Maximum zoom level of the map. This overrides any maxZoom set on map layers.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][0] = 'Zoom snap'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][1] = 'Forces the map\'s zoom level to always be a multiple of the number. Default is 1.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][0] = 'Zoom delta'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][1] = 'Controls how much the map\'s zoom level will change after zoom in or zoom out.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][0] = 'Add default zoom control'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][1] = 'Whether the zoom control is added to the map by default.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][0] = 'Bounce at zoom limits'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][1] = 'Disable if you don\'t want the map to zoom beyond min/max zoom and then bounce back when pinch-zooming'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][0] = 'Extra options'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][1] = 'Add extra map options as valid json. See http://leafletjs.com/reference.html#map-options'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][0] = 'Adjust extra zoom settings'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][1] = 'Enable if you want to adjust minimum and maximum zoom as well'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][0] = 'Default layers'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][1] = 'Inital visible layers of the map. For optional layers use the layers control.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][0] = 'Adjust bounds'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][1] = 'If enabled the map will fit into bounds of data layers which are marked to affect the map bounds.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][0] = 'Locate user position'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][1] = 'Initial map zoom.Tries to locate the user using the Geolocation API.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][0] = 'Watch continuously'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][1] = 'If true, starts continous watching of location changes '; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][0] = 'Update map center'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][1] = 'If enabled, automatically sets the map view to the user location. Otherwise only the locationfound event is triggered.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][0] = 'Locate max zoom'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][1] = 'Max zoom when setting updating map view.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][0] = 'Locate timeout'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][1] = 'Number of milliseconds to wait for a response from geolocation.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][0] = 'High accuracy'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][1] = 'Enables high accuracy, see description in the W3C spec.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][0] = 'Locate maximum age'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][1] = 'Maximum age of detected location in milliseconds. Use cached value if time has not passed.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][0] = 'Load data dynamically in bounds'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][1] = 'If enabled the map requests data from the layers for the current bounds only and make a new request if bounds has changed.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][0] = 'Bounds padding'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][1] = 'Padding being used then applying bounds. Use comma separated values. If 2 values are given the padding option is set. If 4 values are given paddingTopLeft and paddingBottomRight is set.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][0] = 'Enable cache'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][1] = 'If enabled the generated map javascript is cached.'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][0] = 'Cache lifetime'; -$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][1] = 'Indicates how long a cache entry is valid in seconds.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][0] = 'Title'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][1] = 'Title of the map.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][0] = 'Alias'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][1] = 'Alias of the map.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][0] = 'Center'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][1] = 'Initial geographical center of the map. Comma separated coordinates.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][0] = 'Dragging'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][1] = 'Whether the map be draggable with mouse/touch or not.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][0] = 'Touch zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][1] = 'Whether the map can be zoomed by touch-dragging with two fingers.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][0] = 'Scroll wheel zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][1] = 'Whether the map can be zoomed by using the mouse wheel.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][0] = 'Double click zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][1] = 'Whether the map can be zoomed in by double clicking on it and zoomed out by double clicking while holding shift.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][0] = 'Box zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][1] = 'Whether the map can be zoomed to a rectangular area specified by dragging the mouse while pressing shift.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][0] = 'Instant taps'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][1] = 'Enables mobile hacks for supporting instant taps.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][0] = 'Track window resize'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][1] = 'Whether the map automatically handles browser window resize to update itself.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][0] = 'Close popup on click'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][1] = 'Disable if you don\'t want popups to close when user clicks the map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][0] = 'Keyboard navigation'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][1] = 'Makes the map focusable and allows users to navigate the map with keyboard arrows and +/- keys'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][0] = 'Keyboard pan offset'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][1] = 'Amount of pixels to pan when pressing an arrow key.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][0] = 'Keyboard zoom offset'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][1] = 'Number of zoom levels to change when pressing + or - key.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][0] = 'Zoom level'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][1] = 'Initial map zoom.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][0] = 'Minimum zoom level'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][1] = 'Minimum zoom level of the map. Overrides any minZoom set on map layers.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][0] = 'Maximum zoom level'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][1] = 'Maximum zoom level of the map. This overrides any maxZoom set on map layers.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][0] = 'Zoom snap'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][1] = 'Forces the map\'s zoom level to always be a multiple of the number. Default is 1.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][0] = 'Zoom delta'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][1] = 'Controls how much the map\'s zoom level will change after zoom in or zoom out.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][0] = 'Add default zoom control'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][1] = 'Whether the zoom control is added to the map by default.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][0] = 'Bounce at zoom limits'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][1] = 'Disable if you don\'t want the map to zoom beyond min/max zoom and then bounce back when pinch-zooming'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][0] = 'Extra options'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][1] = 'Add extra map options as valid json. See http://leafletjs.com/reference.html#map-options'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][0] = 'Adjust extra zoom settings'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][1] = 'Enable if you want to adjust minimum and maximum zoom as well'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][0] = 'Default layers'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][1] = 'Inital visible layers of the map. For optional layers use the layers control.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][0] = 'Adjust bounds'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][1] = 'If enabled the map will fit into bounds of data layers which are marked to affect the map bounds.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][0] = 'Locate user position'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][1] = 'Initial map zoom.Tries to locate the user using the Geolocation API.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][0] = 'Watch continuously'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][1] = 'If true, starts continous watching of location changes '; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][0] = 'Update map center'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][1] = 'If enabled, automatically sets the map view to the user location. Otherwise only the locationfound event is triggered.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][0] = 'Locate max zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][1] = 'Max zoom when setting updating map view.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][0] = 'Locate timeout'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][1] = 'Number of milliseconds to wait for a response from geolocation.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][0] = 'High accuracy'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][1] = 'Enables high accuracy, see description in the W3C spec.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][0] = 'Locate maximum age'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][1] = 'Maximum age of detected location in milliseconds. Use cached value if time has not passed.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][0] = 'Load data dynamically in bounds'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][1] = 'If enabled the map requests data from the layers for the current bounds only and make a new request if bounds has changed.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][0] = 'Bounds padding'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][1] = 'Padding being used then applying bounds. Use comma separated values. If 2 values are given the padding option is set. If 4 values are given paddingTopLeft and paddingBottomRight is set.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][0] = 'Enable cache'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][1] = 'If enabled the generated map javascript is cached.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][0] = 'Cache lifetime'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][1] = 'Indicates how long a cache entry is valid in seconds.'; $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load'][0] = 'At map initialization'; $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load'][1] = 'Calculate bounds when the map is initialized. All static and already loaded deferred featured are included.'; diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php index b4bf310..03e0398 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php @@ -14,7 +14,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_marker']['title_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['content_legend'] = 'Content'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['active_legend'] = 'Activation'; -$GLOBALS['TL_LANG']['tl_leaflet_marker']['expert_legend'] = 'Expert settings'; +$GLOBALS['TL_LANG']['tl_leaflet_marker']['expert_legend'] = 'Expert settings'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['new'][0] = 'Create marker'; diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php index 0d57c68..5244899 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php @@ -15,7 +15,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_vector']['active_legend'] = 'Activation'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['data_legend'] = 'Vector data'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['popup_legend'] = 'Popup'; -$GLOBALS['TL_LANG']['tl_leaflet_vector']['expert_legend'] = 'Expert settings'; +$GLOBALS['TL_LANG']['tl_leaflet_vector']['expert_legend'] = 'Expert settings'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['new'][0] = 'Create vector'; diff --git a/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 index c859416..dfa1178 100644 --- a/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 +++ b/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 @@ -1,125 +1,140 @@

-
-

headline; ?> version; ?>

-
- -
-

About

-
-

- The Leaflet maps integration for Contao CMS is an Open Source Software license under the LGPL 3.0. - This extension is only exists because of great other Open Source Software which it heavenly depends on. -

-

- This software ships with an visible attribution to netzmacht creative in the map attribution control. - If you want to remove this attribution, you have to purchase a commercial license. - For more details visit the project website. -

+
+

headline; ?> + version; ?> +

-
- > - -

- netzmacht
- David Molineus
-

-

- DAB Bank München
- IBAN: DE52701204008354237003
- BIC: DABBDEMMXXX -

-
- - - - -
-
-
-
-

Support Contao Leaflet

- -
-
-

Report issues

-

If you found a bug, got some troubles or have a feature request - feel free to open an issue.

-

Issue tracker

-
-
-

Contribute

-

There are many ways you can con­tribute. Translations, - docu­mentation or code contributions are welcome. +

+

About

+
+

+ The Leaflet maps integration for Contao CMS is an Open Source Software license under the LGPL 3.0. + This extension is only exists because of great other Open Source Software which it heavenly depends on. +

+

+ This software ships with an visible attribution to netzmacht creative in the map attribution + control. + If you want to remove this attribution, you have to purchase a commercial license. + For more details visit the project + website.

-

Contribute

-
-

Fund a feature

-

Contao Leaflet is not feature complete. Have a look at the list of planned feature and support them.

-

Planned features

+
+ > + +

+ netzmacht
+ David Molineus
+

+

+ DAB Bank München
+ IBAN: DE52701204008354237003
+ BIC: DABBDEMMXXX +

+
+ + + + +
-
-
-

Individual development

-

If you have special requirements you can hire me for an individual development.

-

Contact

+
+

Support Contao Leaflet

+ +
+
+

Report issues

+

If you found a bug, got some troubles or have a feature request - feel free to open an issue.

+

Issue + tracker

+
+
+

Contribute

+

There are many ways you can con­tribute. Translations, + docu­mentation or code contributions are welcome. +

+

Contribute +

+
+
+

Fund a feature

+

Contao Leaflet is not feature complete. Have a look at the list of planned feature and support + them.

+

Planned + features

+
-
-

Commercial license

-

If you want to remove the attribution in the attribution control, you can purchase a commercial license.

-

Purchase license

+
+ +
+

Individual development

+

If you have special requirements you can hire me for an individual development.

+

Contact

+
+
+

Commercial license

+

If you want to remove the attribution in the attribution control, you can purchase a commercial + license.

+

Purchase + license

+
-
-
-

Credits

- - - - - - - - libraries): ?> - - - libraries as $library): ?> - - - - - - - - - - - - - - - - - - - - - - - dependencies): ?> - - - dependencies as $dep): ?> - - - - - - - -
NameVersionLicenseHomepage
Libraries
Graphics
Farm Fresh-Web Icons3.9.2CC BY 3.0 USfatcow.com/free-icons
Web Blog Icons by SEM Labs3.9.2CC BY 4.0semlabs.co.uk
Dependencies
-
+
+

Credits

+ + + + + + + + libraries): ?> + + + + + libraries as $library): ?> + + + + + + + + + + + + + + + + + + + + + + + dependencies): ?> + + + + + dependencies as $dep): ?> + + + + + + + +
NameVersionLicenseHomepage
Libraries
Graphics
Farm Fresh-Web Icons3.9.2CC BY 3.0 USfatcow.com/free-icons
Web Blog Icons by SEM Labs3.9.2CC BY 4.0semlabs.co.uk
Dependencies
+
diff --git a/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 index 842d1f5..6375db0 100644 --- a/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 +++ b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 @@ -10,21 +10,21 @@ L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' }).addTo(map); - var element = $('field; ?>'); + var element = $('field; ?>'); var geocoder = L.Control.geocoder({ defaultMarkGeocode: false, collapsed: false, placeholder: '' }).addTo(map); - geocoder.on('markgeocode', function(event) { + geocoder.on('markgeocode', function (event) { var container = document.createElement('div'); - var link = document.createElement('button'); - var result = event.geocode; + var link = document.createElement('button'); + var result = event.geocode; link.set('style', 'margin-left: 10px;'); link.appendText(''); - link.addEvent('click', function(e) { + link.addEvent('click', function (e) { e.stop(); element.set('value', result.center.lat + ',' + result.center.lng); @@ -37,7 +37,7 @@ map.removeLayer(this._geocodeMarker); } - map.fitBounds(result.bbox, { padding: [0, 70]}); + map.fitBounds(result.bbox, {padding: [0, 70]}); map.panTo(result.center); this._geocodeMarker = new L.Marker(result.center, {draggable: true}) diff --git a/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5 index 61563ff..d62880d 100644 --- a/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5 +++ b/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5 @@ -9,5 +9,5 @@
-' . $this->javascript .''; ?> +' . $this->javascript . ''; ?> diff --git a/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 index 3be0929..160b248 100644 --- a/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 +++ b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 @@ -1,6 +1,6 @@
+ L.contao.addMap('', function () { + + return {map: map, layers: layers, controls: controls, icons: icons}; + }()); diff --git a/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5 index e0138dd..6c7ffbd 100644 --- a/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5 +++ b/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5 @@ -9,4 +9,4 @@
-' . $this->javascript .''; ?> +' . $this->javascript . ''; ?> diff --git a/src/Bundle/Resources/public/css/about.css b/src/Bundle/Resources/public/css/about.css index 0e71c71..87f8827 100644 --- a/src/Bundle/Resources/public/css/about.css +++ b/src/Bundle/Resources/public/css/about.css @@ -3,7 +3,6 @@ padding: 15px; } - .netzmacht-leaflet-credits a { color: #669A00; } @@ -17,7 +16,7 @@ .netzmacht-leaflet-credits h1 { color: #fff; font-size: 1.4em; - text-shadow: 0 -1px 1px rgba(0,0,0,0.35); + text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.35); } .netzmacht-leaflet-credits .row:after { diff --git a/src/Bundle/Resources/public/css/backend.css b/src/Bundle/Resources/public/css/backend.css index 36cc7b9..09d7686 100644 --- a/src/Bundle/Resources/public/css/backend.css +++ b/src/Bundle/Resources/public/css/backend.css @@ -1,9 +1,9 @@ -.tl_listing_container.tree_view ul > li.tl_file { +.tl_listing_container.tree_view ul > li.tl_file { background: url('./../img/fol-placeholder.gif') no-repeat 6px 4px; } -.tl_listing_container.tree_view ul > li.tl_file > div { +.tl_listing_container.tree_view ul > li.tl_file > div { line-height: 18px; } @@ -11,15 +11,15 @@ padding-left: 26px; } -.tl_listing_container.tree_view ul > li.parent > ul { +.tl_listing_container.tree_view ul > li.parent > ul { padding-left: 20px; } -.tl_listing_container.tree_view ul > li > .tl_left > a { +.tl_listing_container.tree_view ul > li > .tl_left > a { margin-left: -20px; } -.tl_listing_container.tree_view ul[class="level_1"] li.tl_file > .tl_left { +.tl_listing_container.tree_view ul[class="level_1"] li.tl_file > .tl_left { padding-left: 20px !important; } diff --git a/src/Bundle/Resources/public/js/backend.js b/src/Bundle/Resources/public/js/backend.js index 1e5f383..94c802d 100644 --- a/src/Bundle/Resources/public/js/backend.js +++ b/src/Bundle/Resources/public/js/backend.js @@ -30,7 +30,7 @@ var ContaoLeafletAjaxRequest = { published = (image.get('data-state') == 1), div = el.getParent('div'), index, next, icon, icond, pa; - img = div.getParent('li').getFirst('.tl_left img.list-icon'); + img = div.getParent('li').getFirst('.tl_left img.list-icon'); // Change the icon if (img !== null && img.nodeName.toLowerCase() == 'img') { diff --git a/src/Encoder/ContaoAssets.php b/src/Encoder/ContaoAssets.php index e3e39cc..902b21d 100644 --- a/src/Encoder/ContaoAssets.php +++ b/src/Encoder/ContaoAssets.php @@ -44,7 +44,7 @@ class ContaoAssets implements Assets private $cache = [ 'stylesheets' => [], 'javascripts' => [], - 'map' => [] + 'map' => [], ]; /** diff --git a/src/Encoder/Subscriber/EncoderSubscriber.php b/src/Encoder/Subscriber/EncoderSubscriber.php index db11ad0..55fe1eb 100644 --- a/src/Encoder/Subscriber/EncoderSubscriber.php +++ b/src/Encoder/Subscriber/EncoderSubscriber.php @@ -34,7 +34,7 @@ class EncoderSubscriber implements EventSubscriberInterface public static function getSubscribedEvents() { return [ - EncodeValueEvent::NAME => [ + EncodeValueEvent::NAME => [ ['encodeIcons', 1000], ['loadLayer', 100], ], diff --git a/src/Filter/BboxFilter.php b/src/Filter/BboxFilter.php index d319abe..4b637e8 100644 --- a/src/Filter/BboxFilter.php +++ b/src/Filter/BboxFilter.php @@ -68,7 +68,7 @@ class BboxFilter implements Filter */ public function getValues() { - return array('bounds' => $this->bounds); + return ['bounds' => $this->bounds]; } /** diff --git a/src/Filter/DistanceFilter.php b/src/Filter/DistanceFilter.php index 590ce57..6c062e3 100644 --- a/src/Filter/DistanceFilter.php +++ b/src/Filter/DistanceFilter.php @@ -88,9 +88,9 @@ class DistanceFilter implements Filter */ public function getValues() { - return array( + return [ 'radius' => $this->radius, - 'center' => $this->center - ); + 'center' => $this->center, + ]; } } diff --git a/src/Frontend/DataController.php b/src/Frontend/DataController.php index 166f522..c5dd4cc 100644 --- a/src/Frontend/DataController.php +++ b/src/Frontend/DataController.php @@ -28,13 +28,13 @@ class DataController * * @var array */ - private $input = array( + private $input = [ 'format' => 'geojson', 'type' => 'layer', 'id' => null, 'filter' => null, - 'values' => null - ); + 'values' => null, + ]; /** * Debug mode. @@ -140,9 +140,9 @@ class DataController default: $error = true; - return array($data, $error); + return [$data, $error]; } - return array($data, $error); + return [$data, $error]; } } diff --git a/src/Frontend/RequestUrl.php b/src/Frontend/RequestUrl.php index 4a6f038..8603a9d 100644 --- a/src/Frontend/RequestUrl.php +++ b/src/Frontend/RequestUrl.php @@ -57,12 +57,12 @@ class RequestUrl implements \JsonSerializable */ public static function create($dataId, $type = null, $format = null, Request $request = null) { - $params = array( + $params = [ 'for' => $request ? $request->getMapIdentifier() : null, 'type' => $type != 'layer' ? $type : null, 'id' => $dataId, - 'format' => $format != 'geojson' ? $format : null - ); + 'format' => $format != 'geojson' ? $format : null, + ]; $hash = base64_encode(implode(',', $params)); $query = 'leaflet=' . $hash; diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index f9f33f4..b490b8f 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -110,7 +110,7 @@ class ControlDcaListener extends AbstractListener */ public function getZoomControls() { - $collection = ControlModel::findBy('type', 'zoom', array('order' => 'title')); + $collection = ControlModel::findBy('type', 'zoom', ['order' => 'title']); return OptionsBuilder::fromCollection($collection, 'title')->getOptions(); } @@ -166,7 +166,7 @@ class ControlDcaListener extends AbstractListener 'lid' => $layer['layer'], 'cid' => $dataContainer->id, 'mode' => $layer['mode'], - 'sorting' => $sorting + 'sorting' => $sorting, ]; $this->connection->insert('tl_leaflet_control_layer', $data); @@ -177,10 +177,10 @@ class ControlDcaListener extends AbstractListener [ 'tstamp' => time(), 'sorting' => $sorting, - 'mode' => $layer['mode'] + 'mode' => $layer['mode'], ], [ - 'id' => $values[$layer['layer']]['id'] + 'id' => $values[$layer['layer']]['id'], ] ); diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index d1ce1cd..23a2d6d 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -52,7 +52,7 @@ class LayerDcaListener extends AbstractListener * @var Connection */ private $connection; - + /** * Tile providers configuration. * @@ -149,7 +149,7 @@ class LayerDcaListener extends AbstractListener return $this->tileProviders[$dataContainer->activeRecord->tile_provider]['variants']; } - return array(); + return []; } /** @@ -233,8 +233,8 @@ class LayerDcaListener extends AbstractListener public function getPasteButtons($dataContainer, $row, $table, $whatever, $children) { $pasteAfterUrl = \Controller::addToUrl( - 'act='.$children['mode'].'&mode=1&pid='.$row['id'] - .(!is_array($children['id']) ? '&id='.$children['id'] : '') + 'act=' . $children['mode'] . '&mode=1&pid=' . $row['id'] + . (!is_array($children['id']) ? '&id=' . $children['id'] : '') . '&rt=' . RequestToken::get() ); @@ -254,7 +254,7 @@ class LayerDcaListener extends AbstractListener 'act=%s&mode=2&pid=%s%s', $children['mode'], $row['id'], - !is_array($children['id']) ? '&id='.$children['id'] : '' + !is_array($children['id']) ? '&id=' . $children['id'] : '' ) . '&rt=' . RequestToken::get() ); @@ -365,7 +365,7 @@ class LayerDcaListener extends AbstractListener */ public function getBoundsModes($dataContainer) { - $options = array(); + $options = []; if ($dataContainer->activeRecord && !empty($this->layers[$dataContainer->activeRecord->type]['boundsMode'])) { foreach ($this->layers[$dataContainer->activeRecord->type]['boundsMode'] as $mode => $enabled) { @@ -413,7 +413,7 @@ class LayerDcaListener extends AbstractListener */ public function getIcons() { - $collection = IconModel::findAll(array('order' => 'title')); + $collection = IconModel::findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection( $collection, function ($model) { diff --git a/src/Listener/Dca/LeafletDcaListener.php b/src/Listener/Dca/LeafletDcaListener.php index d9f5126..704538d 100644 --- a/src/Listener/Dca/LeafletDcaListener.php +++ b/src/Listener/Dca/LeafletDcaListener.php @@ -100,8 +100,8 @@ class LeafletDcaListener */ public function getLayers() { - $options = array(); - $collection = LayerModel::findBy('pid', '0', array('order' => 'title')); + $options = []; + $collection = LayerModel::findBy('pid', '0', ['order' => 'title']); if ($collection) { foreach ($collection as $model) { diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php index acc2c47..e6fa765 100644 --- a/src/Listener/Dca/MapDcaListener.php +++ b/src/Listener/Dca/MapDcaListener.php @@ -90,7 +90,7 @@ class MapDcaListener extends AbstractListener public function saveLayerRelations($layerId, $dataContainer) { $new = array_filter(StringUtil::deserialize($layerId, true)); - $values = array(); + $values = []; $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting'); $statement->bindValue('mid', $dataContainer->id); @@ -108,7 +108,7 @@ class MapDcaListener extends AbstractListener 'tstamp' => time(), 'lid' => $layerId, 'mid' => $dataContainer->id, - 'sorting' => $sorting + 'sorting' => $sorting, ]; $this->connection->insert('tl_leaflet_map_layer', $data); diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php index 4fa565b..0ecb3f3 100644 --- a/src/Listener/Dca/MarkerDcaListener.php +++ b/src/Listener/Dca/MarkerDcaListener.php @@ -71,7 +71,7 @@ class MarkerDcaListener */ public function getIcons() { - $collection = IconModel::findAll(array('order' => 'title')); + $collection = IconModel::findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection( $collection, function ($model) { @@ -89,7 +89,7 @@ class MarkerDcaListener */ public function getPopups() { - $collection = PopupModel::findAll(array('order' => 'title')); + $collection = PopupModel::findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection($collection, 'title'); return $builder->getOptions(); @@ -105,11 +105,11 @@ class MarkerDcaListener */ public function saveCoordinates($value, $dataContainer) { - $combined = array( + $combined = [ 'latitude' => null, 'longitude' => null, - 'altitude' => null - ); + 'altitude' => null, + ]; $values = trimsplit(',', $value); $keys = array_keys($combined); diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php index a8aec5d..d9a99bd 100644 --- a/src/Listener/Dca/VectorDcaListener.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -86,7 +86,7 @@ class VectorDcaListener extends AbstractListener */ public function getStyles() { - $collection = StyleModel::findAll(array('order' => 'title')); + $collection = StyleModel::findAll(['order' => 'title']); return OptionsBuilder::fromCollection($collection, 'title')->getOptions(); } @@ -98,7 +98,7 @@ class VectorDcaListener extends AbstractListener */ public function getIcons() { - $collection = IconModel::findAll(array('order' => 'title')); + $collection = IconModel::findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection( $collection, function ($model) { @@ -116,7 +116,7 @@ class VectorDcaListener extends AbstractListener */ public function getPopups() { - $collection = PopupModel::findAll(array('order' => 'title')); + $collection = PopupModel::findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection($collection, 'title'); return $builder->getOptions(); diff --git a/src/Listener/GeoJsonListener.php b/src/Listener/GeoJsonListener.php index c1f26f1..3719ea2 100644 --- a/src/Listener/GeoJsonListener.php +++ b/src/Listener/GeoJsonListener.php @@ -123,7 +123,7 @@ final class GeoJsonListener public function enrichCircle(GeoJsonObject $feature, LeafletDefinition $definition) { if ($definition instanceof Circle && !$definition instanceof CircleMarker && $feature instanceof Feature) { - $feature->setProperty('arguments', array($definition->getLatLng(), $definition->getRadius())); + $feature->setProperty('arguments', [$definition->getLatLng(), $definition->getRadius()]); } } @@ -186,7 +186,7 @@ final class GeoJsonListener if ($collection) { $value = $collection->fetchEach('path'); } else { - $value = array(); + $value = []; } break; diff --git a/src/Listener/HashSubscriber.php b/src/Listener/HashSubscriber.php index bd4a9a8..ba375c0 100644 --- a/src/Listener/HashSubscriber.php +++ b/src/Listener/HashSubscriber.php @@ -27,12 +27,12 @@ class HashSubscriber implements EventSubscriberInterface */ public static function getSubscribedEvents() { - return array( - GetHashEvent::NAME => array( - array('getModelHash'), - array('getFallback', -100) - ) - ); + return [ + GetHashEvent::NAME => [ + ['getModelHash'], + ['getFallback', -100], + ], + ]; } /** diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 652bf14..21c7a05 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -127,12 +127,12 @@ class LoadAssetsListener $assets = $this->libraries[$library]; if (!empty($assets['css'])) { - list ($source, $type) = (array)$assets['css']; + list ($source, $type) = (array) $assets['css']; $this->assets->addStylesheet($source, $type ?: Assets::TYPE_FILE); } if (!empty($assets['javascript'])) { - list ($source, $type) = (array)$assets['javascript']; + list ($source, $type) = (array) $assets['javascript']; $this->assets->addJavascript($source, $type ?: Assets::TYPE_FILE); } } diff --git a/src/MapProvider.php b/src/MapProvider.php index 483ee32..2fd944d 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -201,8 +201,8 @@ class MapProvider $this->cache->save( $cacheKey, [ - 'assets' => $this->assets->toArray(), - 'javascript' => $buffer + 'assets' => $this->assets->toArray(), + 'javascript' => $buffer, ], (int) $model->cacheLifeTime ); @@ -279,7 +279,7 @@ class MapProvider throw new \RuntimeException('Bad request. Could not resolve query params'); } - $data = array_combine(array('for', 'type', 'id', 'format', 'filter', 'values'), $data); + $data = array_combine(['for', 'type', 'id', 'format', 'filter', 'values'], $data); $data = array_filter($data); if (empty($data['for']) || $data['for'] != $identifier) { diff --git a/src/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php index 308418c..511da9d 100644 --- a/src/Mapper/AbstractMapper.php +++ b/src/Mapper/AbstractMapper.php @@ -156,9 +156,9 @@ abstract class AbstractMapper implements Mapper Request $request = null, $elementId = null ) { - return array( - $this->getElementId($model, $elementId) - ); + return [ + $this->getElementId($model, $elementId), + ]; } /** diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php index 6ef2b0e..f9222be 100644 --- a/src/Mapper/Control/LayersControlMapper.php +++ b/src/Mapper/Control/LayersControlMapper.php @@ -49,8 +49,8 @@ class LayersControlMapper extends AbstractControlMapper $elementId = null ) { $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); - $arguments[1] = array(); - $arguments[2] = array(); + $arguments[1] = []; + $arguments[2] = []; /** @var ControlModel $model */ $collection = $model->findActiveLayers(); diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php index f6a2986..8466a0e 100644 --- a/src/Mapper/Control/LoadingControlMapper.php +++ b/src/Mapper/Control/LoadingControlMapper.php @@ -80,8 +80,8 @@ class LoadingControlMapper extends AbstractControlMapper if ($definition instanceof LoadingControl && !$definition->isSeparate() && $model->zoomControl) { // Only assign if zoom control is activated and part of the map. $control = ControlModel::findOneBy( - array('active=1', 'type=?', 'pid=?', 'id=?'), - array('zoom', $model->pid, $model->zoomControl) + ['active=1', 'type=?', 'pid=?', 'id=?'], + ['zoom', $model->pid, $model->zoomControl] ); if ($control) { diff --git a/src/Mapper/DefinitionMapper.php b/src/Mapper/DefinitionMapper.php index e3e544f..331e4fe 100644 --- a/src/Mapper/DefinitionMapper.php +++ b/src/Mapper/DefinitionMapper.php @@ -34,7 +34,7 @@ class DefinitionMapper * * @var Mapper[][] */ - private $mappers = array(); + private $mappers = []; /** * The event dispatcher. @@ -48,7 +48,7 @@ class DefinitionMapper * * @var array */ - private $mapped = array(); + private $mapped = []; /** * Construct. @@ -84,7 +84,7 @@ class DefinitionMapper */ public function reset() { - $this->mapped = array(); + $this->mapped = []; return $this; } diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php index 8292aa2..2c6d67e 100644 --- a/src/Mapper/Layer/GroupLayerMapper.php +++ b/src/Mapper/Layer/GroupLayerMapper.php @@ -62,9 +62,9 @@ class GroupLayerMapper extends AbstractLayerMapper } $collection = LayerModel::findBy( - array('pid=?', 'active=1'), - array($model->id), - array('order' => 'sorting') + ['pid=?', 'active=1'], + [$model->id], + ['order' => 'sorting'] ); if ($collection) { diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index b5ca318..f4a0e54 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -108,9 +108,9 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper } $collection = LayerModel::findBy( - array('pid=?', 'active=1'), - array($model->id), - array('order' => 'sorting') + ['pid=?', 'active=1'], + [$model->id], + ['order' => 'sorting'] ); if ($collection) { diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index 5bea0ea..34d8652 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -71,18 +71,18 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper $layer->setOption('boundsMode', $model->boundsMode); } - return array( + return [ $this->getElementId($model, $elementId), RequestUrl::create($model->id, null, null, $request), - array(), - $layer - ); + [], + $layer, + ]; } - return array( + return [ $this->getElementId($model, $elementId), - RequestUrl::create($model->id, null, null, $request) - ); + RequestUrl::create($model->id, null, null, $request), + ]; } return parent::buildConstructArguments($model, $mapper, $request, $elementId); diff --git a/src/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php index 7a98417..4b52a5d 100644 --- a/src/Mapper/Layer/ProviderLayerMapper.php +++ b/src/Mapper/Layer/ProviderLayerMapper.php @@ -92,10 +92,10 @@ class ProviderLayerMapper extends AbstractLayerMapper Request $request = null, $elementId = null ) { - return array( + return [ $model->alias ?: ('layer_' . $model->id), $model->tile_provider, - $model->tile_provider_variant ?: null - ); + $model->tile_provider_variant ?: null, + ]; } } diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index ab79f4f..879b6fc 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -61,7 +61,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper $elementId = null ) { if ($model->deferred) { - $options = array(); + $options = []; if ($model->pointToLayer) { $options['pointToLayer'] = new Expression($model->pointToLayer); @@ -79,18 +79,18 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper $layer = new GeoJson($this->getElementId($model, $elementId)); $layer->setOptions($options); - return array( + return [ $this->getElementId($model, $elementId), RequestUrl::create($model->id, null, null, $request), - array(), - $layer - ); + [], + $layer, + ]; } - return array( + return [ $this->getElementId($model, $elementId), - RequestUrl::create($model->id, null, null, $request) - ); + RequestUrl::create($model->id, null, null, $request), + ]; } return parent::buildConstructArguments($model, $mapper, $request, $elementId); diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 05eb513..5ab4f04 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -50,8 +50,8 @@ class MapMapper extends AbstractMapper ->addOptions('center', 'zoom', 'zoomControl') ->addOptions('dragging', 'touchZoom', 'scrollWheelZoom', 'doubleClickZoom', 'boxZoom', 'tap', 'keyboard') ->addOptions('trackResize', 'closeOnClick', 'bounceAtZoomLimits') - ->addConditionalOptions('adjustZoomExtra', array('minZoom', 'maxZoom', 'zoomSnap', 'zoomDelta')) - ->addConditionalOptions('keyboard', array('keyboardPanOffset', 'keyboardZoomOffset')); + ->addConditionalOptions('adjustZoomExtra', ['minZoom', 'maxZoom', 'zoomSnap', 'zoomDelta']) + ->addConditionalOptions('keyboard', ['keyboardPanOffset', 'keyboardZoomOffset']); } /** @@ -82,10 +82,10 @@ class MapMapper extends AbstractMapper Request $request = null, $elementId = null ) { - return array( + return [ $this->getElementId($model, $elementId), - $this->getElementId($model, $elementId) - ); + $this->getElementId($model, $elementId), + ]; } /** @@ -121,7 +121,7 @@ class MapMapper extends AbstractMapper */ private function buildControls(Map $map, MapModel $model, DefinitionMapper $mapper, Request $request = null) { - $collection = ControlModel::findActiveBy('pid', $model->id, array('order' => 'sorting')); + $collection = ControlModel::findActiveBy('pid', $model->id, ['order' => 'sorting']); if (!$collection) { return; @@ -207,13 +207,13 @@ class MapMapper extends AbstractMapper private function buildLocate(Map $map, MapModel $model) { if ($model->locate) { - $options = array(); + $options = []; - $mapping = array( + $mapping = [ 'setView' => 'locateSetView', 'watch' => 'locateWatch', 'enableHighAccuracy' => 'enableHighAccuracy', - ); + ]; foreach ($mapping as $option => $property) { if ($model->$property) { @@ -221,11 +221,11 @@ class MapMapper extends AbstractMapper } } - $mapping = array( + $mapping = [ 'maxZoom' => 'locateMaxZoom', 'timeout' => 'locateTimeout', 'maximumAge' => 'locateMaximumAge', - ); + ]; foreach ($mapping as $option => $property) { if ($model->$property) { diff --git a/src/Mapper/OptionsBuilder.php b/src/Mapper/OptionsBuilder.php index 01522f4..c6b307b 100644 --- a/src/Mapper/OptionsBuilder.php +++ b/src/Mapper/OptionsBuilder.php @@ -9,6 +9,7 @@ * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE * @filesource */ + namespace Netzmacht\Contao\Leaflet\Mapper; use Contao\Model; @@ -30,14 +31,14 @@ class OptionsBuilder * * @var array */ - private $options = array(); + private $options = []; /** * Conditional option mapping. * * @var array */ - private $conditional = array(); + private $conditional = []; /** * Add a option mapping. @@ -253,7 +254,7 @@ class OptionsBuilder */ private static function getDefaultOption($option, $definition) { - $keys = array('has', 'is', 'get'); + $keys = ['has', 'is', 'get']; $suffix = ucfirst($option); foreach ($keys as $key) { diff --git a/src/Mapper/Style/FixedStyleMapper.php b/src/Mapper/Style/FixedStyleMapper.php index 16ad970..5441374 100644 --- a/src/Mapper/Style/FixedStyleMapper.php +++ b/src/Mapper/Style/FixedStyleMapper.php @@ -48,7 +48,7 @@ class FixedStyleMapper extends AbstractStyleMapper ->addConditionalOption('lineCap') ->addConditionalOption('lineJoin') ->addConditionalOption('dashArray') - ->addConditionalOptions('fill', array('fillColor', 'fillOpacity')) + ->addConditionalOptions('fill', ['fillColor', 'fillOpacity']) ->addOption('fill'); } } diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index 134b1e9..f312b13 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -95,14 +95,14 @@ class ImageIconMapper extends AbstractIconMapper $definition->setIconUrl($file->path); $file = new \File($file->path); - $definition->setIconSize(array($file->width, $file->height)); + $definition->setIconSize([$file->width, $file->height]); if (!$model->iconAnchor) { - $definition->setIconAnchor(array($file->width / 2, $file->height)); + $definition->setIconAnchor([($file->width / 2), $file->height]); } if (!$model->popupAnchor) { - $definition->setPopupAnchor(array(0, 8 - $file->height)); + $definition->setPopupAnchor([0, (8 - $file->height)]); } } } @@ -137,10 +137,10 @@ class ImageIconMapper extends AbstractIconMapper $definition->setShadowUrl($file->path); $file = new \File($file->path); - $definition->setShadowSize(array($file->width, $file->height)); + $definition->setShadowSize([$file->width, $file->height]); if (!$model->shadowAnchor) { - $definition->setShadowAnchor(array($file->width / 2, $file->height)); + $definition->setShadowAnchor([($file->width / 2), $file->height]); } } } diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php index 20a37b7..ba2ff2b 100644 --- a/src/Mapper/UI/MarkerMapper.php +++ b/src/Mapper/UI/MarkerMapper.php @@ -75,7 +75,7 @@ class MarkerMapper extends AbstractMapper $elementId = null ) { $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); - $arguments[] = array($model->latitude, $model->longitude, $model->altitude ?: null) ?: null; + $arguments[] = [$model->latitude, $model->longitude, $model->altitude ?: null] ?: null; return $arguments; } @@ -124,9 +124,9 @@ class MarkerMapper extends AbstractMapper if ($model->customIcon) { $iconModel = IconModel::findBy( - array('id=?', 'active=1'), - array($model->icon), - array('return' => 'Model') + ['id=?', 'active=1'], + [$model->icon], + ['return' => 'Model'] ); if ($iconModel) { diff --git a/src/Model/AbstractActiveModel.php b/src/Model/AbstractActiveModel.php index a9aaf75..c1b39cf 100644 --- a/src/Model/AbstractActiveModel.php +++ b/src/Model/AbstractActiveModel.php @@ -29,7 +29,7 @@ abstract class AbstractActiveModel extends \Model * * @return \Model|null */ - public static function findActiveByPK($modelId, $options = array()) + public static function findActiveByPK($modelId, $options = []) { return static::findOneBy('active=1 AND id', $modelId, $options); } @@ -43,7 +43,7 @@ abstract class AbstractActiveModel extends \Model * * @return Collection|null */ - public static function findActiveBy($column, $value, $options = array()) + public static function findActiveBy($column, $value, $options = []) { if (is_array($column)) { $column[] = 'active=1'; @@ -61,7 +61,7 @@ abstract class AbstractActiveModel extends \Model * * @return Collection|null */ - public static function findActives($options = array()) + public static function findActives($options = []) { return static::findBy('active', '1', $options); } diff --git a/src/Model/LayerModel.php b/src/Model/LayerModel.php index 1d09d95..7164d09 100644 --- a/src/Model/LayerModel.php +++ b/src/Model/LayerModel.php @@ -42,18 +42,18 @@ class LayerModel extends AbstractActiveModel * * @return Collection|null */ - public static function findMultipleByTypes(array $types, $options = array()) + public static function findMultipleByTypes(array $types, $options = []) { if (empty($types)) { return null; } - $options['column'] = array( + $options['column'] = [ sprintf( 'type IN (%s)', substr(str_repeat('?,', count($types)), 0, -1) - ) - ); + ), + ]; $options['value'] = $types; $options['return'] = 'Collection'; diff --git a/src/Model/MarkerModel.php b/src/Model/MarkerModel.php index 9a91110..860bdd2 100644 --- a/src/Model/MarkerModel.php +++ b/src/Model/MarkerModel.php @@ -41,7 +41,7 @@ class MarkerModel extends AbstractActiveModel public static function findByFilter($pid, Filter $filter = null) { if (!$filter) { - return static::findActiveBy('pid', $pid, array('order' => 'sorting')); + return static::findActiveBy('pid', $pid, ['order' => 'sorting']); } switch ($filter->getName()) { @@ -63,23 +63,23 @@ class MarkerModel extends AbstractActiveModel */ public static function findByBBoxFilter($pid, BboxFilter $filter) { - $columns = array( + $columns = [ 'active=1', 'pid=?', 'latitude > ? AND latitude < ?', - 'longitude > ? AND longitude < ?' - ); + 'longitude > ? AND longitude < ?', + ]; /** @var LatLngBounds $bounds */ $bounds = $filter->getValues()['bounds']; - $values = array( + $values = [ $pid, $bounds->getSouthWest()->getLatitude(), $bounds->getNorthEast()->getLatitude(), $bounds->getSouthWest()->getLongitude(), - $bounds->getNorthEast()->getLongitude() - ); + $bounds->getNorthEast()->getLongitude(), + ]; - return static::findBy($columns, $values, array('order' => 'sorting')); + return static::findBy($columns, $values, ['order' => 'sorting']); } } From 60306459d291f28b11bbcabaf7fdde6c2996e6e0 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 18:18:33 +0200 Subject: [PATCH 123/152] Add the file path to the layer label. --- .../Label/Layer/FileLabelRenderer.php | 48 +++++++++++++++++++ src/Bundle/Resources/config/layers.yml | 5 ++ 2 files changed, 53 insertions(+) create mode 100644 src/Backend/Renderer/Label/Layer/FileLabelRenderer.php diff --git a/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php b/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php new file mode 100644 index 0000000..6c2256a --- /dev/null +++ b/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php @@ -0,0 +1,48 @@ + + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +declare(strict_types=1); + +namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; + +use Contao\FilesModel; +use Symfony\Component\Translation\TranslatorInterface as Translator; + +/** + * Class FileLabelRenderer + * + * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer + */ +class FileLabelRenderer extends AbstractLabelRenderer +{ + /** + * {@inheritDoc} + */ + protected function getLayerType(): string + { + return 'file'; + } + + /** + * {@inheritDoc} + */ + public function render(array $row, string $label, Translator $translator): string + { + $file = FilesModel::findByPk($row['file']); + + if ($file) { + $label .= ' (' . $file->path . ')'; + } + + return $label; + } +} diff --git a/src/Bundle/Resources/config/layers.yml b/src/Bundle/Resources/config/layers.yml index 6a36bf1..ce7f93f 100644 --- a/src/Bundle/Resources/config/layers.yml +++ b/src/Bundle/Resources/config/layers.yml @@ -84,3 +84,8 @@ services: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\VectorsLabelRenderer tags: - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } + + netzmacht.contao_leaflet.layer_label_renderer.file: + class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\FileLabelRenderer + tags: + - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } From 5501887231b28ca5dccd8be10745f321466d11f5 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 08:27:49 +0200 Subject: [PATCH 124/152] Refactor the factories so that they don't use the container. --- src/Bundle/Resources/config/services.yml | 12 ++- .../ContentElement/MapElementFactory.php | 72 ++++++++++++++---- src/Frontend/Module/MapModuleFactory.php | 74 +++++++++++++++---- 3 files changed, 129 insertions(+), 29 deletions(-) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index c4e6fc3..3188b87 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -83,7 +83,11 @@ services: netzmacht.contao_leaflet.frontend.element_factory: class: Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElementFactory arguments: - - '@service_container' + - '@templating' + - '@translator' + - '@netzmacht.contao_leaflet.map.provider' + - '@netzmacht.contao_toolkit.contao.input_adapter' + - '@netzmacht.contao_toolkit.contao.config_adapter' tags: - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'includes' } @@ -91,7 +95,11 @@ services: netzmacht.contao_leaflet.frontend.module_factory: class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory arguments: - - '@service_container' + - '@templating' + - '@translator' + - '@netzmacht.contao_leaflet.map.provider' + - '@netzmacht.contao_toolkit.contao.input_adapter' + - '@netzmacht.contao_toolkit.contao.config_adapter' tags: - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: 'includes' } diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index 55de776..674def9 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -14,9 +14,14 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\ContentElement; +use Contao\Config; +use Contao\CoreBundle\Framework\Adapter; +use Contao\Input; +use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; -use Psr\Container\ContainerInterface as Container; +use Symfony\Component\Templating\EngineInterface as TemplateEngine; +use Symfony\Component\Translation\TranslatorInterface as Translator; /** * Class MapElementFactory @@ -26,20 +31,61 @@ use Psr\Container\ContainerInterface as Container; class MapElementFactory implements ComponentFactory { /** - * Dependency container. + * Template engine. * - * @var Container + * @var TemplateEngine */ - private $container; + private $templating; + + /** + * Translator. + * + * @var Translator + */ + private $translator; + + /** + * Map provider. + * + * @var MapProvider + */ + private $mapProvider; + + /** + * Input adapter. + * + * @var Input|Adapter + */ + private $input; + + /** + * Config adapter. + * + * @var Config|Adapter + */ + private $config; /** * MapElementFactory constructor. * - * @param Container $container Dependency container. + * @param TemplateEngine $engine Template engine. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param Input|Adapter $input Input adapter. + * @param Config|Adapter $config Config adapter. */ - public function __construct(Container $container) - { - $this->container = $container; + public function __construct( + TemplateEngine $engine, + Translator $translator, + MapProvider $mapProvider, + $input, + $config + ) { + $this->templating = $engine; + $this->translator = $translator; + $this->mapProvider = $mapProvider; + $this->input = $input; + $this->config = $config; } /** @@ -57,11 +103,11 @@ class MapElementFactory implements ComponentFactory { return new MapElement( $model, - $this->container->get('templating'), - $this->container->get('translator'), - $this->container->get('netzmacht.contao_leaflet.map.provider'), - $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'), - $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'), + $this->templating, + $this->translator, + $this->mapProvider, + $this->input, + $this->config, $column ); } diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index 2ff69ba..4c0f809 100644 --- a/src/Frontend/Module/MapModuleFactory.php +++ b/src/Frontend/Module/MapModuleFactory.php @@ -14,9 +14,14 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\Module; +use Contao\Config; +use Contao\CoreBundle\Framework\Adapter; +use Contao\Input; +use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; -use Psr\Container\ContainerInterface as Container; +use Symfony\Component\Templating\EngineInterface as TemplateEngine; +use Symfony\Component\Translation\TranslatorInterface as Translator; /** * Class MapElementFactory @@ -26,20 +31,61 @@ use Psr\Container\ContainerInterface as Container; class MapModuleFactory implements ComponentFactory { /** - * Dependency container. + * Template engine. * - * @var Container + * @var TemplateEngine */ - private $container; + private $templating; /** - * MapModuleFactory constructor. + * Translator. * - * @param Container $container Dependency container. + * @var Translator */ - public function __construct(Container $container) - { - $this->container = $container; + private $translator; + + /** + * Map provider. + * + * @var MapProvider + */ + private $mapProvider; + + /** + * Input adapter. + * + * @var Input|Adapter + */ + private $input; + + /** + * Config adapter. + * + * @var Config|Adapter + */ + private $config; + + /** + * MapElementFactory constructor. + * + * @param TemplateEngine $engine Template engine. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param Input|Adapter $input Input adapter. + * @param Config|Adapter $config Config adapter. + */ + public function __construct( + TemplateEngine $engine, + Translator $translator, + MapProvider $mapProvider, + $input, + $config + ) { + $this->templating = $engine; + $this->translator = $translator; + $this->mapProvider = $mapProvider; + $this->input = $input; + $this->config = $config; } /** @@ -57,11 +103,11 @@ class MapModuleFactory implements ComponentFactory { return new MapModule( $model, - $this->container->get('templating'), - $this->container->get('translator'), - $this->container->get('netzmacht.contao_leaflet.map.provider'), - $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'), - $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'), + $this->templating, + $this->translator, + $this->mapProvider, + $this->input, + $this->config, $column ); } From edb4ac9eeb8f45d11a711e39852c448e735a568b Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 11:47:04 +0200 Subject: [PATCH 125/152] Support geojson and topojson as file types for the file layer. --- src/Bundle/Resources/config/config.yml | 7 +++ src/Bundle/Resources/config/listeners.yml | 1 + src/Bundle/Resources/contao/config/config.php | 4 ++ .../Resources/contao/dca/tl_leaflet_layer.php | 26 ++++++++- .../contao/languages/en/tl_leaflet_layer.php | 15 ++++- .../Resources/public/css/backend_hacks.css | 3 + src/Listener/Dca/LayerDcaListener.php | 56 ++++++++++++++++++- src/Mapper/Layer/FileLayerMapper.php | 18 ++++-- 8 files changed, 122 insertions(+), 8 deletions(-) create mode 100644 src/Bundle/Resources/public/css/backend_hacks.css diff --git a/src/Bundle/Resources/config/config.yml b/src/Bundle/Resources/config/config.yml index 41da04e..d912d2e 100644 --- a/src/Bundle/Resources/config/config.yml +++ b/src/Bundle/Resources/config/config.yml @@ -38,6 +38,13 @@ parameters: - 'circle' - 'circleMarker' + netzmacht.contao_leaflet.file_formats: + gpx: ['gpx'] + kml: ['kml'] + wkt: ['wkt'] + geojson: ['json', 'geojson'] + topojson: ['json', 'topojson'] + # When creating a GeoJSON feature of a map object a feature.properties.model object is passed. # Define the properties you always want to set. # diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index 89ba6f8..1d1a24e 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -39,6 +39,7 @@ services: - '%netzmacht.contao_leaflet.layers%' - '%netzmacht.contao_leaflet.providers%' - '%netzmacht.contao_leaflet.amenities%' + - '%netzmacht.contao_leaflet.file_formats%' netzmacht.contao_leaflet.listeners.dca.marker: class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index a823af9..1d1fba1 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -49,6 +49,10 @@ array_insert( ] ); +if (TL_MODE === 'BE') { + $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_hacks.css'; +} + /* * Models. */ diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index 836b266..c180cb8 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -219,7 +219,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], 'file extends default' => [ - '+config' => ['file', 'boundsMode'], + '+config' => ['boundsMode', 'fileFormat'], '+expert' => [ 'onEachFeature', 'pointToLayer', @@ -235,6 +235,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'MapBox' => ['tile_provider_key'], 'HERE' => ['tile_provider_key', 'tile_provider_code'], ], + 'fileFormat' => [ + '!' => ['file'] + ] ], 'metasubpalettes' => [ @@ -861,15 +864,34 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ ], 'sql' => 'mediumtext NULL', ], + 'fileFormat' => [ + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'], + 'exclude' => true, + 'inputType' => 'select', + 'filter' => true, + 'eval' => [ + 'mandatory' => true, + 'tl_class' => 'w50', + 'includeBlankOption' => true, + 'submitOnChange' => true, + 'chosen' => true, + 'helpwizard' => true, + ], + 'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getFileFormats'], + 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats'], + 'sql' => "varchar(32) NOT NULL default ''", + ], 'file' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'], 'exclude' => true, 'inputType' => 'fileTree', + 'load_callback' => [ + ['netzmacht.contao_leaflet.listeners.dca.layer', 'prepareFileWidget'], + ], 'eval' => [ 'filesOnly' => true, 'fieldType' => 'radio', 'mandatory' => true, - 'extensions' => 'gpx,kml,wkt', 'tl_class' => 'clr', ], 'sql' => 'binary(16) NULL', diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php index 8f0f70d..19935ee 100644 --- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php @@ -145,14 +145,27 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'][0] = 'Amen $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'][1] = 'OSM amenity.'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'][1] = 'Icon'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'][0] = 'Icon style'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'][0] = 'File formats'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'][1] = 'Choose which file format is used.'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['file'][0] = 'File'; -$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'][1] = 'Choose a file containing geodata. Supported formats are gpx,kml and wkt.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'][1] = 'Choose a file containing geodata. Supported formats are: %s.'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][0] = 'Layer group'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][1] = 'Basic layer group.
See http://leafletjs.com/reference.html#layergroup'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['feature'][0] = 'Feature group'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['feature'][1] = 'Extended layer group with events and popup support.
See http://leafletjs.com/reference.html#featuregroup'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['gpx'][0] = 'GPX'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['gpx'][1] = 'GPS Exchange format. Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['kml'][0] = 'KML'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['kml'][1] = 'Keyhole Markup Language. Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['wkt'][0] = 'WKT'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['wkt'][1] = 'Well-known text Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['topojson'][0] = 'TopoJSON'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['topojson'][1] = 'TopoJSON is a topological geospatial data interchange format based on GeoJSON. Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['geojson'][0] = 'GeoJSON'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['geojson'][1] = 'GeoJSON is a format for encoding a variety of geographic data structures. Read the documentation for more information.'; + $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteinto'][1] = 'Paste into layer %s'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteafter'][1] = 'Paste after layer %s'; diff --git a/src/Bundle/Resources/public/css/backend_hacks.css b/src/Bundle/Resources/public/css/backend_hacks.css new file mode 100644 index 0000000..c30f35c --- /dev/null +++ b/src/Bundle/Resources/public/css/backend_hacks.css @@ -0,0 +1,3 @@ +.tl_help_table a { + color: #77ac45 +} diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 23a2d6d..1085496 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -13,6 +13,7 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\Controller; +use Contao\DataContainer; use Contao\Image; use Contao\RequestToken; use Contao\StringUtil; @@ -81,6 +82,13 @@ class LayerDcaListener extends AbstractListener */ private $labelRenderer; + /** + * File formats. + * + * @var array + */ + private $fileFormats; + /** * Construct. * @@ -91,6 +99,7 @@ class LayerDcaListener extends AbstractListener * @param array $layers Leaflet layer configuration. * @param array $tileProviders Tile providers. * @param array $amenities OSM amenities. + * @param array $fileFormats File formats. */ public function __construct( Manager $manager, @@ -99,7 +108,8 @@ class LayerDcaListener extends AbstractListener LayerLabelRenderer $labelRenderer, array $layers, array $tileProviders, - array $amenities + array $amenities, + array $fileFormats ) { parent::__construct($manager); @@ -111,6 +121,7 @@ class LayerDcaListener extends AbstractListener $this->translator = $translator; $this->amenities = $amenities; $this->labelRenderer = $labelRenderer; + $this->fileFormats = $fileFormats; } /** @@ -424,6 +435,49 @@ class LayerDcaListener extends AbstractListener return $builder->getOptions(); } + /** + * Get the file formats. + * + * @return array + */ + public function getFileFormats(): array + { + return array_keys($this->fileFormats); + } + + /** + * Prepare the file widget. + * + * @param mixed $value Given value. + * @param DataContainer $dataContainer Data container driver. + * + * @return mixed + */ + public function prepareFileWidget($value, $dataContainer) + { + if ($dataContainer->activeRecord) { + $fileFormat = $dataContainer->activeRecord->fileFormat; + + if (isset($this->fileFormats[$fileFormat])) { + $definition = $this->getDefinition(); + $definition->set( + ['fields', $dataContainer->field, 'eval', 'extensions'], + implode(',', $this->fileFormats[$fileFormat]) + ); + + $definition->set( + ['fields', $dataContainer->field, 'label', 1], + sprintf( + $definition->get(['fields', $dataContainer->field, 'label', 1]), + implode(', ', $this->fileFormats[$fileFormat]) + ) + ); + } + } + + return $value; + } + /** * Generate a button. * diff --git a/src/Mapper/Layer/FileLayerMapper.php b/src/Mapper/Layer/FileLayerMapper.php index f54d8ad..efd2508 100644 --- a/src/Mapper/Layer/FileLayerMapper.php +++ b/src/Mapper/Layer/FileLayerMapper.php @@ -22,9 +22,11 @@ use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\FeatureGroup; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; +use Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson as OmnivoreGeoJson; use Netzmacht\LeafletPHP\Plugins\Omnivore\Gpx; use Netzmacht\LeafletPHP\Plugins\Omnivore\Kml; use Netzmacht\LeafletPHP\Plugins\Omnivore\OmnivoreLayer; +use Netzmacht\LeafletPHP\Plugins\Omnivore\TopoJson; use Netzmacht\LeafletPHP\Plugins\Omnivore\Wkt; /** @@ -80,17 +82,25 @@ class FileLayerMapper extends AbstractLayerMapper $layerId = $this->getElementId($model, $elementId); if ($fileModel instanceof FilesModel && $fileModel->type === 'file') { - switch ($fileModel->extension) { + switch ($model->fileFormat) { case 'gpx': - $layer = new Gpx($layerId, $fileModel->path, []); + $layer = new Gpx($layerId, $fileModel->path); break; case 'kml': - $layer = new Kml($layerId, $fileModel->path, []); + $layer = new Kml($layerId, $fileModel->path); break; case 'wkt': - $layer = new Wkt($layerId, $fileModel->path, []); + $layer = new Wkt($layerId, $fileModel->path); + break; + + case 'geojson': + $layer = new OmnivoreGeoJson($layerId, $fileModel->path); + break; + + case 'topojson': + $layer = new TopoJson($layerId, $fileModel->path); break; default: From dd23d386eb49e9b83966223ddbfa2ef362dc82c4 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 15:30:24 +0200 Subject: [PATCH 126/152] Use latest Repository feature to replace static model calls. --- composer.json | 2 +- .../Label/Layer/FileLabelRenderer.php | 21 ++++++++++++++++- .../Label/Layer/MarkersLabelRenderer.php | 23 +++++++++++++++++-- .../Label/Layer/OverpassLabelRenderer.php | 2 +- .../Label/Layer/ReferenceLabelRenderer.php | 23 +++++++++++++++++-- .../Label/Layer/VectorsLabelRenderer.php | 23 +++++++++++++++++-- src/Bundle/Resources/config/layers.yml | 8 +++++++ 7 files changed, 93 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index c1962f9..093bc87 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "netzmacht/contao-leaflet-libraries": "^1.0", "netzmacht/php-javascript-builder": "^1.0", "netzmacht/php-leaflet": "^1.0.2", - "netzmacht/contao-toolkit": "^3.0@dev", + "netzmacht/contao-toolkit": "dev-hotfix/3.0.0-beta2", "contao-community-alliance/meta-palettes": "^1.5", "menatwork/contao-multicolumnwizard": "^3.2", "doctrine/cache": "^1.0" diff --git a/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php b/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php index 6c2256a..3c3a354 100644 --- a/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; use Contao\FilesModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Symfony\Component\Translation\TranslatorInterface as Translator; /** @@ -24,6 +25,23 @@ use Symfony\Component\Translation\TranslatorInterface as Translator; */ class FileLabelRenderer extends AbstractLabelRenderer { + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * FileLabelRenderer constructor. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + } + /** * {@inheritDoc} */ @@ -37,7 +55,8 @@ class FileLabelRenderer extends AbstractLabelRenderer */ public function render(array $row, string $label, Translator $translator): string { - $file = FilesModel::findByPk($row['file']); + $repository = $this->repositoryManager->getRepository(FilesModel::class); + $file = $repository->findByPk($row['file']); if ($file) { $label .= ' (' . $file->path . ')'; diff --git a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php index 442d9f0..319fb5d 100644 --- a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; use Netzmacht\Contao\Leaflet\Model\MarkerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Symfony\Component\Translation\TranslatorInterface as Translator; /** @@ -24,6 +25,23 @@ use Symfony\Component\Translation\TranslatorInterface as Translator; */ final class MarkersLabelRenderer extends AbstractLabelRenderer { + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * FileLabelRenderer constructor. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + } + /** * {@inheritdoc} */ @@ -37,8 +55,9 @@ final class MarkersLabelRenderer extends AbstractLabelRenderer */ public function render(array $row, string $label, Translator $translator): string { - $count = MarkerModel::countBy('pid', $row['id']); - $label .= sprintf( + $repository = $this->repositoryManager->getRepository(MarkerModel::class); + $count = $repository->countBy(['pid'], [$row['pid']]); + $label .= sprintf( ' (%s %s)', $count, $translator->trans('countEntries', [], 'contao_tl_leaflet_layer') diff --git a/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php b/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php index 4c291ad..f32f19a 100644 --- a/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php @@ -29,7 +29,7 @@ final class OverpassLabelRenderer extends AbstractLabelRenderer */ protected function getLayerType(): string { - return 'vectors'; + return 'overpass'; } /** diff --git a/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php b/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php index f7fbb6f..afb5497 100644 --- a/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Symfony\Component\Translation\TranslatorInterface as Translator; /** @@ -24,12 +25,29 @@ use Symfony\Component\Translation\TranslatorInterface as Translator; */ final class ReferenceLabelRenderer extends AbstractLabelRenderer { + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * FileLabelRenderer constructor. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + } + /** * {@inheritdoc} */ protected function getLayerType(): string { - return 'vectors'; + return 'reference'; } /** @@ -37,7 +55,8 @@ final class ReferenceLabelRenderer extends AbstractLabelRenderer */ public function render(array $row, string $label, Translator $translator): string { - $reference = LayerModel::findByPk($row['reference']); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $reference = $repository->find((int) $row['reference']); if ($reference) { $label .= ' (' . $reference->title . ')'; diff --git a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php index 01f96d1..57d6b48 100644 --- a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer; use Netzmacht\Contao\Leaflet\Model\VectorModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Symfony\Component\Translation\TranslatorInterface as Translator; /** @@ -24,6 +25,23 @@ use Symfony\Component\Translation\TranslatorInterface as Translator; */ final class VectorsLabelRenderer extends AbstractLabelRenderer { + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * FileLabelRenderer constructor. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + } + /** * {@inheritdoc} */ @@ -37,8 +55,9 @@ final class VectorsLabelRenderer extends AbstractLabelRenderer */ public function render(array $row, string $label, Translator $translator): string { - $count = VectorModel::countBy('pid', $row['id']); - $label .= sprintf( + $repository = $this->repositoryManager->getRepository(VectorModel::class); + $count = $repository->countBy(['pid'], [$row['id']]); + $label .= sprintf( ' (%s %s)', $count, $translator->trans('countEntries', [], 'contao_tl_leaflet_layer') diff --git a/src/Bundle/Resources/config/layers.yml b/src/Bundle/Resources/config/layers.yml index ce7f93f..c6dcc77 100644 --- a/src/Bundle/Resources/config/layers.yml +++ b/src/Bundle/Resources/config/layers.yml @@ -62,6 +62,8 @@ services: netzmacht.contao_leaflet.layer_label_renderer.markers: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\MarkersLabelRenderer + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } @@ -77,15 +79,21 @@ services: netzmacht.contao_leaflet.layer_label_renderer.reference: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ReferenceLabelRenderer + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } netzmacht.contao_leaflet.layer_label_renderer.vectors: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\VectorsLabelRenderer + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } netzmacht.contao_leaflet.layer_label_renderer.file: class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\FileLabelRenderer + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: 'netzmacht.contao_leaflet.layer_label_renderer' } From 0716354952ccb6c1a2fca5a48f9fdd9884c02838 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 16:26:27 +0200 Subject: [PATCH 127/152] Work on service oriented listeners. --- src/Bundle/Resources/config/listeners.yml | 9 ++ .../contao/dca/tl_leaflet_marker.php | 2 +- src/Listener/Dca/ControlDcaListener.php | 34 ++++++-- .../Dca/FrontendIntegrationListener.php | 32 +++++-- src/Listener/Dca/LayerDcaListener.php | 87 ++++++++++++------- src/Listener/Dca/LeafletDcaListener.php | 63 +++++++++++--- src/Listener/Dca/MapDcaListener.php | 25 ++++-- src/Listener/Dca/MarkerDcaListener.php | 26 +++--- src/Listener/Dca/VectorDcaListener.php | 43 ++++----- 9 files changed, 212 insertions(+), 109 deletions(-) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index 1d1a24e..e8b98fa 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -2,7 +2,10 @@ services: netzmacht.contao_leaflet.listeners.dca.leaflet: class: Netzmacht\Contao\Leaflet\Listener\Dca\LeafletDcaListener arguments: + - '@netzmacht.contao_toolkit.repository_manager' + - '@templating' - '@filesystem' + - '@netzmacht.contao_toolkit.contao.system_adapter' - '%netzmacht.contao_leaflet.cache_dir%' netzmacht.contao_leaflet.listeners.dca.validator: @@ -14,6 +17,7 @@ services: netzmacht.contao_leaflet.listeners.dca.frontend_integration: class: Netzmacht\Contao\Leaflet\Listener\Dca\FrontendIntegrationListener arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@translator' netzmacht.contao_leaflet.listeners.dca.map: @@ -21,6 +25,7 @@ services: arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' + - '@netzmacht.contao_toolkit.repository_manager' netzmacht.contao_leaflet.listeners.dca.control: class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener @@ -34,8 +39,10 @@ services: arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' + - '@netzmacht.contao_toolkit.repository_manager' - '@translator' - '@netzmacht.contao_leaflet.layer_label_renderer' + - '@netzmacht.contao_toolkit.contao.backend_adapter' - '%netzmacht.contao_leaflet.layers%' - '%netzmacht.contao_leaflet.providers%' - '%netzmacht.contao_leaflet.amenities%' @@ -45,11 +52,13 @@ services: class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener arguments: - '@database_connection' + - '@netzmacht.contao_toolkit.repository_manager' netzmacht.contao_leaflet.listeners.dca.vector: class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener arguments: - '@netzmacht.contao_toolkit.dca.manager' + - '@netzmacht.contao_toolkit.repository_manager' - '%netzmacht.contao_leaflet.vectors%' netzmacht.contao_leaflet.listeners.dca.icon: diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php index 6524efa..0b24991 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php @@ -23,7 +23,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [ ], ], 'onload_callback' => [ - ['netzmacht.contao_leaflet.listeners.dca.marker', 'initialize'], + ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'], ], 'onsubmit_callback' => [ ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'], diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index b490b8f..af820d5 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -16,6 +16,7 @@ use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Model\ControlModel; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; @@ -48,19 +49,32 @@ class ControlDcaListener extends AbstractListener */ private $types; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * Construct. * - * @param Manager $manager Data container manager. - * @param Connection $connection Database connection. - * @param array $types Control types. + * @param Manager $manager Data container manager. + * @param Connection $connection Database connection. + * @param RepositoryManager $repositoryManager Repository manager. + * @param array $types Control types. */ - public function __construct(Manager $manager, Connection $connection, array $types) - { + public function __construct( + Manager $manager, + Connection $connection, + RepositoryManager $repositoryManager, + array $types + ) { parent::__construct($manager); - $this->connection = $connection; - $this->types = $types; + $this->connection = $connection; + $this->types = $types; + $this->repositoryManager = $repositoryManager; } /** @@ -96,7 +110,8 @@ class ControlDcaListener extends AbstractListener */ public function getLayers() { - $collection = LayerModel::findAll(); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $collection = $repository->findAll(); return OptionsBuilder::fromCollection($collection, 'title') ->asTree() @@ -110,7 +125,8 @@ class ControlDcaListener extends AbstractListener */ public function getZoomControls() { - $collection = ControlModel::findBy('type', 'zoom', ['order' => 'title']); + $repository = $this->repositoryManager->getRepository(ControlModel::class); + $collection = $repository->findBy(['type=?'], ['zoom'], ['order' => 'title']); return OptionsBuilder::fromCollection($collection, 'title')->getOptions(); } diff --git a/src/Listener/Dca/FrontendIntegrationListener.php b/src/Listener/Dca/FrontendIntegrationListener.php index b47bc47..8a4f4c9 100644 --- a/src/Listener/Dca/FrontendIntegrationListener.php +++ b/src/Listener/Dca/FrontendIntegrationListener.php @@ -14,7 +14,11 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Listener\Dca; +use Contao\Image; +use Contao\RequestToken; +use Contao\StringUtil; use Netzmacht\Contao\Leaflet\Model\MapModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Symfony\Component\Translation\TranslatorInterface as Translator; @@ -32,14 +36,23 @@ final class FrontendIntegrationListener */ private $translator; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * FrontendIntegration constructor. * - * @param Translator $translator Translator. + * @param RepositoryManager $repositoryManager Repository manager. + * @param Translator $translator Translator. */ - public function __construct(Translator $translator) + public function __construct(RepositoryManager $repositoryManager, Translator $translator) { - $this->translator = $translator; + $this->translator = $translator; + $this->repositoryManager = $repositoryManager; } /** @@ -49,7 +62,8 @@ final class FrontendIntegrationListener */ public function getMaps(): array { - $collection = MapModel::findAll(); + $repository = $this->repositoryManager->getRepository(MapModel::class); + $collection = $repository->findAll(['order' => 'title']); return OptionsBuilder::fromCollection($collection, 'title')->getOptions(); } @@ -74,11 +88,13 @@ final class FrontendIntegrationListener '%s', 'contao/main.php?do=leaflet_map&table=tl_leaflet_map&act=edit&id=', $dataContainer->value, - \RequestToken::get(), + RequestToken::get(), sprintf( $pattern, - specialchars($this->translator->trans('editalias.1', [$dataContainer->value], 'contao_tl_content')), - specialchars( + StringUtil::specialchars( + $this->translator->trans('editalias.1', [$dataContainer->value], 'contao_tl_content') + ), + StringUtil::specialchars( str_replace( "'", "\\'", @@ -86,7 +102,7 @@ final class FrontendIntegrationListener ) ) ), - \Image::getHtml( + Image::getHtml( 'alias.gif', $this->translator->trans('editalias.0', [$dataContainer->value], 'contao_tl_content'), 'style="vertical-align:top"' diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 1085496..b0a8fde 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -12,15 +12,16 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Contao\Controller; +use Contao\Backend; +use Contao\CoreBundle\Framework\Adapter; use Contao\DataContainer; use Contao\Image; -use Contao\RequestToken; use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; @@ -54,6 +55,13 @@ class LayerDcaListener extends AbstractListener */ private $connection; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * Tile providers configuration. * @@ -89,23 +97,36 @@ class LayerDcaListener extends AbstractListener */ private $fileFormats; + /** + * Backend adapter. + * + * @var Backend|Adapter + */ + private $backendAdapter; + /** * Construct. * - * @param Manager $manager Data container manager. - * @param Connection $connection Database connection. - * @param Translator $translator Translator. - * @param LayerLabelRenderer $labelRenderer Layer label renderer. - * @param array $layers Leaflet layer configuration. - * @param array $tileProviders Tile providers. - * @param array $amenities OSM amenities. - * @param array $fileFormats File formats. + * @param Manager $manager Data container manager. + * @param Connection $connection Database connection. + * @param RepositoryManager $repositoryManager Repository manager. + * @param Translator $translator Translator. + * @param LayerLabelRenderer $labelRenderer Layer label renderer. + * @param Adapter|Backend $backendAdapter Backend adapter. + * @param array $layers Leaflet layer configuration. + * @param array $tileProviders Tile providers. + * @param array $amenities OSM amenities. + * @param array $fileFormats File formats. + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( Manager $manager, Connection $connection, + RepositoryManager $repositoryManager, Translator $translator, LayerLabelRenderer $labelRenderer, + $backendAdapter, array $layers, array $tileProviders, array $amenities, @@ -113,15 +134,15 @@ class LayerDcaListener extends AbstractListener ) { parent::__construct($manager); - Controller::loadLanguageFile('leaflet_layer'); - - $this->connection = $connection; - $this->layers = $layers; - $this->tileProviders = $tileProviders; - $this->translator = $translator; - $this->amenities = $amenities; - $this->labelRenderer = $labelRenderer; - $this->fileFormats = $fileFormats; + $this->connection = $connection; + $this->layers = $layers; + $this->tileProviders = $tileProviders; + $this->translator = $translator; + $this->amenities = $amenities; + $this->labelRenderer = $labelRenderer; + $this->fileFormats = $fileFormats; + $this->repositoryManager = $repositoryManager; + $this->backendAdapter = $backendAdapter; } /** @@ -216,7 +237,8 @@ class LayerDcaListener extends AbstractListener ) ); - $collection = LayerModel::findMultipleByTypes($types); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $collection = $repository->findMultipleByTypes($types); $builder = OptionsBuilder::fromCollection( $collection, 'id', @@ -243,43 +265,42 @@ class LayerDcaListener extends AbstractListener */ public function getPasteButtons($dataContainer, $row, $table, $whatever, $children) { - $pasteAfterUrl = \Controller::addToUrl( + $pasteAfterUrl = $this->backendAdapter->addToUrl( 'act=' . $children['mode'] . '&mode=1&pid=' . $row['id'] . (!is_array($children['id']) ? '&id=' . $children['id'] : '') - . '&rt=' . RequestToken::get() ); $buffer = sprintf( '%s ', $pasteAfterUrl, - specialchars($this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)), - \Image::getHtml( + StringUtil::specialchars($this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)), + Image::getHtml( 'pasteafter.gif', $this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table) ) ); if (!empty($this->layers[$row['type']]['children'])) { - $pasteIntoUrl = \Controller::addToUrl( + $pasteIntoUrl = $this->backendAdapter->addToUrl( sprintf( 'act=%s&mode=2&pid=%s%s', $children['mode'], $row['id'], !is_array($children['id']) ? '&id=' . $children['id'] : '' - ) . '&rt=' . RequestToken::get() + ) ); $buffer .= sprintf( '%s ', $pasteIntoUrl, - specialchars($this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)), - \Image::getHtml( + StringUtil::specialchars($this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)), + Image::getHtml( 'pasteinto.gif', $this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table) ) ); } elseif ($row['id'] > 0) { - $buffer .= \Image::getHtml('pasteinto_.gif'); + $buffer .= Image::getHtml('pasteinto_.gif'); } return $buffer; @@ -348,7 +369,7 @@ class LayerDcaListener extends AbstractListener $statement->bindValue('lid', $dataContainer->id); $statement->execute(); - $undo['data'] = deserialize($undo['data'], true); + $undo['data'] = StringUtil::deserialize($undo['data'], true); while ($row = $statement->fetch()) { $undo['data']['tl_leaflet_map_layer'][] = $row; @@ -400,7 +421,8 @@ class LayerDcaListener extends AbstractListener */ public function getLayers($dataContainer) { - $collection = LayerModel::findBy('id !', $dataContainer->id); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $collection = $repository->findBy(['tl_leaflet_layer.id!=?'], [$dataContainer->id]); return OptionsBuilder::fromCollection($collection, 'title') ->asTree() @@ -424,7 +446,8 @@ class LayerDcaListener extends AbstractListener */ public function getIcons() { - $collection = IconModel::findAll(['order' => 'title']); + $repository = $this->repositoryManager->getRepository(IconModel::class); + $collection = $repository->findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection( $collection, function ($model) { diff --git a/src/Listener/Dca/LeafletDcaListener.php b/src/Listener/Dca/LeafletDcaListener.php index 704538d..a8737ee 100644 --- a/src/Listener/Dca/LeafletDcaListener.php +++ b/src/Listener/Dca/LeafletDcaListener.php @@ -12,11 +12,14 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Contao\Controller; +use Contao\CoreBundle\Framework\Adapter; use Contao\DataContainer; +use Contao\System; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Value\LatLng; use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\Templating\EngineInterface as TemplateEngine; /** * Class Leaflet is the base helper providing different methods. @@ -39,16 +42,48 @@ class LeafletDcaListener */ private $cacheDir; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Template engine. + * + * @var TemplateEngine + */ + private $templateEngine; + + /** + * System adapter. + * + * @var Adapter|System + */ + private $systemAdapter; + /** * LeafletCallbacks constructor. * - * @param Filesystem $fileSystem File system. - * @param string $cacheDir Cache dir. + * @param RepositoryManager $repositoryManager Repository manager. + * @param TemplateEngine $templateEngine Template engine. + * @param Filesystem $fileSystem File system. + * @param Adapter|System $systemAdapter Contao system adapter. + * @param string $cacheDir Cache dir. */ - public function __construct(Filesystem $fileSystem, string $cacheDir) - { - $this->fileSystem = $fileSystem; - $this->cacheDir = $cacheDir; + public function __construct( + RepositoryManager $repositoryManager, + TemplateEngine $templateEngine, + Filesystem $fileSystem, + $systemAdapter, + string $cacheDir + ) { + $this->repositoryManager = $repositoryManager; + $this->templateEngine = $templateEngine; + $this->fileSystem = $fileSystem; + $this->systemAdapter = $systemAdapter; + $this->cacheDir = $cacheDir; } /** @@ -58,7 +93,7 @@ class LeafletDcaListener */ public function loadLanguageFile() { - Controller::loadLanguageFile('leaflet'); + $this->systemAdapter->loadLanguageFile('leaflet'); } /** @@ -80,17 +115,16 @@ class LeafletDcaListener */ public function getGeocoder($dataContainer) { - $template = new \BackendTemplate('be_leaflet_geocode'); - $template->field = 'ctrl_' . $dataContainer->field; + $data['field'] = 'ctrl_' . $dataContainer->field; try { - $latLng = LatLng::fromString($dataContainer->value); - $template->marker = json_encode($latLng); + $latLng = LatLng::fromString($dataContainer->value); + $data['marker'] = json_encode($latLng); } catch (\Exception $e) { // LatLng throws an exception of value could not be created. Just let the value empty when. } - return $template->parse(); + return $this->templateEngine->render('toolkit:be:be_leaflet_geocode.html5', $data); } /** @@ -101,7 +135,8 @@ class LeafletDcaListener public function getLayers() { $options = []; - $collection = LayerModel::findBy('pid', '0', ['order' => 'title']); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $collection = $repository->findBy(['pid=?'], ['0'], ['order' => 'title']); if ($collection) { foreach ($collection as $model) { diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php index e6fa765..2a4077e 100644 --- a/src/Listener/Dca/MapDcaListener.php +++ b/src/Listener/Dca/MapDcaListener.php @@ -18,6 +18,7 @@ use Contao\DataContainer; use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; @@ -44,17 +45,26 @@ class MapDcaListener extends AbstractListener */ private $connection; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * Construct. * - * @param Manager $manager Data container manager. - * @param Connection $connection Database connection. + * @param Manager $manager Data container manager. + * @param Connection $connection Database connection. + * @param RepositoryManager $repositoryManager Repository manager. */ - public function __construct(Manager $manager, Connection $connection) + public function __construct(Manager $manager, Connection $connection, RepositoryManager $repositoryManager) { parent::__construct($manager); - $this->connection = $connection; + $this->connection = $connection; + $this->repositoryManager = $repositoryManager; } /** @@ -150,13 +160,12 @@ class MapDcaListener extends AbstractListener /** * Get all layers except of the current layer. * - * @param DataContainer $dataContainer The dataContainer driver. - * * @return array */ - public function getLayers($dataContainer) + public function getLayers() { - $collection = LayerModel::findBy('id !', $dataContainer->id); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $collection = $repository->findAll(['order' => 'title']); return OptionsBuilder::fromCollection($collection, 'title') ->asTree() diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php index 0ecb3f3..916f7fa 100644 --- a/src/Listener/Dca/MarkerDcaListener.php +++ b/src/Listener/Dca/MarkerDcaListener.php @@ -16,6 +16,7 @@ use Contao\Controller; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; /** @@ -33,23 +34,22 @@ class MarkerDcaListener private $connection; /** - * MarkerDcaListener constructor. + * Repository manager. * - * @param Connection $connection Database connection. + * @var RepositoryManager */ - public function __construct(Connection $connection) - { - $this->connection = $connection; - } + private $repositoryManager; /** - * Initialize the language files. + * MarkerDcaListener constructor. * - * @return void + * @param Connection $connection Database connection. + * @param RepositoryManager $repositoryManager Repository manager. */ - public function initialize() + public function __construct(Connection $connection, RepositoryManager $repositoryManager) { - Controller::loadLanguageFile('leaflet'); + $this->connection = $connection; + $this->repositoryManager = $repositoryManager; } /** @@ -71,7 +71,8 @@ class MarkerDcaListener */ public function getIcons() { - $collection = IconModel::findAll(['order' => 'title']); + $repository = $this->repositoryManager->getRepository(IconModel::class); + $collection = $repository->findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection( $collection, function ($model) { @@ -89,7 +90,8 @@ class MarkerDcaListener */ public function getPopups() { - $collection = PopupModel::findAll(['order' => 'title']); + $repository = $this->repositoryManager->getRepository(PopupModel::class); + $collection = $repository->findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection($collection, 'title'); return $builder->getOptions(); diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php index d9a99bd..34f234d 100644 --- a/src/Listener/Dca/VectorDcaListener.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -12,9 +12,9 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; use Netzmacht\Contao\Leaflet\Model\StyleModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; @@ -40,17 +40,26 @@ class VectorDcaListener extends AbstractListener */ private $vectors; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * Construct. * - * @param Manager $dcaManager Data container manager. - * @param array $vectors Vectors. + * @param Manager $dcaManager Data container manager. + * @param RepositoryManager $repositoryManager Repository manager. + * @param array $vectors Vectors. */ - public function __construct(Manager $dcaManager, array $vectors) + public function __construct(Manager $dcaManager, RepositoryManager $repositoryManager, array $vectors) { parent::__construct($dcaManager); - $this->vectors = $vectors; + $this->vectors = $vectors; + $this->repositoryManager = $repositoryManager; } /** @@ -86,29 +95,12 @@ class VectorDcaListener extends AbstractListener */ public function getStyles() { - $collection = StyleModel::findAll(['order' => 'title']); + $repository = $this->repositoryManager->getRepository(StyleModel::class); + $collection = $repository->findAll(['order' => 'title']); return OptionsBuilder::fromCollection($collection, 'title')->getOptions(); } - /** - * Get all icons. - * - * @return array - */ - public function getIcons() - { - $collection = IconModel::findAll(['order' => 'title']); - $builder = OptionsBuilder::fromCollection( - $collection, - function ($model) { - return sprintf('%s [%s]', $model['title'], $model['type']); - } - ); - - return $builder->getOptions(); - } - /** * Get all popups. * @@ -116,7 +108,8 @@ class VectorDcaListener extends AbstractListener */ public function getPopups() { - $collection = PopupModel::findAll(['order' => 'title']); + $repository = $this->repositoryManager->getRepository(PopupModel::class); + $collection = $repository->findAll(['order' => 'title']); $builder = OptionsBuilder::fromCollection($collection, 'title'); return $builder->getOptions(); From 7741f444284498ea05c899f63d6e0a6ebd1cfcf1 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 16:36:12 +0200 Subject: [PATCH 128/152] Use the repository manager. --- src/Bundle/Resources/config/services.yml | 5 +- src/Frontend/AbstractMapHybrid.php | 32 ++++++------ .../ContentElement/MapElementFactory.php | 33 +++++++------ src/Frontend/Module/MapModuleFactory.php | 33 +++++++------ src/MapProvider.php | 49 ++++++++++++------- 5 files changed, 83 insertions(+), 69 deletions(-) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index 3188b87..7ddbe29 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -15,6 +15,7 @@ services: - '@netzmacht.contao_leaflet.map.assets' - '@netzmacht.contao_leaflet.cache' - '@netzmacht.contao_leaflet.frontend.data_controller' + - '@netzmacht.contao_toolkit.repository_manager' netzmacht.contao_leaflet.libraries: class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration @@ -86,8 +87,8 @@ services: - '@templating' - '@translator' - '@netzmacht.contao_leaflet.map.provider' + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_toolkit.contao.input_adapter' - - '@netzmacht.contao_toolkit.contao.config_adapter' tags: - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'includes' } @@ -98,8 +99,8 @@ services: - '@templating' - '@translator' - '@netzmacht.contao_leaflet.map.provider' + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_toolkit.contao.input_adapter' - - '@netzmacht.contao_toolkit.contao.config_adapter' tags: - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: 'includes' } diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index 27efb8d..4142b1f 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend; -use Contao\Config; use Contao\Database\Result; use Contao\Input; use Contao\Model; @@ -22,6 +21,7 @@ use Contao\Model\Collection; use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Symfony\Component\Templating\EngineInterface as TemplateEngine; use Symfony\Component\Translation\TranslatorInterface as Translator; @@ -42,42 +42,42 @@ abstract class AbstractMapHybrid extends AbstractHybrid /** * The user input. * - * @var \Input + * @var Input */ private $input; /** - * The Contao config. + * Repository manager. * - * @var \Config + * @var RepositoryManager */ - private $config; + private $repositoryManager; /** * HybridTrait constructor. * - * @param Result|Model|Collection $model Component model. - * @param TemplateEngine $templateEngine Template engine. - * @param Translator $translator Translator. - * @param MapProvider $mapProvider Map provider. - * @param Input $input Request Input. - * @param Config $config Config. - * @param string $column Column in which the element appears. + * @param Result|Model|Collection $model Component model. + * @param TemplateEngine $templateEngine Template engine. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param RepositoryManager $repositoryManager Repository manager. + * @param Input $input Request Input. + * @param string $column Column in which the element appears. */ public function __construct( $model, TemplateEngine $templateEngine, Translator $translator, MapProvider $mapProvider, + RepositoryManager $repositoryManager, $input, - $config, $column = null ) { parent::__construct($model, $templateEngine, $translator, $column); - $this->mapProvider = $mapProvider; - $this->input = $input; - $this->config = $config; + $this->mapProvider = $mapProvider; + $this->input = $input; + $this->repositoryManager = $repositoryManager; } /** diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index 674def9..6b8da7f 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -20,6 +20,7 @@ use Contao\Input; use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Symfony\Component\Templating\EngineInterface as TemplateEngine; use Symfony\Component\Translation\TranslatorInterface as Translator; @@ -59,33 +60,33 @@ class MapElementFactory implements ComponentFactory private $input; /** - * Config adapter. + * Repository manager. * - * @var Config|Adapter + * @var RepositoryManager */ - private $config; + private $repositoryManager; /** * MapElementFactory constructor. * - * @param TemplateEngine $engine Template engine. - * @param Translator $translator Translator. - * @param MapProvider $mapProvider Map provider. - * @param Input|Adapter $input Input adapter. - * @param Config|Adapter $config Config adapter. + * @param TemplateEngine $engine Template engine. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param RepositoryManager $repositoryManager Repository manager. + * @param Input|Adapter $input Input adapter. */ public function __construct( TemplateEngine $engine, Translator $translator, MapProvider $mapProvider, - $input, - $config + RepositoryManager $repositoryManager, + $input ) { - $this->templating = $engine; - $this->translator = $translator; - $this->mapProvider = $mapProvider; - $this->input = $input; - $this->config = $config; + $this->templating = $engine; + $this->translator = $translator; + $this->mapProvider = $mapProvider; + $this->input = $input; + $this->repositoryManager = $repositoryManager; } /** @@ -106,8 +107,8 @@ class MapElementFactory implements ComponentFactory $this->templating, $this->translator, $this->mapProvider, + $this->repositoryManager, $this->input, - $this->config, $column ); } diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index 4c0f809..53e255d 100644 --- a/src/Frontend/Module/MapModuleFactory.php +++ b/src/Frontend/Module/MapModuleFactory.php @@ -20,6 +20,7 @@ use Contao\Input; use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Symfony\Component\Templating\EngineInterface as TemplateEngine; use Symfony\Component\Translation\TranslatorInterface as Translator; @@ -59,33 +60,33 @@ class MapModuleFactory implements ComponentFactory private $input; /** - * Config adapter. + * Repository manager. * - * @var Config|Adapter + * @var RepositoryManager */ - private $config; + private $repositoryManager; /** * MapElementFactory constructor. * - * @param TemplateEngine $engine Template engine. - * @param Translator $translator Translator. - * @param MapProvider $mapProvider Map provider. - * @param Input|Adapter $input Input adapter. - * @param Config|Adapter $config Config adapter. + * @param TemplateEngine $engine Template engine. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param RepositoryManager $repositoryManager Repository manager. + * @param Input|Adapter $input Input adapter. */ public function __construct( TemplateEngine $engine, Translator $translator, MapProvider $mapProvider, - $input, - $config + RepositoryManager $repositoryManager, + $input ) { - $this->templating = $engine; - $this->translator = $translator; - $this->mapProvider = $mapProvider; - $this->input = $input; - $this->config = $config; + $this->templating = $engine; + $this->translator = $translator; + $this->mapProvider = $mapProvider; + $this->input = $input; + $this->repositoryManager = $repositoryManager; } /** @@ -106,8 +107,8 @@ class MapModuleFactory implements ComponentFactory $this->templating, $this->translator, $this->mapProvider, + $this->repositoryManager, $this->input, - $this->config, $column ); } diff --git a/src/MapProvider.php b/src/MapProvider.php index 2fd944d..533cd95 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -22,6 +22,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Leaflet; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; @@ -83,18 +84,24 @@ class MapProvider */ private $dataController; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * Construct. * - * @param DefinitionMapper $mapper The definition mapper. - * @param Leaflet $leaflet The Leaflet instance. - * @param EventDispatcher $eventDispatcher The Contao event dispatcher. - * @param Input $input Thw request input. - * @param ContaoAssets $assets Assets handler. - * @param Cache $cache Cache. - * @param DataController $dataController Data controller. - * - * @internal param FilterFactory $filterFactory Filter factory. + * @param DefinitionMapper $mapper The definition mapper. + * @param Leaflet $leaflet The Leaflet instance. + * @param EventDispatcher $eventDispatcher The Contao event dispatcher. + * @param Input $input Thw request input. + * @param ContaoAssets $assets Assets handler. + * @param Cache $cache Cache. + * @param DataController $dataController Data controller. + * @param RepositoryManager $repositoryManager Repository manager. */ public function __construct( DefinitionMapper $mapper, @@ -103,15 +110,17 @@ class MapProvider $input, ContaoAssets $assets, Cache $cache, - DataController $dataController + DataController $dataController, + RepositoryManager $repositoryManager ) { - $this->mapper = $mapper; - $this->leaflet = $leaflet; - $this->eventDispatcher = $eventDispatcher; - $this->input = $input; - $this->assets = $assets; - $this->cache = $cache; - $this->dataController = $dataController; + $this->mapper = $mapper; + $this->leaflet = $leaflet; + $this->eventDispatcher = $eventDispatcher; + $this->input = $input; + $this->assets = $assets; + $this->cache = $cache; + $this->dataController = $dataController; + $this->repositoryManager = $repositoryManager; } /** @@ -149,7 +158,8 @@ class MapProvider */ public function getModel($mapId) { - $model = MapModel::findByIdOrAlias($mapId); + $repository = $this->repositoryManager->getRepository(MapModel::class); + $model = $repository->findByIdOrAlias($mapId); if ($model === null) { throw new \InvalidArgumentException(sprintf('Model "%s" not found', $mapId)); @@ -226,7 +236,8 @@ class MapProvider if ($layerId instanceof LayerModel) { $model = $layerId; } else { - $model = LayerModel::findByPK($layerId); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $model = $repository->find((int) $layerId); } if (!$model || !$model->active) { From a4192b4b1a0b46d6796d63b8b6a933b7cb98bc5d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 16:36:36 +0200 Subject: [PATCH 129/152] Code style. --- src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php index 319fb5d..0ff29bc 100644 --- a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php @@ -57,7 +57,7 @@ final class MarkersLabelRenderer extends AbstractLabelRenderer { $repository = $this->repositoryManager->getRepository(MarkerModel::class); $count = $repository->countBy(['pid'], [$row['pid']]); - $label .= sprintf( + $label .= sprintf( ' (%s %s)', $count, $translator->trans('countEntries', [], 'contao_tl_leaflet_layer') From 451d13fe9812b469e46276d8b11b2858f213f14e Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 16:43:33 +0200 Subject: [PATCH 130/152] Work on repository manager usage. --- src/Bundle/Resources/config/listeners.yml | 3 +++ src/Frontend/AbstractMapHybrid.php | 3 ++- src/Listener/GeoJsonListener.php | 26 +++++++++++++----- src/Listener/LoadAssetsListener.php | 33 ++++++++++++++++------- 4 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index e8b98fa..d786162 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -26,6 +26,7 @@ services: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' - '@netzmacht.contao_toolkit.repository_manager' + - '@netzmacht.contao_toolkit.repository_manager' netzmacht.contao_leaflet.listeners.dca.control: class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener @@ -74,6 +75,7 @@ services: netzmacht.contao_leaflet.listeners.geo_json_listener: class: Netzmacht\Contao\Leaflet\Listener\GeoJsonListener arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '%netzmacht.contao_leaflet.feature_model_properties%' tags: - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.mapper.convert_to_geojson', method: 'handle' } @@ -88,6 +90,7 @@ services: arguments: - '@netzmacht.contao_leaflet.map.assets' - '@netzmacht.contao_leaflet.definition.mapper' + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.libraries' tags: - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript', method: 'onGetJavascriptEvent' } diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index 4142b1f..71d23b1 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -90,7 +90,8 @@ abstract class AbstractMapHybrid extends AbstractHybrid $this->mapProvider->handleAjaxRequest($this->getIdentifier()); if (TL_MODE === 'BE') { - $model = MapModel::findByPk($this->get('leaflet_map')); + $repository = $this->repositoryManager->getRepository(MapModel::class); + $model = $repository->find((int) $this->get('leaflet_map')); $parameters = [ 'title' => $this->get('headline'), ]; diff --git a/src/Listener/GeoJsonListener.php b/src/Listener/GeoJsonListener.php index 3719ea2..4c64914 100644 --- a/src/Listener/GeoJsonListener.php +++ b/src/Listener/GeoJsonListener.php @@ -14,9 +14,11 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Listener; +use Contao\FilesModel; use Contao\Model; use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition as LeafletDefinition; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Marker; @@ -40,13 +42,22 @@ final class GeoJsonListener */ private $featureModelProperties; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * GeoJsonSubscriber constructor. * - * @param array $featureModelProperties Property mapping between models and features. + * @param RepositoryManager $repositoryManager Repository manager. + * @param array $featureModelProperties Property mapping between models and features. */ - public function __construct(array $featureModelProperties) + public function __construct(RepositoryManager $repositoryManager, array $featureModelProperties) { + $this->repositoryManager = $repositoryManager; $this->featureModelProperties = $featureModelProperties; } @@ -176,12 +187,14 @@ final class GeoJsonListener break; case 'file': - $file = \FilesModel::findByUuid($value); - $value = $file->path; + $repository = $this->repositoryManager->getRepository(FilesModel::class); + $file = $repository->findByUuid($value); + $value = $file->path; break; case 'files': - $collection = \FilesModel::findMultipleByUuids(deserialize($value, true)); + $repository = $this->repositoryManager->getRepository(FilesModel::class); + $collection = $repository->findMultipleByUuids(deserialize($value, true)); if ($collection) { $value = $collection->fetchEach('path'); @@ -213,7 +226,8 @@ final class GeoJsonListener if ($model->ignoreForBounds) { $feature->setProperty('ignoreForBounds', true); } else { - $parent = LayerModel::findByPk($model->pid); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $parent = $repository->find((int) $model->pid); if ($parent && $parent->boundsMode !== 'extend') { $feature->setProperty('ignoreForBounds', true); diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php index 21c7a05..79715f8 100644 --- a/src/Listener/LoadAssetsListener.php +++ b/src/Listener/LoadAssetsListener.php @@ -18,6 +18,7 @@ use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets; use Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Assets; use Netzmacht\LeafletPHP\Definition\Type\Icon; use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; @@ -50,18 +51,31 @@ class LoadAssetsListener */ private $libraries; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * LoadAssetsListener constructor. * - * @param Assets $assets Assets. - * @param DefinitionMapper $definitionMapper Definition mapper. - * @param LibrariesConfiguration $libraries Libraries. + * @param Assets $assets Assets. + * @param DefinitionMapper $definitionMapper Definition mapper. + * @param RepositoryManager $repositoryManager Repository manager. + * @param LibrariesConfiguration $libraries Libraries. */ - public function __construct(Assets $assets, DefinitionMapper $definitionMapper, LibrariesConfiguration $libraries) - { - $this->assets = $assets; - $this->definitionMapper = $definitionMapper; - $this->libraries = $libraries; + public function __construct( + Assets $assets, + DefinitionMapper $definitionMapper, + RepositoryManager $repositoryManager, + LibrariesConfiguration $libraries + ) { + $this->assets = $assets; + $this->definitionMapper = $definitionMapper; + $this->libraries = $libraries; + $this->repositoryManager = $repositoryManager; } /** @@ -76,7 +90,8 @@ class LoadAssetsListener ContaoAssets::TYPE_FILE ); - $collection = IconModel::findBy('active', true); + $repository = $this->repositoryManager->getRepository(IconModel::class); + $collection = $repository->findBy(['active=?'], [true]); if ($collection) { $buffer = ''; From 28adc54d366cc0626555434870a44cce3934b07d Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 16:46:05 +0200 Subject: [PATCH 131/152] Fix query. --- src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php index 0ff29bc..d37519f 100644 --- a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php @@ -56,7 +56,7 @@ final class MarkersLabelRenderer extends AbstractLabelRenderer public function render(array $row, string $label, Translator $translator): string { $repository = $this->repositoryManager->getRepository(MarkerModel::class); - $count = $repository->countBy(['pid'], [$row['pid']]); + $count = $repository->countBy(['pid=?'], [$row['pid']]); $label .= sprintf( ' (%s %s)', $count, From 7498aef141cea976a6dd2b9a197cfabea754b27b Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 16:48:16 +0200 Subject: [PATCH 132/152] Fix query. --- src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php index 57d6b48..b892440 100644 --- a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php @@ -56,7 +56,7 @@ final class VectorsLabelRenderer extends AbstractLabelRenderer public function render(array $row, string $label, Translator $translator): string { $repository = $this->repositoryManager->getRepository(VectorModel::class); - $count = $repository->countBy(['pid'], [$row['id']]); + $count = $repository->countBy(['pid=?'], [$row['id']]); $label .= sprintf( ' (%s %s)', $count, From ce9de6ded3130384f82d2df304abc4cd6b057959 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 18 Oct 2017 17:01:03 +0200 Subject: [PATCH 133/152] Use template engine to render the map. --- src/Bundle/Resources/config/services.yml | 1 + .../contao/templates/leaflet_map_html.html5 | 9 ++--- .../contao/templates/leaflet_map_js.html5 | 4 +-- src/MapProvider.php | 34 +++++++++++++------ 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index 7ddbe29..20060d1 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -16,6 +16,7 @@ services: - '@netzmacht.contao_leaflet.cache' - '@netzmacht.contao_leaflet.frontend.data_controller' - '@netzmacht.contao_toolkit.repository_manager' + - '@templating' netzmacht.contao_leaflet.libraries: class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration diff --git a/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 index 160b248..8624e3d 100644 --- a/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 +++ b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 @@ -1,6 +1,7 @@ -
+
+ }()); + diff --git a/src/Bundle/Resources/contao/templates/leaflet_map_js.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_js.html5 index 8f9f88f..31ca758 100644 --- a/src/Bundle/Resources/contao/templates/leaflet_map_js.html5 +++ b/src/Bundle/Resources/contao/templates/leaflet_map_js.html5 @@ -1,5 +1,5 @@ -L.contao.addMap('', function() { - +L.contao.addMap('mapId ?>', function() { +javascript ?> return { map: map, layers: layers, controls: controls, icons: icons }; }()); diff --git a/src/MapProvider.php b/src/MapProvider.php index 533cd95..d630dcf 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -23,10 +23,12 @@ use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; +use Netzmacht\Contao\Toolkit\View\Template\TemplateReference; use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Leaflet; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; +use Symfony\Component\Templating\EngineInterface as TemplateEngine; /** * Class MapProvider. @@ -91,6 +93,13 @@ class MapProvider */ private $repositoryManager; + /** + * Template engine. + * + * @var TemplateEngine + */ + private $templateEngine; + /** * Construct. * @@ -102,6 +111,7 @@ class MapProvider * @param Cache $cache Cache. * @param DataController $dataController Data controller. * @param RepositoryManager $repositoryManager Repository manager. + * @param TemplateEngine $templateEngine Template engine. */ public function __construct( DefinitionMapper $mapper, @@ -111,7 +121,8 @@ class MapProvider ContaoAssets $assets, Cache $cache, DataController $dataController, - RepositoryManager $repositoryManager + RepositoryManager $repositoryManager, + TemplateEngine $templateEngine ) { $this->mapper = $mapper; $this->leaflet = $leaflet; @@ -121,6 +132,7 @@ class MapProvider $this->cache = $cache; $this->dataController = $dataController; $this->repositoryManager = $repositoryManager; + $this->templateEngine = $templateEngine; } /** @@ -356,19 +368,21 @@ class MapProvider protected function doGenerate($model, $filter, $elementId, $template, $style) { $definition = $this->getDefinition($model, $filter, $elementId); - $template = \Controller::getTemplate($template); - - // @codingStandardsIgnoreStart - Set for the template. $javascript = $this->leaflet->build($definition, $this->assets); $mapId = $definition->getId(); - // @codingStandardsIgnoreEnd - ob_start(); - include $template; - $content = ob_get_contents(); - ob_end_clean(); + $templateReference = new TemplateReference($template, 'html5', TemplateReference::SCOPE_FRONTEND); + $parameters = [ + 'definition' => $definition, + 'model' => $model, + 'elementId' => $elementId, + 'style' => $style, + 'javascript' => $javascript, + 'mapId' => $mapId, + ]; - $event = new GetJavascriptEvent($definition, $content); + $content = $this->templateEngine->render($templateReference, $parameters); + $event = new GetJavascriptEvent($definition, $content); $this->eventDispatcher->dispatch($event::NAME, $event); $buffer = $event->getJavascript(); From ef7b493b2dc930116ab13d0ac7f864baff6ea128 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 19 Oct 2017 08:45:39 +0200 Subject: [PATCH 134/152] Use the repository manager. --- src/Bundle/Resources/config/mappers.yml | 27 ++++++++++++++ src/Mapper/Control/LoadingControlMapper.php | 23 +++++++++++- src/Mapper/Layer/FileLayerMapper.php | 23 +++++++++++- src/Mapper/Layer/GroupLayerMapper.php | 23 +++++++++++- src/Mapper/Layer/MarkerClusterLayerMapper.php | 25 +++++++++---- src/Mapper/Layer/MarkersLayerMapper.php | 26 ++++++++++++- src/Mapper/Layer/OverpassLayerMapper.php | 23 +++++++++++- src/Mapper/Layer/ReferenceLayerMapper.php | 23 +++++++++++- src/Mapper/Layer/VectorsLayerMapper.php | 24 +++++++++++- src/Mapper/MapMapper.php | 23 +++++++++++- src/Mapper/Type/ImageIconMapper.php | 37 ++++++++++++++++--- src/Mapper/UI/MarkerMapper.php | 24 +++++++++--- src/Mapper/Vector/AbstractVectorMapper.php | 24 +++++++++--- 13 files changed, 292 insertions(+), 33 deletions(-) diff --git a/src/Bundle/Resources/config/mappers.yml b/src/Bundle/Resources/config/mappers.yml index 6aa5fe8..39644e6 100644 --- a/src/Bundle/Resources/config/mappers.yml +++ b/src/Bundle/Resources/config/mappers.yml @@ -9,6 +9,8 @@ services: # Map mapper netzmacht.contao_leaflet.mapper.map: class: Netzmacht\Contao\Leaflet\Mapper\MapMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -28,26 +30,36 @@ services: netzmacht.contao_leaflet.mapper.markers_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkersLayerMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } netzmacht.contao_leaflet.mapper.group_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\GroupLayerMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } netzmacht.contao_leaflet.mapper.vectors_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\VectorsLayerMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } netzmacht.contao_leaflet.mapper.reference_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\ReferenceLayerMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } netzmacht.contao_leaflet.mapper.overpass_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\OverpassLayerMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -55,11 +67,14 @@ services: class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkerClusterLayerMapper arguments: - '@netzmacht.contao_leaflet.map.assets' + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leflet_maps.mapper } netzmacht.contao_leaflet.mapper.file_layer: class: Netzmacht\Contao\Leaflet\Mapper\Layer\FileLayerMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -86,6 +101,8 @@ services: netzmacht.contao_leaflet.mapper.loading_control: class: Netzmacht\Contao\Leaflet\Mapper\Control\LoadingControlMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -99,6 +116,7 @@ services: netzmacht.contao_leaflet.mapper.polyline: class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolylineMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -106,6 +124,7 @@ services: netzmacht.contao_leaflet.mapper.multi_polyline: class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolylineMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -113,6 +132,7 @@ services: netzmacht.contao_leaflet.mapper.polygon: class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolygonMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -120,6 +140,7 @@ services: netzmacht.contao_leaflet.mapper.multi_polygon: class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolygonMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -127,6 +148,7 @@ services: netzmacht.contao_leaflet.mapper.circle: class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -134,6 +156,7 @@ services: netzmacht.contao_leaflet.mapper.circle_mapper: class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMarkerMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -141,6 +164,7 @@ services: netzmacht.contao_leaflet.mapper.rectangle_mapper: class: Netzmacht\Contao\Leaflet\Mapper\Vector\RectangleMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -154,6 +178,8 @@ services: netzmacht.contao_leaflet.mapper.image_icon: class: Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper + arguments: + - '@netzmacht.contao_toolkit.repository_manager' tags: - { name: netzmacht.contao_leaflet.mapper } @@ -175,6 +201,7 @@ services: netzmacht.contao_leaflet.mapper.marker: class: Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper arguments: + - '@netzmacht.contao_toolkit.repository_manager' - '@netzmacht.contao_leaflet.frontend.value_filter' tags: - { name: netzmacht.contao_leaflet.mapper } diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php index 8466a0e..0b35ba2 100644 --- a/src/Mapper/Control/LoadingControlMapper.php +++ b/src/Mapper/Control/LoadingControlMapper.php @@ -16,6 +16,7 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\ControlModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Control\Zoom; use Netzmacht\LeafletPHP\Plugins\Loading\LoadingControl; @@ -35,6 +36,25 @@ class LoadingControlMapper extends AbstractControlMapper */ protected static $type = 'loading'; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -79,7 +99,8 @@ class LoadingControlMapper extends AbstractControlMapper if ($definition instanceof LoadingControl && !$definition->isSeparate() && $model->zoomControl) { // Only assign if zoom control is activated and part of the map. - $control = ControlModel::findOneBy( + $repository = $this->repositoryManager->getRepository(ControlModel::class); + $control = $repository->findOneBy( ['active=1', 'type=?', 'pid=?', 'id=?'], ['zoom', $model->pid, $model->zoomControl] ); diff --git a/src/Mapper/Layer/FileLayerMapper.php b/src/Mapper/Layer/FileLayerMapper.php index efd2508..1dc9908 100644 --- a/src/Mapper/Layer/FileLayerMapper.php +++ b/src/Mapper/Layer/FileLayerMapper.php @@ -18,6 +18,7 @@ use Contao\FilesModel; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\Request; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\FeatureGroup; @@ -50,6 +51,25 @@ class FileLayerMapper extends AbstractLayerMapper */ protected static $definitionClass = FeatureGroup::class; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritDoc} */ @@ -60,7 +80,8 @@ class FileLayerMapper extends AbstractLayerMapper $elementId = null, Definition $parent = null ) { - $fileModel = FilesModel::findByPk($model->file); + $repository = $this->repositoryManager->getRepository(FilesModel::class); + $fileModel = $repository->findByPk($model->file); $definition = $this->createInstance($model, $mapper, $request, $elementId, $fileModel); $this->optionsBuilder->build($definition, $model); diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php index 2c6d67e..00b8822 100644 --- a/src/Mapper/Layer/GroupLayerMapper.php +++ b/src/Mapper/Layer/GroupLayerMapper.php @@ -16,6 +16,7 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\LayerModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\FeatureGroup; use Netzmacht\LeafletPHP\Definition\Group\LayerGroup; @@ -35,6 +36,25 @@ class GroupLayerMapper extends AbstractLayerMapper */ protected static $type = 'group'; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -61,7 +81,8 @@ class GroupLayerMapper extends AbstractLayerMapper return; } - $collection = LayerModel::findBy( + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $collection = $repository->findBy( ['pid=?', 'active=1'], [$model->id], ['order' => 'sorting'] diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php index f4a0e54..9cb4cf0 100644 --- a/src/Mapper/Layer/MarkerClusterLayerMapper.php +++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php @@ -17,6 +17,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\JavascriptBuilder\Type\AnonymousFunction; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; @@ -53,15 +54,24 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper private $assets; /** - * MarkerClusterLayerMapper constructor. + * Repository manager. * - * @param ContaoAssets $assets Assets manager. + * @var RepositoryManager */ - public function __construct(ContaoAssets $assets) - { - parent::__construct(); + private $repositoryManager; - $this->assets = $assets; + /** + * Construct. + * + * @param ContaoAssets $assets Assets manager. + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(ContaoAssets $assets, RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + $this->assets = $assets; + + parent::__construct(); } /** @@ -107,7 +117,8 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper $this->assets->addStylesheet('assets/leaflet/libs/leaflet-markercluster/MarkerCluster.Default.css'); } - $collection = LayerModel::findBy( + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $collection = $repository->findBy( ['pid=?', 'active=1'], [$model->id], ['order' => 'sorting'] diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index 34d8652..e402bac 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -18,6 +18,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; @@ -38,6 +39,25 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper */ protected static $type = 'markers'; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -154,10 +174,12 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper */ protected function loadMarkerModels(Model $model, Request $request = null) { + $repository = $this->repositoryManager->getRepository(MarkerModel::class); + if ($model->boundsMode == 'fit') { - return MarkerModel::findByFilter($model->id, $request->getFilter()); + return $repository->findByFilter($model->id, $request->getFilter()); } - return MarkerModel::findByFilter($model->id); + return $repository->findByFilter($model->id); } } diff --git a/src/Mapper/Layer/OverpassLayerMapper.php b/src/Mapper/Layer/OverpassLayerMapper.php index 3f44bd7..a2a8743 100644 --- a/src/Mapper/Layer/OverpassLayerMapper.php +++ b/src/Mapper/Layer/OverpassLayerMapper.php @@ -17,6 +17,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; @@ -41,6 +42,25 @@ class OverpassLayerMapper extends AbstractLayerMapper */ protected static $definitionClass = OverpassLayer::class; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -97,7 +117,8 @@ class OverpassLayerMapper extends AbstractLayerMapper $amenityIconsMap = $this->filterAmenityIconsConfig($model->amenityIcons); if ($amenityIconsMap) { - $collection = IconModel::findMultipleByIds(array_unique($amenityIconsMap)); + $repository = $this->repositoryManager->getRepository(IconModel::class); + $collection = $repository->findMultipleByIds(array_unique($amenityIconsMap)); $icons = []; if ($collection) { diff --git a/src/Mapper/Layer/ReferenceLayerMapper.php b/src/Mapper/Layer/ReferenceLayerMapper.php index 4d11fe4..e3c3c9d 100644 --- a/src/Mapper/Layer/ReferenceLayerMapper.php +++ b/src/Mapper/Layer/ReferenceLayerMapper.php @@ -15,6 +15,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition; /** @@ -31,6 +32,25 @@ class ReferenceLayerMapper extends AbstractLayerMapper */ protected static $type = 'reference'; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -41,7 +61,8 @@ class ReferenceLayerMapper extends AbstractLayerMapper $elementId = null, Definition $parent = null ) { - $reference = LayerModel::findByPk($model->reference); + $repository = $this->repositoryManager->getRepository(LayerModel::class); + $reference = $repository->findByPk($model->reference); if (!$reference || !$reference->active) { return null; diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index 879b6fc..bd587d3 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -19,6 +19,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Group\GeoJson; @@ -39,6 +40,25 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper */ protected static $type = 'vectors'; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -159,7 +179,9 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper */ protected function loadVectorModels(Model $model) { - return VectorModel::findActiveBy('pid', $model->id, ['order' => 'sorting']); + $repository = $this->repositoryManager->getRepository(VectorModel::class); + + return $repository->findActiveBy(['pid=?'], [$model->id], ['order' => 'sorting']); } /** diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php index 5ab4f04..441ad8d 100644 --- a/src/Mapper/MapMapper.php +++ b/src/Mapper/MapMapper.php @@ -15,6 +15,7 @@ namespace Netzmacht\Contao\Leaflet\Mapper; use Contao\Model; use Netzmacht\Contao\Leaflet\Model\ControlModel; use Netzmacht\Contao\Leaflet\Model\MapModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Control; use Netzmacht\LeafletPHP\Definition\Layer; @@ -41,6 +42,25 @@ class MapMapper extends AbstractMapper */ protected static $definitionClass = Map::class; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -121,7 +141,8 @@ class MapMapper extends AbstractMapper */ private function buildControls(Map $map, MapModel $model, DefinitionMapper $mapper, Request $request = null) { - $collection = ControlModel::findActiveBy('pid', $model->id, ['order' => 'sorting']); + $repository = $this->repositoryManager->getRepository(ControlModel::class); + $collection = $repository->findActiveBy(['pid=?'], [$model->id], ['order' => 'sorting']); if (!$collection) { return; diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index f312b13..2809ec8 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -12,10 +12,12 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Type; +use Contao\FilesModel; use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\Request; use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; @@ -40,6 +42,25 @@ class ImageIconMapper extends AbstractIconMapper */ protected static $type = 'image'; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + + /** + * Construct. + * + * @param RepositoryManager $repositoryManager Repository manager. + */ + public function __construct(RepositoryManager $repositoryManager) + { + $this->repositoryManager = $repositoryManager; + + parent::__construct(); + } + /** * {@inheritdoc} */ @@ -52,7 +73,8 @@ class ImageIconMapper extends AbstractIconMapper $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId); if ($model->iconImage) { - $file = \FilesModel::findByUuid($model->iconImage); + $repository = $this->repositoryManager->getRepository(FilesModel::class); + $file = $repository->findByUuid($model->iconImage); if ($file) { $arguments[] = $file->path; @@ -88,8 +110,10 @@ class ImageIconMapper extends AbstractIconMapper */ private function addIcon(ImageIcon $definition, IconModel $model) { + $repository = $this->repositoryManager->getRepository(FilesModel::class); + if ($model->iconImage) { - $file = \FilesModel::findByUuid($model->iconImage); + $file = $repository->findByUuid($model->iconImage); if ($file) { $definition->setIconUrl($file->path); @@ -112,7 +136,7 @@ class ImageIconMapper extends AbstractIconMapper } if ($model->iconRetinaImage) { - $file = \FilesModel::findByUuid($model->iconRetinaImage); + $file = $repository->findByUuid($model->iconRetinaImage); if ($file) { $definition->setIconRetinaUrl($file->path); @@ -130,8 +154,10 @@ class ImageIconMapper extends AbstractIconMapper */ private function addShadow(ImageIcon $definition, $model) { + $repository = $this->repositoryManager->getRepository(FilesModel::class); + if ($model->shadowImage) { - $file = \FilesModel::findByUuid($model->shadowImage); + $file = $repository->findByUuid($model->shadowImage); if ($file) { $definition->setShadowUrl($file->path); @@ -150,7 +176,8 @@ class ImageIconMapper extends AbstractIconMapper } if ($model->shadowRetinaImage) { - $file = \FilesModel::findByUuid($model->shadowRetinaImage); + + $file = $repository->findByUuid($model->shadowRetinaImage); if ($file) { $definition->setShadowRetinaUrl($file->path); diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php index ba2ff2b..8a9a060 100644 --- a/src/Mapper/UI/MarkerMapper.php +++ b/src/Mapper/UI/MarkerMapper.php @@ -20,6 +20,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\Type\ImageIcon; use Netzmacht\LeafletPHP\Definition\UI\Marker; @@ -53,16 +54,25 @@ class MarkerMapper extends AbstractMapper */ protected $valueFilter; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * Construct. * - * @param ValueFilter $valueFilter Frontend filter. + * @param RepositoryManager $repositoryManager Repository manager. + * @param ValueFilter $valueFilter Frontend filter. */ - public function __construct(ValueFilter $valueFilter) + public function __construct(RepositoryManager $repositoryManager, ValueFilter $valueFilter) { - parent::__construct(); + $this->repositoryManager = $repositoryManager; + $this->valueFilter = $valueFilter; - $this->valueFilter = $valueFilter; + parent::__construct(); } /** @@ -108,7 +118,8 @@ class MarkerMapper extends AbstractMapper $content = $this->valueFilter->filter($model->popupContent); if ($model->popup) { - $popupModel = PopupModel::findActiveByPK($model->popup); + $popupRepository = $this->repositoryManager->getRepository(PopupModel::class); + $popupModel = $popupRepository->findActiveByPK($model->popup); if ($popupModel) { $popup = $mapper->handle($popupModel, $request, null, $definition); @@ -123,7 +134,8 @@ class MarkerMapper extends AbstractMapper } if ($model->customIcon) { - $iconModel = IconModel::findBy( + $iconRepository = $this->repositoryManager->getRepository(IconModel::class); + $iconModel = $iconRepository->findBy( ['id=?', 'active=1'], [$model->icon], ['return' => 'Model'] diff --git a/src/Mapper/Vector/AbstractVectorMapper.php b/src/Mapper/Vector/AbstractVectorMapper.php index 824f2b3..3b38602 100644 --- a/src/Mapper/Vector/AbstractVectorMapper.php +++ b/src/Mapper/Vector/AbstractVectorMapper.php @@ -21,6 +21,7 @@ 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\Toolkit\Data\Model\RepositoryManager; use Netzmacht\LeafletPHP\Definition; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Popup; @@ -47,16 +48,25 @@ class AbstractVectorMapper extends AbstractTypeMapper */ protected $valueFilter; + /** + * Repository manager. + * + * @var RepositoryManager + */ + private $repositoryManager; + /** * Construct. * - * @param ValueFilter $valueFilter Frontend filter. + * @param RepositoryManager $repositoryManager Repository manager. + * @param ValueFilter $valueFilter Frontend filter. */ - public function __construct(ValueFilter $valueFilter) + public function __construct(RepositoryManager $repositoryManager, ValueFilter $valueFilter) { - parent::__construct(); + $this->repositoryManager = $repositoryManager; + $this->valueFilter = $valueFilter; - $this->valueFilter = $valueFilter; + parent::__construct(); } /** @@ -72,7 +82,8 @@ class AbstractVectorMapper extends AbstractTypeMapper parent::build($definition, $model, $mapper, $request); if ($definition instanceof Path && $model->style) { - $styleModel = StyleModel::findActiveByPK($model->style); + $repository = $this->repositoryManager->getRepository(StyleModel::class); + $styleModel = $repository->findActiveByPK($model->style); if ($styleModel) { $style = $mapper->handle($styleModel); @@ -107,7 +118,8 @@ class AbstractVectorMapper extends AbstractTypeMapper $content = $this->valueFilter->filter($model->popupContent); if ($model->popup) { - $popupModel = PopupModel::findActiveByPK($model->popup); + $repository = $this->repositoryManager->getRepository(PopupModel::class); + $popupModel = $repository->findActiveByPK($model->popup); if ($popupModel) { $popup = $mapper->handle($popupModel, $request, null, $definition); From 08dea6e1da7409ab53ba17ffaade591ab2b774b3 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 19 Oct 2017 09:28:58 +0200 Subject: [PATCH 135/152] Code style. --- src/Mapper/Type/ImageIconMapper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php index 2809ec8..a846217 100644 --- a/src/Mapper/Type/ImageIconMapper.php +++ b/src/Mapper/Type/ImageIconMapper.php @@ -176,7 +176,6 @@ class ImageIconMapper extends AbstractIconMapper } if ($model->shadowRetinaImage) { - $file = $repository->findByUuid($model->shadowRetinaImage); if ($file) { From ae4d9cec137bb46984fa2fa9aa3fa87a42575a85 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 19 Oct 2017 09:31:50 +0200 Subject: [PATCH 136/152] Update changelog. --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56727f0..fc15d0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ Changelog Implemented enhancements - - New file layer for gpx,kml,wkt files added + - Refactor to a more service oriented architecture + - Use a proper template for the map templates (Customize templates has to be adjusted!) + - New file layer for gpx,kml,wkt,topojson,geojson files added - Bypass filesystem cache in debug mode - Changelog added From 86fb4f4e12c6086f1f2c0cfb749902a59649df8c Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 19 Oct 2017 09:35:31 +0200 Subject: [PATCH 137/152] Update the readme. --- README.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c40c958..0e4d64a 100644 --- a/README.md +++ b/README.md @@ -17,17 +17,19 @@ Features - Define Leaflet maps with multiple layers. - Manage map controls - - [Layers control](http://leafletjs.com/reference-1.0.0.html#control-layers) - - [Zoom control](http://leafletjs.com/reference-1.0.0.html#control-zoom) - - [Scale control]((http://leafletjs.com/reference-1.0.0.html#control-scale)) - - [Attribution control](http://leafletjs.com/reference-1.0.0.html#control-attribution) + - [Layers control](http://leafletjs.com/reference-1.2.0.html#control-layers) + - [Zoom control](http://leafletjs.com/reference-1.2.0.html#control-zoom) + - [Scale control]((http://leafletjs.com/reference-1.2.0.html#control-scale)) + - [Attribution control](http://leafletjs.com/reference-1.2.0.html#control-attribution) - [Loading control](https://github.com/ebrelsford/Leaflet.loading) - Manage layers - [Tile provider](https://github.com/leaflet-extras/leaflet-providers) - - Markers - A set of [markers](http://leafletjs.com/reference-1.0.0.html#marker) - - Vectors - A set of [vectors](http://leafletjs.com/reference-1.0.0.html) + - Markers - A set of [markers](http://leafletjs.com/reference-1.2.0.html#marker) + - Vectors - A set of [vectors](http://leafletjs.com/reference-1.2.0.html) - Groups - A group of layers - Reference - A link to another layer + - [Markercluster](https://github.com/Leaflet/Leaflet.markercluster) + - External geo data files (gpx,kml,wkt,geojson,topojson) - Manage marker icons - Manage vector styles - Optional deferred ajax loading of layer data @@ -36,11 +38,22 @@ Features - Autoloading of required assets. - [Layer for MetaModels](https://github.com/netzmacht/contao-leaflet-metamodels) +Changelog +--------- + +View the [CHANGELOG.md](CHANGELOG.md) for the latest changes. + +Requirements +------------ + + - Contao 4.4 + - PHP >= 7.0 + Install ------- ``` -$ php composer.phar require netzmacht/contao-leaflet-maps:~2.0 +$ php composer.phar require netzmacht/contao-leaflet-maps:~3.0 ``` Credits From 099cd6ca9d0fa7e599ed37684818ced2f1d4947f Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 19 Oct 2017 09:38:25 +0200 Subject: [PATCH 138/152] Update changelog. --- CHANGELOG.md | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc15d0e..fde3f14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,10 @@ Changelog ========= -3.0.0-beta2 (YYYY-MM-DD) +3.0.0-alpha1 (2017-10-19) ------------------------ -[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...2.0.0-beta2) +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...2.0.0-alpha2) Implemented enhancements diff --git a/composer.json b/composer.json index 093bc87..feb270d 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "netzmacht/contao-leaflet-libraries": "^1.0", "netzmacht/php-javascript-builder": "^1.0", "netzmacht/php-leaflet": "^1.0.2", - "netzmacht/contao-toolkit": "dev-hotfix/3.0.0-beta2", + "netzmacht/contao-toolkit": "~3.0@beta", "contao-community-alliance/meta-palettes": "^1.5", "menatwork/contao-multicolumnwizard": "^3.2", "doctrine/cache": "^1.0" From 00da9f7b25cd418b6ae287b5191b5c137786e7d5 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 27 Oct 2017 13:36:44 +0200 Subject: [PATCH 139/152] Adjust language path. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index feb270d..33cc1d9 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "transifex": { "project": "contao-leaflet-maps", "prefix": "core-", - "languages_cto": "module/languages", + "languages_cto": "src/Bundle/Resources/contao/languages", "languages_tx": ".tx" } } From 8b193a391add4caae9840dde9f65b8f8caee908e Mon Sep 17 00:00:00 2001 From: David Molineus Date: Sun, 12 Nov 2017 14:48:56 +0100 Subject: [PATCH 140/152] Add the missing repository manager dependency. --- src/Bundle/Resources/config/listeners.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index d786162..ab039e2 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -33,6 +33,7 @@ services: arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' + - '@netzmacht.contao_toolkit.repository_manager' - '%netzmacht.contao_leaflet.controls%' netzmacht.contao_leaflet.listeners.dca.layer: From ded5427afb772fcc38a1a9c59040e480a80375f2 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Sun, 12 Nov 2017 14:59:11 +0100 Subject: [PATCH 141/152] Use same layer id for the geojson layer. --- src/Mapper/Layer/FileLayerMapper.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mapper/Layer/FileLayerMapper.php b/src/Mapper/Layer/FileLayerMapper.php index 1dc9908..17a1687 100644 --- a/src/Mapper/Layer/FileLayerMapper.php +++ b/src/Mapper/Layer/FileLayerMapper.php @@ -128,8 +128,7 @@ class FileLayerMapper extends AbstractLayerMapper return parent::createInstance($model, $mapper, $request, $elementId); } - $customId = $layerId . '_data'; - $customLayer = new GeoJson($customId); + $customLayer = new GeoJson($layerId); $layer->setCustomLayer($customLayer); From 46e066198684b396ccd1c1a2a79d9d90f295c9a1 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Sun, 12 Nov 2017 15:01:16 +0100 Subject: [PATCH 142/152] Use style dca listener. --- src/Bundle/Resources/config/listeners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index ab039e2..9b24dac 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -69,7 +69,7 @@ services: - '%netzmacht.contao_leaflet.icons%' netzmacht.contao_leaflet.listeners.dca.style: - class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener + class: Netzmacht\Contao\Leaflet\Listener\Dca\StyleDcaListener arguments: - '%netzmacht.contao_leaflet.styles%' From 7db007bdabf1cd8ddcc78919b8a196d116df1ad9 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 13 Nov 2017 10:05:20 +0100 Subject: [PATCH 143/152] Remove double parameter. --- src/Bundle/Resources/config/listeners.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index 9b24dac..3183723 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -26,7 +26,6 @@ services: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' - '@netzmacht.contao_toolkit.repository_manager' - - '@netzmacht.contao_toolkit.repository_manager' netzmacht.contao_leaflet.listeners.dca.control: class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener From db352a2df3fe6139081da66818bca5328f293b4f Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 13 Nov 2017 10:12:39 +0100 Subject: [PATCH 144/152] Fix counting of markers. --- src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php index d37519f..7a1e1f6 100644 --- a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php +++ b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php @@ -56,7 +56,7 @@ final class MarkersLabelRenderer extends AbstractLabelRenderer public function render(array $row, string $label, Translator $translator): string { $repository = $this->repositoryManager->getRepository(MarkerModel::class); - $count = $repository->countBy(['pid=?'], [$row['pid']]); + $count = $repository->countBy(['pid=?'], [$row['id']]); $label .= sprintf( ' (%s %s)', $count, From ef30de969883246d2e751fb130a127d13508d4fb Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 13 Nov 2017 11:07:53 +0100 Subject: [PATCH 145/152] Use the geocode widget for the boundaries. --- composer.json | 1 + src/Bundle/Resources/contao/dca/tl_leaflet_layer.php | 4 ++-- src/Bundle/Resources/contao/dca/tl_leaflet_vector.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 33cc1d9..4c1eee6 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "php": ">=7.0", "contao/core-bundle": "~4.4", "netzmacht/contao-leaflet-libraries": "^1.0", + "netzmacht/contao-leaflet-geocode-widget": "^1.2", "netzmacht/php-javascript-builder": "^1.0", "netzmacht/php-leaflet": "^1.0.2", "netzmacht/contao-toolkit": "~3.0@beta", diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php index c180cb8..789aa2d 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php @@ -718,14 +718,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [ 'bounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['bounds'], 'exclude' => true, - 'inputType' => 'text', + 'inputType' => 'leaflet_geocode', 'save_callback' => [ ], 'eval' => [ 'maxlength' => 255, 'multiple' => true, 'size' => 2, - 'tl_class' => 'long clr', + 'tl_class' => 'clr', 'nullIfEmpty' => true, ], 'sql' => 'mediumblob NULL', diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php index 977b3ac..4e2fe66 100644 --- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php @@ -347,13 +347,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [ 'bounds' => [ 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['bounds'], 'exclude' => true, - 'inputType' => 'text', + 'inputType' => 'leaflet_geocode', 'save_callback' => [], 'eval' => [ 'maxlength' => 255, 'multiple' => true, 'size' => 2, - 'tl_class' => 'long clr', + 'tl_class' => 'clr', 'nullIfEmpty' => true, ], 'sql' => 'mediumblob NULL', From 27cef9b45b0dadbefde051bf55934a9308ff8618 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 13 Nov 2017 13:13:14 +0100 Subject: [PATCH 146/152] Add backend icon. --- CHANGELOG.md | 11 +++ src/Bundle/Resources/contao/config/config.php | 2 +- .../Resources/public/css/backend_global.css | 8 +++ .../Resources/public/css/backend_hacks.css | 3 - src/Bundle/Resources/public/img/leaflet.svg | 72 +++++++++++++++++++ 5 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 src/Bundle/Resources/public/css/backend_global.css delete mode 100644 src/Bundle/Resources/public/css/backend_hacks.css create mode 100644 src/Bundle/Resources/public/img/leaflet.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index fde3f14..620cb31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ Changelog ========= +dev-release/3.0.0 (YYYY-MM-DD) +------------------------------ + +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...dev-release/3.0.0) + + +3.0.0-alpha2 +------------ + +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...2.0.0-alpha3) + 3.0.0-alpha1 (2017-10-19) ------------------------ diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index 1d1fba1..094c43f 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -50,7 +50,7 @@ array_insert( ); if (TL_MODE === 'BE') { - $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_hacks.css'; + $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_global.css'; } /* diff --git a/src/Bundle/Resources/public/css/backend_global.css b/src/Bundle/Resources/public/css/backend_global.css new file mode 100644 index 0000000..ffc55e7 --- /dev/null +++ b/src/Bundle/Resources/public/css/backend_global.css @@ -0,0 +1,8 @@ + +#tl_navigation .tl_level_1_group .group-leaflet { + background: url(/bundles/netzmachtcontaoleaflet/img/leaflet.svg) 3px 2px no-repeat; +} + +.tl_help_table a { + text-decoration: underline; +} diff --git a/src/Bundle/Resources/public/css/backend_hacks.css b/src/Bundle/Resources/public/css/backend_hacks.css deleted file mode 100644 index c30f35c..0000000 --- a/src/Bundle/Resources/public/css/backend_hacks.css +++ /dev/null @@ -1,3 +0,0 @@ -.tl_help_table a { - color: #77ac45 -} diff --git a/src/Bundle/Resources/public/img/leaflet.svg b/src/Bundle/Resources/public/img/leaflet.svg new file mode 100644 index 0000000..f499944 --- /dev/null +++ b/src/Bundle/Resources/public/img/leaflet.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + + + + + + + + + + From 16e58f7f40d7bbd465930562a721af0e3139de40 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 15 Nov 2017 11:13:24 +0100 Subject: [PATCH 147/152] Register hook as tagged service. --- src/Bundle/Resources/config/listeners.yml | 7 ++++--- src/Bundle/Resources/contao/config/config.php | 9 --------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index 3183723..4f4938d 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -98,6 +98,7 @@ services: netzmacht.contao_leaflet.listeners.register_libraries: class: Netzmacht\Contao\Leaflet\Listener\RegisterLibrariesListener arguments: - - '@netzmacht.contao_leaflet.libraries' - - '@netzmacht.contao_leaflet.definition.builder' - + - '@netzmacht.contao_leaflet.libraries' + - '@netzmacht.contao_leaflet.definition.builder' + tags: + - { name: 'contao.hook', hook: 'initializeSystem', method: 'onInitializeSystem' } diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php index 094c43f..29595b8 100644 --- a/src/Bundle/Resources/contao/config/config.php +++ b/src/Bundle/Resources/contao/config/config.php @@ -65,12 +65,3 @@ $GLOBALS['TL_MODELS']['tl_leaflet_marker'] = \Netzmacht\Contao\Leaflet\Model\Ma $GLOBALS['TL_MODELS']['tl_leaflet_popup'] = \Netzmacht\Contao\Leaflet\Model\PopupModel::class; $GLOBALS['TL_MODELS']['tl_leaflet_style'] = \Netzmacht\Contao\Leaflet\Model\StyleModel::class; $GLOBALS['TL_MODELS']['tl_leaflet_vector'] = \Netzmacht\Contao\Leaflet\Model\VectorModel::class; - -/* - * Hooks. - */ - -$GLOBALS['TL_HOOKS']['initializeSystem'][] = [ - 'netzmacht.contao_leaflet.listeners.register_libraries', - 'onInitializeSystem', -]; From b4947c1404652f9a56fb7eef136fe7cbbf27ef98 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 15 Nov 2017 11:18:42 +0100 Subject: [PATCH 148/152] Update translations. --- src/Bundle/Resources/contao/languages/de/leaflet.php | 3 ++- .../Resources/contao/languages/de/tl_leaflet_control.php | 3 ++- .../Resources/contao/languages/de/tl_leaflet_icon.php | 6 +++++- .../Resources/contao/languages/de/tl_leaflet_map.php | 6 +++++- .../Resources/contao/languages/de/tl_leaflet_marker.php | 5 ++++- .../Resources/contao/languages/de/tl_leaflet_style.php | 7 ++++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/Bundle/Resources/contao/languages/de/leaflet.php b/src/Bundle/Resources/contao/languages/de/leaflet.php index ede2d01..8103170 100644 --- a/src/Bundle/Resources/contao/languages/de/leaflet.php +++ b/src/Bundle/Resources/contao/languages/de/leaflet.php @@ -8,12 +8,13 @@ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * - * last-updated: 2016-10-06T15:54:30+02:00 + * last-updated: 2017-10-17T16:04:08+00:00 */ $GLOBALS['TL_LANG']['leaflet']['applyPosition'] = 'Position anwenden'; $GLOBALS['TL_LANG']['leaflet']['invalidAlias'] = 'Ein ungültiger Alias wurde angegeben. Ein Alias darf nicht leer sein, mit einer Zahl beginnen oder Sonderzeichen enthalten (Unterstriche sind erlaubt).'; $GLOBALS['TL_LANG']['leaflet']['invalidCoordinates'] = 'Ungültige Koordinatenwerte vorhanden.'; +$GLOBALS['TL_LANG']['leaflet']['searchPosition'] = 'Standort suchen'; $GLOBALS['TL_LANG']['leaflet_control']['attribution']['0'] = 'Copyright-Leiste'; $GLOBALS['TL_LANG']['leaflet_control']['attribution']['1'] = 'Das Kontrollelement zur Namensnennung erlaubt es, Urheber in einer kleinen Textbox auf der Karte anzuzeigen. Lesen Sie für weitere Details die Leaflet-Dokumentation.'; $GLOBALS['TL_LANG']['leaflet_control']['fullscreen']['0'] = 'Fullscreen-Kontrollelement'; diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php index 526a8dd..8dd0c3b 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php @@ -8,7 +8,7 @@ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * - * last-updated: 2016-10-04T13:07:35+02:00 + * last-updated: 2017-10-17T16:04:09+00:00 */ $GLOBALS['TL_LANG']['tl_leaflet_control']['active']['0'] = 'Kontrollelement aktivieren'; @@ -21,6 +21,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_control']['attributions']['1'] = 'Hier kö $GLOBALS['TL_LANG']['tl_leaflet_control']['autoZIndex']['0'] = 'Automatischer Z-Index'; $GLOBALS['TL_LANG']['tl_leaflet_control']['autoZIndex']['1'] = 'Falls aktiviert wird das Kontrollelement zu allen Layern in aufsteigender Reihenfolge einen z-index hinzufügen, damit die Reihenfolge auch beim an- und abschalten von Layern erhalten bleibt.'; $GLOBALS['TL_LANG']['tl_leaflet_control']['base']['0'] = 'Basislayer'; +$GLOBALS['TL_LANG']['tl_leaflet_control']['base']['1'] = 'Basis-Layer werden mit Radio-Buttons umgeschaltet. Beachten Sie, dass alle Basis-Layer als Basis-Layer-Objekte übergeben werden sollten, aber nur ein einziger für die Initialisierung der Karte benutzt werden soll.'; $GLOBALS['TL_LANG']['tl_leaflet_control']['bottomleft']['0'] = 'Links unten'; $GLOBALS['TL_LANG']['tl_leaflet_control']['bottomleft']['1'] = 'Linker unterer Bereich der Karte'; $GLOBALS['TL_LANG']['tl_leaflet_control']['bottomright']['0'] = 'Rechts unten'; diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php index 85f126e..3ff38fa 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php @@ -8,7 +8,7 @@ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * - * last-updated: 2016-10-04T13:07:35+02:00 + * last-updated: 2017-10-17T16:04:07+00:00 */ $GLOBALS['TL_LANG']['tl_leaflet_icon']['active']['0'] = 'Aktivieren Sie das Icon.'; @@ -30,6 +30,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_icon']['edit']['1'] = 'Icon ID %s b $GLOBALS['TL_LANG']['tl_leaflet_icon']['icon']['0'] = 'Icon-CSS-Klasse'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['icon']['1'] = 'Icon-CSS-Klasse, beispielsweise fa-envelope'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconAnchor']['0'] = 'Icon-Anker'; +$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconAnchor']['1'] = 'Die Koordinaten der "Spitze" des Schattens (relativ zu seiner oberen linken Ecke).'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconColor']['0'] = 'Iconfarbe'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconColor']['1'] = 'Definieren Sie hier eine Farbe für den Icon-Marker'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconImage']['0'] = 'Icon-Bild'; @@ -48,7 +49,10 @@ $GLOBALS['TL_LANG']['tl_leaflet_icon']['popupAnchor']['0'] = 'Popup-Anker' $GLOBALS['TL_LANG']['tl_leaflet_icon']['popupAnchor']['1'] = 'Geben Sie die Koordinaten des Punktes an, von dem aus sich das Popup "öffnet". Die Koordinaten werden relativ zum Anker des Icons benutzt.'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['popups']['0'] = 'Popups verwalten'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['popups']['1'] = 'Popup-Icons verwalten'; +$GLOBALS['TL_LANG']['tl_leaflet_icon']['prefix']['0'] = 'Iconpräfix Klasse'; +$GLOBALS['TL_LANG']['tl_leaflet_icon']['prefix']['1'] = 'Iconpräfix Klasse, z.B. fa'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowAnchor']['0'] = 'Schatten-Anker'; +$GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowAnchor']['1'] = 'Die Koordinaten der "Spitze" des Schattens (relativ zu seiner oberen linken Ecke) (das gleiche wie der Symbol Anker, wenn nicht angegeben).'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowImage']['0'] = 'Schatten-Bild'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowImage']['1'] = 'Wählen Sie ein Bild für den Schatten aus.'; $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowRetinaImage']['0'] = 'Retina-Schattenbild'; diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php index 26c78e6..52d31c2 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php @@ -8,11 +8,12 @@ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * - * last-updated: 2016-10-06T15:54:30+02:00 + * last-updated: 2017-10-17T16:04:07+00:00 */ $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds']['0'] = 'Grenzen festlegen'; $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds']['1'] = 'Falls aktiviert passt sich die karten an den Bereich der Datenlayer an, für die Auswirkungen auf die Kartengrenzen zugelassen sind.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['deferred']['0'] = 'Nach dem Laden des verzögerten Features'; $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['deferred']['1'] = 'Bestimmt ob die Kartengrenzen neu berechnet werden wenn ein Feature verzögert geladen wird.'; $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load']['0'] = 'bei Karteninitialisierung'; $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load']['1'] = 'Grenzen berechnen, wenn die Karte initialisiert wird. Alle statischen und bereits geladenen Features werden mit einbezogen.'; @@ -23,6 +24,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['alias']['1'] = $GLOBALS['TL_LANG']['tl_leaflet_map']['behaviour_legend'] = 'Verhalten'; $GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits']['0'] = 'Zurückfedern bei Erreichen des Zoom-Limits'; $GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits']['1'] = 'Deaktivieren Sie diese Einstellung, falls Sie verhindern möchten, dass außerhalb liegende Elemente der Karte beim Zoomen über die festgelegten minimalen / maximalen Zoomstufen hinaus angezeigt werden wenn mit zwei Fingern gezoomt wird.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding']['1'] = 'Padding wird verwendet, um Grenzen zu setzen. Verwenden Sie kommagetrennte Werte. Wenn 2 Werte angegeben werden, ist die Padding-Option eingestellt. Wenn 4 Werte angegeben werden, ist paddingTopLeft und paddingBottomRight gesetzt.'; $GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom']['0'] = 'Zoomen durch Markierung'; $GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom']['1'] = 'legen Sie fest ob der Kartenausschnitt vergrößert werden kann indem Benutzer die Maus mit gedrückter Umschalttaste über die Karte ziehen.'; $GLOBALS['TL_LANG']['tl_leaflet_map']['cache']['0'] = 'Cache aktivieren'; @@ -62,6 +64,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['layers']['1'] = $GLOBALS['TL_LANG']['tl_leaflet_map']['layers_legend'] = 'Standardlayer'; $GLOBALS['TL_LANG']['tl_leaflet_map']['locate']['0'] = 'Nutzerposition ermitteln'; $GLOBALS['TL_LANG']['tl_leaflet_map']['locate']['1'] = 'Initialer Kartenzoom. Diese Funktion versucht, den Benutzer mittels Geolocation-API zu orten.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom']['0'] = 'Lokalisieren Sie den maximalen Zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom']['1'] = 'Max-Zoom bei der Aktualisierung der Kartenansicht.'; $GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge']['0'] = 'Maximale Gültigkeit der Benutzerposition'; $GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge']['1'] = 'Maximales Alter der Daten zum Aufenthaltsort in Millisekunden. Ansonsten wird der zwischengespeicherte Wert benutzt.'; $GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView']['0'] = 'Kartenmitte aktualisieren'; diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php index a9ec43c..f3fbfcf 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php @@ -8,7 +8,7 @@ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * - * last-updated: 2016-10-06T15:54:30+02:00 + * last-updated: 2017-10-17T16:04:07+00:00 */ $GLOBALS['TL_LANG']['tl_leaflet_marker']['active']['0'] = 'Marker aktivieren'; @@ -44,6 +44,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_marker']['icon']['1'] = 'Individuelle $GLOBALS['TL_LANG']['tl_leaflet_marker']['icons']['0'] = 'Icons verwalten'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['icons']['1'] = 'Marker-Icons verwalten'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['ignoreForBounds']['0'] = 'Von Grenzen-Berechnung ausschließen.'; +$GLOBALS['TL_LANG']['tl_leaflet_marker']['ignoreForBounds']['1'] = 'Fügen Sie dieses Element nicht in die Berechnung ein.'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['keyboard']['0'] = 'Tatstaturnavigation'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['keyboard']['1'] = 'Legen Sie fest ob der Marker über die Tabulatortaste erreicht und mit der Eingabetaste geklickt werden kann.'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['new']['0'] = 'Marker erstellen'; @@ -62,5 +63,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_marker']['title_legend'] = 'Titel und Ty $GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle']['0'] = 'Aktivierung umschalten'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle']['1'] = 'Aktivierung von Marker ID %s umschalten'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['tooltip']['0'] = 'Tooltip'; +$GLOBALS['TL_LANG']['tl_leaflet_marker']['tooltip']['1'] = 'Marker-Tooltip als Titelattribut gerendert.'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['zIndexOffset']['0'] = 'Z-Index-Offset'; +$GLOBALS['TL_LANG']['tl_leaflet_marker']['zIndexOffset']['1'] = 'Standardmäßig werden Markerbilder z-Index automatisch auf Grundlage der geografischen Breite festgelegt. Verwenden Sie diese Option, wenn Sie den Marker über allen anderen (oder darunter) platzieren möchten und einen hohen Wert wie 1000 (bzw. einen hohen negativen Wert) angeben.'; diff --git a/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php b/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php index 0602c3f..4a771dc 100644 --- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php +++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php @@ -8,17 +8,19 @@ * * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL * - * last-updated: 2016-10-04T13:07:35+02:00 + * last-updated: 2017-10-17T16:04:07+00:00 */ $GLOBALS['TL_LANG']['tl_leaflet_style']['active_legend'] = 'Aktivierung'; $GLOBALS['TL_LANG']['tl_leaflet_style']['alias']['0'] = 'Alias'; $GLOBALS['TL_LANG']['tl_leaflet_style']['alias']['1'] = 'Alias des Stils.'; $GLOBALS['TL_LANG']['tl_leaflet_style']['color']['0'] = 'Linienfarbe'; +$GLOBALS['TL_LANG']['tl_leaflet_style']['color']['1'] = 'Eigene Linienfarbe. Wenn dieses Feld leer ist wird die Standard-Linienfarbe benutzt. Erwartete Werte sind vollständige Hex-Codes (mit #).'; $GLOBALS['TL_LANG']['tl_leaflet_style']['config_legend'] = 'Konfiguration'; $GLOBALS['TL_LANG']['tl_leaflet_style']['copy']['0'] = 'Stil kopieren'; $GLOBALS['TL_LANG']['tl_leaflet_style']['copy']['1'] = 'Stil ID %s kopieren'; $GLOBALS['TL_LANG']['tl_leaflet_style']['dashArray']['0'] = 'Linienmuster'; +$GLOBALS['TL_LANG']['tl_leaflet_style']['dashArray']['1'] = 'Geben Sie einen String ein, der für die Linienart benutzt werden soll.'; $GLOBALS['TL_LANG']['tl_leaflet_style']['delete']['0'] = 'Stil löschen'; $GLOBALS['TL_LANG']['tl_leaflet_style']['delete']['1'] = 'Stil ID %s löschen'; $GLOBALS['TL_LANG']['tl_leaflet_style']['edit']['0'] = 'Stil bearbeiten'; @@ -26,6 +28,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['edit']['1'] = 'Stil ID %s bearbe $GLOBALS['TL_LANG']['tl_leaflet_style']['fill']['0'] = 'Vektor füllen'; $GLOBALS['TL_LANG']['tl_leaflet_style']['fill']['1'] = 'Bestimmen Sie, ob der Pfad gefüllt dargestellt werden soll.'; $GLOBALS['TL_LANG']['tl_leaflet_style']['fillColor']['0'] = 'Füllfarbe'; +$GLOBALS['TL_LANG']['tl_leaflet_style']['fillColor']['1'] = 'Eigene Linienfarbe. Wenn dieses Feld leer ist wird die Standard-Linienfarbe benutzt. Erwartete Werte sind vollständige Hex-Codes (mit #).'; $GLOBALS['TL_LANG']['tl_leaflet_style']['fillOpacity']['0'] = 'Transparenz der Füllung'; $GLOBALS['TL_LANG']['tl_leaflet_style']['fillOpacity']['1'] = 'Die Transparenz der Füllung kann einen Wert zwischen 0 und 1 annehmen.'; $GLOBALS['TL_LANG']['tl_leaflet_style']['icons']['0'] = 'Icons verwalten'; @@ -35,6 +38,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['layersBtn']['1'] = 'Leaflet-Layer ver $GLOBALS['TL_LANG']['tl_leaflet_style']['lineCap']['0'] = 'Linienenden'; $GLOBALS['TL_LANG']['tl_leaflet_style']['lineCap']['1'] = 'Geben Sie einen Wert ein, der für die Enden der Linie benutzt werden soll,'; $GLOBALS['TL_LANG']['tl_leaflet_style']['lineJoin']['0'] = 'Linienverbindung'; +$GLOBALS['TL_LANG']['tl_leaflet_style']['lineJoin']['1'] = 'Geben Sie einen String ein, der die Form der Ecken definiert.'; $GLOBALS['TL_LANG']['tl_leaflet_style']['new']['0'] = 'Stil erstellen'; $GLOBALS['TL_LANG']['tl_leaflet_style']['new']['1'] = 'Neuen Stil erstellen'; $GLOBALS['TL_LANG']['tl_leaflet_style']['opacity']['0'] = 'Linientransparenz'; @@ -44,6 +48,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['1'] = 'Popup-Icons verwa $GLOBALS['TL_LANG']['tl_leaflet_style']['show']['0'] = 'Details anzeigen'; $GLOBALS['TL_LANG']['tl_leaflet_style']['show']['1'] = 'Details des Stils ID %s anzeigen'; $GLOBALS['TL_LANG']['tl_leaflet_style']['stroke']['0'] = 'Linie ziehen'; +$GLOBALS['TL_LANG']['tl_leaflet_style']['stroke']['1'] = 'Legt fest, ob eine Linie entlang des Pfades dargestellt werden soll. Deaktivieren Sie diese Einstellung um die Grenzen von Polygonen oder Kreisen unsichtbar zu schalten.'; $GLOBALS['TL_LANG']['tl_leaflet_style']['title']['0'] = 'Titel'; $GLOBALS['TL_LANG']['tl_leaflet_style']['title']['1'] = 'Titel des Stils.'; $GLOBALS['TL_LANG']['tl_leaflet_style']['title_legend'] = 'Titel und Typ'; From bde761911ff4199ee9efd5b585783260a9c570bf Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 15 Nov 2017 11:21:01 +0100 Subject: [PATCH 149/152] Update changelog. --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 620cb31..7ddbe33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,21 @@ Changelog dev-release/3.0.0 (YYYY-MM-DD) ------------------------------ -[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...dev-release/3.0.0) +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...release/3.0.0) +3.0.0-beta1 (2017-11-15) +------------------------ + +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-beta1) + +Enhancements + + - Updated translations + +Bugfixes + + - Broken service definitions + - Broken file layer id 3.0.0-alpha2 ------------ From 295d5385a0f69c41b43cc6ce0146a0354daadc19 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 5 Jan 2018 17:03:30 +0100 Subject: [PATCH 150/152] Make services public which has to be required in Symfony 3.4. --- src/Bundle/Resources/config/listeners.yml | 11 +++++++++++ src/Bundle/Resources/config/services.yml | 1 + 2 files changed, 12 insertions(+) diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml index 4f4938d..16622f6 100644 --- a/src/Bundle/Resources/config/listeners.yml +++ b/src/Bundle/Resources/config/listeners.yml @@ -1,6 +1,7 @@ services: netzmacht.contao_leaflet.listeners.dca.leaflet: class: Netzmacht\Contao\Leaflet\Listener\Dca\LeafletDcaListener + public: true arguments: - '@netzmacht.contao_toolkit.repository_manager' - '@templating' @@ -10,18 +11,21 @@ services: netzmacht.contao_leaflet.listeners.dca.validator: class: Netzmacht\Contao\Leaflet\Listener\Dca\Validator + public: true arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@translator' netzmacht.contao_leaflet.listeners.dca.frontend_integration: class: Netzmacht\Contao\Leaflet\Listener\Dca\FrontendIntegrationListener + public: true arguments: - '@netzmacht.contao_toolkit.repository_manager' - '@translator' netzmacht.contao_leaflet.listeners.dca.map: class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener + public: true arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' @@ -29,6 +33,7 @@ services: netzmacht.contao_leaflet.listeners.dca.control: class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener + public: true arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' @@ -37,6 +42,7 @@ services: netzmacht.contao_leaflet.listeners.dca.layer: class: Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener + public: true arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@database_connection' @@ -51,12 +57,14 @@ services: netzmacht.contao_leaflet.listeners.dca.marker: class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener + public: true arguments: - '@database_connection' - '@netzmacht.contao_toolkit.repository_manager' netzmacht.contao_leaflet.listeners.dca.vector: class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener + public: true arguments: - '@netzmacht.contao_toolkit.dca.manager' - '@netzmacht.contao_toolkit.repository_manager' @@ -64,11 +72,13 @@ services: netzmacht.contao_leaflet.listeners.dca.icon: class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener + public: true arguments: - '%netzmacht.contao_leaflet.icons%' netzmacht.contao_leaflet.listeners.dca.style: class: Netzmacht\Contao\Leaflet\Listener\Dca\StyleDcaListener + public: true arguments: - '%netzmacht.contao_leaflet.styles%' @@ -97,6 +107,7 @@ services: netzmacht.contao_leaflet.listeners.register_libraries: class: Netzmacht\Contao\Leaflet\Listener\RegisterLibrariesListener + public: true arguments: - '@netzmacht.contao_leaflet.libraries' - '@netzmacht.contao_leaflet.definition.builder' diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index 20060d1..c77c5b8 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -108,6 +108,7 @@ services: netzmacht.contao_leaflet.frontend.insert_tag: class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser + public: true arguments: - '@netzmacht.contao_leaflet.map.provider' - '%kernel.debug%' From 19614d305f33efe080a09205e398b670c4ba8f13 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 5 Jan 2018 17:04:14 +0100 Subject: [PATCH 151/152] Update requirements. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4c1eee6..5d41e4c 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "netzmacht/contao-leaflet-geocode-widget": "^1.2", "netzmacht/php-javascript-builder": "^1.0", "netzmacht/php-leaflet": "^1.0.2", - "netzmacht/contao-toolkit": "~3.0@beta", - "contao-community-alliance/meta-palettes": "^1.5", + "netzmacht/contao-toolkit": "~3.0", + "contao-community-alliance/meta-palettes": "^2.0 || ^1.5", "menatwork/contao-multicolumnwizard": "^3.2", "doctrine/cache": "^1.0" }, From e5d336037f3e9c649defafe3b3de9c60ebb00774 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 5 Jan 2018 17:11:21 +0100 Subject: [PATCH 152/152] Prepare the release. --- .travis.yml | 1 + CHANGELOG.md | 8 +++++--- composer.json | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b90fbc7..9918e23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: php php: - "7.0" - "7.1" + - "7.2" env: - CONTAO_VERSION=contao/core-bundle ~4.4.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ddbe33..6e0a267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ Changelog ========= -dev-release/3.0.0 (YYYY-MM-DD) ------------------------------- +3.0.0 (2018-01-05) +------------------ -[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...release/3.0.0) +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...3.0.0) + + - Make hook/dca listener services public 3.0.0-beta1 (2017-11-15) ------------------------ diff --git a/composer.json b/composer.json index 5d41e4c..1bdfbcf 100644 --- a/composer.json +++ b/composer.json @@ -49,9 +49,9 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0.x-dev", - "dev-develop": "2.1.x-dev", - "dev-release/3.0.0": "3.0.x-dev" + "dev-master": "3.0.x-dev", + "dev-develop": "3.1.x-dev", + "dev-support/2.x": "2.0.x-dev" }, "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin", "contao": {