Commit 83eee75
feat 可感知图层新增dataSource vector的非restmap 类型
AI-GEN: 60%1 parent 6c17dc4 commit 83eee75
3 files changed
Lines changed: 1196 additions & 11 deletions
File tree
- src/common/mapping/utils
- test
- common/mapping/utils
- tool
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -175,17 +175,34 @@ export class SourceListModelV3 extends AppreciableLayerBase { | |||
| 175 | 175 | const sourceOnMap = this.map.getSource(layer.source); | |
| 176 | 176 | if (!Object.keys(dataSource).length && sourceOnMap && sourceOnMap.type === 'vector') { | |
| 177 | 177 | const matchSource = this._mapInfo.sources[layer.source] || sourceOnMap; | |
| 178 | - if (matchSource.tiles && matchSource.tiles[0].includes('/rest/maps/')) { | ||
| 178 | + if (matchSource.tiles && matchSource.tiles.length > 0) { | ||
| 179 | 179 | const tileUrl = matchSource.tiles[0]; | |
| 180 | - const [serverUrl, leftParts] = tileUrl.split('/rest/maps/'); | ||
| 181 | - const [mapName] = leftParts.split('/tileFeature'); | ||
| 182 | - dataSource.url = `${serverUrl}/rest/maps`; | ||
| 183 | - dataSource.mapName = mapName; | ||
| 184 | - dataSource.type = 'REST_MAP'; | ||
| 185 | - dataSource.layerName = serviceLayerId; | ||
| 180 | + switch (true) { | ||
| 181 | + case tileUrl.includes('/rest/maps/'): { | ||
| 182 | + const [serverUrl, leftParts] = tileUrl.split('/rest/maps/'); | ||
| 183 | + const [mapName] = leftParts.split('/tileFeature'); | ||
| 184 | + dataSource.url = `${serverUrl}/rest/maps`; | ||
| 185 | + dataSource.mapName = mapName; | ||
| 186 | + dataSource.type = 'REST_MAP'; | ||
| 187 | + dataSource.layerName = serviceLayerId; | ||
| 188 | + break; | ||
| 189 | + } | ||
| 190 | + case tileUrl.includes('/restjsr/v1/'): { | ||
| 191 | + const [serverUrl, leftParts] = tileUrl.split('/restjsr/v1/'); | ||
| 192 | + const [mapName] = leftParts.split('/tiles/'); | ||
| 193 | + dataSource.url = `${serverUrl}/restjsr/v1/vectortile/maps`; | ||
| 194 | + dataSource.mapName = mapName; | ||
| 195 | + dataSource.type = 'RESTJSR'; | ||
| 196 | + break; | ||
| 197 | + } | ||
| 198 | + default: { | ||
| 199 | + dataSource.url = tileUrl; | ||
| 200 | + dataSource.type = 'VECTOR_OTHER'; | ||
| 201 | + } | ||
| 202 | + } | ||
| 186 | 203 | } | |
| 187 | 204 | } | |
| 188 | - layerInfo.dataSource = dataSource; | ||
| 205 | + layerInfo.dataSource = Object.assign(dataSource, { serviceLayerId }); | ||
| 189 | 206 | if (this._l7LayerUtil.isL7Layer(layer)) { | |
| 190 | 207 | layerInfo.CLASS_NAME = 'L7Layer'; | |
| 191 | 208 | } | |
0 commit comments