109,18 → 109,17 |
public function getTout($params) { |
|
$emplacements = null; |
$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,''), IFNULL(wgs84_latitude,''),IFNULL(wgs84_longitude,'')) "; |
$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,'')) "; |
$transmission = ( $this->standard = 0) ? "transmission = '1' AND " : ""; |
$requete = 'SELECT ce_zone_geo, zone_geo, station, '. |
"mots_cles_texte, ". |
"latitude, ". |
"wgs84_latitude, ". |
"NULL as wgs84_latitude, ". |
"longitude, ". |
"wgs84_longitude, ". |
"NULL as wgs84_longitude, ". |
$concatenation_id." as id_coord ". |
'FROM '.$this->table_export.' AS co '. |
' LEFT JOIN cel_zones_geo AS zg '. |
' ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) '. |
|
"WHERE ".$transmission. |
" (". |
$this->construireWhereRectangleStationOR()." OR ". |
160,8 → 159,6 |
$transmission = ( $this->standard = 0) ? "transmission = '1' AND " : ""; |
$requete = 'SELECT COUNT(*) as nb '. |
'FROM '.$this->table_export.' AS co '. |
' LEFT JOIN cel_zones_geo AS zg '. |
' ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) '. |
"WHERE ".$transmission. |
" (". |
$this->construireWhereRectangleStationOR()." OR ". |
354,8 → 351,6 |
' lieudit, zone_geo, date_observation, milieu, commentaire, '. |
' utm_secteur, utm_x, utm_y, code, date_transmission, nom_referentiel '. |
'FROM '.$this->table_export.' AS co '. |
' LEFT JOIN cel_zones_geo AS zg '. |
" ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) ". |
"WHERE ".$transmission. |
(($this->communeEstDemandee()) ? $this->construireWhereCommuneSansCoordonneesAvecSensibles() : $this->construireWhereCoordonneesSansSensibles()). |
$this->construireWhereDept(). |
502,8 → 497,6 |
$transmission = ( $this->standard = 0) ? "transmission = '1' AND " : ""; |
$requete = 'SELECT SQL_CALC_FOUND_ROWS DISTINCT nom_ret, nom_ret_nn, nt, famille '. |
'FROM '.$this->table_export.' AS co '. |
' LEFT JOIN cel_zones_geo AS zg '. |
' ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) '. |
"WHERE ".$transmission. |
" nom_ret != '' ". |
$this->construireWhereDept(). |
561,7 → 554,7 |
if ($type == self::MARQUEUR_COMMUNE) { |
$lat = Cel::db()->proteger($lat.'%'); |
$lng = Cel::db()->proteger($lng.'%'); |
$sql = " AND wgs84_latitude LIKE $lat AND wgs84_longitude LIKE $lng "; |
//$sql = " AND wgs84_latitude LIKE $lat AND wgs84_longitude LIKE $lng "; |
} else if ($type == self::MARQUEUR_STATION) { |
$lat = Cel::db()->proteger($lat.'%'); |
$lng = Cel::db()->proteger($lng.'%'); |
579,7 → 572,7 |
if ($type == self::MARQUEUR_COMMUNE) { |
$lat = Cel::db()->proteger($lat); |
$lng = Cel::db()->proteger($lng); |
$sql = " AND wgs84_latitude LIKE $lat AND wgs84_longitude LIKE $lng "; |
//$sql = " AND wgs84_latitude LIKE $lat AND wgs84_longitude LIKE $lng "; |
} else if ($type == self::MARQUEUR_STATION) { |
$lat = Cel::db()->proteger($lat.'%'); |
$lng = Cel::db()->proteger($lng.'%'); |
881,9 → 874,9 |
$latMax = $ne['lat']; |
$lngMax = $ne['lng']; |
|
$sql = "AND wgs84_longitude != 0 AND wgs84_latitude != 0 ". |
/*$sql = "AND wgs84_longitude != 0 AND wgs84_latitude != 0 ". |
" AND wgs84_latitude BETWEEN $latMin AND $latMax ". |
" AND wgs84_longitude BETWEEN $lngMin AND $lngMax "; |
" AND wgs84_longitude BETWEEN $lngMin AND $lngMax ";*/ |
} |
return $sql; |
} |
900,9 → 893,9 |
$latMax = $ne['lat']; |
$lngMax = $ne['lng']; |
|
$sql = "( wgs84_longitude != 0 AND wgs84_latitude != 0 ". |
/*$sql = "( wgs84_longitude != 0 AND wgs84_latitude != 0 ". |
" AND wgs84_latitude BETWEEN $latMin AND $latMax ". |
" AND wgs84_longitude BETWEEN $lngMin AND $lngMax )"; |
" AND wgs84_longitude BETWEEN $lngMin AND $lngMax )";*/ |
|
/*$sql = " MBRWithin(point_commune, GeomFromText('POLYGON((".$latMin.' '.$lngMin.','. |
$latMax.' '.$lngMin.','. |