Changeset 20035

Timestamp:

Jan 10, 2013, 12:03:08 PM (12 years ago)

Author:

cljosse

Message:

[extensions] edit_gmaps Minor corrections

Location:

extensions/edit_gmaps/admin/include

Files:

• XML.php (modified) (1 diff)
• fonctions.php (modified) (3 diffs)

extensions/edit_gmaps/admin/include/XML.php

@@ -139 +139 @@
         // This is very difficult to work with, so it needs to be
         // converted to a tree structure before being returned
-        return xml_get_children($newvals, $i=0);
+         $i=0;
+        return xml_get_children($newvals, $i);
 
 }

extensions/edit_gmaps/admin/include/fonctions.php

@@ -72 +72 @@
     }
     $num = (int)$num;
-
+ if(empty($ret1)) $ret1=(object) '';
     // whole number, just return it
-    if( $den == 1 ) return $num;
-
+    if( $den == 1 ) {
+        $ret1->Numerator =($num ) ;
+        $ret1->Denominator=($den);
+    return $ret1;
+    }
     $num2 = $num;
     $den2 = $den;
@@ -85 +88 @@
      $den2 = $rem;
     }
-    if( $den2 != $den ) $rem = $den2;
-
-    $ret1->Numerator =($num / $rem ) ;
+        if( $den2 != $den ) $rem = $den2;
+       
+        $ret1->Numerator =($num / $rem ) ;
         $ret1->Denominator=($den / $rem);
-
+     
     // now $rem holds the gcd of the numerator and denominator of our fraction
     return $ret1;
@@ -104 +107 @@
         $seconds= round(($tmp-$minutes)*6000)/100;
        
-        $sec=  dec2frac($seconds);
- 
+        $sec =  dec2frac($seconds);
+
+   //if(empty($ret1)) $ret1=(object) ;
+   $ret=array();
+
         $ret[0]['Numerator'] =$degrees ;
         $ret[0]['Denominator'] = 1 ;        
-        $ret[1]['Numerator']  =$minutes ;
-        $ret[1]['Denominator']=1;  
-        $ret[2]['Numerator']  =$sec->Numerator ;
-        $ret[2]['Denominator']=$sec->Denominator;
+        $ret[1]['Numerator']  = $minutes ;
+        $ret[1]['Denominator']= 1;  
+        if($sec->Numerator){
+            $ret[2]['Numerator']  = $sec->Numerator ;
+            $ret[2]['Denominator']= $sec->Denominator;
+        }
   $ret[3]= " Deg: " . $degrees . " Min: " . $minutes . " Sec: " . $seconds."  " ;
         $ret[4]= " " . $degrees . "/1 " . $minutes . "/1 " . $sec->Numerator."/".$sec->Denominator ; 
+
 return( $ret);