Changeset 75297 in spip-zone


Ignore:
Timestamp:
Sep 6, 2013, 10:15:22 AM (6 years ago)
Author:
brunobergot@…
Message:

Version 4.9.5 : on se passe de la lib externe qu'on embarque directement dans gis/lib/leaflet + mise à jour des scripts des plugins, on bascule sur le fork suivant https://github.com/brunob/leaflet-plugins dans lequel j'ai intégré pas mal des pull requests en attente sur le repo original + suppression d'images obsolètes

Location:
_plugins_/gis/trunk
Files:
33 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • _plugins_/gis/trunk/gis_options.php

    r74343 r75297  
    22
    33if (!defined('_ECRIRE_INC_VERSION')) return;
    4 
    5 define('_DIR_LIB_GIS','lib/leaflet-gis-4.9.0/');
    64
    75$GLOBALS['logo_libelles']['id_gis'] = _T('gis:libelle_logo_gis');
  • _plugins_/gis/trunk/gis_pipelines.php

    r74581 r75297  
    1010 */
    1111function gis_insert_head_css($flux){
    12         $flux .="\n".'<link rel="stylesheet" href="'. find_in_path(_DIR_LIB_GIS.'dist/leaflet.css') .'" />';
    13         $flux .="\n".'<!--[if lte IE 8]> <link rel="stylesheet" href="'. find_in_path(_DIR_LIB_GIS.'dist/leaflet.ie.css') .'" /> <![endif]-->';
    14         $flux .="\n".'<link rel="stylesheet" href="'. find_in_path(_DIR_LIB_GIS.'plugins/leaflet-plugins.css') .'" />';
    15         $flux .="\n".'<link rel="stylesheet" href="'. sinon(find_in_path('css/leaflet.markercluster.css'),find_in_path(_DIR_LIB_GIS.'plugins/leaflet.markercluster.css')) .'" />';
    16         $flux .="\n".'<!--[if lte IE 8]><link rel="stylesheet" href="'. sinon(find_in_path('css/leaflet.markercluster.ie.css'),find_in_path(_DIR_LIB_GIS.'plugins/leaflet.markercluster.ie.css')) .'" /><![endif]-->';
     12        $flux .="\n".'<link rel="stylesheet" href="'. find_in_path('lib/leaflet/dist/leaflet.css') .'" />';
     13        $flux .="\n".'<!--[if lte IE 8]> <link rel="stylesheet" href="'. find_in_path('lib/leaflet/dist/leaflet.ie.css') .'" /> <![endif]-->';
     14        $flux .="\n".'<link rel="stylesheet" href="'. find_in_path('lib/leaflet/plugins/leaflet-plugins.css') .'" />';
     15        $flux .="\n".'<link rel="stylesheet" href="'. sinon(find_in_path('css/leaflet.markercluster.css'),find_in_path('lib/leaflet/plugins/leaflet.markercluster.css')) .'" />';
     16        $flux .="\n".'<!--[if lte IE 8]><link rel="stylesheet" href="'. sinon(find_in_path('css/leaflet.markercluster.ie.css'),find_in_path('lib/leaflet/plugins/leaflet.markercluster.ie.css')) .'" /><![endif]-->';
    1717        return $flux;
    1818}
  • _plugins_/gis/trunk/javascript/gis.js.html

    r74343 r75297  
    11#HTTP_HEADER{Content-type:text/javascript}
    22
    3 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})dist/[(#CONFIG{auto_compress_js}|=={oui}|?{'leaflet','leaflet-src'})].js]})]})]
     3[(#INCLURE{lib/leaflet/dist/[(#CONFIG{auto_compress_js}|=={oui}|?{'leaflet','leaflet-src'})].js})]
    44
    5 [L.Icon.Default.imagePath = "(#CHEMIN{#EVAL{_DIR_LIB_GIS}dist/images}|url_absolue)";]
     5[L.Icon.Default.imagePath = "(#CHEMIN{lib/leaflet/dist/images}|url_absolue)";]
    66
    77[(#INCLURE{javascript/gis_geocoder.js})]
     
    99[(#INCLURE{javascript/gis_utils.js})]
    1010
    11 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/KML.js]})]})]
     11[(#INCLURE{lib/leaflet/plugins/KML.js})]
    1212
    13 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/GPX.js]})]})]
     13[(#INCLURE{lib/leaflet/plugins/GPX.js})]
    1414
    15 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/leaflet-providers.js]})]})]
     15[(#INCLURE{lib/leaflet/plugins/leaflet-providers.js})]
    1616
    17 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/Control.FullScreen.js]})]})]
     17[(#INCLURE{lib/leaflet/plugins/Control.FullScreen.js})]
    1818
    19 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/Control.MiniMap.js]})]})]
     19[(#INCLURE{lib/leaflet/plugins/Control.MiniMap.js})]
    2020
    21 [(#REM) Tester suivant la config pour ces deux scripts ]
     21[(#REM) Scripts de google et bing si besoin ]
    2222
    2323#SET{layers,#CONFIG{gis/layers,#ARRAY{0,openstreetmap_mapnik}}}
     
    2727
    2828[(#LISTE{google_roadmap,google_satellite,google_terrain}|array_intersect{#GET{layers}}|count|>{0}|oui)
    29 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/Google.js]})]})]
     29[(#INCLURE{lib/leaflet/plugins/Google.js})]
    3030]
    3131
    3232[(#VAL{bing_aerial}|in_array{#GET{layers}}|oui)
    33 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/Bing.js]})]})]
     33[(#INCLURE{lib/leaflet/plugins/Bing.js})]
    3434]
    3535
    36 [(#REM)
    37 Lib clustering si besoin
    38 ]
     36[(#REM) Lib clustering si besoin ]
    3937[(#ENV{cluster}|=={oui}|oui)
    40 [(#INCLURE{[(#VAL{[(#EVAL{_DIR_LIB_GIS})plugins/leaflet.markercluster-src.js]})]})]
     38[(#INCLURE{lib/leaflet/plugins/leaflet.markercluster-src.js})]
    4139]
    4240
    43 #INCLURE{javascript/gis_init_map.js}
     41[(#INCLURE{javascript/gis_init_map.js})]
    4442
    4543[(#CONFIG{auto_compress_js}|=={oui}|oui)
  • _plugins_/gis/trunk/paquet.xml

    r74937 r75297  
    22        prefix="gis"
    33        categorie="divers"
    4         version="4.9.4"
     4        version="4.9.5"
    55        schema="2.0.3"
    66        etat="stable"
     
    1717        <auteur lien="http://www.ldd.fr">Les Développements Durables</auteur>
    1818        <credit lien="http://leafletjs.com/">Leaflet</credit>
    19         <credit lien="https://github.com/shramov/leaflet-plugins">Leaflet plugins</credit>
     19        <credit lien="https://github.com/brunob/leaflet-plugins">Leaflet plugins</credit>
    2020        <credit lien="https://github.com/leaflet-extras/leaflet-providers">Leaflet providers</credit>
    2121        <credit lien="https://github.com/brunob/leaflet.fullscreen">Leaflet fullscreen</credit>
     
    3030        <utilise nom="selecteur_generique" compatibilite="[1.12;]" />
    3131        <necessite nom="saisies" compatibilite="[1.19.0;]" />
    32         <lib nom="leaflet-gis-4.9.0" lien="http://contrib.spip.net/IMG/zip/leaflet-gis-4.9.0.zip" />
    3332
    3433        <pipeline
Note: See TracChangeset for help on using the changeset viewer.