Browse Source

version 4.44.16 : nouveau fond de carte Wikimedia + modification de l'ordre des couches proposées

les fonds qui nécessitent une clé passent en fin de liste
svn/root/tags/v4.47.18
brunobergot@gmail.com 5 years ago
parent
commit
3b461e0a2b
  1. 60
      gis_options.php
  2. 8
      lib/leaflet/plugins/leaflet-providers.js
  3. 2
      paquet.xml

60
gis_options.php

@ -33,22 +33,6 @@ $gis_layers = array (
'nom' => 'OpenStreetMap H.O.T.',
'layer' => 'L.tileLayer.provider("OpenStreetMap.HOT")'
),
'google_roadmap' => array(
'nom' => 'Google Roadmap',
'layer' => 'L.gridLayer.googleMutant({type:"roadmap"})'
),
'google_satellite' => array(
'nom' => 'Google Satellite',
'layer' => 'L.gridLayer.googleMutant({type:"satellite"})'
),
'google_terrain' => array(
'nom' => 'Google Terrain',
'layer' => 'L.gridLayer.googleMutant({type:"terrain"})'
),
'bing_aerial' => array(
'nom' => 'Bing Aerial',
'layer' => 'L.BingLayer("'.$api_key_bing.'")'
),
'opentopomap' => array(
'nom' => 'OpenTopoMap',
'layer' => 'L.tileLayer.provider("OpenTopoMap")'
@ -69,6 +53,26 @@ $gis_layers = array (
'nom' => 'Hydda Base',
'layer' => 'L.tileLayer.provider("Hydda.Base")'
),
'wikimedia' => array(
'nom' => 'Wikimedia',
'layer' => 'L.tileLayer.provider("Wikimedia")'
),
'cartodb_positron' => array(
'nom' => 'CartoDB Positron',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.Positron").options)' : 'L.tileLayer.provider("CartoDB.Positron")'
),
'cartodb_positron_base' => array(
'nom' => 'CartoDB Positron Base',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_nolabels/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.PositronNoLabels").options)' : 'L.tileLayer.provider("CartoDB.PositronNoLabels")'
),
'cartodb_darkmatter' => array(
'nom' => 'CartoDB DarkMatter',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.DarkMatter").options)' : 'L.tileLayer.provider("CartoDB.DarkMatter")'
),
'cartodb_darkmatter_base' => array(
'nom' => 'CartoDB DarkMatter Base',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.DarkMatterNoLabels").options)' : 'L.tileLayer.provider("CartoDB.DarkMatterNoLabels")'
),
'stamen_toner' => array(
'nom' => 'Stamen Toner',
'layer' => 'L.tileLayer.provider("Stamen.Toner")'
@ -125,21 +129,21 @@ $gis_layers = array (
'nom' => 'Esri WorldGrayCanvas',
'layer' => 'L.tileLayer.provider("Esri.WorldGrayCanvas")'
),
'cartodb_positron' => array(
'nom' => 'CartoDB Positron',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.Positron").options)' : 'L.tileLayer.provider("CartoDB.Positron")'
'bing_aerial' => array(
'nom' => 'Bing Aerial',
'layer' => 'L.BingLayer("'.$api_key_bing.'")'
),
'cartodb_positron_base' => array(
'nom' => 'CartoDB Positron Base',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_nolabels/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.PositronNoLabels").options)' : 'L.tileLayer.provider("CartoDB.PositronNoLabels")'
'google_roadmap' => array(
'nom' => 'Google Roadmap',
'layer' => 'L.gridLayer.googleMutant({type:"roadmap"})'
),
'cartodb_darkmatter' => array(
'nom' => 'CartoDB DarkMatter',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.DarkMatter").options)' : 'L.tileLayer.provider("CartoDB.DarkMatter")'
'google_satellite' => array(
'nom' => 'Google Satellite',
'layer' => 'L.gridLayer.googleMutant({type:"satellite"})'
),
'cartodb_darkmatter_base' => array(
'nom' => 'CartoDB DarkMatter Base',
'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.DarkMatterNoLabels").options)' : 'L.tileLayer.provider("CartoDB.DarkMatterNoLabels")'
'google_terrain' => array(
'nom' => 'Google Terrain',
'layer' => 'L.gridLayer.googleMutant({type:"terrain"})'
)
);

8
lib/leaflet/plugins/leaflet-providers.js

@ -680,6 +680,14 @@
white: 'white',
plurality: 'plural'
}
},
Wikimedia: {
url: 'https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png',
options: {
attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia</a>',
minZoom: 1,
maxZoom: 18
}
}
};

2
paquet.xml

@ -1,7 +1,7 @@
<paquet
prefix="gis"
categorie="divers"
version="4.44.15"
version="4.44.16"
schema="2.1.0"
etat="stable"
compatibilite="[3.0.0;3.2.*]"

Loading…
Cancel
Save