Parse TIFF exifs, add altitude parsing

app/static/app/js/components/MapPreview.jsx

@@ -179,10 +179,11 @@ _('Example:'),
         });
         this.capturePath.addTo(this.map);
       }
-
+      
-      this.imagesGroup = L.featureGroup(images).addTo(this.map);
+      if (images.length > 0){
-
+        this.imagesGroup = L.featureGroup(images).addTo(this.map);
-      this.map.fitBounds(this.imagesGroup.getBounds());
+        this.map.fitBounds(this.imagesGroup.getBounds());
+      }
 
       this.setState({showLoading: false});
 
@@ -206,59 +207,56 @@ _('Example:'),
       const options = {
         ifd0: false,
         exif: [0x9003],
-        gps: [0x0001, 0x0002, 0x0003, 0x0004],
+        gps: [0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006],
         interop: false,
         ifd1: false // thumbnail
       };
+
+      const next = (i) => {
+        if (i < images.length - 1) parseImage(i+1);
+        else{
+          // Sort by date/time
+          if (this.hasTimestamp){
+            this.exifData.sort((a, b) => {
+              if (a.timestamp < b.timestamp) return -1;
+              else if (a.timestamp > b.timestamp) return 1;
+              else return 0;
+            });
+          }
+
+          resolve();
+        }
+      };
       
       const parseImage = i => {
         const img = images[i];
-        exifr.parse(img, options).then(gps => {
+        exifr.parse(img, options).then(exif => {
-          if (!gps.latitude || !gps.longitude){
+          if (!exif.latitude || !exif.longitude){
               // reject(new Error(interpolate(_("Cannot extract GPS data from %(file)s"), {file: img.name})));
+              next(i);
               return;
           }
 
-          let dateTime = gps["36867"];
+          let dateTime = exif.DateTimeOriginal;
           let timestamp = null;
-
+          if (dateTime && dateTime.getTime) timestamp = dateTime.getTime();
-          // Try to parse the date from EXIF to JS
-          const parts = dateTime.split(" ");
-          
-          if (parts.length == 2){
-              let [ d, t ] = parts;
-              d = d.replace(/:/g, "-");
-              const tm = Date.parse(`${d} ${t}`);
-              if (!isNaN(tm)){
-                  timestamp = new Date(tm).getTime();
-              }
-          }
-          
           if (!timestamp) this.hasTimestamp = false;
 
           this.exifData.push({
             image: img,
             gps: {
-              latitude: gps.latitude,
+              latitude: exif.latitude,
-              longitude: gps.longitude
+              longitude: exif.longitude,
+              altitude: exif.GPSAltitude !== undefined ? exif.GPSAltitude : null,
             },
             timestamp
           });
 
-          if (i < images.length - 1) parseImage(i+1);
+          next(i);
-          else{
+        }).catch((e) => {
-            // Sort by date/time
+          console.warn(e);
-            if (this.hasTimestamp){
+          next(i);
-              this.exifData.sort((a, b) => {
+        });
-                if (a.timestamp < b.timestamp) return -1;
-                else if (a.timestamp > b.timestamp) return 1;
-                else return 0;
-              });
-            }
-
-            resolve();
-          }
-        }).catch(reject);
       };
 
       if (images.length > 0) parseImage(0);
@@ -497,7 +495,8 @@ _('Example:'),
             type: "Point",
             coordinates: [
               ed.gps.longitude,
-              ed.gps.latitude
+              ed.gps.latitude,
+              ed.gps.altitude !== null ? ed.gps.altitude : 0
             ]
           }
         }
@@ -507,8 +506,8 @@ _('Example:'),
     if (format === 'geojson'){
       output = JSON.stringify(feats, null, 4);
     }else if (format === 'csv'){
-      output = `Filename,Timestamp,Latitude,Longitude\r\n${feats.features.map(feat => {
+      output = `Filename,Timestamp,Latitude,Longitude,Altitude\r\n${feats.features.map(feat => {
-        return `${feat.properties.Filename},${feat.properties.Timestamp},${feat.geometry.coordinates[1]},${feat.geometry.coordinates[0]}`
+        return `${feat.properties.Filename},${feat.properties.Timestamp},${feat.geometry.coordinates[1]},${feat.geometry.coordinates[0]},${feat.geometry.coordinates[2]}`
       }).join("\r\n")}`;
     }else{
       console.error("Invalid format");

app/static/app/js/components/ProjectListItem.jsx

@@ -140,7 +140,7 @@ class ProjectListItem extends React.Component {
           url : 'TO_BE_CHANGED',
           parallelUploads: 6,
           uploadMultiple: false,
-          acceptedFiles: "image/*,text/*,.las,.laz,video/*,.srt",
+          acceptedFiles: "image/*,text/plain,.las,.laz,video/*,.srt",
           autoProcessQueue: false,
           createImageThumbnails: false,
           clickable: this.uploadButton,
@@ -501,34 +501,27 @@ class ProjectListItem extends React.Component {
                 interop: false,
                 ifd1: false // thumbnail
               };
-              exifr.parse(f, options).then(gps => {
+              exifr.parse(f, options).then(exif => {
-                if (!gps.latitude || !gps.longitude){
+                if (!exif.latitude || !exif.longitude){
                     reject();
                     return;
                 }
 
                 if (hasGPSCallback !== undefined) hasGPSCallback();
 
-                let dateTime = gps["36867"];
+                let dateTime = exif.DateTimeOriginal;
-
+                if (dateTime && dateTime.toLocaleDateString) dateTime = dateTime.toLocaleDateString();
-                // Try to parse the date from EXIF to JS
-                const parts = dateTime.split(" ");
-                if (parts.length == 2){
-                    let [ d, t ] = parts;
-                    d = d.replace(/:/g, "-");
-                    const tm = Date.parse(`${d} ${t}`);
-                    if (!isNaN(tm)){
-                        dateTime = new Date(tm).toLocaleDateString();
-                    }
-                }
                 
                 // Fallback to file modified date if 
                 // no exif info is available
-                if (!dateTime) dateTime = f.lastModifiedDate.toLocaleDateString();
+                if (!dateTime){
+                  if (f.lastModifiedDate) dateTime = f.lastModifiedDate.toLocaleDateString();
+                  else if (f.lastModified) dateTime = new Date(f.lastModified).toLocaleDateString();
+                }
 
                 // Query nominatim OSM
                 $.ajax({
-                    url: `https://nominatim.openstreetmap.org/reverse?format=jsonv2&lat=${gps.latitude}&lon=${gps.longitude}`,
+                    url: `https://nominatim.openstreetmap.org/reverse?format=jsonv2&lat=${exif.latitude}&lon=${exif.longitude}`,
                     contentType: 'application/json',
                     type: 'GET'
                 }).done(json => {

app/static/app/js/vendor/exifr.js

@@ -1 +1 @@
-module.exports = require('exifr/dist/mini.umd');
+module.exports = require('exifr/dist/full.legacy.umd');