Skip to content

Commit

Permalink
Merge pull request #326 from 3DStreet/rename-layers-2d
Browse files Browse the repository at this point in the history
rename layers-2 entity
  • Loading branch information
kfarr authored Aug 8, 2023
2 parents a3cc351 + d794139 commit f188a1e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion mapbox.html
Original file line number Diff line number Diff line change
Expand Up @@ -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;"
Expand Down
6 changes: 3 additions & 3 deletions src/json-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 &&
Expand Down

0 comments on commit f188a1e

Please sign in to comment.