Browse Source

[enh] again

Pierre Bourdin 1 year ago
parent
commit
cf10bb83a0
2 changed files with 13 additions and 9 deletions
  1. 1 1
      convert_ll_dec.py
  2. 12 8
      process/1_capture

+ 1 - 1
convert_ll_dec.py

@@ -11,4 +11,4 @@ d, m = int(d), int(m)
 
 print("d:"+str(d))
 print("m:"+str(m))
-print("s:{:.6f}".format(s));
+print("s:{:.4f}".format(s));

+ 12 - 8
process/1_capture

@@ -9,14 +9,18 @@ NS=$(echo $DATA| tr ' ' '\n' | grep NS | cut -d'=' -f2 | cut -d',' -f1)
 EW=$(echo $DATA| tr ' ' '\n' | grep EW | cut -d'=' -f2 | cut -d',' -f1)
 
 LAT=$(echo $DATA| tr ' ' '\n' | grep 'lat=' | cut -d'=' -f2 | cut -d',' -f1)
-LATD=$(../convert_ll_dec.py $LAT | grep "d:" | cut -d':' -f1)
-LATM=$(../convert_ll_dec.py $LAT | grep "d:" | cut -d':' -f1)
-LATS=$(../convert_ll_dec.py $LAT | grep "d:" | cut -d':' -f1)
+echo "Latitude $LAT"
+LATD=$(../convert_ll_dec.py $LAT | grep "d:" | cut -d':' -f2)
+LATM=$(../convert_ll_dec.py $LAT | grep "m:" | cut -d':' -f2)
+LATS=$(../convert_ll_dec.py $LAT | grep "s:" | cut -d':' -f2 | sed 's/\.//' )
+echo "$LATD $LATM $LATS"
 
 LON=$(echo $DATA| tr ' ' '\n' | grep 'lon=' | cut -d'=' -f2 | cut -d',' -f1)
-LOND=$(../convert_ll_dec.py $LON| grep "d:" | cut -d':' -f1)
-LONM=$(../convert_ll_dec.py $LON | grep "d:" | cut -d':' -f1)
-LONS=$(../convert_ll_dec.py $LON | grep "d:" | cut -d':' -f1)
+echo "Longitude : $LON"
+LOND=$(../convert_ll_dec.py $LON| grep "d:" | cut -d':' -f2)
+LONM=$(../convert_ll_dec.py $LON | grep "m:" | cut -d':' -f2)
+LONS=$(../convert_ll_dec.py $LON | grep "s:" | cut -d':' -f2 | sed 's/\.//')
+echo "$LOND $LONM $LONS"
 
 # Creation du script pour ajout des données Exif dans le JPG
 cat <<EOF > /ramfs/.conf_exif
@@ -25,9 +29,9 @@ cat <<EOF > /ramfs/.conf_exif
     # 'set' pour remplacer celles déjà exisante
     # 'del' pour les supprimer (sans préciser de valeur)
     add Exif.GPSInfo.GPSLatitudeRef ${NS}
-    add Exif.GPSInfo.GPSLatitude ${LATD}/1 ${LATM}/1 ${LATS}/6
+    add Exif.GPSInfo.GPSLatitude ${LATD}/1 ${LATM}/1 ${LATS}/10000
     add Exif.GPSInfo.GPSLongitudeRef ${EW}
-    add Exif.GPSInfo.GPSLongitude ${LOND}/1 ${LONM}/1 ${LONS}/6
+    add Exif.GPSInfo.GPSLongitude ${LOND}/1 ${LONM}/1 ${LONS}/10000
 EOF
 
 exiv2 -m /ramfs/.conf_exif /ramfs/$DATE.jpg