//trunk/widget/modules/cartopoint/squelettes/scripts/carto.js |
---|
390,7 → 390,7 |
var marqueurs = new Array(); |
function chargerMarqueurs(zoom, NELatLng, SWLatLng) { |
cacherMessageAucuneObs() |
cacherMessageAucuneObs(); |
var url = stationsUrl+ |
'&zoom='+zoom+ |
'&ne='+NELatLng+ |
744,6 → 744,11 |
if (pointClique.stationInfos.type_emplacement == 'communes') { |
urlObs = urlObs.replace(/commune=%2A/g, formaterParametreCommunePourRequete(pointClique.stationInfos.nom)); |
} |
// Ajout de la zone geo |
if (pointClique.stationInfos.zonegeo) { |
urlObs += '&zonegeo=' + pointClique.stationInfos.zonegeo; |
} |
urlObs = urlObs.replace(/\{nt\}/g, nt); |
urlObs = urlObs.replace(/\{start\}/g, depart); |
//trunk/jrest/services/CelWidgetMapPoint.php |
---|
904,8 → 904,12 |
extract($this->parametres); |
if (isset($this->parametres['commune']) && !$this->etreNull($commune)) { |
$commune = Cel::db()->proteger($commune); |
$sql = " AND zone_geo LIKE $commune "; |
$sql = " AND zone_geo LIKE $commune"; |
} |
if (isset($this->parametres['zonegeo']) && !$this->etreNull($zonegeo)) { |
$zonegeo = Cel::db()->proteger($zonegeo); |
$sql = " AND ce_zone_geo = $zonegeo"; |
} |
return $sql; |
} |
915,7 → 919,7 |
extract($this->parametres); |
if (isset($this->parametres['commune']) && !$this->etreNull($commune)) { |
$commune = Cel::db()->proteger($commune); |
$sql = " AND zone_geo LIKE $commune "; |
$sql = " AND zone_geo LIKE $commune"; |
$sql .= " AND ( |
( |
(latitude = '000null' OR latitude = '' OR latitude = 0 OR latitude IS NULL) ". |
925,6 → 929,10 |
') '; |
} |
if (isset($this->parametres['zonegeo']) && !$this->etreNull($zonegeo)) { |
$zonegeo = Cel::db()->proteger($zonegeo); |
$sql = " AND ce_zone_geo = $zonegeo"; |
} |
return $sql; |
} |
//trunk/jrest/lib/CartoGroupage.php |
---|
201,6 → 201,7 |
$point_allege['nom'] = self::formaterNomStation($point, 'communes'); |
$point_allege['lat'] = (float)$point['wgs84_latitude']; |
$point_allege['lng'] = (float)$point['wgs84_longitude']; |
$point_allege['zonegeo'] = $point['ce_zone_geo']; |
$point = $point_allege; |
} else { |
209,7 → 210,8 |
$point_allege['type_emplacement'] = 'stations'; |
$point_allege['nom'] = self::formaterNomStation($point, 'stations'); |
$point_allege['lat'] = (float)$point['latitude']; |
$point_allege['lng'] = (float)$point['longitude']; |
$point_allege['lng'] = (float)$point['wgs84_longitude']; |
$point_allege['zonegeo'] = $point['ce_zone_geo']; |
$point = $point_allege; |
} |