From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 14 Mar 2017 11:25:39 +0000 (+0100)
Subject: [LAYERS] -thunderforest, cloudmade, etc +osmfr et téléchargement des
X-Git-Tag: v1.3.1~1
X-Git-Url: http://git.cyclocoop.org/data/%27%20.%20mediabox_timestamp%28find_in_path%28%27javascript/%7B%24www_url%7Dadmin/compta/operations/%40%20%27info_etape_suivante_2%27%20=%3E%20%27You%20can%20move%20on%20to%20the%20next%20step.%27%2C%20%27info_exceptions_proxy%27%20=%3E%20%27Exceptions%20for%20the%20proxy%27%2C%20%27info_exportation_base%27%20=%3E%20%27export%20database%20to%20%40archive%40%27%2C-%27info_facilite_suivi_activite%27%20=%3E%20%27To%20simplify%20monitoring%20of%20the%20site/%27s%20editorial;-%20%20activities%2C%20SPIP%20can%20send%20rmail%20notifications%2C%20e.g.%20to%20an%20editors/%7B%24admin_url%7Dlogout.php?a=commitdiff_plain;h=eee80a48d6b9a104335e86a5e4a7d7e9f5b1eded;p=lhc%2Fweb%2Fspip_carte_de_sites.git

[LAYERS] -thunderforest, cloudmade, etc +osmfr et téléchargement des
tuiles via https
---

diff --git a/contenu/page-carte_de_sites.html b/contenu/page-carte_de_sites.html
index 99587e0..dd98dd7 100755
--- a/contenu/page-carte_de_sites.html
+++ b/contenu/page-carte_de_sites.html
@@ -24,8 +24,8 @@
 
 <div id="map" style="[(#ENV{larg}|oui) width: [(#ENV{larg}|sinon{'540'})px;]] height: [(#ENV{haut}|sinon{'400'})]px">
 
-<script src="[(#CHEMIN{lib/leaflet-gis-4.1.13/dist/leaflet.js}|url_absolue)]" type="text/javascript"></script>
-<script src="[(#CHEMIN{lib/leaflet-gis-4.1.13/plugins/control/Control.FullScreen.js}|url_absolue)]" type="text/javascript"></script>
+<script src="[(#CHEMIN{lib/leaflet/dist/leaflet.js}|url_absolue)]" type="text/javascript"></script>
+<script src="[(#CHEMIN{lib/leaflet/plugins/Control.FullScreen.js}|url_absolue)]" type="text/javascript"></script>
 
 
 <script>
@@ -56,13 +56,11 @@
     var cloudmadeAttribution = 'Map data &copy; OpenStreetMap contributors<br/>[(#ENV{lien}|!={non}|oui)(<a href="#URL_SITE_SPIP/?page=carte_de_sites_plein&lien=non&groupe=#ENV{groupe}&boite=oui&haut=400[&lat=(#ENV{lat})][&lon=(#ENV{lon})][&zoom=(#ENV{zoom})][&legende=(#ENV{legende})]" rel="external" target="_blank"><:carte_de_sites:grande_carte:></a>)]',
         cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/{styleId}/256/{z}/{x}/{y}.png';
 
