Commit 5ff794cb authored by JonathanMM's avatar JonathanMM

Merge branch 'master' into 'master'

Améliorations de la carte See merge request !11
parents a4f1e8b1 29ceb793
......@@ -10,3 +10,4 @@ script/fixStation.py
templates_c/*
!templates_c/README.md
script/fixInseeStation.py
/script/velibLib.pyc
......@@ -822,12 +822,12 @@ function getCommunesCarte($idConso)
define('BORNES_OUI', 20);
$couleur_etat=array(
BORNES_NON+ETAT_INCONNU=>'mediumvioletred',
BORNES_NON+ETAT_TRAVAUX=>'darkred',
BORNES_NON+ETAT_OUVERTE=>'slateblue',
BORNES_OUI+ETAT_INCONNU=>'indigo',
BORNES_OUI+ETAT_TRAVAUX=>'darkorange',
BORNES_OUI+ETAT_OUVERTE=>'darkgreen'
BORNES_NON+ETAT_INCONNU=>'DodgerBlue',
BORNES_NON+ETAT_TRAVAUX=>'FireBrick',
BORNES_NON+ETAT_OUVERTE=>'Coral',
BORNES_OUI+ETAT_INCONNU=>'MediumOrchid',
BORNES_OUI+ETAT_TRAVAUX=>'DarkTurquoise',
BORNES_OUI+ETAT_OUVERTE=>'Green'
);
$nombre_etat=array(
......@@ -844,6 +844,7 @@ function getCommunesCarte($idConso)
//interprétation de l'état de la station 0=état non prévu
switch($station['state'])
{
case 'En travaux':
case 'Work in progress':
$etat = ETAT_TRAVAUX;
break;
......@@ -964,7 +965,7 @@ function getCommunesCarte($idConso)
'texte'=>'Stations en service ('.$nombre_etat[BORNES_OUI+ETAT_OUVERTE].')');
}
$svg = genererCarteSVG(800, 500, $liste_communes, 'commune.php?insee=', '', '', $objets);
$svg = genererCarteSVG(800, 500, $liste_communes, 'commune.php?insee=', '', '', $objets,COMMUNE_AVM_VELIB);
return $svg;
}
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment