| /trunk/widget/modules/carto/Carto.php |
|---|
| 38,7 → 38,6 |
| extract($this->parametres); |
| $this->carte = (isset($carte) ? $carte : self::SERVICE_CARTO_ACTION_DEFAUT); |
| $this->departement = (isset($dept) ? $dept : '*'); |
| $this->regions = (isset($regions) ? $regions : '*'); |
| $this->pays = (isset($pays) ? $pays : '*'); |
| } |
| 53,7 → 52,6 |
| $widget['donnees']['url_web_service'] = sprintf($this->config['chemins']['baseURLServicesTpl'], ''); |
| $widget['donnees']['url_page_fiche'] = $this->config['carto']["urlPageFiche"]; |
| $widget['donnees']['departement'] = $this->departement; |
| $widget['donnees']['regions'] = $this->regions; |
| $widget['donnees']['pays'] = $this->pays; |
| $widget['squelette'] = 'carto'; |
| return $widget; |
| /trunk/widget/modules/carto/squelettes/carto.tpl.html |
|---|
| 24,7 → 24,6 |
| <script type="text/javascript"> |
| //<![CDATA[ |
| var departement = '<?= $departement ?>'; |
| var regions = '<?= $regions ?>'; // parmi les codes de http://download.geonames.org/export/dump/admin1CodesASCII.txt |
| var pays = '<?= $pays ?>'; |
| var urlWebService = '<?= $url_web_service ?>'; |
| //]]> |
| /trunk/widget/modules/carto/squelettes/scripts/carto.js |
|---|
| 37,7 → 37,7 |
| $.ajax({ |
| dataType: "json", |
| url: urlWebService + "CoelRecherche/Nombre/*/*/*/*/*/*/*/" + departement + "/*/", |
| data: { formatRetour: "text/plain", pays: pays, regions: regions }, |
| data: { formatRetour: "text/plain", pays: pays}, |
| async: false |
| }).complete(function(msg) { |
| if (! estStatutRequeteOK(msg.status)) { |
| 97,7 → 97,7 |
| $.ajax({ |
| dataType: "json", |
| url: urlWebService + "CoelRecherche/ParDefaut/*/*/*/*/*/*/*/" + departement + "/*/", |
| data: { limit: nombreCollections, pays: pays, regions: regions }, |
| data: { limit: nombreCollections, pays: pays}, |
| async: true |
| }).complete(function(msg) { |
| if (!estStatutRequeteOK(msg.status)) { |
| /trunk/jrest/services/CoelRecherche.php |
|---|
| 314,11 → 314,6 |
| if(!$p['pays']) unset($p['pays']); |
| } |
| if(isset($qs['regions'])) { |
| $p['regions'] = array_filter(explode(',', $qs['regions']), create_function('$val', 'return preg_match("/^[A-Z][A-Z]\.\w\w$/", $val);')); |
| if(!$p['regions']) unset($p['regions']); |
| } |
| return $p; |
| } |
| 428,9 → 423,6 |
| if (isset($p['p'])) { |
| $join[] = 'LEFT JOIN coel_personne ON (ccap_id_personne = cp_id_personne)'; |
| } |
| /*if (isset($p['lieu-stockage'])) { // @TODO on verra plus tard, galère avec la table meta |
| $join[] = 'LEFT JOIN coel_ ON (cs_ce_truk_region = )'; |
| }*/ |
| $join = array_unique($join); |
| } |
| 453,7 → 445,6 |
| "cp_code_postal LIKE {$p['adresse']}", |
| "cp_ville LIKE {$p['adresse']}", |
| "cp_ce_truk_pays LIKE {$p['adresse']}", |
| "cp_ce_truk_region LIKE {$p['adresse']}", |
| "cp_naissance_lieu LIKE {$p['adresse']}", |
| "cp_deces_lieu LIKE {$p['adresse']}", |
| "cmlv.cmlv_nom LIKE {$p['adresse']}", |