| Line 153... |
Line 153... |
| 153 |
$this->info['nom'] = $this->param['masque.ns'].' '.$this->param['masque.au'];
|
153 |
$this->info['nom'] = $this->param['masque.ns'].' '.$this->param['masque.au'];
|
| 154 |
$this->info['nom_ss_auteur'] = $this->param['masque.ns'];
|
154 |
$this->info['nom_ss_auteur'] = $this->param['masque.ns'];
|
| 155 |
}
|
155 |
}
|
| Line 156... |
Line 156... |
| 156 |
|
156 |
|
| - |
|
157 |
private function chargerVille() {
|
| 157 |
private function chargerVille() {
|
158 |
$requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector".
|
| 158 |
$requete = "SELECT * FROM tb_cel.locations";
|
159 |
" FROM tb_cel.cel_zones_geo;";
|
| 159 |
$villes = $this->getBdd()->recupererTous($requete);
|
160 |
$villes = $this->getBdd()->recupererTous($requete);
|
| 160 |
foreach ($villes as $ville) {
|
161 |
foreach ($villes as $ville) {
|
| 161 |
$this->tab_code_insee[$ville['insee_code']] = $ville;
|
162 |
$this->tab_code_insee[$ville['insee_code']] = $ville;
|
| 162 |
}
|
163 |
}
|
| Line 176... |
Line 177... |
| 176 |
$merge = array();
|
177 |
$merge = array();
|
| 177 |
foreach ($inventories as $inventory){
|
178 |
foreach ($inventories as $inventory){
|
| 178 |
$utm = $this->cartesFormateur->chercherVille($inventory, $this->tab_code_insee);
|
179 |
$utm = $this->cartesFormateur->chercherVille($inventory, $this->tab_code_insee);
|
| 179 |
// Ultime tentative
|
180 |
// Ultime tentative
|
| 180 |
if (!$utm) {
|
181 |
if (!$utm) {
|
| - |
|
182 |
$requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector".
|
| 181 |
$requete = "SELECT * FROM tb_cel.locations WHERE name LIKE ".$this->getBdd()->proteger($inventory['location']);
|
183 |
" FROM tb_cel.cel_zones_geo WHERE name LIKE ".$this->getBdd()->proteger($inventory['location']);
|
| 182 |
$utm = $this->getBdd()->recupererTous($requete);
|
184 |
$utm = $this->getBdd()->recupererTous($requete);
|
| 183 |
}
|
185 |
}
|
| Line 184... |
Line 186... |
| 184 |
|
186 |
|
| 185 |
// Si des doublons sur la commune : pas d'affichage , il vaut mieux ne rien afficher que d'afficher des erreurs.
|
187 |
// Si des doublons sur la commune : pas d'affichage , il vaut mieux ne rien afficher que d'afficher des erreurs.
|