BREAKING CHANGE : adapt "site" part for J5

This commit is contained in:
vincent.tisseyre 2024-11-08 11:06:03 +01:00
parent 326a46370e
commit 0e94341e99
25 changed files with 237 additions and 850 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 618 B

View File

@ -1,640 +0,0 @@
/* required styles */
.leaflet-pane,
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-tile-container,
.leaflet-pane > svg,
.leaflet-pane > canvas,
.leaflet-zoom-box,
.leaflet-image-layer,
.leaflet-layer {
position: absolute;
left: 0;
top: 0;
}
.leaflet-container {
overflow: hidden;
}
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow {
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
-webkit-user-drag: none;
}
/* Prevents IE11 from highlighting tiles in blue */
.leaflet-tile::selection {
background: transparent;
}
/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
.leaflet-safari .leaflet-tile {
image-rendering: -webkit-optimize-contrast;
}
/* hack that prevents hw layers "stretching" when loading new tiles */
.leaflet-safari .leaflet-tile-container {
width: 1600px;
height: 1600px;
-webkit-transform-origin: 0 0;
}
.leaflet-marker-icon,
.leaflet-marker-shadow {
display: block;
}
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
.leaflet-container .leaflet-overlay-pane svg,
.leaflet-container .leaflet-marker-pane img,
.leaflet-container .leaflet-shadow-pane img,
.leaflet-container .leaflet-tile-pane img,
.leaflet-container img.leaflet-image-layer,
.leaflet-container .leaflet-tile {
max-width: none !important;
max-height: none !important;
}
.leaflet-container.leaflet-touch-zoom {
-ms-touch-action: pan-x pan-y;
touch-action: pan-x pan-y;
}
.leaflet-container.leaflet-touch-drag {
-ms-touch-action: pinch-zoom;
/* Fallback for FF which doesn't support pinch-zoom */
touch-action: none;
touch-action: pinch-zoom;
}
.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
-ms-touch-action: none;
touch-action: none;
}
.leaflet-container {
-webkit-tap-highlight-color: transparent;
}
.leaflet-container a {
-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
}
.leaflet-tile {
filter: inherit;
visibility: hidden;
}
.leaflet-tile-loaded {
visibility: inherit;
}
.leaflet-zoom-box {
width: 0;
height: 0;
-moz-box-sizing: border-box;
box-sizing: border-box;
z-index: 800;
}
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
.leaflet-overlay-pane svg {
-moz-user-select: none;
}
.leaflet-pane { z-index: 400; }
.leaflet-tile-pane { z-index: 200; }
.leaflet-overlay-pane { z-index: 400; }
.leaflet-shadow-pane { z-index: 500; }
.leaflet-marker-pane { z-index: 600; }
.leaflet-tooltip-pane { z-index: 650; }
.leaflet-popup-pane { z-index: 700; }
.leaflet-map-pane canvas { z-index: 100; }
.leaflet-map-pane svg { z-index: 200; }
.leaflet-vml-shape {
width: 1px;
height: 1px;
}
.lvml {
behavior: url(#default#VML);
display: inline-block;
position: absolute;
}
/* control positioning */
.leaflet-control {
position: relative;
z-index: 800;
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
.leaflet-top,
.leaflet-bottom {
position: absolute;
z-index: 1000;
pointer-events: none;
}
.leaflet-top {
top: 0;
}
.leaflet-right {
right: 0;
}
.leaflet-bottom {
bottom: 0;
}
.leaflet-left {
left: 0;
}
.leaflet-control {
float: left;
clear: both;
}
.leaflet-right .leaflet-control {
float: right;
}
.leaflet-top .leaflet-control {
margin-top: 10px;
}
.leaflet-bottom .leaflet-control {
margin-bottom: 10px;
}
.leaflet-left .leaflet-control {
margin-left: 10px;
}
.leaflet-right .leaflet-control {
margin-right: 10px;
}
/* zoom and fade animations */
.leaflet-fade-anim .leaflet-tile {
will-change: opacity;
}
.leaflet-fade-anim .leaflet-popup {
opacity: 0;
-webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
opacity: 1;
}
.leaflet-zoom-animated {
-webkit-transform-origin: 0 0;
-ms-transform-origin: 0 0;
transform-origin: 0 0;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
will-change: transform;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
}
.leaflet-zoom-anim .leaflet-tile,
.leaflet-pan-anim .leaflet-tile {
-webkit-transition: none;
-moz-transition: none;
transition: none;
}
.leaflet-zoom-anim .leaflet-zoom-hide {
visibility: hidden;
}
/* cursors */
.leaflet-interactive {
cursor: pointer;
}
.leaflet-grab {
cursor: -webkit-grab;
cursor: -moz-grab;
cursor: grab;
}
.leaflet-crosshair,
.leaflet-crosshair .leaflet-interactive {
cursor: crosshair;
}
.leaflet-popup-pane,
.leaflet-control {
cursor: auto;
}
.leaflet-dragging .leaflet-grab,
.leaflet-dragging .leaflet-grab .leaflet-interactive,
.leaflet-dragging .leaflet-marker-draggable {
cursor: move;
cursor: -webkit-grabbing;
cursor: -moz-grabbing;
cursor: grabbing;
}
/* marker & overlays interactivity */
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-image-layer,
.leaflet-pane > svg path,
.leaflet-tile-container {
pointer-events: none;
}
.leaflet-marker-icon.leaflet-interactive,
.leaflet-image-layer.leaflet-interactive,
.leaflet-pane > svg path.leaflet-interactive,
svg.leaflet-image-layer.leaflet-interactive path {
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
/* visual tweaks */
.leaflet-container {
background: #ddd;
outline: 0;
}
.leaflet-container a {
color: #0078A8;
}
.leaflet-container a.leaflet-active {
outline: 2px solid orange;
}
.leaflet-zoom-box {
border: 2px dotted #38f;
background: rgba(255,255,255,0.5);
}
/* general typography */
.leaflet-container {
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
}
/* general toolbar styles */
.leaflet-bar {
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
border-radius: 4px;
}
.leaflet-bar a,
.leaflet-bar a:hover {
background-color: #fff;
border-bottom: 1px solid #ccc;
width: 26px;
height: 26px;
line-height: 26px;
display: block;
text-align: center;
text-decoration: none;
color: black;
}
.leaflet-bar a,
.leaflet-control-layers-toggle {
background-position: 50% 50%;
background-repeat: no-repeat;
display: block;
}
.leaflet-bar a:hover {
background-color: #f4f4f4;
}
.leaflet-bar a:first-child {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.leaflet-bar a:last-child {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom: none;
}
.leaflet-bar a.leaflet-disabled {
cursor: default;
background-color: #f4f4f4;
color: #bbb;
}
.leaflet-touch .leaflet-bar a {
width: 30px;
height: 30px;
line-height: 30px;
}
.leaflet-touch .leaflet-bar a:first-child {
border-top-left-radius: 2px;
border-top-right-radius: 2px;
}
.leaflet-touch .leaflet-bar a:last-child {
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
}
/* zoom control */
.leaflet-control-zoom-in,
.leaflet-control-zoom-out {
font: bold 18px 'Lucida Console', Monaco, monospace;
text-indent: 1px;
}
.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
font-size: 22px;
}
/* layers control */
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
background: #fff;
border-radius: 5px;
}
.leaflet-control-layers-toggle {
background-image: url(images/layers.png);
width: 36px;
height: 36px;
}
.leaflet-retina .leaflet-control-layers-toggle {
background-image: url(images/layers-2x.png);
background-size: 26px 26px;
}
.leaflet-touch .leaflet-control-layers-toggle {
width: 44px;
height: 44px;
}
.leaflet-control-layers .leaflet-control-layers-list,
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
display: none;
}
.leaflet-control-layers-expanded .leaflet-control-layers-list {
display: block;
position: relative;
}
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
color: #333;
background: #fff;
}
.leaflet-control-layers-scrollbar {
overflow-y: scroll;
overflow-x: hidden;
padding-right: 5px;
}
.leaflet-control-layers-selector {
margin-top: 2px;
position: relative;
top: 1px;
}
.leaflet-control-layers label {
display: block;
}
.leaflet-control-layers-separator {
height: 0;
border-top: 1px solid #ddd;
margin: 5px -10px 5px -6px;
}
/* Default icon URLs */
.leaflet-default-icon-path {
background-image: url(images/marker-icon.png);
}
/* attribution and scale controls */
.leaflet-container .leaflet-control-attribution {
background: #fff;
background: rgba(255, 255, 255, 0.7);
margin: 0;
}
.leaflet-control-attribution,
.leaflet-control-scale-line {
padding: 0 5px;
color: #333;
}
.leaflet-control-attribution a {
text-decoration: none;
}
.leaflet-control-attribution a:hover {
text-decoration: underline;
}
.leaflet-container .leaflet-control-attribution,
.leaflet-container .leaflet-control-scale {
font-size: 11px;
}
.leaflet-left .leaflet-control-scale {
margin-left: 5px;
}
.leaflet-bottom .leaflet-control-scale {
margin-bottom: 5px;
}
.leaflet-control-scale-line {
border: 2px solid #777;
border-top: none;
line-height: 1.1;
padding: 2px 5px 1px;
font-size: 11px;
white-space: nowrap;
overflow: hidden;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
background: rgba(255, 255, 255, 0.5);
}
.leaflet-control-scale-line:not(:first-child) {
border-top: 2px solid #777;
border-bottom: none;
margin-top: -2px;
}
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
border-bottom: 2px solid #777;
}
.leaflet-touch .leaflet-control-attribution,
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
box-shadow: none;
}
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
border: 2px solid rgba(0,0,0,0.2);
background-clip: padding-box;
}
/* popup */
.leaflet-popup {
position: absolute;
text-align: center;
margin-bottom: 20px;
}
.leaflet-popup-content-wrapper {
padding: 1px;
text-align: left;
border-radius: 12px;
}
.leaflet-popup-content {
margin: 13px 19px;
line-height: 1.4;
}
.leaflet-popup-content p {
margin: 18px 0;
}
.leaflet-popup-tip-container {
width: 40px;
height: 20px;
position: absolute;
left: 50%;
margin-left: -20px;
overflow: hidden;
pointer-events: none;
}
.leaflet-popup-tip {
width: 17px;
height: 17px;
padding: 1px;
margin: -10px auto 0;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
transform: rotate(45deg);
}
.leaflet-popup-content-wrapper,
.leaflet-popup-tip {
background: white;
color: #333;
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
}
.leaflet-container a.leaflet-popup-close-button {
position: absolute;
top: 0;
right: 0;
padding: 4px 4px 0 0;
border: none;
text-align: center;
width: 18px;
height: 14px;
font: 16px/14px Tahoma, Verdana, sans-serif;
color: #c3c3c3;
text-decoration: none;
font-weight: bold;
background: transparent;
}
.leaflet-container a.leaflet-popup-close-button:hover {
color: #999;
}
.leaflet-popup-scrolled {
overflow: auto;
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
}
.leaflet-oldie .leaflet-popup-content-wrapper {
-ms-zoom: 1;
}
.leaflet-oldie .leaflet-popup-tip {
width: 24px;
margin: 0 auto;
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
}
.leaflet-oldie .leaflet-popup-tip-container {
margin-top: -1px;
}
.leaflet-oldie .leaflet-control-zoom,
.leaflet-oldie .leaflet-control-layers,
.leaflet-oldie .leaflet-popup-content-wrapper,
.leaflet-oldie .leaflet-popup-tip {
border: 1px solid #999;
}
/* div icon */
.leaflet-div-icon {
background: #fff;
border: 1px solid #666;
}
/* Tooltip */
/* Base styles for the element that has a tooltip */
.leaflet-tooltip {
position: absolute;
padding: 6px;
background-color: #fff;
border: 1px solid #fff;
border-radius: 3px;
color: #222;
white-space: nowrap;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
pointer-events: none;
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
}
.leaflet-tooltip.leaflet-clickable {
cursor: pointer;
pointer-events: auto;
}
.leaflet-tooltip-top:before,
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
position: absolute;
pointer-events: none;
border: 6px solid transparent;
background: transparent;
content: "";
}
/* Directions */
.leaflet-tooltip-bottom {
margin-top: 6px;
}
.leaflet-tooltip-top {
margin-top: -6px;
}
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-top:before {
left: 50%;
margin-left: -6px;
}
.leaflet-tooltip-top:before {
bottom: 0;
margin-bottom: -12px;
border-top-color: #fff;
}
.leaflet-tooltip-bottom:before {
top: 0;
margin-top: -12px;
margin-left: -6px;
border-bottom-color: #fff;
}
.leaflet-tooltip-left {
margin-left: -6px;
}
.leaflet-tooltip-right {
margin-left: 6px;
}
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
top: 50%;
margin-top: -6px;
}
.leaflet-tooltip-left:before {
right: 0;
margin-right: -12px;
border-left-color: #fff;
}
.leaflet-tooltip-right:before {
left: 0;
margin-left: -12px;
border-right-color: #fff;
}

File diff suppressed because one or more lines are too long

View File

@ -1,30 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_leaflet
*
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
/**
* leaflet Component Controller
*
* @since 0.0.1
*/
class leafletController extends JControllerLegacy
{
public function initData()
{
if (!JSession::checkToken('get'))
{
echo new JResponseJson(null, JText::_('JINVALID_TOKEN'), true);
}
else
{
parent::display();
}
}
}

View File

@ -1,2 +0,0 @@
<html><body bgcolor="#FFFFFF"></body></html>
<!-- prevents web server from listing directory content -->

View File

@ -0,0 +1,6 @@
; Joomla! Project
; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8
COM_LEAFLET_TITLE_LEAFLET="Cartographie des projets d'enedis coorace"

View File

@ -10,12 +10,15 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
use Joomla\CMS\MVC\Controller\BaseController;
// Get an instance of the controller prefixed by HelloWorld
$controller = JControllerLegacy::getInstance('leaflet');
$controller = BaseController::getInstance('leaflet');
// Perform the Request task
$input = JFactory::getApplication()->input;
$controller->execute($input->getCmd('task'));
$input = Factory::getApplication()->input;
$controller->execute($input->getCmd('task', 'display'));
// Redirect if set by the controller
$controller->redirect();

View File

@ -0,0 +1,25 @@
<?php
defined('_JEXEC') or die;
use Joomla\CMS\Component\Router\RouterServiceInterface;
use Joomla\CMS\Component\Router\RouterFactoryInterface;
use Joomla\CMS\Router\Route;
return [
'services' => [
RouterServiceInterface::class => function (RouterFactoryInterface $routerFactory) {
$router = $routerFactory->create('site');
$router->addRoute(
'com_leaflet',
[
'pattern' => 'ajax',
'controller' => 'ajax',
'task' => 'myAjaxFunction',
]
);
return $router;
},
],
];

