Changeset 12215 for platform/tdiary/plugin

Timestamp:

05/22/08 21:24:34 (6 months ago)

Author:

kp

Message:

測地系がTOKYO以外の場合はWGS-84と類推する

Files:

• platform/tdiary/plugin/image_gps.rb (modified) (3 diffs)

platform/tdiary/plugin/image_gps.rb

@@ -12 +12 @@
 
 =begin ChangeLog
+2008-05-22 kp
+  * MapDatumがTOKYO以外の場合、WGS-84と類推する
 2008-01-17 kp
   * いろいろ変更
@@ -69 +71 @@
     end
     begin
-      if(exif['GPSLatitudeRef'].value == 'N' && exif['GPSLongitudeRef'].value == 'E' && exif['GPSMapDatum'].value =~ /(WGS-?84|TOKYO)/)
+      if(exif['GPSLatitudeRef'].value == 'N' && exif['GPSLongitudeRef'].value == 'E')
         nl = exif['GPSLatitude'].value if exif.tag?('GPSLatitude')
         el = exif['GPSLongitude'].value if exif.tag?('GPSLongitude')
@@ -83 +85 @@
       lon = "#{sprintf("%d.%d.%.2f",*el)}"
     else
-      Wgs2Tky.conv!(nl,el) if datum =~ /WGS-?84/
+      Wgs2Tky.conv!(nl,el) unless datum == /TOKYO/
       lat ="#{sprintf("%d/%d/%.3f",*nl)}"
       lon ="#{sprintf("%d/%d/%.3f",*el)}"