Skip to content

Commit

Permalink
Merge pull request #2 from arknoll/timestamp
Browse files Browse the repository at this point in the history 
Updates for new version of photo csv file.
  • Loading branch information
@arknoll
arknoll authored Jul 8, 2021
2 parents 26f07d5 + 69238ee commit aa5b1bf
Show file tree
Hide file tree
Showing 9 changed files with 680 additions and 661 deletions.
486 changes: 243 additions & 243 deletions build/exifwrite/Analysis-00.toc
View file

Large diffs are not rendered by default.

340 changes: 170 additions & 170 deletions build/exifwrite/EXE-00.toc
View file

Large diffs are not rendered by default.

Binary file modified build/exifwrite/PKG-00.pkg
View file
Binary file not shown.
338 changes: 169 additions & 169 deletions build/exifwrite/PKG-00.toc
View file

Large diffs are not rendered by default.

Binary file modified build/exifwrite/PYZ-00.pyz
View file
Binary file not shown.
148 changes: 74 additions & 74 deletions build/exifwrite/PYZ-00.toc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -650,14 +650,14 @@
('socket',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\socket.py',
'PYMODULE'),
('_py_abc',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\_py_abc.py',
('tracemalloc',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\tracemalloc.py',
'PYMODULE'),
('stringprep',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\stringprep.py',
'PYMODULE'),
('tracemalloc',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\tracemalloc.py',
('_py_abc',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\_py_abc.py',
'PYMODULE'),
('gps_time.core',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\gps_time\\core.py',
Expand Down Expand Up @@ -1545,65 +1545,65 @@
('PIL.Image',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\Image.py',
'PYMODULE'),
('PIL.FtexImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\FtexImagePlugin.py',
('PIL.Hdf5StubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\Hdf5StubImagePlugin.py',
'PYMODULE'),
('PIL.ImageFile',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\ImageFile.py',
'PYMODULE'),
('PIL.GribStubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\GribStubImagePlugin.py',
('PIL.FtexImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\FtexImagePlugin.py',
'PYMODULE'),
('PIL.BufrStubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\BufrStubImagePlugin.py',
('PIL.BlpImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\BlpImagePlugin.py',
'PYMODULE'),
('PIL.EpsImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\EpsImagePlugin.py',
'PYMODULE'),
('PIL.MpegImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\MpegImagePlugin.py',
'PYMODULE'),
('PIL.SunImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\SunImagePlugin.py',
'PYMODULE'),
('PIL.MicImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\MicImagePlugin.py',
'PYMODULE'),
('PIL.FpxImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\FpxImagePlugin.py',
'PYMODULE'),
('PIL.TgaImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\TgaImagePlugin.py',
('PIL.WebPImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\WebPImagePlugin.py',
'PYMODULE'),
('PIL.PcxImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PcxImagePlugin.py',
'PYMODULE'),
('PIL.XbmImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\XbmImagePlugin.py',
'PYMODULE'),
('PIL.DcxImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\DcxImagePlugin.py',
('PIL.FpxImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\FpxImagePlugin.py',
'PYMODULE'),
('PIL.MpoImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\MpoImagePlugin.py',
('PIL.CurImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\CurImagePlugin.py',
'PYMODULE'),
('PIL.SgiImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\SgiImagePlugin.py',
'PYMODULE'),
('PIL.PsdImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PsdImagePlugin.py',
('PIL.XVThumbImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\XVThumbImagePlugin.py',
'PYMODULE'),
('PIL.IcnsImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\IcnsImagePlugin.py',
'PYMODULE'),
('PIL.features',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\features.py',
'PYMODULE'),
('PIL.ImtImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\ImtImagePlugin.py',
'PYMODULE'),
('PIL.XpmImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\XpmImagePlugin.py',
('PIL.FitsStubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\FitsStubImagePlugin.py',
'PYMODULE'),
('PIL.MspImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\MspImagePlugin.py',
('PIL.McIdasImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\McIdasImagePlugin.py',
'PYMODULE'),
('PIL.IcnsImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\IcnsImagePlugin.py',
('PIL.PdfImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PdfImagePlugin.py',
'PYMODULE'),
('PIL.features',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\features.py',
('PIL.PdfParser',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PdfParser.py',
'PYMODULE'),
('PIL.ImageSequence',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\ImageSequence.py',
'PYMODULE'),
('PIL.WmfImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\WmfImagePlugin.py',
Expand All @@ -1614,68 +1614,68 @@
('PIL.ImageTk',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\ImageTk.py',
'PYMODULE'),
('PIL.PixarImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PixarImagePlugin.py',
'PYMODULE'),
('PIL.GbrImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\GbrImagePlugin.py',
('PIL.XpmImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\XpmImagePlugin.py',
'PYMODULE'),
('PIL.IcoImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\IcoImagePlugin.py',
('PIL.Jpeg2KImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\Jpeg2KImagePlugin.py',
'PYMODULE'),
('PIL.FliImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\FliImagePlugin.py',
'PYMODULE'),
('PIL.WebPImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\WebPImagePlugin.py',
('PIL.PixarImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PixarImagePlugin.py',
'PYMODULE'),
('PIL.DdsImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\DdsImagePlugin.py',
'PYMODULE'),
('PIL.PcdImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PcdImagePlugin.py',
'PYMODULE'),
('PIL.XVThumbImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\XVThumbImagePlugin.py',
'PYMODULE'),
('PIL.PdfImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PdfImagePlugin.py',
('PIL.IcoImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\IcoImagePlugin.py',
'PYMODULE'),
('PIL.PdfParser',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PdfParser.py',
('PIL.BufrStubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\BufrStubImagePlugin.py',
'PYMODULE'),
('PIL.ImageSequence',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\ImageSequence.py',
('PIL.XbmImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\XbmImagePlugin.py',
'PYMODULE'),
('PIL.PalmImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PalmImagePlugin.py',
'PYMODULE'),
('PIL.BlpImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\BlpImagePlugin.py',
('PIL.ImImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\ImImagePlugin.py',
'PYMODULE'),
('PIL.FitsStubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\FitsStubImagePlugin.py',
('PIL.MspImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\MspImagePlugin.py',
'PYMODULE'),
('PIL.DdsImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\DdsImagePlugin.py',
('PIL.TgaImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\TgaImagePlugin.py',
'PYMODULE'),
('PIL.Hdf5StubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\Hdf5StubImagePlugin.py',
('PIL.PsdImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\PsdImagePlugin.py',
'PYMODULE'),
('PIL.CurImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\CurImagePlugin.py',
('PIL.GribStubImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\GribStubImagePlugin.py',
'PYMODULE'),
('PIL.McIdasImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\McIdasImagePlugin.py',
('PIL.SunImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\SunImagePlugin.py',
'PYMODULE'),
('PIL.Jpeg2KImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\Jpeg2KImagePlugin.py',
('PIL.MicImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\MicImagePlugin.py',
'PYMODULE'),
('PIL.GbrImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\GbrImagePlugin.py',
'PYMODULE'),
('PIL.IptcImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\IptcImagePlugin.py',
'PYMODULE'),
('PIL.EpsImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\EpsImagePlugin.py',
('PIL.DcxImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\DcxImagePlugin.py',
'PYMODULE'),
('PIL.ImImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\ImImagePlugin.py',
('PIL.MpoImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\MpoImagePlugin.py',
'PYMODULE'),
('PIL.TiffImagePlugin',
'c:\\users\\alexknoll\\miniconda3\\envs\\exifwriter\\lib\\site-packages\\PIL\\TiffImagePlugin.py',
Expand Down
2 changes: 1 addition & 1 deletion build/exifwrite/warn-exifwrite.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ missing module named winxptheme - imported by wx.lib.agw.aui.dockart (conditiona
missing module named 'Carbon.Appearance' - imported by wx.lib.agw.aui.aui_utilities (conditional, optional), wx.lib.agw.aui.tabart (conditional, optional)
missing module named __builtin__ - imported by wx.py.sliceshell (delayed, conditional), pyparsing (conditional), py._builtin (conditional), pkg_resources._vendor.pyparsing (conditional), setuptools._vendor.pyparsing (conditional)
runtime module named six.moves - imported by wx.py.interpreter (delayed, conditional), wx.py.shell (delayed)
missing module named olefile - imported by PIL.FpxImagePlugin (top-level), PIL.MicImagePlugin (top-level)
missing module named olefile - imported by PIL.MicImagePlugin (top-level), PIL.FpxImagePlugin (top-level)
missing module named IPython - imported by PIL.ImageShow (optional)
missing module named 'PySide2.QtGui' - imported by PIL.ImageQt (conditional, optional)
missing module named PySide2 - imported by PIL.ImageQt (conditional, optional)
Expand Down
Binary file modified dist/exifwrite.exe
View file
Binary file not shown.
27 changes: 23 additions & 4 deletions exifwrite.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,34 @@ def main():
total_lines = len(list(trajectory_csv))
i = 0
traj.seek(0)
headers = []
week = 0
second = 1
epsg = 2
easting = 3
northing = 4
height = 5
photo_item = 9

for line in trajectory_csv:
if i > 0:
photoname = line[9]
photoname = line[photo_item]
photoname = photoname.replace('camera/', '')
if os.path.exists(args.base_camera_dir + os.sep + photoname):
photo = args.base_camera_dir + os.sep + photoname
reproject = reproject_point(line[3], line[4], 'epsg:' + line[2])
photo_date = get_photo_date(line[0], line[1])
set_gps_location(photo, float(reproject[1]), float(reproject[0]), float(line[5]), photo_date)
reproject = reproject_point(line[easting], line[northing], 'epsg:' + line[epsg])
photo_date = get_photo_date(line[week], line[second])
set_gps_location(photo, float(reproject[1]), float(reproject[0]), float(line[height]), photo_date)
else:
headers = line
if headers[0] == 'Easting':
week = 9
second = 10
epsg = 11
easting = 0
northing = 1
height = 2
photo_item = 8

i = i + 1
print('progress: ' + str(i) + '/' + str(total_lines))
Expand Down

0 comments on commit aa5b1bf

Please sign in to comment.