mirror of
https://github.com/netzmacht/contao-leaflet-geocode-widget.git
synced 2025-11-29 04:03:40 +01:00
Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99f080473b | ||
|
|
e7115cd227 | ||
|
|
1f556ba752 | ||
|
|
178520dd6f | ||
|
|
572b58edeb | ||
|
|
940b9b07f7 | ||
|
|
e47d2b0a9d | ||
|
|
229ff66f98 | ||
|
|
b6418dd2de | ||
|
|
617a996e0e | ||
|
|
be820179de | ||
|
|
a4c24a80c2 | ||
|
|
e7b930f4a1 | ||
|
|
76a0793efa | ||
|
|
67d39cc8c0 | ||
|
|
656ddc3089 | ||
|
|
c0ce2f4c5c | ||
|
|
e505651cd9 | ||
|
|
c3e034f161 | ||
|
|
047cc7b7cf | ||
|
|
c4517b2dec | ||
|
|
b7192d0972 | ||
|
|
5a56204a22 | ||
|
|
32e2c7578d | ||
|
|
e933eb0126 | ||
|
|
f4fc8c9fe5 | ||
|
|
1964dab9e8 |
10
.gitattributes
vendored
Normal file
10
.gitattributes
vendored
Normal file
@@ -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
|
||||
30
.gitignore
vendored
30
.gitignore
vendored
@@ -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
|
||||
|
||||
34
.travis.yml
Normal file
34
.travis.yml
Normal file
@@ -0,0 +1,34 @@
|
||||
language: php
|
||||
|
||||
php:
|
||||
- "5.6"
|
||||
- "7.0"
|
||||
- "7.1"
|
||||
- "7.2"
|
||||
|
||||
env:
|
||||
- CONTAO_VERSION=contao/core-bundle ~4.4.2
|
||||
- CONTAO_VERSION=contao/core-bundle ~4.5.0
|
||||
|
||||
matrix:
|
||||
exclude:
|
||||
- php: 5.6
|
||||
env: CONTAO_VERSION=contao/core-bundle ~4.5.0
|
||||
- php: 7.0
|
||||
env: CONTAO_VERSION=contao/core-bundle ~4.5.0
|
||||
|
||||
sudo: false
|
||||
|
||||
install:
|
||||
- travis_retry composer self-update && composer --version
|
||||
- travis_retry composer require $CONTAO_VERSION --no-update
|
||||
- travis_retry composer update --prefer-dist --no-interaction
|
||||
|
||||
script: ant -keep-going
|
||||
|
||||
git:
|
||||
depth: 2147483647
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- vendor
|
||||
29
CHANGELOG.md
Normal file
29
CHANGELOG.md
Normal file
@@ -0,0 +1,29 @@
|
||||
|
||||
Changelog
|
||||
=========
|
||||
|
||||
Version 1.3.0 (2018-02-xx)
|
||||
--------------------------
|
||||
|
||||
[Full Changelog](https://github.com/netzmacht/contao-leaflet-geocode-widget/compare/1.2.1...1.3.0)
|
||||
|
||||
- Move apply button to the modal footer.
|
||||
- Deprecate `Netzmacht\Contao\Leaflet\GeocodeWidget`. Use `Netzmacht\Contao\Leaflet\Widget\GeocodeWidget` instead.
|
||||
- Add feature to adjust a radius.
|
||||
- Allow Contao 4.5.0.
|
||||
|
||||
Version 1.2.0 (2017-11-13)
|
||||
--------------------------
|
||||
|
||||
[Full Changelog](https://github.com/netzmacht/contao-leaflet-geocode-widget/compare/1.1.0...1.2.0)
|
||||
|
||||
- Allow multiple elements
|
||||
|
||||
Version 1.1.0
|
||||
-------------
|
||||
|
||||
[Full Changelog](https://github.com/netzmacht/contao-leaflet-geocode-widget/compare/1.0.0...1.1.0)
|
||||
|
||||
- Add wizard class using an extra div wrapper
|
||||
- Require Contao 4.4.2 (BC break in Contao see #1)
|
||||
- Apply coding standards
|
||||
165
LICENSE
Normal file
165
LICENSE
Normal file
@@ -0,0 +1,165 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
|
||||
This version of the GNU Lesser General Public License incorporates
|
||||
the terms and conditions of version 3 of the GNU General Public
|
||||
License, supplemented by the additional permissions listed below.
|
||||
|
||||
0. Additional Definitions.
|
||||
|
||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||
General Public License.
|
||||
|
||||
"The Library" refers to a covered work governed by this License,
|
||||
other than an Application or a Combined Work as defined below.
|
||||
|
||||
An "Application" is any work that makes use of an interface provided
|
||||
by the Library, but which is not otherwise based on the Library.
|
||||
Defining a subclass of a class defined by the Library is deemed a mode
|
||||
of using an interface provided by the Library.
|
||||
|
||||
A "Combined Work" is a work produced by combining or linking an
|
||||
Application with the Library. The particular version of the Library
|
||||
with which the Combined Work was made is also called the "Linked
|
||||
Version".
|
||||
|
||||
The "Minimal Corresponding Source" for a Combined Work means the
|
||||
Corresponding Source for the Combined Work, excluding any source code
|
||||
for portions of the Combined Work that, considered in isolation, are
|
||||
based on the Application, and not on the Linked Version.
|
||||
|
||||
The "Corresponding Application Code" for a Combined Work means the
|
||||
object code and/or source code for the Application, including any data
|
||||
and utility programs needed for reproducing the Combined Work from the
|
||||
Application, but excluding the System Libraries of the Combined Work.
|
||||
|
||||
1. Exception to Section 3 of the GNU GPL.
|
||||
|
||||
You may convey a covered work under sections 3 and 4 of this License
|
||||
without being bound by section 3 of the GNU GPL.
|
||||
|
||||
2. Conveying Modified Versions.
|
||||
|
||||
If you modify a copy of the Library, and, in your modifications, a
|
||||
facility refers to a function or data to be supplied by an Application
|
||||
that uses the facility (other than as an argument passed when the
|
||||
facility is invoked), then you may convey a copy of the modified
|
||||
version:
|
||||
|
||||
a) under this License, provided that you make a good faith effort to
|
||||
ensure that, in the event an Application does not supply the
|
||||
function or data, the facility still operates, and performs
|
||||
whatever part of its purpose remains meaningful, or
|
||||
|
||||
b) under the GNU GPL, with none of the additional permissions of
|
||||
this License applicable to that copy.
|
||||
|
||||
3. Object Code Incorporating Material from Library Header Files.
|
||||
|
||||
The object code form of an Application may incorporate material from
|
||||
a header file that is part of the Library. You may convey such object
|
||||
code under terms of your choice, provided that, if the incorporated
|
||||
material is not limited to numerical parameters, data structure
|
||||
layouts and accessors, or small macros, inline functions and templates
|
||||
(ten or fewer lines in length), you do both of the following:
|
||||
|
||||
a) Give prominent notice with each copy of the object code that the
|
||||
Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
4. Combined Works.
|
||||
|
||||
You may convey a Combined Work under terms of your choice that,
|
||||
taken together, effectively do not restrict modification of the
|
||||
portions of the Library contained in the Combined Work and reverse
|
||||
engineering for debugging such modifications, if you also do each of
|
||||
the following:
|
||||
|
||||
a) Give prominent notice with each copy of the Combined Work that
|
||||
the Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
c) For a Combined Work that displays copyright notices during
|
||||
execution, include the copyright notice for the Library among
|
||||
these notices, as well as a reference directing the user to the
|
||||
copies of the GNU GPL and this license document.
|
||||
|
||||
d) Do one of the following:
|
||||
|
||||
0) Convey the Minimal Corresponding Source under the terms of this
|
||||
License, and the Corresponding Application Code in a form
|
||||
suitable for, and under terms that permit, the user to
|
||||
recombine or relink the Application with a modified version of
|
||||
the Linked Version to produce a modified Combined Work, in the
|
||||
manner specified by section 6 of the GNU GPL for conveying
|
||||
Corresponding Source.
|
||||
|
||||
1) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (a) uses at run time
|
||||
a copy of the Library already present on the user's computer
|
||||
system, and (b) will operate properly with a modified version
|
||||
of the Library that is interface-compatible with the Linked
|
||||
Version.
|
||||
|
||||
e) Provide Installation Information, but only if you would otherwise
|
||||
be required to provide such information under section 6 of the
|
||||
GNU GPL, and only to the extent that such information is
|
||||
necessary to install and execute a modified version of the
|
||||
Combined Work produced by recombining or relinking the
|
||||
Application with a modified version of the Linked Version. (If
|
||||
you use option 4d0, the Installation Information must accompany
|
||||
the Minimal Corresponding Source and Corresponding Application
|
||||
Code. If you use option 4d1, you must provide the Installation
|
||||
Information in the manner specified by section 6 of the GNU GPL
|
||||
for conveying Corresponding Source.)
|
||||
|
||||
5. Combined Libraries.
|
||||
|
||||
You may place library facilities that are a work based on the
|
||||
Library side by side in a single library together with other library
|
||||
facilities that are not Applications and are not covered by this
|
||||
License, and convey such a combined library under terms of your
|
||||
choice, if you do both of the following:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work based
|
||||
on the Library, uncombined with any other library facilities,
|
||||
conveyed under the terms of this License.
|
||||
|
||||
b) Give prominent notice with the combined library that part of it
|
||||
is a work based on the Library, and explaining where to find the
|
||||
accompanying uncombined form of the same work.
|
||||
|
||||
6. Revised Versions of the GNU Lesser General Public License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions
|
||||
of the GNU Lesser General Public License from time to time. Such new
|
||||
versions will be similar in spirit to the present version, but may
|
||||
differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Library as you received it specifies that a certain numbered version
|
||||
of the GNU Lesser General Public License "or any later version"
|
||||
applies to it, you have the option of following the terms and
|
||||
conditions either of that published version or of any later version
|
||||
published by the Free Software Foundation. If the Library as you
|
||||
received it does not specify a version number of the GNU Lesser
|
||||
General Public License, you may choose any version of the GNU Lesser
|
||||
General Public License ever published by the Free Software Foundation.
|
||||
|
||||
If the Library as you received it specifies that a proxy can decide
|
||||
whether future versions of the GNU Lesser General Public License shall
|
||||
apply, that proxy's public statement of acceptance of any version is
|
||||
permanent authorization for you to choose that version for the
|
||||
Library.
|
||||
65
README.md
65
README.md
@@ -1,13 +1,23 @@
|
||||
Leaflet geocode widget
|
||||
======================
|
||||
|
||||
[](https://travis-ci.org/netzmacht/contao-leaflet-geocode-widget)
|
||||
[](http://packagist.org/packages/netzmacht/contao-leaflet-geocode-widget)
|
||||
[](http://packagist.org/packages/netzmacht/contao-leaflet-geocode-widget)
|
||||
[](http://packagist.org/packages/netzmacht/contao-leaflet-geocode-widget)
|
||||
[](https://github.com/contao-community-alliance/coding-standard)
|
||||
|
||||
This extension provides an widget to pick coordinates from a map. It uses the leaflet framework.
|
||||
|
||||
Changlog
|
||||
--------
|
||||
|
||||
See [CHANGELOG](CHANGELOG.md).
|
||||
|
||||
Requirements
|
||||
------------
|
||||
|
||||
Contao 4.3
|
||||
- Contao ~4.4
|
||||
|
||||
|
||||
Install
|
||||
@@ -41,12 +51,63 @@ bin/console assets:install --symlink
|
||||
|
||||
### 4. Use the widget
|
||||
|
||||
#### Coordinates only
|
||||
|
||||
```php
|
||||
$GLOBALS['TL_DCA']['tl_example']['fields']['coordinates'] = [
|
||||
'label' => ['Koordinaten', 'Geben Sie die Koordinaten ein'],
|
||||
'inputType' => 'leaflet_geocode',
|
||||
'eval' => [
|
||||
'tl_class' => 'w50 wizard',
|
||||
'tl_class' => 'w50',
|
||||
],
|
||||
'sql' => 'varchar(255) NOT NULL default \'\''
|
||||
];
|
||||
```
|
||||
|
||||
#### Coordinates and radius
|
||||
|
||||
To pick the radius in meters as well, you have to configure the `eval.radius` option for the related radius field.
|
||||
The radius field should be a simle text input. The `default`, `minval` and `maxval` flags are passed to the geocode
|
||||
widget so that only radius in that boundary can be chosen.
|
||||
|
||||
```php
|
||||
$GLOBALS['TL_DCA']['tl_page']['fields']['coordinates'] = [
|
||||
'label' => ['Koordinaten', 'Geben Sie die Koordinaten ein'],
|
||||
'inputType' => 'leaflet_geocode',
|
||||
'eval' => [
|
||||
'tl_class' => 'w50',
|
||||
'radius' => 'radius'
|
||||
],
|
||||
'sql' => 'varchar(255) NOT NULL default \'\''
|
||||
];
|
||||
|
||||
$GLOBALS['TL_DCA']['tl_page']['fields']['radius'] = [
|
||||
'label' => ['Radius', 'Angabe des Radius in Metern'],
|
||||
'inputType' => 'leaflet_radius', // Optional, you can use a text widget as well
|
||||
'eval' => [
|
||||
'default' => 500,
|
||||
'minval' => 100,
|
||||
'maxval' => 5000,
|
||||
'steps' => 100, // Round value to the closest 100m.
|
||||
'tl_class' => 'w50',
|
||||
],
|
||||
'sql' => 'varchar(255) NOT NULL default \'\''
|
||||
];
|
||||
```
|
||||
|
||||
If you want to add an wizard icon to the radius field as well, you only have to reference the coordinates field.
|
||||
|
||||
```php
|
||||
$GLOBALS['TL_DCA']['tl_page']['fields']['radius'] = [
|
||||
'label' => ['Radius', 'Angabe des Radius in Metern'],
|
||||
'inputType' => 'leaflet_radius',
|
||||
'eval' => [
|
||||
'rgxp' => 'natural',
|
||||
'default' => 500,
|
||||
'minval' => 100,
|
||||
'maxval' => 5000,
|
||||
'tl_class' => 'w50 wizard',
|
||||
'coordinates' => 'coordinates'
|
||||
],
|
||||
'sql' => 'varchar(255) NOT NULL default \'\''
|
||||
];
|
||||
|
||||
4
build.default.properties
Normal file
4
build.default.properties
Normal file
@@ -0,0 +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
|
||||
phpcpd.excluded = contao
|
||||
5
build.xml
Normal file
5
build.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project name="netzmacht/contao-leaflet-geocode-widget" default="build">
|
||||
<!-- import the main build system -->
|
||||
<import file="vendor/phpcq/phpcq/phpcq.main.xml" />
|
||||
</project>
|
||||
@@ -8,13 +8,13 @@
|
||||
"leaflet"
|
||||
],
|
||||
"type": "contao-bundle",
|
||||
"license": "LGPL-3.0+",
|
||||
"license": "LGPL-3.0-or-later",
|
||||
"authors": [
|
||||
{
|
||||
"name": "David Molineus",
|
||||
"email": "mail@netzmacht.de",
|
||||
"homepage": "http://www.netzmacht.de",
|
||||
"role": "Project leader"
|
||||
"homepage": "https://netzmacht.de",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"support": {
|
||||
@@ -24,17 +24,14 @@
|
||||
"source": "https://github.com/contao-bootstrap/core"
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5.0",
|
||||
"contao/core-bundle": "~4.3",
|
||||
"contao-community-alliance/composer-plugin": "~2.4 || ~3.0",
|
||||
"netzmacht/contao-leaflet-libraries": "~1.0"
|
||||
"php": ">=5.6.0",
|
||||
"contao/core-bundle": "^4.4.0",
|
||||
"netzmacht/contao-leaflet-libraries": "~1.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"netzmacht/contao-build-tools": "~1.1",
|
||||
"contao/manager-plugin": "^2.0"
|
||||
},
|
||||
"conflict": {
|
||||
"contao/manager-plugin": "<2.0 || >=3.0"
|
||||
"contao/manager-plugin": "^2.0",
|
||||
"phpcq/all-tasks": "^1.2",
|
||||
"php-http/guzzle6-adapter": "^1.1"
|
||||
},
|
||||
"suggest": {
|
||||
"netzmacht/contao-leaflet-maps": "Leaflet Maps for Contao"
|
||||
@@ -46,11 +43,9 @@
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0.x-dev",
|
||||
"dev-develop": "1.1.x-dev"
|
||||
"dev-master": "1.3.x-dev",
|
||||
"dev-develop": "1.4.x-dev"
|
||||
},
|
||||
"contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\GeocodeWidget\\ContaoManager\\Plugin"
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"prefer-stable": true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2017 netzmacht David Molineus. All rights reserved.
|
||||
* @copyright 2016-2017 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Netzmacht\Contao\Leaflet\GeocodeWidget\ContaoManager;
|
||||
@@ -17,7 +19,7 @@ use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
|
||||
use Netzmacht\Contao\Leaflet\GeocodeWidget\LeafletGeocodeWidgetBundle;
|
||||
|
||||
/**
|
||||
* Class Plugin
|
||||
* Contao Manager plugin.
|
||||
*
|
||||
* @package Netzmacht\Contao\Leaflet\GeocodeWidget\ContaoManager
|
||||
*/
|
||||
|
||||
37
src/DependencyInjection/LeafletGeocodeWidgetExtension.php
Normal file
37
src/DependencyInjection/LeafletGeocodeWidgetExtension.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*/
|
||||
|
||||
namespace Netzmacht\Contao\Leaflet\GeocodeWidget\DependencyInjection;
|
||||
|
||||
use Symfony\Component\Config\FileLocator;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Extension\Extension;
|
||||
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
|
||||
|
||||
/**
|
||||
* Class LeafletGeocodeWidgetExtension
|
||||
*/
|
||||
class LeafletGeocodeWidgetExtension extends Extension
|
||||
{
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function load(array $configs, ContainerBuilder $container)
|
||||
{
|
||||
$loader = new YamlFileLoader(
|
||||
$container,
|
||||
new FileLocator(dirname(__DIR__) . '/Resources/config')
|
||||
);
|
||||
|
||||
$loader->load('listeners.yml');
|
||||
}
|
||||
}
|
||||
45
src/EventListener/RadiusWizardCallbackListener.php
Normal file
45
src/EventListener/RadiusWizardCallbackListener.php
Normal file
@@ -0,0 +1,45 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*/
|
||||
|
||||
namespace Netzmacht\Contao\Leaflet\GeocodeWidget\EventListener;
|
||||
|
||||
use Contao\DataContainer;
|
||||
|
||||
/**
|
||||
* Class RadiusWizardCallbackListener
|
||||
*
|
||||
* @package Netzmacht\Contao\Leaflet\GeocodeWidget\EventListener
|
||||
*/
|
||||
class RadiusWizardCallbackListener
|
||||
{
|
||||
/**
|
||||
* Generate the wizard for the radius widget.
|
||||
*
|
||||
* @param DataContainer $dataContainer Data container driver.
|
||||
*
|
||||
* @return string
|
||||
*
|
||||
* @SuppressWarnings(PHPMD.Superglobals)
|
||||
*/
|
||||
public function generateWizard($dataContainer)
|
||||
{
|
||||
if (!isset($GLOBALS['TL_DCA'][$dataContainer->table]['fields'][$dataContainer->field]['eval']['coordinates'])) {
|
||||
return '';
|
||||
}
|
||||
|
||||
return sprintf(
|
||||
'<a href="#" onclick="$(\'ctrl_%s_toggle\').click();return false;"><img src="%s"></a>',
|
||||
$GLOBALS['TL_DCA'][$dataContainer->table]['fields'][$dataContainer->field]['eval']['coordinates'],
|
||||
'bundles/leafletgeocodewidget/img/map.png'
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,104 +1,42 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2017 netzmacht David Molineus. All rights reserved.
|
||||
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Netzmacht\Contao\Leaflet\GeocodeWidget;
|
||||
|
||||
use Netzmacht\Contao\Leaflet\GeocodeWidget\Widget\GeocodeWidget as BaseWidget;
|
||||
|
||||
/**
|
||||
* Class GeocodeWidget
|
||||
*
|
||||
* @package Netzmacht\Contao\Leaflet\GeocodeWidget
|
||||
* @deprecated
|
||||
*/
|
||||
class GeocodeWidget extends \Widget
|
||||
class GeocodeWidget extends BaseWidget
|
||||
{
|
||||
/**
|
||||
* Submit user input.
|
||||
*
|
||||
* @var boolean
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected $blnSubmitInput = true;
|
||||
|
||||
/**
|
||||
* Add a for attribute.
|
||||
*
|
||||
* @var boolean
|
||||
*/
|
||||
protected $blnForAttribute = true;
|
||||
|
||||
/**
|
||||
* Template.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $strTemplate = 'be_widget';
|
||||
|
||||
/**
|
||||
* Template name.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $widgetTemplate = 'be_widget_leaflet_geocode';
|
||||
|
||||
/**
|
||||
* Validate the input.
|
||||
*
|
||||
* @param mixed $value Given value.
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
protected function validator($value)
|
||||
public function __construct(array $arrAttributes = null)
|
||||
{
|
||||
$value = parent::validator($value);
|
||||
parent::__construct($arrAttributes);
|
||||
|
||||
if (!$value) {
|
||||
return $value;
|
||||
}
|
||||
|
||||
if (
|
||||
// See: http://stackoverflow.com/a/18690202
|
||||
!preg_match(
|
||||
'#^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)(,[-+]?\d+)?$#',
|
||||
$value
|
||||
)
|
||||
) {
|
||||
$this->addError(
|
||||
sprintf(
|
||||
$GLOBALS['TL_LANG']['ERR']['leafletInvalidCoordinate'],
|
||||
$value
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate the widget.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function generate()
|
||||
{
|
||||
$template = new \BackendTemplate($this->widgetTemplate);
|
||||
$template->setData(
|
||||
[
|
||||
'widget' => $this,
|
||||
'value' => specialchars($this->value),
|
||||
'class' => $this->strClass ? ' ' . $this->strClass : '',
|
||||
'id' => $this->strId,
|
||||
'name' => $this->strName,
|
||||
'attributes' => $this->getAttributes(),
|
||||
'wizard' => $this->wizard,
|
||||
'label' => $this->strLabel
|
||||
]
|
||||
// @codingStandardsIgnoreStart
|
||||
@trigger_error(
|
||||
sprintf(
|
||||
'"%s" is deprecated and will be removed in version 2.0.0. Use "%s" instead.',
|
||||
GeocodeWidget::class,
|
||||
BaseWidget::class
|
||||
),
|
||||
E_USER_DEPRECATED
|
||||
);
|
||||
|
||||
return $template->parse();
|
||||
// @codingStandardsIgnoreEnd
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2017 netzmacht David Molineus. All rights reserved.
|
||||
* @copyright 2016-2017 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Netzmacht\Contao\Leaflet\GeocodeWidget;
|
||||
|
||||
4
src/Resources/config/listeners.yml
Normal file
4
src/Resources/config/listeners.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
services:
|
||||
netzmacht.contao_leaflet_geocode.listeners.radius_wizard:
|
||||
class: Netzmacht\Contao\Leaflet\GeocodeWidget\EventListener\RadiusWizardCallbackListener
|
||||
public: true
|
||||
@@ -1,11 +1,14 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2017 netzmacht David Molineus. All rights reserved.
|
||||
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*
|
||||
*/
|
||||
|
||||
$GLOBALS['BE_FFL']['leaflet_geocode'] = 'Netzmacht\Contao\Leaflet\GeocodeWidget\GeocodeWidget';
|
||||
$GLOBALS['BE_FFL']['leaflet_geocode'] = 'Netzmacht\Contao\Leaflet\GeocodeWidget\Widget\GeocodeWidget';
|
||||
$GLOBALS['BE_FFL']['leaflet_radius'] = 'Netzmacht\Contao\Leaflet\GeocodeWidget\Widget\RadiusWidget';
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2017 netzmacht David Molineus. All rights reserved.
|
||||
* @copyright 2016-2017 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*
|
||||
*/
|
||||
|
||||
$GLOBALS['TL_LANG']['ERR']['leafletInvalidCoordinate'] = 'Die angegebenen Koordinaten sind ungültig.';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletSearchPositionLabel'] = 'Suchen';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletApplyPositionLabel'] = 'Übernehmen';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletConfirmPositionLabel'] = 'Als neue Position übernehmen?';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletOkLabel'] = 'Ja';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletCancelLabel'] = 'Nein';
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2017 netzmacht David Molineus. All rights reserved.
|
||||
* @copyright 2016-2017 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*
|
||||
*/
|
||||
|
||||
$GLOBALS['TL_LANG']['ERR']['leafletInvalidCoordinate'] = 'Invalid coordinates given.';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletSearchPositionLabel'] = 'Search';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletApplyPositionLabel'] = 'Apply';
|
||||
$GLOBALS['TL_LANG']['ERR']['leafletInvalidCoordinate'] = 'Invalid coordinates given.';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletSearchPositionLabel'] = 'Search';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletApplyPositionLabel'] = 'Apply';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletConfirmPositionLabel'] = 'Set as new position';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletOkLabel'] = 'Ok';
|
||||
$GLOBALS['TL_LANG']['MSC']['leafletCancelLabel'] = 'Cancel';
|
||||
|
||||
@@ -1,30 +1,50 @@
|
||||
<?php
|
||||
<?php
|
||||
|
||||
$GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/leaflet/leaflet.css';
|
||||
$GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.css';
|
||||
$GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/leaflet/leaflet.css';
|
||||
$GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.css';
|
||||
$GLOBALS['TL_CSS'][] = 'bundles/leafletgeocodewidget/css/backend.css';
|
||||
|
||||
$GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/leaflet/leaflet.js';
|
||||
$GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.js';
|
||||
|
||||
if ($this->radius) {
|
||||
$GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/leaflet-pm/leaflet.pm.css';
|
||||
$GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/leaflet-pm/leaflet.pm.min.js';
|
||||
}
|
||||
|
||||
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/leafletgeocodewidget/js/geocode.widget.js';
|
||||
|
||||
?>
|
||||
|
||||
<input type="text"
|
||||
name="<?= $this->name ?>"
|
||||
id="ctrl_<?= $this->id ?>"
|
||||
class="tl_text tl_leaflet_geocode<?= $this->class ?>"
|
||||
value="<?= $this->value ?>"<?= $this->attributes ?>
|
||||
onfocus="Backend.getScrollOffset()"
|
||||
>
|
||||
<div class="<?= $this->wrapperClass ?>">
|
||||
<input type="text"
|
||||
name="<?= $this->name ?>"
|
||||
id="ctrl_<?= $this->id ?>"
|
||||
class="tl_text tl_leaflet_geocode<?= $this->class ?>"
|
||||
value="<?= $this->value ?>"<?= $this->attributes ?>
|
||||
onfocus="Backend.getScrollOffset()"
|
||||
>
|
||||
|
||||
<img src="bundles/leafletgeocodewidget/img/map.png" id="ctrl_<?= $this->id ?>_toggle">
|
||||
<a href="#"><img src="bundles/leafletgeocodewidget/img/map.png" id="ctrl_<?= $this->id ?>_toggle"></a>
|
||||
</div>
|
||||
|
||||
<?= $this->wizard ?>
|
||||
<script>
|
||||
new LeafletGeocodeWidget({
|
||||
id: 'ctrl_<?= $this->id ?>',
|
||||
searchPositionLabel: '<?= $GLOBALS['TL_LANG']['MSC']['leafletSearchPositionLabel'] ?>',
|
||||
applyPositionLabel: '<?= $GLOBALS['TL_LANG']['MSC']['leafletApplyPositionLabel'] ?>',
|
||||
modalTitle: '<?= $this->label ?>'
|
||||
})
|
||||
window.addEvent(
|
||||
'domready',
|
||||
function () {
|
||||
new LeafletGeocodeWidget({
|
||||
id: 'ctrl_<?= $this->id ?>',
|
||||
searchPositionLabel: '<?= $GLOBALS['TL_LANG']['MSC']['leafletSearchPositionLabel'] ?>',
|
||||
applyPositionLabel: '<?= $GLOBALS['TL_LANG']['MSC']['leafletApplyPositionLabel'] ?>',
|
||||
confirmPositionLabel: '<?= $GLOBALS['TL_LANG']['MSC']['leafletConfirmPositionLabel'] ?>',
|
||||
okLabel: '<?= $GLOBALS['TL_LANG']['MSC']['leafletOkLabel'] ?>',
|
||||
cancelLabel: '<?= $GLOBALS['TL_LANG']['MSC']['leafletCancelLabel'] ?>',
|
||||
modalTitle: '<?= $this->label ?>'<?php if ($this->radius): ?>,
|
||||
radius: <?= json_encode($this->radius) ?>,
|
||||
picker: LeafletGeocodeCirclePicker
|
||||
<?php endif ?>
|
||||
})
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
<div class="<?= $this->wrapperClass ?>">
|
||||
<input type="text"
|
||||
name="<?= $this->name ?>"
|
||||
id="ctrl_<?= $this->id ?>"
|
||||
class="tl_text tl_leaflet_geocode<?= $this->class ?>"
|
||||
value="<?= $this->value ?>"<?= $this->attributes ?>
|
||||
onfocus="Backend.getScrollOffset()"
|
||||
>
|
||||
|
||||
<?php if ($this->coordinates): ?>
|
||||
<a href="#" onclick="$('ctrl_<?= $this->coordinates ?>_toggle').click();return false;"><img src="bundles/leafletgeocodewidget/img/map.png"></a>,
|
||||
<?php endif ?>
|
||||
</div>
|
||||
26
src/Resources/public/css/backend.css
Normal file
26
src/Resources/public/css/backend.css
Normal file
@@ -0,0 +1,26 @@
|
||||
.wizard_2 {
|
||||
width: 325px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.leaflet-geocode-map {
|
||||
width: 100%;
|
||||
height: 50vh;
|
||||
min-height: 400px
|
||||
}
|
||||
|
||||
.leaflet-geocode-btn {
|
||||
margin-top: 10px;
|
||||
display: inline-block;
|
||||
padding: 7px 12px;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 2px;
|
||||
box-sizing: border-box;
|
||||
cursor: pointer;
|
||||
background: #eee;
|
||||
transition: background .2s ease;
|
||||
}
|
||||
|
||||
.leaflet-geocode-btn + .leaflet-geocode-btn {
|
||||
margin-left: 5px;
|
||||
}
|
||||
@@ -1,10 +1,153 @@
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*/
|
||||
|
||||
var LeafletGeocodeAbstractPicker = L.Class.extend({
|
||||
initialize: function (map, options) {
|
||||
L.Util.setOptions(this, options);
|
||||
this.map = map;
|
||||
},
|
||||
show: function (position, radius) {
|
||||
if (!this.marker) {
|
||||
this._createMarker(position, radius);
|
||||
} else {
|
||||
this._updateCoordinates(position, radius);
|
||||
}
|
||||
|
||||
this._panTo(position);
|
||||
},
|
||||
_updateCoordinates: function (position) {
|
||||
this.marker.setLatLng(position);
|
||||
}
|
||||
});
|
||||
|
||||
var LeafletGeocodeMarkerPicker = LeafletGeocodeAbstractPicker.extend({
|
||||
apply: function (coordinatesInput) {
|
||||
var coordinates = this.marker
|
||||
? ( this.marker.getLatLng().lat + ',' + this.marker.getLatLng().lng)
|
||||
: '';
|
||||
|
||||
coordinatesInput.set('value', coordinates);
|
||||
},
|
||||
_panTo: function (position) {
|
||||
this.map.setZoom(this.map.getMaxZoom());
|
||||
this.map.panTo(position);
|
||||
},
|
||||
_createMarker: function (position) {
|
||||
this.marker = L.marker(position, {draggable: true}).addTo(this.map);
|
||||
this.marker.on('dragend', function () {
|
||||
this.map.panTo(this.marker.getLatLng());
|
||||
}.bind(this));
|
||||
}
|
||||
});
|
||||
|
||||
var LeafletGeocodeCirclePicker = LeafletGeocodeAbstractPicker.extend({
|
||||
apply: function (coordinatesInput, radiusInput) {
|
||||
var radius = '';
|
||||
var coordinates = this.marker
|
||||
? ( this.marker.getLatLng().lat + ',' + this.marker.getLatLng().lng)
|
||||
: '';
|
||||
|
||||
coordinatesInput.set('value', coordinates);
|
||||
|
||||
if (this.marker) {
|
||||
radius = Math.round(this.marker.getRadius());
|
||||
|
||||
if (this.options.radius.steps > 0) {
|
||||
radius = (this.options.radius.steps * Math.round(radius / this.options.radius.steps));
|
||||
}
|
||||
}
|
||||
|
||||
radiusInput.set('value', radius);
|
||||
},
|
||||
_panTo: function () {
|
||||
this.map.fitBounds(this.marker.getBounds());
|
||||
},
|
||||
_createMarker: function (position, radius) {
|
||||
this.marker = L.circle(position, { radius: radius || this.options.radius.default });
|
||||
this.marker.addTo(this.map);
|
||||
|
||||
this.marker.on('pm:markerdragend', function () {
|
||||
var radius = this.marker.getRadius();
|
||||
|
||||
if (this.options.radius.steps > 0) {
|
||||
radius = (this.options.radius.steps * Math.round(radius / this.options.radius.steps));
|
||||
}
|
||||
|
||||
if (this.options.radius.min > 0 && this.options.radius.min > radius) {
|
||||
radius = this.options.radius.min;
|
||||
}
|
||||
|
||||
if (this.options.radius.max > 0 && this.options.radius.max < radius) {
|
||||
radius = this.options.radius.max;
|
||||
}
|
||||
|
||||
if (radius != this.marker.getRadius()) {
|
||||
this.marker.pm.disable();
|
||||
this.marker.setRadius(radius);
|
||||
this._enableEditMode();
|
||||
} else {
|
||||
this.marker.pm._outerMarker.setTooltipContent(this._formatRadius(radius));
|
||||
}
|
||||
|
||||
this.map.fitBounds(this.marker.getBounds());
|
||||
}.bind(this));
|
||||
|
||||
this._enableEditMode();
|
||||
},
|
||||
_updateCoordinates: function (position,radius) {
|
||||
this.marker.pm.disable();
|
||||
this.marker.setLatLng(position);
|
||||
|
||||
if (radius !== undefined) {
|
||||
this.marker.setRadius(radius);
|
||||
}
|
||||
this.marker.pm.enable();
|
||||
},
|
||||
_enableEditMode: function () {
|
||||
this.marker.pm.enable();
|
||||
this.marker.pm._outerMarker.bindTooltip(
|
||||
this._formatRadius(this.marker.getRadius()),
|
||||
{permanent: true, direction: 'right', offset: [10, 0] }
|
||||
);
|
||||
},
|
||||
_formatRadius: function (radius) {
|
||||
var unit = 'm';
|
||||
|
||||
radius = Math.floor(radius);
|
||||
|
||||
if (radius > 1000) {
|
||||
unit = 'km';
|
||||
radius = (radius / 1000).toFixed(1);
|
||||
}
|
||||
|
||||
return radius.toString() + ' ' + unit;
|
||||
}
|
||||
});
|
||||
|
||||
var LeafletGeocodeWidget = L.Class.extend({
|
||||
options: {
|
||||
mapTemplate: '<div id="leaflet_geocode_widget_map_{id}" class="" style="width 100%; height: 50vh; min-height: 400px"></div>',
|
||||
mapTemplate: '<div id="leaflet_geocode_widget_map_{id}" class="leaflet-geocode-map"></div>',
|
||||
modalWidth: 800,
|
||||
modalTitle: 'Choose coordinates',
|
||||
searchPositionLabel: 'Search',
|
||||
applyPositionLabel: 'Apply'
|
||||
applyPositionLabel: 'Apply',
|
||||
confirmPositionLabel: 'Set as new position',
|
||||
okLabel: 'Ok',
|
||||
cancelLabel: 'Cancel',
|
||||
radius: null,
|
||||
picker: LeafletGeocodeMarkerPicker,
|
||||
map: {
|
||||
maxZoom: 15,
|
||||
minZoom: 2
|
||||
},
|
||||
bboxPadding: [0, 70]
|
||||
},
|
||||
initialize: function (options) {
|
||||
L.Util.setOptions(this, options);
|
||||
@@ -12,36 +155,94 @@ var LeafletGeocodeWidget = L.Class.extend({
|
||||
this.element = $(this.options.id);
|
||||
this.toggle = $(this.options.id + '_toggle');
|
||||
this.toggle.addEvent('click', this._showMap.bind(this));
|
||||
|
||||
if (this.options.radius) {
|
||||
this.radius = $(this.options.radius.element);
|
||||
|
||||
if (this.radius.get('value').length > 0) {
|
||||
this.options.radius.default = parseInt(this.radius.get('value'));
|
||||
}
|
||||
|
||||
if (this.options.radius.default === undefined) {
|
||||
this.options.radius.default = 0;
|
||||
}
|
||||
}
|
||||
},
|
||||
_showMap: function () {
|
||||
var content, modal;
|
||||
_showMap: function (e) {
|
||||
e.stop();
|
||||
|
||||
// Create modal window.
|
||||
content = L.Util.template(this.options.mapTemplate, this.options);
|
||||
modal = this._createModal();
|
||||
var content = L.Util.template(this.options.mapTemplate, this.options);
|
||||
this.modal = this._createModal();
|
||||
|
||||
modal.show({'title': this.options.modalTitle, 'contents': content});
|
||||
this.modal.show({title: this.options.modalTitle, contents: content});
|
||||
|
||||
// Initialize map after showing modal so element exists.
|
||||
this._createMap(modal);
|
||||
this._createMap();
|
||||
},
|
||||
_createModal: function () {
|
||||
return new SimpleModal({
|
||||
'width': this.options.modalWidth,
|
||||
'hideFooter': true,
|
||||
'draggable': false,
|
||||
'overlayOpacity': .5,
|
||||
'onShow': function() { document.body.setStyle('overflow', 'hidden'); },
|
||||
'onHide': function() { document.body.setStyle('overflow', 'auto'); }
|
||||
var modal = new SimpleModal({
|
||||
width: this.options.modalWidth,
|
||||
hideFooter: false,
|
||||
draggable: false,
|
||||
overlayOpacity: .5,
|
||||
btn_ok: Contao.lang.close,
|
||||
onShow: function () {
|
||||
document.body.setStyle('overflow', 'hidden');
|
||||
},
|
||||
onHide: function () {
|
||||
document.body.setStyle('overflow', 'auto');
|
||||
}
|
||||
});
|
||||
|
||||
modal.addButton(Contao.lang.apply, 'btn', function () {
|
||||
this.picker.apply(this.element, this.radius);
|
||||
modal.hide();
|
||||
}.bind(this));
|
||||
|
||||
return modal;
|
||||
},
|
||||
_createMap: function (modal) {
|
||||
var map = L.map('leaflet_geocode_widget_map_' + this.options.id).setView([0, 0], 2);
|
||||
_createMap: function () {
|
||||
var map = L.map('leaflet_geocode_widget_map_' + this.options.id, this.options.map).setView([0, 0], 2);
|
||||
var radius = 0;
|
||||
this.picker = new this.options.picker(map, this.options);
|
||||
|
||||
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
|
||||
attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
|
||||
}).addTo(map);
|
||||
|
||||
map.on('click', function (event) {
|
||||
var marker = new L.marker(event.latlng).addTo(map);
|
||||
var container = document.createElement('div');
|
||||
var okButton = document.createElement('button');
|
||||
var cancelButton = document.createElement('button');
|
||||
|
||||
okButton.set('class', 'leaflet-geocode-btn').appendHTML(this.options.okLabel);
|
||||
okButton.addEvent('click', function (event) {
|
||||
event.stop();
|
||||
|
||||
this.picker.show(marker.getLatLng());
|
||||
map.removeLayer(marker);
|
||||
}.bind(this));
|
||||
|
||||
cancelButton.set('class', 'leaflet-geocode-btn').appendHTML(this.options.cancelLabel);
|
||||
cancelButton.addEvent('click', function (event) {
|
||||
map.removeLayer(marker);
|
||||
});
|
||||
|
||||
container.appendHTML('<h2>' + this.options.confirmPositionLabel + '</h2>');
|
||||
container.appendChild(okButton);
|
||||
container.appendChild(cancelButton);
|
||||
|
||||
marker.bindPopup(container, {
|
||||
keepInView: true,
|
||||
autoPanPaddingTopLeft: this.options.bboxPadding,
|
||||
autoClose: false,
|
||||
closeOnClick: false,
|
||||
closeButton: false
|
||||
}).openPopup();
|
||||
}.bind(this));
|
||||
|
||||
var geoCoder = L.Control.geocoder({
|
||||
defaultMarkGeocode: false,
|
||||
collapsed: false,
|
||||
@@ -49,53 +250,15 @@ var LeafletGeocodeWidget = L.Class.extend({
|
||||
}).addTo(map);
|
||||
|
||||
geoCoder.on('markgeocode', function (event) {
|
||||
this._handleGeoCode.call(this, modal, map, event);
|
||||
this.picker.show(event.geocode.center);
|
||||
}.bind(this));
|
||||
|
||||
if (this.element.value) {
|
||||
var value = this.element.value.split(/,/);
|
||||
this._createMarker(value, map);
|
||||
if (this.radius && this.radius.get('value').length > 0) {
|
||||
radius = parseInt(this.radius.get('value'));
|
||||
}
|
||||
|
||||
map.setZoom(16);
|
||||
map.panTo(value);
|
||||
this.picker.show(L.latLng(this.element.value.split(/,/)), radius);
|
||||
}
|
||||
|
||||
return map;
|
||||
},
|
||||
_handleGeoCode: function (modal, map, event) {
|
||||
var container = document.createElement('div');
|
||||
var link = document.createElement('button');
|
||||
var result = event.geocode;
|
||||
|
||||
link.set('style', 'margin-left: 10px;');
|
||||
link.appendText(this.options.applyPositionLabel);
|
||||
link.addEvent('click', function(e) {
|
||||
e.stop();
|
||||
|
||||
this.element.set('value', result.center.lat + ',' + result.center.lng);
|
||||
modal.hide();
|
||||
}.bind(this));
|
||||
|
||||
container.appendHTML(result.html || result.name);
|
||||
container.appendChild(link);
|
||||
|
||||
if (this._geocodeMarker) {
|
||||
map.removeLayer(this._geocodeMarker);
|
||||
}
|
||||
|
||||
map.fitBounds(result.bbox, { padding: [0, 70]});
|
||||
map.panTo(result.center);
|
||||
|
||||
this._createMarker(result.center, map);
|
||||
this._geocodeMarker.bindPopup(container, {
|
||||
keepInView: true,
|
||||
autoPanPaddingTopLeft: [0, 70]
|
||||
}).openPopup();
|
||||
},
|
||||
_createMarker: function (position, map) {
|
||||
this._geocodeMarker = L.marker(position, {draggable: true}).addTo(map);
|
||||
this._geocodeMarker.on('dragend', function (event) {
|
||||
this.element.set('value', event.target._latlng.lat + ',' + event.target._latlng.lng);
|
||||
}.bind(this));
|
||||
}
|
||||
});
|
||||
|
||||
167
src/Widget/GeocodeWidget.php
Normal file
167
src/Widget/GeocodeWidget.php
Normal file
@@ -0,0 +1,167 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*/
|
||||
|
||||
namespace Netzmacht\Contao\Leaflet\GeocodeWidget\Widget;
|
||||
|
||||
/**
|
||||
* Class GeocodeWidget
|
||||
*
|
||||
* @property int size
|
||||
* @property bool multiple
|
||||
*/
|
||||
class GeocodeWidget extends \Widget
|
||||
{
|
||||
/**
|
||||
* Submit user input.
|
||||
*
|
||||
* @var boolean
|
||||
*/
|
||||
protected $blnSubmitInput = true;
|
||||
|
||||
/**
|
||||
* Add a for attribute.
|
||||
*
|
||||
* @var boolean
|
||||
*/
|
||||
protected $blnForAttribute = true;
|
||||
|
||||
/**
|
||||
* Template.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $strTemplate = 'be_widget';
|
||||
|
||||
/**
|
||||
* Template name.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $widgetTemplate = 'be_widget_leaflet_geocode';
|
||||
|
||||
/**
|
||||
* Validate the input.
|
||||
*
|
||||
* @param mixed $value Given value.
|
||||
*
|
||||
* @return mixed
|
||||
*
|
||||
* @SuppressWarnings(PHPMD.Superglobals)
|
||||
*/
|
||||
protected function validator($value)
|
||||
{
|
||||
$value = parent::validator($value);
|
||||
|
||||
if (!$value) {
|
||||
return $value;
|
||||
}
|
||||
|
||||
if (is_array($value)) {
|
||||
foreach ($value as $key => $val) {
|
||||
$value[$key] = $this->validator($val);
|
||||
}
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
||||
// See: http://stackoverflow.com/a/18690202
|
||||
if (!preg_match(
|
||||
'#^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)(,[-+]?\d+)?$#',
|
||||
$value
|
||||
)) {
|
||||
$this->addError(
|
||||
sprintf(
|
||||
$GLOBALS['TL_LANG']['ERR']['leafletInvalidCoordinate'],
|
||||
$value
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate the widget.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function generate()
|
||||
{
|
||||
$wrapperClass = 'wizard';
|
||||
|
||||
if (!$this->multiple || !$this->size) {
|
||||
$this->size = 1;
|
||||
} else {
|
||||
$wrapperClass .= ' wizard_' . $this->size;
|
||||
}
|
||||
|
||||
if (!is_array($this->value)) {
|
||||
$this->value = [$this->value];
|
||||
}
|
||||
|
||||
$buffer = '';
|
||||
|
||||
for ($index = 0; $index < $this->size; $index++) {
|
||||
$template = new \BackendTemplate($this->widgetTemplate);
|
||||
$template->setData(
|
||||
[
|
||||
'wrapperClass' => $wrapperClass,
|
||||
'widget' => $this,
|
||||
'value' => \StringUtil::specialchars($this->value[$index]),
|
||||
'class' => $this->strClass ? ' ' . $this->strClass : '',
|
||||
'id' => $this->strId . (($this->size > 1) ? '_' . $index : ''),
|
||||
'name' => $this->strName . (($this->size > 1) ? '[]' : ''),
|
||||
'attributes' => $this->getAttributes(),
|
||||
'wizard' => $this->wizard,
|
||||
'label' => $this->strLabel,
|
||||
'radius' => $this->buildRadiusOptions()
|
||||
]
|
||||
);
|
||||
|
||||
$buffer .= $template->parse();
|
||||
}
|
||||
|
||||
return $buffer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the radius options.
|
||||
*
|
||||
* @return array|null
|
||||
*
|
||||
* @SuppressWarnings(PHPMD.Superglobals)
|
||||
*/
|
||||
private function buildRadiusOptions()
|
||||
{
|
||||
if (!$this->radius || !isset($GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->radius])) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$options = [
|
||||
'element' => 'ctrl_' . $this->radius,
|
||||
'min' => 0,
|
||||
'max' => 0,
|
||||
'defaultValue' => 0
|
||||
];
|
||||
|
||||
if (isset($GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->radius]['eval'])) {
|
||||
$config = $GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->radius]['eval'];
|
||||
|
||||
$options['min'] = isset($config['minval']) ? (int) $config['minval'] : 0;
|
||||
$options['max'] = isset($config['maxval']) ? (int) $config['maxval'] : 0;
|
||||
$options['defaultValue'] = isset($config['default']) ? (int) $config['default'] : 0;
|
||||
$options['steps'] = isset($config['steps']) ? (int) $config['steps'] : 0;
|
||||
}
|
||||
|
||||
return $options;
|
||||
}
|
||||
}
|
||||
99
src/Widget/RadiusWidget.php
Normal file
99
src/Widget/RadiusWidget.php
Normal file
@@ -0,0 +1,99 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Geocode backend widget based on Leaflet.
|
||||
*
|
||||
* @package netzmacht
|
||||
* @author David Molineus <david.molineus@netzmacht.de>
|
||||
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
|
||||
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
|
||||
* @filesource
|
||||
*/
|
||||
|
||||
namespace Netzmacht\Contao\Leaflet\GeocodeWidget\Widget;
|
||||
|
||||
use Contao\BackendTemplate;
|
||||
use Contao\TextField;
|
||||
|
||||
/**
|
||||
* Class RadiusWidget
|
||||
*/
|
||||
class RadiusWidget extends TextField
|
||||
{
|
||||
/**
|
||||
* Template name.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $widgetTemplate = 'be_widget_leaflet_radius';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function __get($strKey)
|
||||
{
|
||||
if ($strKey === 'rgxp') {
|
||||
return 'natural';
|
||||
}
|
||||
|
||||
return parent::__get($strKey);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate the widget.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function generate()
|
||||
{
|
||||
$wrapperClass = $this->coordinates ? 'wizard' : '';
|
||||
|
||||
if (!$this->multiple || !$this->size) {
|
||||
$this->size = 1;
|
||||
} else {
|
||||
$wrapperClass .= ' wizard_' . $this->size;
|
||||
}
|
||||
|
||||
if (!is_array($this->value)) {
|
||||
$this->value = [$this->value];
|
||||
}
|
||||
|
||||
$buffer = '';
|
||||
|
||||
for ($index = 0; $index < $this->size; $index++) {
|
||||
$template = new BackendTemplate($this->widgetTemplate);
|
||||
$template->setData(
|
||||
[
|
||||
'wrapperClass' => trim($wrapperClass),
|
||||
'widget' => $this,
|
||||
'value' => \StringUtil::specialchars($this->value[$index]),
|
||||
'class' => $this->strClass ? ' ' . $this->strClass : '',
|
||||
'id' => $this->strId . (($this->size > 1) ? '_' . $index : ''),
|
||||
'name' => $this->strName . (($this->size > 1) ? '[]' : ''),
|
||||
'attributes' => $this->getAttributes(),
|
||||
'wizard' => $this->wizard,
|
||||
'label' => $this->strLabel,
|
||||
'coordinates' => $this->coordinates
|
||||
]
|
||||
);
|
||||
|
||||
$buffer .= $template->parse();
|
||||
}
|
||||
|
||||
return $buffer;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function validator($varInput)
|
||||
{
|
||||
if (is_numeric($varInput) && $this->steps > 0) {
|
||||
$steps = (int) $this->steps;
|
||||
$varInput = (int) $varInput;
|
||||
$varInput = ($steps * round($varInput / $steps));
|
||||
}
|
||||
|
||||
return parent::validator($varInput);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user