View File

@ -0,0 +1,30 @@
<?php
namespace Digitanie\Component\Leaflet\Site\Controller;
defined('_JEXEC') or die;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Factory;
class AjaxController extends BaseController
{
public function myAjaxFunction()
{
// Sécuriser la requête en utilisant le token Joomla pour les requêtes AJAX
Factory::getApplication()->input->checkToken('get') or die('Invalid Token');
// Récupérer les données envoyées par AJAX
$input = Factory::getApplication()->input;
$param1 = $input->get('param1', '', 'STRING');
// Traiter les données ou exécuter une fonction
$result = ['status' => 'success', 'message' => 'Votre requête a été traitée avec succès.'];
// Retourner la réponse en format JSON
echo json_encode($result);
// Fermer l'application Joomla pour arrêter l'exécution
Factory::getApplication()->close();
}
}

View File

@ -0,0 +1,20 @@
<?php
namespace Digitanie\Component\Leaflet\Site\Controller;
defined('_JEXEC') or die;
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Factory;
/**
* Leaflet Component Controller
* @since 0.0.2
*/
class DisplayController extends BaseController {
public function display($cachable = false, $urlparams = array()) {
parent::display($cachable, $urlparams);
}
}

View File

@ -0,0 +1,30 @@
<?php
namespace Digitanie\Component\Leaflet\Site\Controller;
defined('_JEXEC') or die;
use Joomla\CMS\Response\JsonResponse;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Factory;
use Joomla\CMS\Session\Session;
/**
* Leaflet Component Controller
* @since 0.0.2
*/
class LeafletController extends BaseController {
public function initData()
{
if (!Session::checkToken('post'))
{
echo new JsonResponse(null, JText::_('JINVALID_TOKEN'), true);
}
else
{
parent::display();
}
}
}

