Merge main into sweep/add-console-log

3DStreet · Aug 8, 2023 · fdcd654 · fdcd654
2 parents 34424e0 + f188a1e
commit fdcd654
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/index.html b/index.html
@@ -68,7 +68,7 @@
         <a-entity id="default-street" street streetmix-loader set-loader-from-hash></a-entity>
       </a-entity>
 
-      <a-entity id="layers-2d" data-layer-name="2D Street Layers" data-layer-show-children>
+      <a-entity id="reference-layers" data-layer-name="Reference Layers" data-layer-show-children>
 
     </a-scene>
   </body>

diff --git a/mapbox.html b/mapbox.html
@@ -107,7 +107,7 @@
 
       </a-entity>
 
-      <a-entity id="layers-2d" data-layer-name="2D Street Layers" data-layer-show-children>
+      <a-entity id="reference-layers" data-layer-name="Reference Layers" data-layer-show-children>
         <a-entity
           data-layer-name="Mapbox Satellite Streets"
           geometry="primitive: plane; width: 512; height: 512;"

diff --git a/src/json-utils.js b/src/json-utils.js
@@ -7,8 +7,8 @@ and returns a Javascript object
 function convertDOMElToObject (entity) {
   const data = [];
   const environmentElement = document.querySelector('#environment');
-  const layers2DElement = document.querySelector('#layers-2d');
-  const sceneEntities = [entity, environmentElement, layers2DElement];
+  const referenceEntities = document.querySelector('#reference-layers');
+  const sceneEntities = [entity, environmentElement, referenceEntities];
 
   for (const entry of sceneEntities) {
     const entityData = getElementData(entry);
@@ -285,7 +285,7 @@ function getModifiedProperty (entity, componentName) {
 
 function createEntities (entitiesData, parentEl) {
   const sceneElement = document.querySelector('a-scene');
-  const removeEntities = ['environment', 'layers-2d'];
+  const removeEntities = ['environment', 'reference-layers'];
   for (const entityData of entitiesData) {
     if (entityData.id === 'street-container' &&
     entityData.children &&