Compare commits

..

No commits in common. "d986b18ba747b9b24db99b6bd2b7fb41c24f3d07" and "18b171a03afb552eb273a3fe7b0a705a2a44e9ea" have entirely different histories.

2 changed files with 73 additions and 70 deletions

View File

@ -33,10 +33,9 @@ export default class LayerMgr3D extends LayerMgr {
for (const layer of this.layers) { for (const layer of this.layers) {
layer.destroy(); layer.destroy();
} }
this.viewer.dataSources.removeAll();
this.viewer.entities.removeAll(); this.viewer.entities.removeAll();
this.viewer.imageryLayers.removeAll() this.viewer.imageryLayers.removeAll()
this.viewer.destroy();
} }
frameUpdate() { frameUpdate() {

View File

@ -160,12 +160,14 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
return ( return (
<> <>
{ {
(data.level === 5 || data.level === 4) && ( (zoom > 8 || distSq < dist2 || highlight) && (data.level === 5 || data.level === 4) &&
// isShow
true
) && (
<> <>
<div <div
id={`marker_tuxiang_${data.id}`} id={`marker_tuxiang_${data.id}`}
style={{ style={{
display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
position: 'absolute', position: 'absolute',
bottom: 0, bottom: 0,
left: 0, left: 0,
@ -180,7 +182,6 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
className="markerLabel" className="markerLabel"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
fontSize: 10, fontSize: 10,
@ -194,15 +195,18 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
{data?.NAME} {data?.NAME}
</div> </div>
</> </>
)
} }
{ {
data.level === 6 && ( (zoom > 12 || distSq < dist2 || highlight) && data.level === 6 &&
// isShow
true
) && (
<> <>
<div <div
id={`marker_tuxiang_${data.id}`} id={`marker_tuxiang_${data.id}`}
style={{ style={{
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
position: 'absolute', position: 'absolute',
bottom: 0, bottom: 0,
left: 0, left: 0,
@ -216,7 +220,6 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
<div <div
className="markerLabel" className="markerLabel"
style={{ style={{
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
@ -231,6 +234,7 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
{data?.NAME} {data?.NAME}
</div> </div>
</> </>
)
} }
</> </>
) )