Merge pull request #72 from amosproj/sprint-07-release-candidate

Sprint 07 release candidate to main
amosproj · Jun 2, 2021 · 92e6fe7 · 92e6fe7
2 parents 5ddb9f6 + a445a4f
commit 92e6fe7
Show file tree

Hide file tree

Showing 19 changed files with 674 additions and 496 deletions.
diff --git a/README.md b/README.md
@@ -51,14 +51,14 @@ The computer science department would like to use this viewer to display its 50
 
 
 -   **/assets**:
-    manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files, and image files
+    panaroma image dataset as an example to try the viewer software
 
 -   **/src**:
     stands for source, and is the raw code before minification or concatenation or some other compilation - used to read/edit the code
 
 
 -   **/gitignore**:
-  is a text file that tells Git which files or folders to ignore in a project
+    is a text file that tells Git which files or folders to ignore in a project
 
 
 -   **/license**:
@@ -96,7 +96,6 @@ Includes the js files and main.js
 
 - [License | jQuery Foundation](https://jquery.org/license/): JavaScript library for simple HTML DOM manipulation
 
-- [org.w3c.dom (Java Platform SE 8 ](https://docs.oracle.com/javase/8/docs/api/org/w3c/dom/package-summary.html): Web APIs frontend for display Visualizations basics
 
 
 

diff --git a/assets/map-small.jpg b/assets/map-small.jpg
diff --git a/assets/map-wb50.png b/assets/map-wb50.png
diff --git a/src/css/main.css b/src/css/main.css
@@ -22,10 +22,24 @@ body {
     cursor: -webkit-grabbing;
 }
 
-.control{
+#map{
     position: fixed;
-    bottom: 40%;
+    bottom: 1%;
     right: 3%;
+    width: 20%;
+    height:20%;
     color: #fff;
 }
 
+.map {
+    background-color: white;
+}
+
+.control-OL{
+    position: fixed;
+    bottom:21%;
+    right: 3%;
+    color: #fff;
+}
+
+
diff --git a/src/index.html b/src/index.html
@@ -8,16 +8,55 @@
     <body>
         <script src="libs/three.min.js"></script>
         <script src="libs/jQuery.min.js"></script>
-        <script type="module" src="js/main.js"></script>
+        <script src="libs/ol.js"></script>
+
+        <script type="module">
+            import { ViewerWindow } from "./js/viewer/ViewerWindow.js";
+
+            const getUrlParameter = function getUrlParameter(sParam) {
+                let sPageURL = window.location.search.substring(1),
+                    sURLVariables = sPageURL.split('&'),
+                    sParameterName;
+
+                for (let i = 0; i < sURLVariables.length; i++) {
+                    sParameterName = sURLVariables[i].split('=');
+
+                    if (sParameterName[0].toUpperCase() === sParam.toUpperCase()) {
+                        return typeof sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]);
+                    }
+                }
+
+                return false;
+            };
+
+            const onLoadStr = getUrlParameter("onLoad");
+            const parts = decodeURIComponent(onLoadStr).split('.');
+
+            let onLoadFunc = window.parent;
+            for (let i = 0; i < parts.length; i++) {
+                try {
+                    onLoadFunc = onLoadFunc[parts[i]];
+                }
+                catch (e) {
+                    onLoadFunc = null;
+                }
+            }
+
+            if ('function' === typeof(onLoadFunc)) {
+                onLoadFunc(window, ViewerWindow.viewerAsync);
+            }
+        </script>
 
         <div id="pano-viewer">
-            <div class = "control">
-                <div id="nof"></div>
-                <div id="cf"></div>
-                <button name="buttonUp">Up</button>
-                <button name="buttonDown">Down</button>
-                <select name="dropdown" id="dropdown-floors"></select>
+            <div id="map" class="map"></div>
+
+            <div class = "control-OL" id="floorOL">
+                <div id="cfOL"></div>
+                <select name="dropdown-OL" id="dropdown-floors-OL" ></select>
+                <button id="buttonUpOL" class="code">Floor Up</button>
+                <button id="buttonDownOL" class="code">Floor Down</button>
             </div>
+
         </div>
     </body>
 </html>