173,9 → 173,9 |
return $sensible; |
} |
|
private static function formaterNomStation(&$point, $type_emplacement) { |
private static function formaterNomStation(&$point) { |
$station = ''; |
if($type_emplacement == 'stations' && $point['station'] != '' && $point['station'] != '000null') { |
if($point['station'] != '' && $point['station'] != '000null') { |
$station = $point['station']; |
} else { |
$station = $point['zone_geo'].(($point['id_zone_geo'] != '' && $point['id_zone_geo'] != '000null') ? ' ('.self::formaterNomZoneGeo($point['id_zone_geo']).')' : ''); |
200,7 → 200,7 |
$point_allege = array(); |
$point_allege['id'] = self::MARQUEUR_COMMUNE.':'.$point['wgs84_latitude'].'|'.$point['wgs84_longitude']; |
$point_allege['type_emplacement'] = 'communes'; |
$point_allege['nom'] = self::formaterNomStation($point, 'communes'); |
$point_allege['nom'] = self::formaterNomStation($point); |
$point_allege['lat'] = (float)$point['wgs84_latitude']; |
$point_allege['lng'] = (float)$point['wgs84_longitude']; |
|
209,7 → 209,7 |
$point_allege = array(); |
$point_allege['id'] = self::MARQUEUR_STATION.':'.$point['latitude'].'|'.$point['longitude']; |
$point_allege['type_emplacement'] = 'stations'; |
$point_allege['nom'] = self::formaterNomStation($point, 'stations'); |
$point_allege['nom'] = self::formaterNomStation($point); |
$point_allege['lat'] = (float)$point['latitude']; |
$point_allege['lng'] = (float)$point['longitude']; |
|