dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Fixed process tiles URL in vector map

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2025-03-12 11:11:39 +02:00
parent 760d1cb280
commit bfec366fcb
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/widget/lib/maps/map-layer.ts
View File

@ -165,17 +165,9 @@ export abstract class TbMapLayer<S extends MapLayerSettings> {
return spec$.pipe( return spec$.pipe(
map(spec => { map(spec => {
const sourceSpec = (spec.sources['esri'] as VectorSourceSpecification); const sourceSpec = (spec.sources['esri'] as VectorSourceSpecification);
const tileUrl = sourceSpec.url;
const attribution = sourceSpec.attribution; const attribution = sourceSpec.attribution;
const transformRequest = (url: string, resourceType: ResourceType) => {
if (resourceType === 'Tile') {
url = tileUrl + '/' + url;
}
return {url}
}
const gl = L.maplibreGL({ const gl = L.maplibreGL({
style: spec, style: spec,
transformRequest
}); });
gl.options.attribution = attribution; gl.options.attribution = attribution;
return gl; return gl;

5
ui-ngx/src/assets/map/openstreetmap_hybrid_reference_style.json
View File

@ -6,7 +6,10 @@
"esri": { "esri": {
"type": "vector", "type": "vector",
"url": "https://basemaps.arcgis.com/arcgis/rest/services/OpenStreetMap_v2/VectorTileServer", "url": "https://basemaps.arcgis.com/arcgis/rest/services/OpenStreetMap_v2/VectorTileServer",
"attribution": "Map data (c) OpenStreetMap contributors, Microsoft, Facebook, Google, Esri Community Maps contributors, Map layer by Esri" "attribution": "Map data (c) OpenStreetMap contributors, Microsoft, Facebook, Google, Esri Community Maps contributors, Map layer by Esri",
"tiles": [
"https://basemaps.arcgis.com/arcgis/rest/services/OpenStreetMap_v2/VectorTileServer/tile/{z}/{y}/{x}.pbf"
]
} }
}, },
"layers": [ "layers": [

5
ui-ngx/src/assets/map/world_edition_hybrid_reference_style.json
View File

@ -6,7 +6,10 @@
"esri": { "esri": {
"type": "vector", "type": "vector",
"url": "https://basemaps.arcgis.com/arcgis/rest/services/World_Basemap_v2/VectorTileServer", "url": "https://basemaps.arcgis.com/arcgis/rest/services/World_Basemap_v2/VectorTileServer",
"attribution": "Sources: Esri, TomTom, Garmin, FAO, NOAA, USGS, © OpenStreetMap contributors, and the GIS User Community" "attribution": "Sources: Esri, TomTom, Garmin, FAO, NOAA, USGS, © OpenStreetMap contributors, and the GIS User Community",
"tiles": [
"https://basemaps.arcgis.com/arcgis/rest/services/World_Basemap_v2/VectorTileServer/tile/{z}/{y}/{x}.pbf"
]
} }
}, },
"layers": [ "layers": [