|
@@ -23,21 +23,22 @@ let getMapProp = function(type1, type2){
|
|
|
props = type1 == 'satellite' ? [
|
|
|
{url: `https://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=6&x={x}&y={y}&z={z}&layer=6&token=YOUR_API_KEY`, //style=6是卫星,7是标准
|
|
|
maximumLevel: 18 ,
|
|
|
- name:'高德baseLayer'
|
|
|
+ name:'高德satellite-baseLayer'
|
|
|
},{
|
|
|
url: `https://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}&layer=6&token=YOUR_API_KEY`, //style=6是卫星,7是标准
|
|
|
maximumLevel: 18,
|
|
|
- name:'高德textLayer'
|
|
|
+ name:'高德satellite-textLayer'
|
|
|
}] : [
|
|
|
{url: `https://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}&layer=6&token=YOUR_API_KEY`, //style=6是卫星,7是标准
|
|
|
maximumLevel: 19 ,
|
|
|
- name:'高德baseLayer'
|
|
|
+ name:'高德standard'
|
|
|
},
|
|
|
]
|
|
|
}else{
|
|
|
props = [{
|
|
|
url: 'https://mt0.google.com/vt/lyrs='+ (type1 == 'satellite'?"y":"m" ) +'&x={x}&y={y}&z={z}',
|
|
|
- maximumLevel: 22
|
|
|
+ maximumLevel: 22,
|
|
|
+ name:'google'
|
|
|
}]
|
|
|
}
|
|
|
return props
|
|
@@ -1865,7 +1866,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
tag.titleLabel.sprite.update()
|
|
|
tag.updateMatrixWorld() //有的不加不对
|
|
|
let pos = tag.onMesh ? tag.position : tag.titleLabel.parent.position.clone().applyMatrix4(tag.matrixWorld).applyMatrix4(tag.root.matrixWorld.clone().invert())
|
|
|
- console.log(props.title, tag.id, 'getImageCenter', pos.toArray()/* , tag.titleLabel.parent.position.toArray(), */ )
|
|
|
+ //console.log(props.title, tag.id, 'getImageCenter', pos.toArray()/* , tag.titleLabel.parent.position.toArray(), */ )
|
|
|
return pos
|
|
|
},
|
|
|
|
|
@@ -1979,7 +1980,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
url:e.url,
|
|
|
minimumLevel: 0,
|
|
|
maximumLevel: e.maximumLevel,
|
|
|
- credit: new Cesium.Credit(e.name),
|
|
|
+ credit: new Cesium.Credit(e.name||''),
|
|
|
tilingScheme: new AmapMercatorTilingScheme(), //修改投影,从84->高德
|
|
|
crossOrigin: 'anonymous',
|
|
|
})
|