| Line 88... |
Line 88... |
| 88 |
|
88 |
|
| 89 |
return array('type' => 'png', 'img' => $img);
|
89 |
return array('type' => 'png', 'img' => $img);
|
| Line 90... |
Line 90... |
| 90 |
}
|
90 |
}
|
| 91 |
|
- |
|
| 92 |
public function getTout($params) {
|
91 |
|
| 93 |
|
92 |
public function getTout($params) {
|
| Line 94... |
Line 93... |
| 94 |
$emplacements = null;
|
93 |
$emplacements = null;
|
| 95 |
$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,''), IFNULL(wgs84_latitude,''),IFNULL(wgs84_longitude,'')) ";
|
- |
|
| 96 |
|
- |
|
| 97 |
$requete = 'SELECT ce_zone_geo, zone_geo, station, '.
|
- |
|
| 98 |
"mots_cles_texte, ".
|
- |
|
| 99 |
"latitude, ".
|
94 |
$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,''), IFNULL(wgs84_latitude,''),IFNULL(wgs84_longitude,'')) ";
|
| 100 |
"wgs84_latitude, ".
|
95 |
|
| 101 |
"longitude, ".
|
96 |
$requete = 'SELECT ce_zone_geo, zone_geo, station, '.
|
| 102 |
"wgs84_longitude, ".
|
97 |
' mots_cles_texte, latitude, wgs84_latitude, longitude, wgs84_longitude, '.
|
| 103 |
$concatenation_id." as id_coord ".
|
98 |
" $concatenation_id AS id_coord ".
|
| 104 |
'FROM cel_obs AS co '.
|
99 |
'FROM cel_obs AS co '.
|
| 105 |
' LEFT JOIN cel_zones_geo AS l '.
|
100 |
' LEFT JOIN cel_zones_geo AS l '.
|
| Line 247... |
Line 242... |
| 247 |
}
|
242 |
}
|
| Line 248... |
Line 243... |
| 248 |
|
243 |
|
| 249 |
if (isset($this->parametres['ne']) && $this->parametres['sw'] && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) {
|
244 |
if (isset($this->parametres['ne']) && $this->parametres['sw'] && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) {
|
| 250 |
$ne = $this->decomposerLatLng($this->parametres['ne']);
|
245 |
$ne = $this->decomposerLatLng($this->parametres['ne']);
|
| 251 |
$sw = $this->decomposerLatLng($this->parametres['sw']);
|
246 |
$sw = $this->decomposerLatLng($this->parametres['sw']);
|
| 252 |
$marqueurs['points'] = CartoGroupage::creerGroupesQuadtree(&$points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom);
|
247 |
$marqueurs['points'] = CartoGroupage::creerGroupesQuadtree($points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom);
|
| 253 |
} else {
|
248 |
} else {
|
| 254 |
$marqueurs['points'] = $points;
|
249 |
$marqueurs['points'] = $points;
|
| 255 |
}
|
250 |
}
|
| 256 |
//$marqueurs['stats']['latDiff'] = abs($marqueurs['stats']['latMin'] - $marqueurs['stats']['latMax']);
|
251 |
//$marqueurs['stats']['latDiff'] = abs($marqueurs['stats']['latMin'] - $marqueurs['stats']['latMax']);
|