Commit 7f9c01a

committed

[fix]isvj-9934 时间轴切换china chinadark不对

1 parent 54489ba commit 7f9c01aCopy full SHA for 7f9c01a

File tree

+46

-1

lines changed

+46

-1

lines changed

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -165,10 +165,27 @@ export function getLayerInfosFromCatalogs(catalogs, catalogTypeField = 'type') {`
`165`	`165`	`return results;`
`166`	`166`	`}`
`167`	`167`
	`168`	`+function isSameRasterUrl(urlA, urlB) {`
	`169`	`+ if (urlA === urlB) {`
	`170`	`+ return true;`
	`171`	`+ }`
	`172`	`+ const uriA = new URL(urlA);`
	`173`	`+ const uriB = new URL(urlB);`
	`174`	`+ if (uriA.origin !== uriB.origin) {`
	`175`	`+ return false;`
	`176`	`+ }`
	`177`	`+ const regex = /\/([^/?#]+\.\w+)$/;`
	`178`	`+ const pathA = uriA.pathname.replace(regex, '');`
	`179`	`+ const pathB = uriB.pathname.replace(regex, '');`
	`180`	`+`
	`181`	`+ // 3. 判断子路径关系`
	`182`	`+ return pathA === pathB \|\| pathA.startsWith(pathB + (pathB.endsWith('/') ? '' : '/'));`
	`183`	`+}`
	`184`	`+`
`168`	`185`	`export function isSameRasterLayer(sourceInfo, compareSource) {`
`169`	`186`	`const { type, tiles } = sourceInfo;`
`170`	`187`	`if (type === 'raster') {`
`171`		`- return type === compareSource.type && tiles && compareSource.tiles && (tiles[0].includes(compareSource.tiles[0])\|\|compareSource.tiles[0].includes(tiles[0]))`
	`188`	`+ return type === compareSource.type && tiles && compareSource.tiles && isSameRasterUrl(tiles[0],compareSource.tiles[0]);`
`172`	`189`	`}`
`173`	`190`	`return false;`
`174`	`191`	`}`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,27 @@`
	`1`	`+import { isSameRasterLayer } from '../../../../src/common/mapping/utils/util';`
	`2`	`+`
	`3`	`+describe('util', () => {`
	`4`	`+ it('isSameRasterLayer', (done) => {`
	`5`	`+ let res = isSameRasterLayer(`
	`6`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/rest/maps/China'] },`
	`7`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/rest/maps/ChinaDark'] }`
	`8`	`+ );`
	`9`	`+ expect(res).toBeFalse();`
	`10`	`+ let res1 = isSameRasterLayer(`
	`11`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/map-China100/rest/maps/China'] },`
	`12`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/map-China100/rest/maps/China/tileImage.png?a=1234'] }`
	`13`	`+ );`
	`14`	`+ expect(res1).toBeTruthy();`
	`15`	`+ let res12 = isSameRasterLayer(`
	`16`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/map-China100/rest/maps/China'] },`
	`17`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/map-China100/rest/maps/China?a=1234'] }`
	`18`	`+ );`
	`19`	`+ expect(res12).toBeTruthy();`
	`20`	`+ let res3 = isSameRasterLayer(`
	`21`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/map-China100/rest/maps/China?a=1234'] },`
	`22`	`+ { type: 'raster', tiles: ['http:17.0.0.1:8190/iserver/map-China100/rest/maps/China/tileImage.png?a=1234'] }`
	`23`	`+ );`
	`24`	`+ expect(res3).toBeTruthy();`
	`25`	`+ done();`
	`26`	`+ });`
	`27`	`+});`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,5 +231,6 @@ import './common/mapping/utils/ColorUtilSpec.js';`
`231`	`231`	`import './common/mapping/utils/SourceListModelV2Spec.js';`
`232`	`232`	`import './common/mapping/utils/SourceListModelV3Spec.js';`
`233`	`233`	`import './common/mapping/utils/epsgDefineSpec.js';`
	`234`	`+import './common/mapping/utils/UtilSpec.js';`
`234`	`235`	`import './common/mapping/WebMapServiceSpec';`
`235`	`236`	`import './common/mapping/WebMapV2BaseSpec';`

Comments

(0)