| /trunk/widget/modules/cartodepartement/CartoDepartement.php |
|---|
| 38,6 → 38,7 |
| 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 : '*'); |
| } |
| 52,6 → 53,7 |
| $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_departement'; |
| return $widget; |
| /trunk/widget/modules/cartodepartement/squelettes/carto_departement.tpl.html |
|---|
| 24,6 → 24,7 |
| <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/cartodepartement/squelettes/scripts/carto.js |
|---|
| 37,7 → 37,7 |
| $.ajax({ |
| dataType: "json", |
| url: urlWebService + "CoelRecherche/Nombre/*/*/*/*/*/*/" + departement + "/*/*/", |
| data: { formatRetour: "text/plain", pays: pays }, |
| data: { formatRetour: "text/plain", pays: pays, regions: regions }, |
| 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 }, |
| data: { limit: nombreCollections, pays: pays, regions: regions }, |
| async: true |
| }).complete(function(msg) { |
| if (!estStatutRequeteOK(msg.status)) { |
| /trunk/jrest/services/CoelRecherche.php |
|---|
| 207,6 → 207,11 |
| 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; |
| } |
| 266,6 → 271,7 |
| } |
| // par défaut, spécifier un département restreint à la France |
| // TODO: INNER JOIN |
| if (isset($p['str-d'])) { |
| $join[] = 'LEFT JOIN coel_meta_liste_valeur cv ON cv.cmlv_id_valeur = cs_ce_truk_pays'; |
| $where[] = 'cv.cmlv_abreviation = "FR"'; |
| 272,6 → 278,12 |
| $where[] = sprintf("cs_code_postal REGEXP '^(%s).*'", implode('|', $p['str-d'])); |
| } |
| // http://download.geonames.org/export/dump/admin1CodesASCII.txt |
| if (isset($p['regions'])) { |
| $join[] = 'LEFT JOIN coel_meta_liste_valeur cv ON cv.cmlv_id_valeur = cs_ce_truk_region'; |
| $where[] = sprintf('cv.cmlv_abreviation IN ("%s")', implode('","', $p['regions'])); |
| } |
| if (isset($p['pays'])) { |
| $join[] = 'LEFT JOIN coel_meta_liste_valeur cv ON cv.cmlv_id_valeur = cs_ce_truk_pays'; |
| $where[] = sprintf('cv.cmlv_abreviation IN ("%s")', implode('","', $p['pays'])); |