Merge branch 'support/2.x' of github.com:netzmacht/contao-leaflet-maps into support/2.x

.gitignore

@@ -4,6 +4,7 @@
 /assets/js/*.js
 /node_modules/
 /.tx/
+/.idea/
 
 coverage.xml
 composer.lock

composer.json

@@ -22,9 +22,9 @@
         "contao/core":"^3.5",
         "contao-community-alliance/dependency-container":"^1.0",
         "contao-community-alliance/event-dispatcher":"^1.0",
-        "netzmacht/contao-leaflet-libraries": "^1.0",
+        "netzmacht/contao-leaflet-libraries": "^1.3.4",
         "netzmacht/php-javascript-builder": "^1.0",
-        "netzmacht/php-leaflet": "^1.0",
+        "netzmacht/php-leaflet": "^1.1.0",
         "netzmacht/contao-toolkit":"^2.0",
         "contao-community-alliance/meta-palettes": "^1.5",
         "menatwork/contao-multicolumnwizard": "^3.2",

module/config/leaflet_providers.php

@@ -18,12 +18,17 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
 (
     'OpenStreetMap' => array
     (
-        'variants' => array('Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH'),
+        'variants' => array('Mapnik', 'BlackAndWhite', 'DE', 'CH', 'France', 'HOT', 'BZH'),
     ),
     'OpenSeaMap'    => array(),
     'OpenTopoMap'   => array(),
+    'OpenPtMap'   => array(),
+    'OpenRailwayMap' => array(),
+    'OpenFireMap' => array(),
+    'SafeCast' => array(),
     'Thunderforest' => array
     (
+        'class'   => 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\ThunderforestProvider',
         'variants' => array(
             'OpenCycleMap',
             'Transport',
@@ -32,7 +37,10 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
             'Landscape',
             'Outdoors',
             'Pioneer'
-        )
+        ),
+        'options' => array(
+            'apyKey' => 'tile_provider_key'
+        ),
     ),
     'OpenMapSurfer' => array
     (
@@ -44,7 +52,7 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
     'MapBox' => array(
         'class'   => 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\MapBoxProvider',
         'options' => array(
-            'key' => 'tile_provider_key'
+            'accessToken' => 'tile_provider_key'
         ),
     ),
     'Stamen' => array(
@@ -77,6 +85,7 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
         )
     ),
     'OpenWeatherMap' => array(
+        'class'   => 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\OpenWeatherMapProvider',
         'variants' => array(
             'Clouds',
             'CloudsClassic',
@@ -89,9 +98,13 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
             'Wind',
             'Temperature',
             'Snow'
-        )
+        ),
+        'options' => array(
+            'apiKey' => 'tile_provider_key'
+        ),
     ),
     'HERE' => array(
+        'class'   => 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider',
         'variants' => array(
             'normalDay',
             'normalDayCustom',
@@ -104,12 +117,17 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
             'normalNightMobile',
             'normalNightGrey',
             'normalNightGreyMobile',
+            'normalNightTransit',
+            'reducedDay',
+            'reducedNight',
             'basicMap',
             'mapLabels',
             'trafficFlow',
             'carnavDayGrey',
             'hybridDay',
             'hybridDayMobile',
+            'hybridDayTransit',
+            'hybridDayGrey',
             'pedestrianDay',
             'pedestrianNight',
             'satelliteDay',
@@ -121,7 +139,6 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
             'appCode' => 'tile_provider_code',
         ),
         'fields' => array('tile_provider_key', 'tile_provider_code'),
-        'class'  => 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider',
     ),
     'JusticeMap' => array(
         'variants' => array(
@@ -133,7 +150,7 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
             'multi',
             'nonWhite',
             'white',
-            'plurality'
+            'plurality',
         )
     ),
     'FreeMapSK' => array(),
@@ -146,6 +163,10 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
             'DarkMatter',
             'DarkMatterNoLabels',
             'DarkMatterOnlyLabels',
+            'Voyager',
+            'VoyagerNoLabels',
+            'VoyagerOnlyLabels',
+            'VoyagerLabelsUnder',
         )
     ),
     'HikeBike' => array(
@@ -177,5 +198,23 @@ $GLOBALS['LEAFLET_TILE_PROVIDERS'] = array
             'ModisTerraChlorophyll',
         )
     ),
-    'NLS' => array()
+    'NLS' => array(),
+    'Wikimedia' => array(),
+    'GeoportailFrance' => array(
+        'variants' => array(
+            'parcels',
+            'ignMaps',
+            'maps',
+            'orthos'
+        ),
+    ),
+    'OneMapSG' => array(
+        'variants' => array(
+            'Default',
+            'Night',
+            'Original',
+            'Grey',
+            'LandLot'
+        ),
+    )
 );

module/dca/tl_leaflet_layer.php

@@ -238,8 +238,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
             'provider' => array('tile_provider', 'tile_provider_variant')
         ),
         'tile_provider' => array(
-            'MapBox' => array('tile_provider_key'),
-            'HERE'   => array('tile_provider_key', 'tile_provider_code'),
+            'MapBox'         => array('tile_provider_key'),
+            'HERE'           => array('tile_provider_key', 'tile_provider_code'),
+            'OpenWeatherMap' => array('tile_provider_key'),
+            'Thunderforest'  => array('tile_provider_key'),
         ),
     ),
 

src/Netzmacht/Contao/Leaflet/Mapper/Control/LayersControlMapper.php

@@ -62,4 +62,14 @@ class LayersControlMapper extends AbstractControlMapper
 
         return $arguments;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function initialize()
+    {
+        parent::initialize();
+
+        $this->optionsBuilder->addOption('collapsed');
+    }
 }