Merge pull request #868 from 3DStreet/scene-id-fix

keep scene id when loading URL
3DStreet · Sep 27, 2024 · b4791bb · b4791bb
2 parents 53d2a32 + 869b055
commit b4791bb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 39 deletions.
diff --git a/index.html b/index.html
@@ -131,16 +131,6 @@
 </script>
 <script>
 
-  // document.getElementById('inputfile')
-  //   .addEventListener('change', STREET.utils.fileJSON);
-
-  // function buttonScreenshotTock() {
-  //   const screenshotEl = document.getElementById('screenshot');
-  //   screenshotEl.play(); // double check playing in case we're in editor mode
-  //   screenshotEl.setAttribute('screentock', 'type', 'jpg');
-  //   screenshotEl.setAttribute('screentock', 'takeScreenshot', true);
-  // }
-
   function startEditor() {
     var sceneEl = document.querySelector('a-scene');
     sceneEl.components.inspector.openInspector();

diff --git a/public/index.html b/public/index.html
@@ -148,15 +148,6 @@
 </script>
 <script>
 
-  // document.getElementById('inputfile')
-  //   .addEventListener('change', STREET.utils.fileJSON);
-
-  // function buttonScreenshotTock() {
-  //   const screenshotEl = document.getElementById('screenshot');
-  //   screenshotEl.play(); // double check playing in case we're in editor mode
-  //   screenshotEl.setAttribute('screentock', 'type', 'jpg');
-  //   screenshotEl.setAttribute('screentock', 'takeScreenshot', true);
-  // }
 
   function startEditor() {
     var sceneEl = document.querySelector('a-scene');

diff --git a/src/editor/lib/toolbar.js b/src/editor/lib/toolbar.js
@@ -42,7 +42,7 @@ export function fileJSON(event) {
   let reader = new FileReader();
 
   reader.onload = function () {
-    STREET.utils.createElementsFromJSON(reader.result);
+    STREET.utils.createElementsFromJSON(reader.result, true);
   };
 
   reader.readAsText(event.target.files[0]);

diff --git a/src/json-utils_1.1.js b/src/json-utils_1.1.js
@@ -573,6 +573,13 @@ AFRAME.registerComponent('set-loader-from-hash', {
   },
   fetchJSON: function (requestURL) {
     const request = new XMLHttpRequest();
+
+    // Prepend the base URL to the requestURL
+    if (window.location.href.includes('localhost')) {
+      const baseURL = 'https://dev-3dstreet.web.app';
+      requestURL = baseURL + requestURL;
+    }
+
     request.open('GET', requestURL, true);
     request.onload = function () {
       if (this.status >= 200 && this.status < 400) {
@@ -586,7 +593,7 @@ AFRAME.registerComponent('set-loader-from-hash', {
           '[set-loader-from-hash]',
           '200 response received and JSON parsed, now createElementsFromJSON'
         );
-        STREET.utils.createElementsFromJSON(jsonData);
+        STREET.utils.createElementsFromJSON(jsonData, false);
         const sceneId = getUUIDFromPath(requestURL);
         if (sceneId) {
           console.log('sceneId from fetchJSON from url hash loader', sceneId);
@@ -660,7 +667,7 @@ function getValidJSON(stringJSON) {
     .replace(/[\u0000-\u0019]+/g, ''); // eslint-disable-line no-control-regex
 }
 
-function createElementsFromJSON(streetJSON) {
+function createElementsFromJSON(streetJSON, clearUrlHash) {
   let streetObject = {};
   if (typeof streetJSON === 'string') {
     const validJSONString = getValidJSON(streetJSON);
@@ -671,7 +678,7 @@ function createElementsFromJSON(streetJSON) {
 
   // clear scene data, create new blank scene.
   // clearMetadata = true, clearUrlHash = true, addDefaultStreet = false
-  STREET.utils.newScene(true, true, false);
+  STREET.utils.newScene(true, clearUrlHash, false);
 
   const sceneTitle = streetObject.title;
   if (sceneTitle) {
@@ -682,20 +689,8 @@ function createElementsFromJSON(streetJSON) {
   const streetContainerEl = document.getElementById('street-container');
 
   createEntities(streetObject.data, streetContainerEl);
-  STREET.notify.successMessage('Scene loaded from JSON');
+  STREET.notify.successMessage('Scene loaded');
   AFRAME.scenes[0].emit('newScene');
 }
 
 STREET.utils.createElementsFromJSON = createElementsFromJSON;
-
-// handle viewer widget click to open 3dstreet json scene
-function fileJSON() {
-  const reader = new FileReader();
-  reader.onload = function () {
-    createElementsFromJSON(reader.result);
-  };
-  reader.readAsText(this.files[0]);
-}
-
-// temporarily place the UI function in utils, which is used in index.html.
-STREET.utils.fileJSON = fileJSON;
diff --git a/streetplan.html b/streetplan.html
@@ -104,9 +104,6 @@
   </script>
   <script>
 
-    document.getElementById('inputfile')
-            .addEventListener('change', STREET.utils.fileJSON);
-
     function buttonScreenshotTock() {
       const screenshotEl = document.getElementById('screenshot');
       screenshotEl.play(); // double check playing in case we're in editor mode