Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Building Scene Layer (BSL) OGC I3S standard #11678

Merged
merged 33 commits into from
Feb 28, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
808fcaa
- Added support for conversion from sRGB color space profile to linea…
Tamrat-B Dec 5, 2023
0b9869b
Added Support for BSL structure, BSL statistics, generic feature attr…
Tamrat-B Dec 5, 2023
d612e7b
I3S Building Scene Layer Sandcastle app
Tamrat-B Dec 5, 2023
a4da846
I3S BSL app icon
Tamrat-B Dec 5, 2023
f469a21
Added support for conversion from sRGB color space profile to linear …
Tamrat-B Dec 5, 2023
4f92b4a
added additional payload options
Tamrat-B Dec 5, 2023
a2066b0
- Added support for binary attribute data with values stored in objec…
Tamrat-B Dec 5, 2023
562d6e5
- Added support for 3D objects transparency
Tamrat-B Dec 5, 2023
89f6dbe
- Added support for BSL hierarchy of layers
Tamrat-B Dec 5, 2023
394f823
- Added support for the generic feature attribute driven filter
Tamrat-B Dec 5, 2023
1394e4a
Added support for BSL structure per the OGC I3S standard
Tamrat-B Dec 5, 2023
5a34b60
- Added support for symbolization defined in I3S Layer data
Tamrat-B Dec 5, 2023
1054536
Added support for EXT_mesh_features and EXT_structural_metadata glTF …
Tamrat-B Dec 5, 2023
e1d55f7
Added bsl layer tests
Tamrat-B Dec 5, 2023
04f3c51
Added I3S BSL ViewModel tests
Tamrat-B Dec 5, 2023
3e75b94
Added I3S BSL explorer
Tamrat-B Dec 5, 2023
969ac49
Added I3S Explorer tests
Tamrat-B Dec 5, 2023
b4b23a6
Added I3S BSL Explorer layer widget
Tamrat-B Dec 5, 2023
e03286b
Merge branch 'CesiumGS:main' into feature/i3s_bsl_support
Tamrat-B Jan 11, 2024
21b2f4f
updates based on review feedback
Tamrat-B Jan 11, 2024
efc7db5
Added I3S support PR to additions
Tamrat-B Feb 2, 2024
03a9125
removed non necessary options
Tamrat-B Feb 2, 2024
17784df
check before updating visibility
Tamrat-B Feb 2, 2024
c815c03
additional specs changes
Tamrat-B Feb 2, 2024
4bffc64
Merge branch 'main' into feature/i3s_bsl_support
Tamrat-B Feb 2, 2024
9f02cf3
Merge branch 'CesiumGS:main' into feature/i3s_bsl_support
Tamrat-B Feb 28, 2024
9d6dc59
Removed picking result from console output
Tamrat-B Feb 28, 2024
c7570c3
Remove console out if geoid transform is not needed
Tamrat-B Feb 28, 2024
88eae59
Default to model overview if present
Tamrat-B Feb 28, 2024
1aefdc9
update tests to account for model views
Tamrat-B Feb 28, 2024
cf8d1da
Added I3S Building Scene Layer support to March 1 release
Tamrat-B Feb 28, 2024
96aca3e
Handling edge case use cases where there is no Full Model and/or Over…
Tamrat-B Feb 28, 2024
a3ea292
Rename BSL -> BuildingSceneLayer
ggetz Feb 28, 2024
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added support for BSL structure per the OGC I3S standard
  • Loading branch information
Tamrat-B committed Dec 5, 2023
commit 1394e4a036737cad8e8c8626d29801915b2bbe26
177 changes: 177 additions & 0 deletions packages/engine/Source/Scene/I3SSublayer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
import Check from "../Core/Check.js";
import defaultValue from "../Core/defaultValue.js";
import defined from "../Core/defined.js";
import I3SDataProvider from "./I3SDataProvider.js";
import I3SLayer from "./I3SLayer.js";
import Resource from "../Core/Resource.js";