-    var midnightCommander = new L.TileLayer(cloudmadeUrl, {styleId: 999, attribution: cloudmadeAttribution}),
-        thunderforest = new L.TileLayer('http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png', {attribution: cloudmadeAttribution}),
-        minimal = new L.TileLayer(cloudmadeUrl, {styleId: [(#ENV{style}|sinon{'14189'})], attribution: cloudmadeAttribution});
+    var osmfr = new L.TileLayer('https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {attribution: cloudmadeAttribution});
 
     //Construction de la carte
     var map = new L.Map('map');
-    map.setView(new L.LatLng([(#ENV{lat}|sinon{'46.8'})],[(#ENV{lon}|sinon{'2.52'})]),[(#ENV{zoom}|sinon{5})]).addLayer(thunderforest);
+    map.setView(new L.LatLng([(#ENV{lat}|sinon{'46.8'})],[(#ENV{lon}|sinon{'2.52'})]),[(#ENV{zoom}|sinon{5})]).addLayer(osmfr);
     [(#ENV{fullscreen}|oui)
         map.addControl(new L.Control.FullScreen());
     ]
diff --git a/inclure/boite.html b/inclure/boite.html
index 99c2596..5ca0df6 100644
--- a/inclure/boite.html
+++ b/inclure/boite.html
@@ -1,8 +1,6 @@
 //Definition des fonds de carte
 	var baseMaps = {
-                                "<:carte_de_sites:vue_cycle:>": thunderforest,
-                                "<:carte_de_sites:vue_jour:>": minimal,
-                                "<:carte_de_sites:vue_nuit:>": midnightCommander
+                                "<:carte_de_sites:vue_osmfr:>": osmfr
                         };
 
 //Definition des calques de marqueurs
diff --git a/lang/carte_de_sites_en.php b/lang/carte_de_sites_en.php
index 85716b7..11faf15 100644
--- a/lang/carte_de_sites_en.php
+++ b/lang/carte_de_sites_en.php
@@ -4,9 +4,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 'legende' => 'Key',
 'inclure_carte' => 'To insert the map in your website ...',
 'coordonnees_clic' => 'Coordinates of your click has just been reported in the survey below. To be more accurate, you can zoom even more on your bike co-op and click again.',
-'vue_cycle' => 'Bike ways',
-'vue_nuit' => 'Night view',
-'vue_jour' => 'Day view',
+'vue_osmfr' => 'OSM FR',
 'aide_iframe' => 'Copy and paste the following code to insert the map in your website.',
 'grande_carte' => 'Go to the fullscreen map',
 'nom_carte' => 'Bike co-ops Map',
diff --git a/lang/carte_de_sites_fr.php b/lang/carte_de_sites_fr.php
index 9caa0b8..49b769b 100644
--- a/lang/carte_de_sites_fr.php
+++ b/lang/carte_de_sites_fr.php
@@ -4,9 +4,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 'legende' => 'L&eacute;gende',
 'inclure_carte' => 'Pour inclure la carte dans votre site oueb ...',
 'coordonnees_clic' => 'Les coordonn&eacute;es de votre clic ont &eacute;t&eacute; report&eacute;es dans le formulaire ci-dessous. Pour &ecirc;tre encore plus pr&eacute;cis, vous pouvez zoomer plus encore sur votre atelier et re-cliquer.',
-'vue_cycle' => 'Voies cyclables',
-'vue_nuit' => 'Vue de nuit',
-'vue_jour' => 'Vue de jour',
+'vue_osmfr' => 'OSM FR',
 'aide_iframe' => 'Ins&eacute;rer le code ci-dessous pour int&eacute;grer la carte dans votre site oueb.',
 'grande_carte' => 'Voir la carte en plus grand',
 'nom_carte' => 'Carte des ateliers',
diff --git a/paquet.xml b/paquet.xml
index f8628b5..de212ec 100755
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,16 +1,16 @@
 <paquet
     prefix="carte_de_sites"
     categorie="divers"
-    version="1.2.1"
-    etat="dev"
-    compatibilite="[3.0.0;3.0.*]"
+    version="1.3.0"
+    etat="stable"
+    compatibilite="[3.0.0;3.1.*]"
     documentation="http://www.wiklou.org/index.php/Inclusion_de_la_carte"
 >
 
     <nom>Carte de sites</nom>
     <auteur lien="http://www.heureux-cyclage.org">L'Heureux Cyclage</auteur>
     <credit lien="http://contrib.spip.net/4189">b_b</credit>
-    <copyright>2011-2015</copyright>
+    <copyright>2011-2017</copyright>
     <licence>GPL v3</licence>
-    <necessite nom="gis" compatibilite="[4.3.0;]"/>
+    <necessite nom="gis" compatibilite="[4.43.1;]"/>
 </paquet>