| 20,6 → 20,7 |
|---|
| * @version $Id$ |
| * @copyright © 2010, Jean-Pascal MILCENT |
| */ |
| // TODO : supprimer le TRIM quand les obs seront reliées correctements aux localisations (sur le code INSEE par exemple) |
| class CelWidgetMap extends Cel { |
| |
| /** |
| 65,7 → 66,7 |
|---|
| $requete = 'SELECT sector, x_utm, y_utm '. |
| 'FROM cel_inventory AS i '. |
| ' LEFT JOIN locations AS l '. |
| ' ON (l.name = i.location AND l.code = i.id_location) '. |
| " ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ". |
| "WHERE transmission = '1' ". |
| (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ). |
| (isset($dept) ? " AND l.insee_code LIKE '$dept%' " : ''). |
| 136,7 → 137,7 |
|---|
| $requete = 'SELECT sector, x_utm, y_utm, coord_x, coord_y, ref_geo '. |
| 'FROM cel_inventory AS i '. |
| ' LEFT JOIN locations AS l '. |
| ' ON (l.name = i.location AND l.code = i.id_location) '. |
| " ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ". |
| "WHERE transmission = '1' ". |
| (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ). |
| (isset($dept) ? " AND l.insee_code LIKE '$dept%' " : ''). |
| 216,7 → 217,7 |
|---|
| ' sector, x_utm, y_utm, insee_code '. |
| 'FROM cel_inventory AS i '. |
| ' LEFT JOIN locations AS l '. |
| ' ON (l.name = i.location AND l.code = i.id_location) '. |
| " ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ". |
| "WHERE transmission = '1' ". |
| (($type == 'UTM') ? " AND (sector = '$secteur' AND x_utm = '$x_utm' AND y_utm = '$y_utm' ) " : ''). |
| (($type == 'LngLat') ? " AND (coord_x = '$coord_x' AND coord_y = '$coord_y' ) " : ''). |
| 252,7 → 253,7 |
|---|
| $requete = 'SELECT nom_sel, num_nom_sel, nom_ret, num_nom_ret, num_taxon, famille '. |
| 'FROM cel_inventory AS i '. |
| ' LEFT JOIN locations AS l '. |
| ' ON (l.name = i.location AND l.code = i.id_location) '. |
| " ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ". |
| "WHERE transmission = '1' ". |
| (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : ''). |
| (isset($dept) ? " AND l.insee_code LIKE '$dept%' " : ''). |