Subversion Repositories eFlore/Applications.cel

Rev

Rev 3736 | Rev 3747 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3736 Rev 3746
Line 109... Line 109...
109
	public function getTout($params) { 
109
	public function getTout($params) { 
Line 110... Line 110...
110
 
110
 
111
		$emplacements = null;
111
		$emplacements = null;
112
		$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,'')) ";
112
		$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,'')) ";
113
		$transmission = ( $this->standard == 0) ? "transmission = '1' AND " : "";
113
		$transmission = ( $this->standard == 0) ? "transmission = '1' AND " : "";
114
		$requete =  'SELECT ce_zone_geo, zone_geo, station, '.
114
        $requete =  'SELECT distinct ce_zone_geo, zone_geo, NULL as station, '.
115
								"mots_cles_texte, ".
115
            "NULL as mots_cles_texte, ".
116
								"latitude, ".
116
								"latitude, ".
117
								"NULL as wgs84_latitude, ".
117
								"NULL as wgs84_latitude, ".
118
								"longitude, ".
118
								"longitude, ".
119
								"NULL as wgs84_longitude, ".
119
								"NULL as wgs84_longitude, ".
Line 136... Line 136...
136
					$this->construireWherePhotosSeulement().
136
					$this->construireWherePhotosSeulement().
137
					$this->construireWhereProjet().
137
					$this->construireWhereProjet().
138
					$this->construireWhereTag().
138
					$this->construireWhereTag().
139
					$this->construireWhereNombreDeJours().
139
					$this->construireWhereNombreDeJours().
140
					$this->construireWhereAnnee().
140
					$this->construireWhereAnnee().
141
					$this->construireWhereGroupeZoneGeo().
141
            $this->construireWhereGroupeZoneGeo();
142
					' GROUP BY id_coord';
-
 
Line 143... Line 142...
143
 
142
 
144
		$resultats_emplacements = Cel::db()->requeter($requete);
143
		$resultats_emplacements = Cel::db()->requeter($requete);
145
		$emplacements = $this->traiterEmplacements($resultats_emplacements, $this->compterObservations($params));
144
		$emplacements = $this->traiterEmplacements($resultats_emplacements, $this->compterObservations($params));
146
		return $emplacements;
145
		return $emplacements;