--- domain_geolocalization.module	2009-06-12 01:31:01.000000000 +0100
+++ domain_geolocalization_v2.module	2009-10-08 15:27:48.000000000 +0100
@@ -117,6 +117,28 @@ function domain_geolocalization_form_alt
 }
 
 /**
+ * Implementation of hook_location_element_alter().
+ */
+function domain_geolocalization_location_element_alter(&$element) {
+
+  global $_domain;
+  $domainvals = $_domain;
+  domain_geolocalization_domainload($domainvals);
+         
+  //Tie domain gelolocalization fields to their equivalents in location module      
+  $fields = array('city'=>'city','state'=>'province','zipcode'=>'postal_code','country'=>'country');
+        
+  //If a field is already set in the domain geolocalization settings, hide it 
+  //and pass the geolocalization setting instead
+  foreach($fields as $key => $value) {     
+    if(!empty($domainvals[$key])) {
+      $element[$value]['#type'] = 'hidden';
+      $element[$value]['#value'] = $domainvals[$key];	
+    }
+  } 
+}
+
+/**
  * Implementation of hook_block().
  */
 function domain_geolocalization_block($op = 'list', $delta = 0, $edit = array()) {
@@ -258,8 +280,9 @@ function domain_geolocalization_domainup
     default:
       $values = $form_state['values'];
 
-      if ($values['use_geolocalization']) {
+      //if ($values['use_geolocalization']) {
         // check if update
+        drupal_set_message($values['country']);
         $update = NULL;
         if (db_result(db_query("SELECT domain_id FROM {domain_geolocalization} WHERE domain_id = %d", $domain['domain_id']))) {
           $update = array('domain_id');
@@ -281,11 +304,11 @@ function domain_geolocalization_domainup
         }
         drupal_write_record('domain_geolocalization_location', $record, $update);
         drupal_write_record('domain_geolocalization_location_instance', $record, $update);
-      }
-      else {
+      //}
+      //else {
         // remove records
-        _domain_geolocalization_delete($domain);
-      }
+        //_domain_geolocalization_delete($domain);
+      //}
   }
 }