Complete implementation of tile providers.

CHANGELOG.md

@@ -6,7 +6,39 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 3.1.0 - 2018-01-11
+## 3.1.2 - TBD
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.1...hotfix/3.1.2)
+
+### Fixed
+
+ - Fix broken MapBox integration: Access token is now required
+ - Fix broken OpenWeatherMap integration: Api key is now required
+ - Fix broken Thunderforest integration: Api key is now required
+
+### Added
+
+ - Add missing OpenPtMap of leaflet-providers
+ - Add missing OpenRailwayMap of leaflet-providers
+ - Add missing OpenFireMap of leaflet-providers
+ - Add missing SafeCast of leaflet-providers
+ - Add missing map types `normalNightTransit`, `normalNightTransitMobile`, `reducedDay`, `reducedNight`, 
+   `hybridDayTransit` and `hybridDayGrey` of HERE provider
+ - Add missing map types `Voyager`, `VoyagerNoLabels`, `VoyagerOnlyLabels` and `VoyagerLabelsUnder` of CartoDB provider
+ - Add missing Wikimedia of leaflet-providers
+ - Add missing GeoportailFrance of leaflet-providers
+ - Add missing OneMapSG of leaflet-providers
+
+## 3.1.1 - 2018-12-07
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.0...3.1.1)
+
+### Fixed
+
+ - Fix missing marker cluster icon.
+ - Ignore markers without coordinates to prevent uncaught exception caused by invalid coordinates.
+
+## 3.1.0 - 2018-11-01
 
 [Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.4...3.1.0)
 

composer.json

@@ -34,10 +34,10 @@
     "symfony/http-kernel": "~3.3 || ~4.0",
     "symfony/translation": "~3.3 || ~4.0",
     "symfony/templating": "~3.3 || ~4.0",
-    "netzmacht/contao-leaflet-libraries": "^1.0",
+    "netzmacht/contao-leaflet-libraries": "^1.3.4",
     "netzmacht/contao-leaflet-geocode-widget": "^1.2",
     "netzmacht/php-javascript-builder": "^1.0",
-    "netzmacht/php-leaflet": "^1.0.2",
+    "netzmacht/php-leaflet": "^1.1.0",
     "netzmacht/contao-toolkit": "~3.0",
     "netzmacht/contao-page-context": "~1.0",
     "contao-community-alliance/meta-palettes": "^2.0 || ^1.5",

src/Bundle/Resources/config/layers.yml

@@ -32,7 +32,7 @@ parameters:
 
     markercluster:
       children: true
-      icon: 'bundles/netzmachtcontaoleaflet/img/markercluster.png'
+      icon: 'bundles/netzmachtcontaoleaflet/img/cluster.png'
 
     tile:
       children: false

src/Bundle/Resources/config/providers.yml

@@ -1,13 +1,22 @@
 parameters:
   netzmacht.contao_leaflet.providers:
     OpenStreetMap:
-      variants: ['Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH']
+      variants: ['Mapnik', 'BlackAndWhite', 'DE', 'CH', 'France', 'HOT', 'BZH']
 
     OpenSeaMap: []
 
     OpenTopoMap: []
 
+    OpenPtMap: []
+
+    OpenRailwayMap: []
+
+    OpenFireMap: []
+
+    SafeCast: []
+
     Thunderforest:
+      class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\ThunderforestProvider'
       variants:
         - 'OpenCycleMap'
         - 'Transport'
@@ -16,6 +25,9 @@ parameters:
         - 'Landscape'
         - 'Outdoors'
         - 'Pioneer'
+      options:
+        apiKey: 'tile_provider_key'
+      fields: ['tile_provider_key']
 
     OpenMapSurfer:
       variants: ['Roads', 'AdminBounds', 'Grayscale']
@@ -26,7 +38,8 @@ parameters:
     MapBox:
       class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\MapBoxProvider'
       options:
-        key: 'tile_provider_key'
+        accessToken: 'tile_provider_key'
+      fields: ['tile_provider_key']
 
     Stamen:
       variants:
@@ -56,6 +69,7 @@ parameters:
         - 'WorldGrayCanvas'
 
     OpenWeatherMap:
+      class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\OpenWeatherMapProvider'
       variants:
         - 'Clouds'
         - 'CloudsClassic'
@@ -68,6 +82,9 @@ parameters:
         - 'Wind'
         - 'Temperature'
         - 'Snow'
+      options:
+        apiKey: 'tile_provider_key'
+      fields: ['tile_provider_key']
 
     HERE:
       class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider'
@@ -83,12 +100,18 @@ parameters:
         - 'normalNightMobile'
         - 'normalNightGrey'
         - 'normalNightGreyMobile'
+        - 'normalNightTransit'
+        - 'normalNightTransitMobile'
+        - 'reducedDay'
+        - 'reducedNight'
         - 'basicMap'
         - 'mapLabels'
         - 'trafficFlow'
         - 'carnavDayGrey'
         - 'hybridDay'
         - 'hybridDayMobile'
+        - 'hybridDayTransit'
+        - 'hybridDayGrey'
         - 'pedestrianDay'
         - 'pedestrianNight'
         - 'satelliteDay'
@@ -123,6 +146,10 @@ parameters:
         - 'DarkMatter'
         - 'DarkMatterNoLabels'
         - 'DarkMatterOnlyLabels'
+        - 'Voyager'
+        - 'VoyagerNoLabels'
+        - 'VoyagerOnlyLabels'
+        - 'VoyagerLabelsUnder'
 
     HikeBike:
       variants:
@@ -155,3 +182,20 @@ parameters:
         - 'ModisTerraChlorophyll'
 
     NLS: []
+
+    Wikimedia: []
+
+    GeoportailFrance:
+      variants:
+        - 'parcels'
+        - 'ignMaps'
+        - 'maps'
+        - 'orthos'
+
+    OneMapSG:
+      variants:
+        - 'Default'
+        - 'Night'
+        - 'Original'
+        - 'Grey'
+        - 'LandLot'

src/Bundle/Resources/contao/config/config.php

@@ -44,7 +44,7 @@ array_insert(
     ]
 );
 
-if (TL_MODE === 'BE') {
+if (defined('TL_MODE') && TL_MODE === 'BE') {
     $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_global.css';
 }
 

src/Bundle/Resources/contao/dca/tl_leaflet_layer.php

@@ -232,12 +232,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'provider' => ['tile_provider', 'tile_provider_variant'],
         ],
         'tile_provider' => [
-            'MapBox' => ['tile_provider_key'],
+            'MapBox'         => ['tile_provider_key'],
-            'HERE'   => ['tile_provider_key', 'tile_provider_code'],
+            'HERE'           => ['tile_provider_key', 'tile_provider_code'],
+            'OpenWeatherMap' => ['tile_provider_key'],
+            'Thunderforest'  => ['tile_provider_key'],
+        ],
+        'fileFormat'    => [
+            '!' => ['file'],
         ],
-        'fileFormat' => [
-            '!' => ['file']
-        ]
     ],
 
     'metasubpalettes' => [
@@ -864,7 +866,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             ],
             'sql'       => 'mediumtext NULL',
         ],
-        'fileFormat' => [
+        'fileFormat'                     => [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'],
             'exclude'          => true,
             'inputType'        => 'select',
@@ -882,19 +884,19 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
         'file'                           => [
-            'label'     => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'],
+            'label'         => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'],
-            'exclude'   => true,
+            'exclude'       => true,
-            'inputType' => 'fileTree',
+            'inputType'     => 'fileTree',
             'load_callback' => [
                 ['netzmacht.contao_leaflet.listeners.dca.layer', 'prepareFileWidget'],
             ],
-            'eval'      => [
+            'eval'          => [
-                'filesOnly'  => true,
+                'filesOnly' => true,
-                'fieldType'  => 'radio',
+                'fieldType' => 'radio',
-                'mandatory'  => true,
+                'mandatory' => true,
-                'tl_class'   => 'clr',
+                'tl_class'  => 'clr',
             ],
-            'sql'       => 'binary(16) NULL',
+            'sql'           => 'binary(16) NULL',
         ],
     ],
 ];

src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php

@@ -149,6 +149,10 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'][0]                 = 'File
 $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: %s.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_key'][0]          = 'API key / Access token';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_key'][1]          = 'Please define the API key / access token which is required for this tile provider.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_code'][0]         = 'App code';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_code'][1]         = 'Please define the required app code for this tile provider.';
 
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][0]   = 'Layer group';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][1]   = 'Basic layer group. <br> See <a href="http://leafletjs.com/reference.html#layergroup" target="_blank">http://leafletjs.com/reference.html#layergroup</a>';

src/Bundle/Resources/contao/public/.htaccess

@@ -1,7 +0,0 @@
-<IfModule !mod_authz_core.c>
-  Order allow,deny
-  Allow from all
-</IfModule>
-<IfModule mod_authz_core.c>
-  Require all granted
-</IfModule>

src/Listener/Dca/LeafletDcaListener.php

@@ -122,6 +122,7 @@ class LeafletDcaListener
             $data['marker'] = json_encode($latLng);
         } catch (\Exception $e) {
             // LatLng throws an exception of value could not be created. Just let the value empty when.
+            $data['marker'] = null;
         }
 
         return $this->templateEngine->render('toolkit:be:be_leaflet_geocode.html5', $data);

src/Model/MarkerModel.php

@@ -44,7 +44,18 @@ class MarkerModel extends AbstractActiveModel
     public static function findByFilter($pid, ?Filter $filter = null)
     {
         if (!$filter) {
-            return static::findActiveBy('pid', $pid, ['order' => 'sorting']);
+            $table = static::getTable();
+
+            return static::findBy(
+                [
+                    $table . '.active=1',
+                    $table . '.pid=?',
+                    $table . '.latitude>0',
+                    $table . '.longitude>0',
+                ],
+                [$pid],
+                ['order' => 'sorting']
+            );
         }
 
         switch (true) {