Skip to content

feat: support 3d sr ( MAPCO-10926 ) #994

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.

Sign up for GitHub

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

Merged
alebinson merged 1 commit into from
Jun 25, 2026
Merged

feat: support 3d sr ( MAPCO-10926 ) #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/common/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@
"field-names.3d.productName": "Name",
"field-names.3d.productVersion": "Version #",
"field-names.3d.productType": "Type",
"field-names.3d.productSubType": "Sub Type",
"field-names.3d.description": "Description",
"field-names.3d.creationDate": "Created",
"field-names.3d.updateDate": "Updated in catalog",
Expand Down Expand Up @@ -820,7 +821,10 @@
"ProductType.quantized_mesh_dsm": "QuantizedMeshDSM",
"ProductType.quantized_mesh_dtm_best": "QuantizedMeshDTMBest",
"ProductType.quantized_mesh_dsm_best": "QuantizedMeshDSMBest",
"ProductType.photo_realistic_3d": "3DPhotoRealistic",
"ProductType.photo_realistic": "3DPhotoRealistic",
"ProductType.photo_realistic_best": "3DPhotoRealisticBest",
"ProductType.semantic": "Semantic",
"ProductType.semantic_mesh": "SemanticMesh",
"ProductType.point_cloud": "PointCloud",

"RecordStatus.published": "Published",
Expand Down
6 changes: 5 additions & 1 deletion src/common/i18n/he.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@
"field-names.3d.productName": "שם",
"field-names.3d.productVersion": "מס' גירסה",
"field-names.3d.productType": "סוג",
"field-names.3d.productSubType": "תת סוג",
"field-names.3d.description": "תיאור",
"field-names.3d.creationDate": "יצירה",
"field-names.3d.updateDate": "עדכון פרטים",
Expand Down Expand Up @@ -820,7 +821,10 @@
"ProductType.quantized_mesh_dsm": "QuantizedMeshDSM",
"ProductType.quantized_mesh_dtm_best": "QuantizedMeshDTMBest",
"ProductType.quantized_mesh_dsm_best": "QuantizedMeshDSMBest",
"ProductType.photo_realistic_3d": "3DPhotoRealistic",
"ProductType.photo_realistic": "3DPhotoRealistic",
"ProductType.photo_realistic_best": "3DPhotoRealisticBest",
"ProductType.semantic": "Semantic",
"ProductType.semantic_mesh": "SemanticMesh",
"ProductType.point_cloud": "PointCloud",

