Commit 4d0f4d32 authored by Clément Damiens's avatar Clément Damiens
Browse files

Merged branch development into terla

parents 8db1a286 f01c3a97
......@@ -162,7 +162,7 @@ var formInMap = {
formInMap.NE_street = "";
formInMap.initHtml();
$("#country_sumery_value").html($('[name="newElement_country"]').val());
$("#newElement_btnValidateAddress").prop('disabled', true);
$("#divStreetAddress").addClass("hidden");
formInMap.initDropdown();
......@@ -499,14 +499,17 @@ var formInMap = {
$("#dropdown-newElement_streetAddress-found").html("<li><a href='javascript:'><i class='fa fa-spin fa-refresh'></i> recherche en cours</a></li>");
$("#dropdown-newElement_streetAddress-found").show();
mylog.log("countryCode", countryCode);
if(countryCode == "NC"){
var countryDataGouv = ["FR","GP","MQ","GF","RE","PM","YT"];
if(countryDataGouv.indexOf(countryCode) != -1){
countryCode = formInMap.changeCountryForNominatim(countryCode);
mylog.log("countryCode", countryCode);
callNominatim(requestPart, countryCode);
mylog.log("countryCodeHere", countryCode);
callDataGouv(requestPart, countryCode);
}else{
countryCode = formInMap.changeCountryForNominatim(countryCode);
mylog.log("countryCode", countryCode);
callDataGouv(requestPart, countryCode);
callNominatim(requestPart, countryCode);
}
formInMap.btnValideDisable(false);
......
......@@ -64,7 +64,7 @@ function callDataGouv(requestPart, countryCode){ /*countryCode=="FR"*/
function callNominatim(requestPart, countryCode){
mylog.log('callNominatim');
showMsgListRes("<i class='fa fa-spin fa-refresh'></i> Recherche en cours <small>Nominatim</small>");
showMsgListRes("<i class='fa fa-spin fa-refresh'></i> "+trad["Currently researching"]+" <small>Nominatim</small>");
callGeoWebService("nominatim", requestPart, countryCode,
function(objNomi){ /*success nominatim*/
mylog.log("SUCCESS nominatim");
......
......@@ -49,7 +49,7 @@ class CO2 {
$communexion["state"] = true;
}
if(CookieHelper::hasCookie("communexion")) {
if(CookieHelper::hasCookie("communexion") && CookieHelper::hasCookie("communexionType")) {
$communexion["state"] = true;
$communexion["values"] = json_decode(CookieHelper::getCookie("communexion"), true);
$communexion["currentLevel"] = "city";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment