Prepare release.

.travis.yml

@@ -1,8 +1,18 @@
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - ant-optional
+
 language: php
 
 php:
-  - "7.1"
+  - "7.3"
   - "7.2"
+  - "7.1"
+  - "7.4snapshot"
+  - "nightly"
 
 env:
   - CONTAO_VERSION=contao/core-bundle ~4.4.0
@@ -11,10 +21,12 @@ env:
 
 matrix:
   exclude:
+  allow_failures:
+    - php: "nightly"
+    - php: "7.4snapshot"
 
-sudo: false
+before_script:
-
+  - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-install:
   - travis_retry composer self-update && composer --version
   - travis_retry composer require $CONTAO_VERSION --no-update
   - travis_retry composer update --prefer-dist --no-interaction

CHANGELOG.md

@@ -6,9 +6,25 @@ 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.2 - TBD
+## [3.1.4] - 2019-02-13
 
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.1...hotfix/3.1.2)
+### Fixed
+
+ - Fix ordering changes in layer control element aren't recognized ([#72](https://github.com/netzmacht/contao-leaflet-maps/issues/72))
+ - Fix markers with negative coordinates aren't displayed ([#74](https://github.com/netzmacht/contao-leaflet-maps/issues/74))
+ - Fix image icon with non existing image throws exception ([#75](https://github.com/netzmacht/contao-leaflet-maps/issues/75))
+ - Fix invalid alias then using multiple edit. Aliases aren't copied anymore. ([#71](https://github.com/netzmacht/contao-leaflet-maps/issues/71))
+
+## [3.1.3] - 2019-01-10
+
+### Fixed
+
+ - Fix broken api routes in Contao 4.6/Symfony 4 (#69)
+ - Fix broken about.html.twig template. Error block was missing
+
+## 3.1.2 - 2018-12-18
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.1...3.1.2)
 
 ### Fixed
 
@@ -29,9 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Add missing GeoportailFrance of leaflet-providers
  - Add missing OneMapSG of leaflet-providers
 
-## 3.1.1 - 2018-12-07
+## [3.1.1] - 2018-12-07
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.0...3.1.1)
 
 ### Fixed
 
@@ -65,43 +79,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Fix broken marker cluster layer (#60).
 
 
-## 3.0.4 - 2018-10-08
+## [3.0.4] - 2018-10-08
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.3...3.0.4)
 
 ### Fixed
 
  - Fix broken content element attributes (Missing class and custom id).
 
-## 3.0.3 - 2018-09-18
+## [3.0.3] - 2018-09-18
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.2...3.0.3)
 
 ### Fixed
 
  - Make alias generator services public for Contao 4.6/Symfony 4.0 compatibility.
 
-## 3.0.2 - 2018-08-23
+## [3.0.2] - 2018-08-23
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.1...3.0.2)
 
  - Run composer require checker and solve issues.
  
-## 3.0.1 - 2018-06-20
+## [3.0.1] - 2018-06-20
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0...3.0.1)
 
  - Fix broken dynamic bbox related data loading (#57) 
 
-## 3.0.0 - 2018-01-05
+## [3.0.0] - 2018-01-05
-
-[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
+## [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
 
@@ -112,9 +114,7 @@ Bugfixes
   - Broken service definitions
   - Broken file layer id 
 
-## 3.0.0-alpha1 - 2017-10-19
+## [3.0.0-alpha2] - 2017-10-19
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...3.0.0-alpha2)
 
 Implemented enhancements
  
@@ -123,3 +123,14 @@ Implemented enhancements
  - New file layer for gpx,kml,wkt,topojson,geojson files added
  - Bypass filesystem cache in debug mode
  - Changelog added
+
+[3.1.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.2...3.1.4
+[3.1.3]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.2...3.1.3
+[3.1.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.0...3.1.1
+[3.0.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.3...3.0.4
+[3.0.3]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.2...3.0.3
+[3.0.2]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.1...3.0.2
+[3.0.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0...3.0.1
+[3.0.0]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...3.0.0
+[3.0.0-beta1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-beta1
+[3.0-0-alpha2]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...3.0.0-alpha2

README.md

@@ -2,9 +2,9 @@ Leaflet integration into Contao CMS
 ===================================
 
 [![Build Status](http://img.shields.io/travis/netzmacht/contao-leaflet-maps/master.svg?style=flat-square)](https://travis-ci.org/netzmacht/contao-leaflet-maps)
-[![Version](http://img.shields.io/packagist/v/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
+[![Version](http://img.shields.io/packagist/v/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
-[![License](http://img.shields.io/packagist/l/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
+[![License](http://img.shields.io/packagist/l/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
-[![Downloads](http://img.shields.io/packagist/dt/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
+[![Downloads](http://img.shields.io/packagist/dt/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
 [![Contao Community Alliance coding standard](http://img.shields.io/badge/cca-coding_standard-red.svg?style=flat-square)](https://github.com/contao-community-alliance/coding-standard)
 
 This extension provides a backend gui for integrating [Leaflet](http://leafletjs.com/) into the Contao CMS.
@@ -38,6 +38,12 @@ Features
  - Autoloading of required assets.
  - [Layer for MetaModels](https://github.com/netzmacht/contao-leaflet-metamodels)
  
+
+Documentation
+-------------
+
+A basic [user documentation](http://leaflet-maps-for-contao.readthedocs.org/) written in German is available.
+ 
 Changelog
 ---------
 

composer.json

@@ -1,12 +1,12 @@
 {
   "name": "netzmacht/contao-leaflet-maps",
+  "type": "contao-bundle",
   "description": "Contao Leaflet maps integration",
   "keywords": [
     "contao",
     "maps",
     "leaflet"
   ],
-  "type": "contao-bundle",
   "license": "LGPL-3.0-or-later",
   "authors": [
     {
@@ -16,38 +16,48 @@
       "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",
     "ext-json": "*",
     "ext-pdo": "*",
+    "contao-community-alliance/meta-palettes": "^2.0 || ^1.11",
     "contao/core-bundle": "~4.4",
+    "doctrine/cache": "^1.0",
     "doctrine/dbal": "^2.5",
-    "symfony/config": "~3.3 || ~4.0",
+    "menatwork/contao-multicolumnwizard": "^3.3",
-    "symfony/event-dispatcher": "~3.3 || ~4.0",
-    "symfony/dependency-injection": "~3.3 || ~4.0",
-    "symfony/filesystem": "~3.3 || ~4.0",
-    "symfony/http-kernel": "~3.3 || ~4.0",
-    "symfony/translation": "~3.3 || ~4.0",
-    "symfony/templating": "~3.3 || ~4.0",
-    "netzmacht/contao-leaflet-libraries": "^1.3.4",
     "netzmacht/contao-leaflet-geocode-widget": "^1.2",
+    "netzmacht/contao-leaflet-libraries": "^1.3.4",
+    "netzmacht/contao-page-context": "~1.0",
+    "netzmacht/contao-toolkit": "~3.0",
     "netzmacht/php-javascript-builder": "^1.0",
     "netzmacht/php-leaflet": "^1.1.0",
-    "netzmacht/contao-toolkit": "~3.0",
+    "symfony/config": "~3.3 || ~4.0",
-    "netzmacht/contao-page-context": "~1.0",
+    "symfony/dependency-injection": "~3.3 || ~4.0",
-    "contao-community-alliance/meta-palettes": "^2.0 || ^1.5",
+    "symfony/event-dispatcher": "~3.3 || ~4.0",
-    "menatwork/contao-multicolumnwizard": "^3.2",
+    "symfony/filesystem": "~3.3 || ~4.0",
-    "doctrine/cache": "^1.0"
+    "symfony/http-kernel": "~3.3 || ~4.0",
+    "symfony/templating": "~3.3 || ~4.0",
+    "symfony/translation": "~3.3 || ~4.0"
   },
   "require-dev": {
-    "phpcq/all-tasks": "^1.2",
     "contao/manager-plugin": "^2.1",
-    "phpstan/phpstan": "^0.10.3"
+    "phpcq/all-tasks": "^1.2"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "3.1.x-dev",
+      "dev-develop": "3.2.x-dev",
+      "dev-support/2.x": "2.0.x-dev"
+    },
+    "contao": {
+      "transifex": {
+        "project": "contao-leaflet-maps",
+        "prefix": "core-",
+        "languages_cto": "src/Bundle/Resources/contao/languages",
+        "languages_tx": ".tx"
+      }
+    },
+    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin"
   },
   "autoload": {
     "psr-4": {
@@ -59,20 +69,10 @@
       "vendor/phpcq/autoload-validation/hacks/contao-hack.php"
     ]
   },
-  "extra": {
+  "support": {
-    "branch-alias": {
+    "email": "mail@netzmacht.de",
-      "dev-master": "3.1.x-dev",
+    "issues": "https://github.com/netzmacht/contao-leaflet-maps/issues",
-      "dev-develop": "3.2.x-dev",
+    "source": "https://github.com/netzmacht/contao-leaflet-maps",
-      "dev-support/2.x": "2.0.x-dev"
+    "docs": "http://leaflet-maps-for-contao.readthedocs.org/"
-    },
-    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin",
-    "contao": {
-      "transifex": {
-        "project": "contao-leaflet-maps",
-        "prefix": "core-",
-        "languages_cto": "src/Bundle/Resources/contao/languages",
-        "languages_tx": ".tx"
-      }
-    }
   }
 }

src/Bundle/Resources/config/services.yml

@@ -128,11 +128,13 @@ services:
       - { name: Netzmacht\Contao\PageContext\Request\PageIdDeterminator }
 
   Netzmacht\Contao\Leaflet\Frontend\Action\LayerDataAction:
+    public: true
     arguments:
       - '@netzmacht.contao_leaflet.map.provider'
       - '@netzmacht.contao_leaflet.filter_factory'
 
   Netzmacht\Contao\Leaflet\Backend\Action\AboutAction:
+    public: true
     arguments:
       - '@templating'
       - '%kernel.project_dir%'

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

@@ -164,6 +164,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
                 'maxlength'   => 255,
                 'tl_class'    => 'w50',
                 'nullIfEmpty' => true,
+                'doNotCopy'   => true,
             ],
             'toolkit'       => [
                 'alias_generator' => [

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

@@ -179,7 +179,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -278,7 +278,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval' => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'nullIfEmpty' => true,
+                'doNotCopy'   => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -157,7 +157,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -160,7 +160,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -151,7 +151,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -145,7 +145,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -185,7 +185,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

src/Bundle/Resources/views/backend/about.html.twig

@@ -2,6 +2,8 @@
 
 {% block headline %}{{ "MOD.leaflet_about.1"|trans({}, 'contao_modules') }}{% endblock %}
 
+{% block error %}{% endblock %}
+
 {% block main %}
     <div class="netzmacht-leaflet-credits">
         <div class="header">

src/Listener/Dca/MapDcaListener.php

@@ -25,10 +25,8 @@ use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
 use PDO;
-use function strlen;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
-use function var_dump;
 
 /**
  * Class Map is the helper class for the tl_leaflet_map dca.

src/Mapper/Type/ImageIconMapper.php

@@ -72,15 +72,9 @@ class ImageIconMapper extends AbstractIconMapper
         $elementId = null
     ) {
         $arguments   = parent::buildConstructArguments($model, $mapper, $request, $elementId);
-
-        if ($model->iconImage) {
         $repository  = $this->repositoryManager->getRepository(FilesModel::class);
         $file        = $repository->findByUuid($model->iconImage);
-
+        $arguments[] = $file ? $file->path : '';
-            if ($file) {
-                $arguments[] = $file->path;
-            }
-        }
 
         return $arguments;
     }
@@ -117,8 +111,6 @@ class ImageIconMapper extends AbstractIconMapper
             $file = $repository->findByUuid($model->iconImage);
 
             if ($file) {
-                $definition->setIconUrl($file->path);
-
                 $file = new File($file->path);
                 $definition->setIconSize([$file->width, $file->height]);
 

src/Model/ControlModel.php

@@ -41,6 +41,7 @@ SELECT    l.*, c.mode as controlMode
 FROM      tl_leaflet_layer l
 LEFT JOIN tl_leaflet_control_layer c ON l.id = c.lid
 WHERE     c.cid=?
+ORDER BY  c.sorting
 SQL;
 
         $result = Database::getInstance()
@@ -67,6 +68,7 @@ FROM      tl_leaflet_layer l
 LEFT JOIN tl_leaflet_control_layer
 c ON      l.id = c.lid
 WHERE     c.cid=? AND l.active=1
+ORDER BY  c.sorting
 SQL;
 
         $result = Database::getInstance()

src/Model/MarkerModel.php

@@ -17,7 +17,6 @@ use Netzmacht\Contao\Leaflet\Filter\BboxFilter;
 use Netzmacht\Contao\Leaflet\Filter\DistanceFilter;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
 use Netzmacht\LeafletPHP\Value\LatLngBounds;
-use function var_dump;
 
 /**
  * Class MarkerModel for the tl_leaflet_marker table.
@@ -50,8 +49,8 @@ class MarkerModel extends AbstractActiveModel
                 [
                     $table . '.active=1',
                     $table . '.pid=?',
-                    $table . '.latitude>0',
+                    $table . '.latitude IS NOT NULL',
-                    $table . '.longitude>0',
+                    $table . '.longitude IS NOT NULL',
                 ],
                 [$pid],
                 ['order' => 'sorting']