/**
* This class implements an I3S sublayer for Building Scene Layer.
* <p>
* This object is normally not instantiated directly, use {@link I3SSublayer.fromData}.
* </p>
* @alias I3SSublayer
* @internalConstructor
*/
function I3SSublayer(dataProvider, parent, sublayerData) {
this._dataProvider = dataProvider;
this._parent = parent;
this._data = sublayerData;
this._name = sublayerData.name;
this._modelName = sublayerData.modelName;
this._visibility = defaultValue(sublayerData.visibility, true);
this._resource = undefined;
this._sublayers = [];
this._i3sLayers = [];
}

Object.defineProperties(I3SSublayer.prototype, {
/**
* Gets the resource for the sublayer
* @memberof I3SSublayer.prototype
* @type {Resource}
* @readonly
*/
resource: {
get: function () {
return this._resource;
},
},

/**
* Gets the I3S data for this object.
* @memberof I3SSublayer.prototype
* @type {object}
* @readonly
*/
data: {
get: function () {
return this._data;
},
},

/**
* Gets the name for the sublayer.
* @memberof I3SSublayer.prototype
* @type {string}
* @readonly
*/
name: {
get: function () {
return this._name;
},
},

/**
* Gets the model name for the sublayer.
* @memberof I3SSublayer.prototype
* @type {string}
* @readonly
*/
modelName: {
get: function () {
return this._modelName;
},
},

/**
* Gets the collection of child sublayers.
* @memberof I3SSublayer.prototype
* @type {I3SSublayer[]}
* @readonly
*/
sublayers: {
get: function () {
return this._sublayers;
},
},

/**
* Gets or sets the sublayer visibility.
* @memberof I3SSublayer.prototype
* @type {boolean}
*/
visibility: {
get: function () {
return this._visibility;
},
set: function (value) {
//>>includeStart('debug', pragmas.debug);
Check.defined("value", value);
//>>includeEnd('debug');

this._visibility = value;
for (let i = 0; i < this._i3sLayers.length; i++) {
Tamrat-B marked this conversation as resolved.
Show resolved Hide resolved
this._i3sLayers[i]._updateVisibility();
}
},
},

/**
* Determines if the sublayer will be shown.
* @memberof I3SSublayer.prototype
* @type {boolean}
* @readonly
*/
show: {
Tamrat-B marked this conversation as resolved.
Show resolved Hide resolved
get: function () {
return this._visibility && this._parent.show;
},
},
});

/**
* @private
*/
I3SSublayer._fromData = async function (
dataProvider,
buildingLayerUrl,
sublayerData,
parent
) {
const sublayer = new I3SSublayer(dataProvider, parent, sublayerData);
if (sublayer._data.layerType === "group") {
const sublayers = sublayer._data.sublayers;
if (defined(sublayers)) {
const promises = [];
for (let i = 0; i < sublayers.length; i++) {
const promise = I3SSublayer._fromData(
dataProvider,
buildingLayerUrl,
sublayers[i],
sublayer
);
promises.push(promise);
}
const childSublayers = await Promise.all(promises);
for (let i = 0; i < childSublayers.length; i++) {
const childSublayer = childSublayers[i];
sublayer._sublayers.push(childSublayer);
sublayer._i3sLayers.push(...childSublayer._i3sLayers);
}
}
} else if (sublayer._data.layerType === "3DObject") {
const sublayerUrl = buildingLayerUrl.concat(
`/sublayers/${sublayer._data.id}`
);
const resource = new Resource({ url: sublayerUrl });
resource.setQueryParameters(dataProvider.resource.queryParameters);
resource.appendForwardSlash();
sublayer._resource = resource;

const layerData = await I3SDataProvider.loadJson(
sublayer._resource,
dataProvider._traceFetches
);
const layer = new I3SLayer(dataProvider, layerData, sublayer);
sublayer._i3sLayers.push(layer);
} else {
// Filter other scene layer types out
console.log(
`${sublayer._data.layerType} layer ${sublayer._data.name} is skipped as not supported.`
);
}
return sublayer;
};

export default I3SSublayer;