"RecordStatus.published": "מפורסם",
Expand Down
2 changes: 1 addition & 1 deletion src/discrete-layer/components/layer-details/entity.dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const buildRecord = (
Layer3DRecordModelKeys.forEach((key) => {
record[key as string] = undefined;
});
record.productType = ProductType.PHOTO_REALISTIC_3D;
record.productType = ProductType.PHOTO_REALISTIC;
record.productStatus = RecordStatus.UNPUBLISHED;
record['__typename'] = Layer3DRecordModel.properties['__typename'].name.replaceAll('"', '');
break;
Expand Down
4 changes: 3 additions & 1 deletion src/discrete-layer/models/Layer3DRecordModel.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const Layer3DRecordModelBase = ModelBase
// ASSAF: MUST REMAIN STRING
productVersion: types.union(types.undefined, types.null, types.string),
productType: types.union(types.undefined, ProductTypeEnumType),
productSubType: types.union(types.undefined, types.null, types.string),
description: types.union(types.undefined, types.null, types.string),
creationDate: types.union(types.undefined, types.null, types.frozen()),
updateDate: types.union(types.undefined, types.null, types.frozen()),
Expand Down Expand Up @@ -75,6 +76,7 @@ export class Layer3DRecordModelSelector extends QueryBuilder {
get productName() { return this.__attr(`productName`) }
get productVersion() { return this.__attr(`productVersion`) }
get productType() { return this.__attr(`productType`) }
get productSubType() { return this.__attr(`productSubType`) }
get description() { return this.__attr(`description`) }
get creationDate() { return this.__attr(`creationDate`) }
get updateDate() { return this.__attr(`updateDate`) }
Expand Down Expand Up @@ -114,4 +116,4 @@ export function selectFromLayer3DRecord() {
return new Layer3DRecordModelSelector()
}

export const layer3DRecordModelPrimitives = selectFromLayer3DRecord().type.productId.productName.productVersion.productType.description.creationDate.updateDate.sourceDateStart.sourceDateEnd.minResolutionMeter.maxResolutionMeter.maxAccuracyCE90.absoluteAccuracyLE90.accuracySE90.relativeAccuracySE90.visualAccuracy.sensors.footprint.heightRangeFrom.heightRangeTo.srsId.srsName.region.classification.productionSystem.productionSystemVer.producerName.minFlightAlt.maxFlightAlt.geographicArea.productBoundingBox.productSource.productStatus.insertDate.wktGeometry.keywords.id.links(linkModelPrimitives)
export const layer3DRecordModelPrimitives = selectFromLayer3DRecord().type.productId.productName.productVersion.productType.productSubType.description.creationDate.updateDate.sourceDateStart.sourceDateEnd.minResolutionMeter.maxResolutionMeter.maxAccuracyCE90.absoluteAccuracyLE90.accuracySE90.relativeAccuracySE90.visualAccuracy.sensors.footprint.heightRangeFrom.heightRangeTo.srsId.srsName.region.classification.productionSystem.productionSystemVer.producerName.minFlightAlt.maxFlightAlt.geographicArea.productBoundingBox.productSource.productStatus.insertDate.wktGeometry.keywords.id.links(linkModelPrimitives)
10 changes: 8 additions & 2 deletions src/discrete-layer/models/ProductTypeEnum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ QUANTIZED_MESH_DTM="QUANTIZED_MESH_DTM",
QUANTIZED_MESH_DSM="QUANTIZED_MESH_DSM",
QUANTIZED_MESH_DTM_BEST="QUANTIZED_MESH_DTM_BEST",
QUANTIZED_MESH_DSM_BEST="QUANTIZED_MESH_DSM_BEST",
PHOTO_REALISTIC_3D="PHOTO_REALISTIC_3D",
PHOTO_REALISTIC="PHOTO_REALISTIC",
PHOTO_REALISTIC_BEST="PHOTO_REALISTIC_BEST",
SEMANTIC="SEMANTIC",
SEMANTIC_MESH="SEMANTIC_MESH",
POINT_CLOUD="POINT_CLOUD"
}

Expand All @@ -48,6 +51,9 @@ export const ProductTypeEnumType = types.enumeration("ProductType", [
"QUANTIZED_MESH_DSM",
"QUANTIZED_MESH_DTM_BEST",
"QUANTIZED_MESH_DSM_BEST",
"PHOTO_REALISTIC_3D",
"PHOTO_REALISTIC",
"PHOTO_REALISTIC_BEST",
"SEMANTIC",
"SEMANTIC_MESH",
"POINT_CLOUD",
])
1 change: 1 addition & 0 deletions src/discrete-layer/models/RootStore.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ export type Layer3DRecordInput = {
productName: string
productVersion?: string
productType: ProductType
productSubType?: string
description?: string
creationDate?: any
updateDate?: any
Expand Down
27 changes: 24 additions & 3 deletions src/discrete-layer/views/components/data-fetchers/mc-enums-fetcher.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ export const MCEnumsFetcher: React.FC = observer(() => {
QUANTIZED_MESH_DSM,
QUANTIZED_MESH_DTM_BEST,
QUANTIZED_MESH_DSM_BEST,
PHOTO_REALISTIC_3D,
PHOTO_REALISTIC,
PHOTO_REALISTIC_BEST,
POINT_CLOUD,
SEMANTIC,
SEMANTIC_MESH,
} = ProductType;

enums['LayerRasterRecord'] = {
Expand Down Expand Up @@ -193,8 +196,14 @@ export const MCEnumsFetcher: React.FC = observer(() => {
parent: 'QuantizedMeshBestRecord',
parentDomain: RecordType.RECORD_DEM,
};
enums[PHOTO_REALISTIC_3D] = {
...enums[PHOTO_REALISTIC_3D],
enums[PHOTO_REALISTIC] = {
...enums[PHOTO_REALISTIC],
icon: 'mc-icon-Map-3D',
parent: 'Layer3DRecord',
parentDomain: RecordType.RECORD_3D,
};
enums[PHOTO_REALISTIC_BEST] = {
...enums[PHOTO_REALISTIC_BEST],
icon: 'mc-icon-Map-3D',
parent: 'Layer3DRecord',
parentDomain: RecordType.RECORD_3D,
Expand All @@ -205,6 +214,18 @@ export const MCEnumsFetcher: React.FC = observer(() => {
parent: 'Layer3DRecord',
parentDomain: RecordType.RECORD_3D,
};
enums[SEMANTIC] = {
...enums[SEMANTIC],
icon: 'mc-icon-Map-3D',
parent: 'Layer3DRecord',
parentDomain: RecordType.RECORD_3D,
};
enums[SEMANTIC_MESH] = {
...enums[SEMANTIC_MESH],
icon: 'mc-icon-Map-3D',
parent: 'Layer3DRecord',
parentDomain: RecordType.RECORD_3D,
};

const { UNPUBLISHED } = RecordStatus;

Expand Down
Loading