Compare commits
No commits in common. "d986b18ba747b9b24db99b6bd2b7fb41c24f3d07" and "18b171a03afb552eb273a3fe7b0a705a2a44e9ea" have entirely different histories.
d986b18ba7
...
18b171a03a
|
|
@ -33,10 +33,9 @@ export default class LayerMgr3D extends LayerMgr {
|
|||
for (const layer of this.layers) {
|
||||
layer.destroy();
|
||||
}
|
||||
this.viewer.dataSources.removeAll();
|
||||
this.viewer.entities.removeAll();
|
||||
|
||||
this.viewer.imageryLayers.removeAll()
|
||||
this.viewer.destroy();
|
||||
}
|
||||
|
||||
frameUpdate() {
|
||||
|
|
|
|||
|
|
@ -160,12 +160,14 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
|
|||
return (
|
||||
<>
|
||||
{
|
||||
(data.level === 5 || data.level === 4) &&
|
||||
( (zoom > 8 || distSq < dist2 || highlight) && (data.level === 5 || data.level === 4) &&
|
||||
// isShow
|
||||
true
|
||||
) && (
|
||||
<>
|
||||
<div
|
||||
id={`marker_tuxiang_${data.id}`}
|
||||
style={{
|
||||
display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
|
||||
position: 'absolute',
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
|
|
@ -180,7 +182,6 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
|
|||
className="markerLabel"
|
||||
style={{
|
||||
// backgroundColor: '#0008',
|
||||
display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
|
||||
padding: 4,
|
||||
borderRadius: 4,
|
||||
fontSize: 10,
|
||||
|
|
@ -194,15 +195,18 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
|
|||
{data?.NAME}
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
{
|
||||
data.level === 6 &&
|
||||
( (zoom > 12 || distSq < dist2 || highlight) && data.level === 6 &&
|
||||
// isShow
|
||||
true
|
||||
) && (
|
||||
<>
|
||||
<div
|
||||
id={`marker_tuxiang_${data.id}`}
|
||||
style={{
|
||||
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
|
||||
position: 'absolute',
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
|
|
@ -216,7 +220,6 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
|
|||
<div
|
||||
className="markerLabel"
|
||||
style={{
|
||||
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
|
||||
// backgroundColor: '#0008',
|
||||
padding: 4,
|
||||
borderRadius: 4,
|
||||
|
|
@ -231,6 +234,7 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
|
|||
{data?.NAME}
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
</>
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue