Changeset 33148 for main/trunk/greenstone3/web/interfaces/default/js/panoramaViewer.js

Timestamp:

2019-06-11T20:20:04+12:00 (5 years ago)

Author:

wy59

Message:

1. Untested changes to Panorama viewer related xsl and js files to incorporate Coordinate meta wherever Latitude and Longitude meta was referred to. There's no way to test as we have no existing or tutorial collection making use of the Panorama Viewer to hand, however, a lot of the code added to deal with Coordinates is identical to other Coordinate insertions where Lat Long was used in classifier.xsl, document.xsl and map-tools.xsl and map-scripts.js. 2. Added new and removed finished TODOs.

File:

• main/trunk/greenstone3/web/interfaces/default/js/panoramaViewer.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/panoramaViewer.js

@@ -212 +212 @@
     panoDocList.ids.move(panoDocList.ids.indexOf(panoramaID), 0);
 
-    var startPanoLonLat = new THREE.Vector3(gs.documentMetadata[panoramaID].Latitude,gs.documentMetadata[panoramaID].Longitude);
+    var startPanoLonLat;
+    if(typeof gs.documentMetadata[panoramaID].Coordinate !== 'undefined'){ // we have Coordinate meta
+        var coordInfo = getLatLngForCoord(gs.documentMetadata[panoramaID].Coordinate);
+        startPanoLonLat = new THREE.Vector3(coordInfo.lat,coordInfo.lng);
+    } else {
+        startPanoLonLat = new THREE.Vector3(gs.documentMetadata[panoramaID].Latitude,gs.documentMetadata[panoramaID].Longitude);
+    }
 
     // going through the panolist checking the distance
     for(var i = 1; i < panoDocList.ids.length; i++) {
-    var endPanoLonLat = new THREE.Vector3(gs.documentMetadata[panoDocList.ids[i]].Latitude,gs.documentMetadata[panoDocList.ids[i]].Longitude);
+    var endPanoLonLat;
+    if(typeof gs.documentMetadata[panoDocList.ids[i]].Coordinate !== 'undefined'){ // we have Coordinate meta
+        var coordInfo = getLatLngForCoord(gs.documentMetadata[panoDocList.ids[i]].Coordinate);
+        endPanoLonLat = new THREE.Vector3(coordInfo.lat,coordInfo.lng);
+    } else {
+        endPanoLonLat = new THREE.Vector3(gs.documentMetadata[panoDocList.ids[i]].Latitude,gs.documentMetadata[panoDocList.ids[i]].Longitude);
+    }
     if(calculateDistance(startPanoLonLat,endPanoLonLat) < panoSelectionRadius) {
         var bearing = calculateBearing(startPanoLonLat,endPanoLonLat); 
@@ -235 +247 @@
     }
     
-} 
-
+}
+
+// DUPLICATED FROM map-scripts.js
+function getLatLngForCoord(coord) {
+    
+    // https://stackoverflow.com/questions/2559318/how-to-check-for-an-undefined-or-null-variable-in-javascript
+    if(!coord) {
+         // some_variable is either null, undefined, 0, NaN, false, or an empty string
+        console.log("@@@@ In panoramaViewer::getLatLngForCoord(): no or invalid coord info");
+        return null;
+    }
+    
+    // coord is of the form: "37S77 157E53"
+    // lat will be 37S77, lng 157E53.
+    var indexOfSpace = coord.indexOf(" ");
+    if(indexOfSpace === -1) {
+        console.log("@@@@ In panoramaViewer::getLatLngForCoord(): bad format for coord  " + coord);
+        return null;
+    }
+    var latitude = coord.substring(0, indexOfSpace);
+    var longitude = coord.substring(indexOfSpace+1);
+    return {lat: latitude, lng: longitude}; // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Working_with_Objects
+}
 
 function onWindowResize() {