Changeset 3980

Timestamp:

09/20/10 11:52:17 (10 years ago)

Author:

b_b

Message:

report de ​http://zone.spip.org/trac/spip-zone/changeset/40522 et 40523 de gis + un log en moins

Location:

plugins_spip/diogene_complements

Files:

• diogene_geo/prive/inc-diogene_geo_map.html (modified) (1 diff)
• diogene_mots/diogene_mots_pipelines.php (modified) (1 diff)

plugins_spip/diogene_complements/diogene_geo/prive/inc-diogene_geo_map.html

@@ -24 +24 @@
                                                 return false;
                                         } else {
+                                                $("#pays,#code_pays,#region,#ville,#code_postal").val("");
+                                                CountryName = '';
+                                                CountryNameCode = '';
+                                                AdministrativeAreaName = '';
+                                                LocalityName = '';
+                                                PostalCodeNumber = '';
                                                 place = response.Placemark[(#VAL{91}|chr)]0[(#VAL{93}|chr)];
                                                 $("#map_adresse").val(place.address);
-                                                if (place.AddressDetails.Accuracy > 0)
-                                                        $("#pays").val(place.AddressDetails.Country.CountryName);
-                                                if (place.AddressDetails.Accuracy > 0)
-                                                        $("#code_pays").val(place.AddressDetails.Country.CountryNameCode);
-                                                if (place.AddressDetails.Accuracy > 1)
-                                                        $("#region").val(place.AddressDetails.Country.AdministrativeArea.AdministrativeAreaName);
-                                                if (place.AddressDetails.Accuracy > 3)
-                                                        $("#ville").val(place.AddressDetails.Country.AdministrativeArea.SubAdministrativeArea.Locality.LocalityName);
-                                                if (place.AddressDetails.Accuracy > 5)
-                                                        $("#code_postal").val(place.AddressDetails.Country.AdministrativeArea.SubAdministrativeArea.Locality.PostalCode.PostalCodeNumber);
+                                                if (Country = place.AddressDetails.Country){
+                                                        if (CountryName = Country.CountryName)
+                                                                $("#pays").val(CountryName);
+                                                        if (CountryNameCode = Country.CountryNameCode)
+                                                                $("#code_pays").val(CountryNameCode);
+                                                        if (AdministrativeArea = Country.AdministrativeArea){
+                                                                if (AdministrativeAreaName = AdministrativeArea.AdministrativeAreaName)
+                                                                        $("#region").val(AdministrativeAreaName);
+                                                                if ((SubAdministrativeArea = AdministrativeArea.SubAdministrativeArea) && (Locality = SubAdministrativeArea.Locality)){
+                                                                        if (LocalityName = Locality.LocalityName)
+                                                                                $("#ville").val(LocalityName);
+                                                                        if ((PostalCode = Locality.PostalCode) && (PostalCodeNumber = PostalCode.PostalCodeNumber))
+                                                                                $("#code_postal").val(PostalCodeNumber);
+                                                                }
+                                                        }
+                                                }
                                         }
                                 }

plugins_spip/diogene_complements/diogene_mots/diogene_mots_pipelines.php

@@ -48 +48 @@
                 foreach($options_complements['mots_obligatoires'] as $groupe_obligatoire){
                         $mots_groupe = _request('groupe_'.$groupe_obligatoire);
-                        spip_log($mots_groupe,"bb");
                         if(empty($mots_groupe)){
                                 $erreurs['groupe_'.$groupe_obligatoire] = _T('info_obligatoire');