p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(maps): 高德地图加载固定位为https协议

This commit is contained in:
thinkinggis 2020-07-15 10:11:59 +08:00
parent 5ca1fe316e
commit 5bd2fa5ec6
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/boundary/src/config.ts
View File

@ -137,7 +137,7 @@ const dataLevel1: { [key: string]: any } = {
label: { label: {
type: 'pbf', type: 'pbf',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/90c51eb3-04d7-402f-bd05-95e4bd27dd62.bin', 'https://gw.alipayobjects.com/os/bmw-prod/90c51eb3-04d7-402f-bd05-95e4bd27dd62.bin',
parser: { parser: {
type: 'geojson', type: 'geojson',
}, },
@ -145,7 +145,7 @@ const dataLevel1: { [key: string]: any } = {
nationalBoundaries: { nationalBoundaries: {
type: 'json', type: 'json',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/ee493a41-0558-4c0e-bee6-520276c4f1a8.json', 'https://gw.alipayobjects.com/os/bmw-prod/ee493a41-0558-4c0e-bee6-520276c4f1a8.json',
}, },
}, },
country: { country: {
@ -159,17 +159,17 @@ const dataLevel1: { [key: string]: any } = {
line: { line: {
type: 'pbf', type: 'pbf',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/70ec087e-c48a-4b76-8825-6452f17bae7a.bin', 'https://gw.alipayobjects.com/os/bmw-prod/70ec087e-c48a-4b76-8825-6452f17bae7a.bin',
}, },
provinceLine: { provinceLine: {
type: 'pbf', type: 'pbf',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/778ad7ba-5a3f-4ed6-a94a-b8ab8acae9d6.bin', 'https://gw.alipayobjects.com/os/bmw-prod/778ad7ba-5a3f-4ed6-a94a-b8ab8acae9d6.bin',
}, },
label: { label: {
type: 'json', type: 'json',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/36832a45-68f8-4b51-b006-9dec71f92a23.json', 'https://gw.alipayobjects.com/os/bmw-prod/36832a45-68f8-4b51-b006-9dec71f92a23.json',
}, },
}, },
2: { 2: {
@ -203,38 +203,38 @@ const dataLevel1: { [key: string]: any } = {
line: { line: {
type: 'pbf', type: 'pbf',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/bc97875a-90f2-42c0-a62c-43d2efd7460d.bin', 'https://gw.alipayobjects.com/os/bmw-prod/bc97875a-90f2-42c0-a62c-43d2efd7460d.bin',
}, },
countryLine: { countryLine: {
type: 'pbf', type: 'pbf',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/bc97875a-90f2-42c0-a62c-43d2efd7460d.bin', 'https://gw.alipayobjects.com/os/bmw-prod/bc97875a-90f2-42c0-a62c-43d2efd7460d.bin',
}, },
cityLine: { cityLine: {
type: 'pbf', type: 'pbf',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/8bfbfe7e-bd0e-4bbe-84d8-629f4dc7abc4.bin', 'https://gw.alipayobjects.com/os/bmw-prod/8bfbfe7e-bd0e-4bbe-84d8-629f4dc7abc4.bin',
}, },
provinceLine: { provinceLine: {
type: 'pbf', type: 'pbf',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/778ad7ba-5a3f-4ed6-a94a-b8ab8acae9d6.bin', 'https://gw.alipayobjects.com/os/bmw-prod/778ad7ba-5a3f-4ed6-a94a-b8ab8acae9d6.bin',
}, },
}, },
nationalBoundaries: { nationalBoundaries: {
type: 'json', type: 'json',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/ee493a41-0558-4c0e-bee6-520276c4f1a8.json', 'https://gw.alipayobjects.com/os/bmw-prod/ee493a41-0558-4c0e-bee6-520276c4f1a8.json',
}, },
nationalBoundaries2: { nationalBoundaries2: {
type: 'json', type: 'json',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/f2189cc4-662b-4358-8573-36f0f918b7ca.json', 'https://gw.alipayobjects.com/os/bmw-prod/f2189cc4-662b-4358-8573-36f0f918b7ca.json',
}, },
island: { island: {
type: 'json', type: 'json',
url: url:
'//gw.alipayobjects.com/os/bmw-prod/fe49b393-1147-4769-94ed-70471f4ff15d.json', 'https://gw.alipayobjects.com/os/bmw-prod/fe49b393-1147-4769-94ed-70471f4ff15d.json',
}, },
}, },
}, },

1
packages/layers/src/point/models/image.ts
View File

@ -122,5 +122,4 @@ export default class ImageModel extends BaseModel {
height: this.iconService.canvasHeight || 128, height: this.iconService.canvasHeight || 128,
}); });
}; };
} }

2
packages/maps/src/amap/map.ts
View File

@ -331,7 +331,7 @@ export default class AMapService
amapLoaded = true; amapLoaded = true;
plugin.push('Map3D'); plugin.push('Map3D');
this.loadAMapScript( this.loadAMapScript(
`//webapi.amap.com/maps?v=${AMAP_VERSION}&key=${token}&plugin=${plugin.join( `https://webapi.amap.com/maps?v=${AMAP_VERSION}&key=${token}&plugin=${plugin.join(
',', ',',
)}`, )}`,
).then(() => { ).then(() => {