View File

@ -1,22 +1,16 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_leaflet
*
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
namespace Digitanie\Component\Leaflet\Site\Model;
defined('_JEXEC') or die;
use Joomla\CMS\MVC\Model\ItemModel;
use Joomla\CMS\Factory;
/**
* leaflet Model
*
* @since 0.0.1
* Leaflet Model
*/
class leafletModelleaflet extends JModelItem
{
class LeafletModel extends ItemModel {
/**
* @var string message
*/
@ -27,7 +21,7 @@ class leafletModelleaflet extends JModelItem
{
try
{
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db
->getQuery(true)
->select('id')
@ -43,7 +37,7 @@ class leafletModelleaflet extends JModelItem
catch (Exception $e)
{
$msg = $e->getMessage();
JFactory::getApplication()->enqueueMessage($msg, 'error');
Factory::getApplication()->enqueueMessage($msg, 'error');
$results = null;
}
@ -56,7 +50,7 @@ class leafletModelleaflet extends JModelItem
{
try
{
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams')));
@ -68,7 +62,7 @@ class leafletModelleaflet extends JModelItem
catch (Exception $e)
{
$msg = $e->getMessage();
JFactory::getApplication()->enqueueMessage($msg, 'error');
Factory::getApplication()->enqueueMessage($msg, 'error');
$results = null;
}
@ -79,7 +73,7 @@ class leafletModelleaflet extends JModelItem
{
try
{
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams')));
@ -93,7 +87,7 @@ class leafletModelleaflet extends JModelItem
catch (Exception $e)
{
$msg = $e->getMessage();
JFactory::getApplication()->enqueueMessage($msg, 'error');
Factory::getApplication()->enqueueMessage($msg, 'error');
$results = null;
}
@ -104,7 +98,7 @@ class leafletModelleaflet extends JModelItem
{
try
{
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams')));
@ -117,7 +111,7 @@ class leafletModelleaflet extends JModelItem
catch (Exception $e)
{
$msg = $e->getMessage();
JFactory::getApplication()->enqueueMessage($msg, 'error');
Factory::getApplication()->enqueueMessage($msg, 'error');
$results = null;
}
@ -129,7 +123,7 @@ class leafletModelleaflet extends JModelItem
{
try
{
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db->getQuery(true);
$groupId = 4;
@ -176,7 +170,7 @@ class leafletModelleaflet extends JModelItem
catch (Exception $e)
{
$msg = $e->getMessage();
JFactory::getApplication()->enqueueMessage($msg, 'error');
Factory::getApplication()->enqueueMessage($msg, 'error');
$results = null;
}

View File

@ -0,0 +1,36 @@
<?php
namespace Digitanie\Component\Leaflet\Site\View\Leaflet;
defined('_JEXEC') or die;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Factory;
/**
* View for the user identity validation form
*/
class HtmlView extends BaseHtmlView {
/**
* Display the view
*
* @param string $template The name of the layout file to parse.
* @return void
*/
public function display($template = null) {
$this->loadTemplateHeader();
// Call the parent display to display the layout file
parent::display($template);
}
/**
* Load the template header data here to simplify the template
*/
protected function loadTemplateHeader()
{
// Import CSS
$document = Factory::getDocument();
$document->addStyleSheet('components/com_leaflet/assets/css/global.css');
}
}

View File

@ -3,11 +3,17 @@
* View file for responding to Ajax request for performing Search Here on the map
*
*/
namespace Digitanie\Component\Leaflet\Site\View\Leaflet;
use Joomla\CMS\Factory;
use Joomla\CMS\Response\JsonResponse;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Language\Text;
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
class leafletViewleaflet extends JViewLegacy
class JsonView extends BaseHtmlView
{
/**
* This display function returns in json format the Helloworld greetings
@ -18,7 +24,7 @@ class leafletViewleaflet extends JViewLegacy
function display($tpl = null)
{
$input = JFactory::getApplication()->input;
$input = Factory::getApplication()->input;
$type = $input->get('type', null, 'string');
$catId = $input->get('catId', null, 'string');
@ -28,58 +34,57 @@ class leafletViewleaflet extends JViewLegacy
$records = $model->getCategory();
if ($records)
{
echo new JResponseJson($records);
echo new JsonResponse($records);
}
else
{
echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
}
} else if ($type == "departement") {
$records = $model->getTerritoires();
if ($records)
{
echo new JResponseJson($records);
echo new JsonResponse($records);
}
else
{
echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
}
} else if ($type == "categorie") {
$records = $model->getCategoriesExperience();
if ($records)
{
echo new JResponseJson($records);
echo new JsonResponse($records);
}
else
{
echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
}
} else if ($type == "activite") {
$records = $model->getActivite();
if ($records)
{
echo new JResponseJson($records);
echo new JsonResponse($records);
}
else
{
echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true);
}
} else if ($type == "markers" && isset($catId)) {
$records = $model->getMarkers($catId);
if ($records)
{
echo new JResponseJson($records);
echo new JsonResponse($records);
}
else
{
echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS_1'), true);
echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS_1'), true);
}
}
else
{
$records = array();
//echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_MAP_BOUNDS'), true);
echo new JResponseJson($type);
echo new JsonResponse($type);
}
}
}

View File

@ -0,0 +1,46 @@
<?php
use Joomla\CMS\Language\Text;
use Joomla\CMS\Session\Session;
// No direct access to this file
defined('_JEXEC') or die('Restricted Access');
JHtml::_('script', JUri::root() . 'media/com_leaflet/js/jquery-3.6.0.min.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', JUri::root() . 'media/com_leaflet/js/leaflet-1.7.1/leaflet.js');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-1.7.1/leaflet.css');
JHtml::_('script', 'com_leaflet/leaflet-panel-layers-master/src/leaflet-panel-layers.js', array('version' => 'auto', 'relative' => true));
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-search-master/src/leaflet-search.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css');
JHtml::_('script', 'com_leaflet/nouvelles_regionsV3.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/mapbox_token.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'media/com_leaflet/js/leaflet-omnivore.min.js');
JHtml::_('script', 'com_leaflet/leaflet-search-master/src/leaflet-search.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/leaflet-sidebar-master/src/L.Control.Sidebar.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/app.js', array('version' => 'auto', 'relative' => true));
?>
<?php echo '<input id="token" type="hidden" name="' . Session::getFormToken() . '" value="1" />'; ?>
<div id="mapid">
<div id="filtreMap">
<div id="filtreCode">
</div id="filtre">
</div>
<div id="sidebar">
<h1><?= Text::_('COM_LEAFLET_TITLE_LEAFLET') ?></h1>
</div>
<div id="tooltip">
</div>

View File

@ -1,84 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_leaflet
*
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
?>
<!-- IMPORT JS FILES -->
<?php
//JHtml::_('jquery.framework');
//JHtml::_('script', 'https://unpkg.com/leaflet@1.7.1/dist/leaflet.js');
//JHtml::_('stylesheet', 'https://unpkg.com/leaflet@1.7.1/dist/leaflet.css');
JHtml::_('script', JUri::root() . 'media/com_leaflet/js/jquery-3.6.0.slim.min.js');
JHtml::_('script', JUri::root() . 'media/com_leaflet/js/leaflet-1.7.1/leaflet.js');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-1.7.1/leaflet.css');
JHtml::_('script', 'com_leaflet/leaflet-panel-layers-master/src/leaflet-panel-layers.js', array('version' => 'auto', 'relative' => true));
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-search-master/src/leaflet-search.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css');
JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css');
// JHtml::_('script', JUri::root() . 'media/com_leaflet/js/leaflet-menu-master/src/leaflet.menu.min.js');
// JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-menu-master/src/leaflet.menu.min.css');
// JHtml::_('stylesheet', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css');
// JHtml::_('script', 'com_leaflet/chflieu_communesV2.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/nouvelles_regionsV3.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/mapbox_token.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'media/com_leaflet/js/leaflet-omnivore.min.js');
//JHtml::_('script', 'media/com_leaflet/jsChainesGeomWKT.js');
// JHtml::_('script', 'com_leaflet/themes.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/leaflet-search-master/src/leaflet-search.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/leaflet-sidebar-master/src/L.Control.Sidebar.js', array('version' => 'auto', 'relative' => true));
JHtml::_('script', 'com_leaflet/app.js', array('version' => 'auto', 'relative' => true));
?>
<!-- TEMPLATE -->
<?php echo '<input id="token" type="hidden" name="' . JSession::getFormToken() . '" value="1" />'; ?>
<!-- <table class="table table-bordered"> -->
<!-- <thead>
<tr>
<th>Code</th>
</tr>
</thead>
<tbody id="t_points"></tbody>
<tr>
<td>test<td>
</tr>
</table> -->
<div id="mapid">
<div id="filtreMap">
<div id="filtreCode">
</div id="filtre">
</div>
<div id="sidebar">
<h1>Cartographie des projets d'enedis coorace</h1>
</div>
<div id="tooltip">
</divid>
<!-- SCRIPT -->
<!-- HERE IS THE VIEW IN FRONT-END WHEN WE SEE COMPONENT -->

View File

@ -1,46 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_leaflet
*
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
/**
* HTML View class for the leaflet Component
*
* @since 0.0.1
*/
class leafletViewleaflet extends JViewLegacy
{
/**
* Display the leaflet view
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
*/
function display($tpl = null)
{
$this->loadTemplateHeader();
// Display the view
parent::display($tpl);
}
/**
* Load the template header data here to simplify the template
*/
protected function loadTemplateHeader()
{
// Import CSS
$document = JFactory::getDocument();
$document->addStyleSheet('components/com_leaflet/assets/css/global.css');
}
}
// SEND THE DATA TO THE VIEW FRONT