14498284719

Committed 16 Apr 2025 04:59PM UTC coverage: 84.633% (+1.6%) from 83.067%

Build # 14498284719

Build Type

Pull #1213

github

Committed by

web-flow

Commit Message

Merge 2907ba719 into 186d57931

Pull Request Pull Request #1213: [Datahub] Add support for TMS in map preview and API links

Run Details

3509 of 4616 branches covered (76.02%)

Branch coverage included in aggregate %.

33 of 38 new or added lines in 7 files covered. (86.84%)

18 existing lines in 5 files now uncovered.

10023 of 11373 relevant lines covered (88.13%)

367.32 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

94.05

/libs/feature/record/src/lib/map-view/map-view.component.ts

import {
  AfterViewInit,
  ChangeDetectionStrategy,
  ChangeDetectorRef,
  Component,
  Input,
  ViewChild,
} from '@angular/core'
import { MapUtilsService } from '@geonetwork-ui/feature/map'
import { getLinkLabel } from '@geonetwork-ui/util/shared'
import {
  BehaviorSubject,
  combineLatest,
  from,
  Observable,
  of,
  startWith,
  throwError,
  withLatestFrom,
} from 'rxjs'
import {
  catchError,
  distinctUntilChanged,
  finalize,
  map,
  shareReplay,
  switchMap,
  tap,
} from 'rxjs/operators'
import { MdViewFacade } from '../state/mdview.facade'
import { DataService } from '@geonetwork-ui/feature/dataviz'
import { DatasetOnlineResource } from '@geonetwork-ui/common/domain/model/record'
import {
  createViewFromLayer,
  MapContext,
  MapContextLayer,
  SourceLoadErrorEvent,
} from '@geospatial-sdk/core'
import {
  FeatureDetailComponent,
  MapContainerComponent,
  prioritizePageScroll,
  MapLegendComponent,
} from '@geonetwork-ui/ui/map'
import { Feature } from 'geojson'
import { NgIconComponent, provideIcons } from '@ng-icons/core'
import { matClose } from '@ng-icons/material-icons/baseline'
import { CommonModule } from '@angular/common'
import {
  ButtonComponent,
  DropdownSelectorComponent,
} from '@geonetwork-ui/ui/inputs'
import { TranslateModule, TranslateService } from '@ngx-translate/core'
import { ExternalViewerButtonComponent } from '../external-viewer-button/external-viewer-button.component'
import {
  LoadingMaskComponent,
  PopupAlertComponent,
} from '@geonetwork-ui/ui/widgets'
import { marker } from '@biesbjerg/ngx-translate-extract-marker'
import { FetchError } from '@geonetwork-ui/data-fetcher'

marker('map.dropdown.placeholder')
marker('wfs.feature.limit')
marker('dataset.error.restrictedAccess')

@Component({
  selector: 'gn-ui-map-view',
  templateUrl: './map-view.component.html',
  styleUrls: ['./map-view.component.css'],
  changeDetection: ChangeDetectionStrategy.OnPush,
  standalone: true,
  imports: [
    CommonModule,
    DropdownSelectorComponent,
    MapContainerComponent,
    FeatureDetailComponent,
    PopupAlertComponent,
    TranslateModule,
    LoadingMaskComponent,
    NgIconComponent,
    ExternalViewerButtonComponent,
    ButtonComponent,
    MapLegendComponent,
  ],
  viewProviders: [provideIcons({ matClose })],
})
export class MapViewComponent implements AfterViewInit {
  @Input() set exceedsLimit(value: boolean) {
    this.excludeWfs$.next(value)
  }
  @Input() displaySource = true
  @ViewChild('mapContainer') mapContainer: MapContainerComponent

  excludeWfs$ = new BehaviorSubject(false)
  hidePreview = false
  selection: Feature
  showLegend = true
  legendExists = false

  toggleLegend() {
    this.showLegend = !this.showLegend
  }

  onLegendStatusChange(status: boolean) {
    this.legendExists = status
  }

  compatibleMapLinks$ = combineLatest([
    this.mdViewFacade.mapApiLinks$,
    this.mdViewFacade.geoDataLinksWithGeometry$,
  ]).pipe(
    map(([mapApiLinks, geoDataLinksWithGeometry]) => {
      return [...mapApiLinks, ...geoDataLinksWithGeometry]
    })
  )

  dropdownChoices$ = this.compatibleMapLinks$.pipe(
    map((links) =>
      links.length
        ? links.map((link, index) => ({
            label: getLinkLabel(link),
            value: index,
          }))
        : [{ label: 'map.dropdown.placeholder', value: 0 }]
    )
  )
  selectedLinkIndex$ = new BehaviorSubject(0)

  loading = false
  error = null

  selectedLink$ = combineLatest([
    this.compatibleMapLinks$,
    this.selectedLinkIndex$.pipe(distinctUntilChanged()),
  ]).pipe(map(([links, index]) => links[index]))

  currentLayers$ = combineLatest([this.selectedLink$, this.excludeWfs$]).pipe(
    switchMap(([link, excludeWfs]) => {
      if (!link) {
        return of([])
      }
      if (excludeWfs && link.accessServiceProtocol === 'wfs') {
        this.hidePreview = true
        return of([])
      }
      this.hidePreview = false
      this.loading = true
      this.error = null
      if (link.accessRestricted) {
        this.handleError('dataset.error.restrictedAccess')
        return of([])
      }
      return this.getLayerFromLink(link).pipe(
        map((layer) => [layer]),
        catchError((e) => {
          this.handleError(e)
          return of([])
        }),
        finalize(() => (this.loading = false))
      )
    })
  )

  mapContext$: Observable<MapContext> = this.currentLayers$.pipe(
    switchMap((layers) =>
      from(createViewFromLayer(layers[0])).pipe(
        catchError(() => of(null)), // could not zoom on the layer: use the record extent
        map((view) => ({
          layers,
          view,
        })),
        tap(() => {
          this.resetSelection()
        })
      )
    ),
    startWith({
      layers: [],
      view: null,
    }),
    withLatestFrom(this.mdViewFacade.metadata$),
    map(([context, metadata]) => {
      if (context.view) return context
      const extent = this.mapUtils.getRecordExtent(metadata)
      const view = extent ? { extent } : null
      return {
        ...context,
        view,
      }
    }),
    shareReplay(1)
  )

  constructor(
    private mdViewFacade: MdViewFacade,
    private mapUtils: MapUtilsService,
    private dataService: DataService,
    private changeRef: ChangeDetectorRef,
    private translateService: TranslateService
  ) {}

  async ngAfterViewInit() {
    const map = await this.mapContainer.openlayersMap
    prioritizePageScroll(map.getInteractions())
  }

  onMapFeatureSelect(features: Feature[]): void {
    this.resetSelection()
    this.selection = features?.length > 0 && features[0]
    if (this.selection) {
      // FIXME: restore styling of selected feature
      // this.selection.setStyle(this.selectionStyle)
    }
    this.changeRef.detectChanges()
  }

  onSourceLoadError(error: SourceLoadErrorEvent) {
    if (error.httpStatus === 403 || error.httpStatus === 401) {
      this.error = this.translateService.instant(`dataset.error.forbidden`)
    } else {
      this.error = this.translateService.instant(`dataset.error.http`, {
        info: error.httpStatus,
      })
    }
  }

  resetSelection(): void {
    if (this.selection) {
      // FIXME: restore styling of selected feature
      // this.selection.setStyle(null)
    }
    this.selection = null
  }

  getLayerFromLink(link: DatasetOnlineResource): Observable<MapContextLayer> {
    if (link.type === 'service' && link.accessServiceProtocol === 'wms') {
      return of({
        url: link.url.toString(),
        type: 'wms',
        name: link.name,
      })
    } else if (
      link.type === 'service' &&
      link.accessServiceProtocol === 'tms'
    ) {
      return of({
        type: 'maplibre-style',
        name: link.name,
        styleUrl: link.styleInfo?.href || null,
      })
    } else if (
      link.type === 'service' &&
      link.accessServiceProtocol === 'wmts'
    ) {
      return of({
        url: link.url.toString(),
        type: 'wmts',
        name: link.name,
      })
    } else if (
      (link.type === 'service' &&
        (link.accessServiceProtocol === 'wfs' ||
          link.accessServiceProtocol === 'esriRest' ||
          link.accessServiceProtocol === 'ogcFeatures')) ||
      link.type === 'download'
    ) {
      const cacheActive = true // TODO implement whether should be true or false
      return this.dataService.readAsGeoJson(link, cacheActive).pipe(
        map((data) => ({
          type: 'geojson',
          data,
        }))
      )
    }
    return throwError(() => 'protocol not supported')
  }

  selectLinkToDisplay(link: number) {
    this.selectedLinkIndex$.next(link)
  }

  handleError(error: FetchError | Error | string) {
    if (error instanceof FetchError) {
      this.error = this.translateService.instant(
        `dataset.error.${error.type}`,
        {
          info: error.info,
        }
      )
      console.warn(error.message)
    } else if (error instanceof Error) {
      this.error = this.translateService.instant(error.message)
      console.warn(error.stack || error)
    } else {
      this.error = this.translateService.instant(error)
      console.warn(error)
    }
    this.loading = false
    this.changeRef.detectChanges()
  }
}

1	import {	1✔
2	AfterViewInit,
3	ChangeDetectionStrategy,
4	ChangeDetectorRef,
5	Component,
6	Input,
7	ViewChild,
8	} from '@angular/core'
9	import { MapUtilsService } from '@geonetwork-ui/feature/map'	1✔
10	import { getLinkLabel } from '@geonetwork-ui/util/shared'	1✔
11	import {	1✔
12	BehaviorSubject,
13	combineLatest,
14	from,
15	Observable,
16	of,
17	startWith,
18	throwError,
19	withLatestFrom,
20	} from 'rxjs'
21	import {	1✔
22	catchError,
23	distinctUntilChanged,
24	finalize,
25	map,
26	shareReplay,
27	switchMap,
28	tap,
29	} from 'rxjs/operators'
30	import { MdViewFacade } from '../state/mdview.facade'	1✔
31	import { DataService } from '@geonetwork-ui/feature/dataviz'	1✔
32	import { DatasetOnlineResource } from '@geonetwork-ui/common/domain/model/record'
33	import {	1✔
34	createViewFromLayer,
35	MapContext,
36	MapContextLayer,
37	SourceLoadErrorEvent,
38	} from '@geospatial-sdk/core'
39	import {	1✔
40	FeatureDetailComponent,
41	MapContainerComponent,
42	prioritizePageScroll,
43	MapLegendComponent,
44	} from '@geonetwork-ui/ui/map'
45	import { Feature } from 'geojson'
46	import { NgIconComponent, provideIcons } from '@ng-icons/core'	1✔
47	import { matClose } from '@ng-icons/material-icons/baseline'	1✔
48	import { CommonModule } from '@angular/common'	1✔
49	import {	1✔
50	ButtonComponent,
51	DropdownSelectorComponent,
52	} from '@geonetwork-ui/ui/inputs'
53	import { TranslateModule, TranslateService } from '@ngx-translate/core'	1✔
54	import { ExternalViewerButtonComponent } from '../external-viewer-button/external-viewer-button.component'	1✔
55	import {	1✔
56	LoadingMaskComponent,
57	PopupAlertComponent,
58	} from '@geonetwork-ui/ui/widgets'
59	import { marker } from '@biesbjerg/ngx-translate-extract-marker'	1✔
60	import { FetchError } from '@geonetwork-ui/data-fetcher'	1✔
61
62	marker('map.dropdown.placeholder')	1✔
63	marker('wfs.feature.limit')	1✔
64	marker('dataset.error.restrictedAccess')	1✔
65
66	@Component({
67	selector: 'gn-ui-map-view',
68	templateUrl: './map-view.component.html',
69	styleUrls: ['./map-view.component.css'],
70	changeDetection: ChangeDetectionStrategy.OnPush,
71	standalone: true,
72	imports: [
73	CommonModule,
74	DropdownSelectorComponent,
75	MapContainerComponent,
76	FeatureDetailComponent,
77	PopupAlertComponent,
78	TranslateModule,
79	LoadingMaskComponent,
80	NgIconComponent,
81	ExternalViewerButtonComponent,
82	ButtonComponent,
83	MapLegendComponent,
84	],
85	viewProviders: [provideIcons({ matClose })],
86	})
87	export class MapViewComponent implements AfterViewInit {	1✔
88	@Input() set exceedsLimit(value: boolean) {
89	this.excludeWfs$.next(value)	×
90	}
91	@Input() displaySource = true	51✔
92	@ViewChild('mapContainer') mapContainer: MapContainerComponent
93
94	excludeWfs$ = new BehaviorSubject(false)	51✔
95	hidePreview = false	51✔
96	selection: Feature
97	showLegend = true	51✔
98	legendExists = false	51✔
99
100	toggleLegend() {
101	this.showLegend = !this.showLegend	×
102	}
103
104	onLegendStatusChange(status: boolean) {
105	this.legendExists = status	1✔
106	}
107
108	compatibleMapLinks$ = combineLatest([	51✔
109	this.mdViewFacade.mapApiLinks$,
110	this.mdViewFacade.geoDataLinksWithGeometry$,
111	]).pipe(
112	map(([mapApiLinks, geoDataLinksWithGeometry]) => {
113	return [...mapApiLinks, ...geoDataLinksWithGeometry]	129✔
114	})
115	)
116
117	dropdownChoices$ = this.compatibleMapLinks$.pipe(	51✔
118	map((links) =>
119	links.length	43✔
120	? links.map((link, index) => ({	78✔
121	label: getLinkLabel(link),
122	value: index,
123	}))
124	: [{ label: 'map.dropdown.placeholder', value: 0 }]
125	)
126	)
127	selectedLinkIndex$ = new BehaviorSubject(0)	51✔
128
129	loading = false	51✔
130	error = null	51✔
131
132	selectedLink$ = combineLatest([	51✔
133	this.compatibleMapLinks$,
134	this.selectedLinkIndex$.pipe(distinctUntilChanged()),
135	]).pipe(map(([links, index]) => links[index]))	112✔
136
137	currentLayers$ = combineLatest([this.selectedLink$, this.excludeWfs$]).pipe(	51✔
138	switchMap(([link, excludeWfs]) => {
139	if (!link) {	58✔
140	return of([])	4✔
141	}
142	if (excludeWfs && link.accessServiceProtocol === 'wfs') {	54✔
143	this.hidePreview = true	4✔
144	return of([])	4✔
145	}
146	this.hidePreview = false	50✔
147	this.loading = true	50✔
148	this.error = null	50✔
149	if (link.accessRestricted) {	50✔
150	this.handleError('dataset.error.restrictedAccess')	1✔
151	return of([])	1✔
152	}
153	return this.getLayerFromLink(link).pipe(	49✔
154	map((layer) => [layer]),	41✔
155	catchError((e) => {
156	this.handleError(e)	3✔
157	return of([])	3✔
158	}),
159	finalize(() => (this.loading = false))	47✔
160	)
161	})
162	)
163
164	mapContext$: Observable<MapContext> = this.currentLayers$.pipe(	51✔
165	switchMap((layers) =>
166	from(createViewFromLayer(layers[0])).pipe(	53✔
167	catchError(() => of(null)), // could not zoom on the layer: use the record extent	2✔
168	map((view) => ({	35✔
169	layers,
170	view,
171	})),
172	tap(() => {
173	this.resetSelection()	35✔
174	})
175	)
176	),
177	startWith({
178	layers: [],
179	view: null,
180	}),
181	withLatestFrom(this.mdViewFacade.metadata$),
182	map(([context, metadata]) => {
183	if (context.view) return context	86✔
184	const extent = this.mapUtils.getRecordExtent(metadata)	83✔
185	const view = extent ? { extent } : null	83✔
186	return {	83✔
187	...context,
188	view,
189	}
190	}),
191	shareReplay(1)
192	)
193
194	constructor(
195	private mdViewFacade: MdViewFacade,	51!
196	private mapUtils: MapUtilsService,	51!
197	private dataService: DataService,	51!
198	private changeRef: ChangeDetectorRef,	51!
199	private translateService: TranslateService	51✔
200	) {}
201
202	async ngAfterViewInit() {
203	const map = await this.mapContainer.openlayersMap	51✔
204	prioritizePageScroll(map.getInteractions())	51✔
205	}
206
207	onMapFeatureSelect(features: Feature[]): void {
208	this.resetSelection()	3✔
209	this.selection = features?.length > 0 && features[0]	3✔
210	if (this.selection) {	3✔
211	// FIXME: restore styling of selected feature
212	// this.selection.setStyle(this.selectionStyle)
213	}
214	this.changeRef.detectChanges()	3✔
215	}
216
217	onSourceLoadError(error: SourceLoadErrorEvent) {
218	if (error.httpStatus === 403 \|\| error.httpStatus === 401) {	3✔
219	this.error = this.translateService.instant(`dataset.error.forbidden`)	2✔
220	} else {
221	this.error = this.translateService.instant(`dataset.error.http`, {	1✔
222	info: error.httpStatus,
223	})
224	}
225	}
226
227	resetSelection(): void {
228	if (this.selection) {	39✔
229	// FIXME: restore styling of selected feature
230	// this.selection.setStyle(null)
231	}
232	this.selection = null	39✔
233	}
234
235	getLayerFromLink(link: DatasetOnlineResource): Observable<MapContextLayer> {
236	if (link.type === 'service' && link.accessServiceProtocol === 'wms') {	49✔
237	return of({	33✔
238	url: link.url.toString(),
239	type: 'wms',
240	name: link.name,
241	})
242	} else if (	16✔
243	link.type === 'service' &&	25✔
244	link.accessServiceProtocol === 'tms'
245	) {
246	return of({	1✔
247	type: 'maplibre-style',
248	name: link.name,
249	styleUrl: link.styleInfo?.href \|\| null,	1!
250	})
251	} else if (	15✔
252	link.type === 'service' &&	23✔
253	link.accessServiceProtocol === 'wmts'
254	) {
255	return of({	1✔
256	url: link.url.toString(),
257	type: 'wmts',
258	name: link.name,
259	})
260	} else if (	14✔
261	(link.type === 'service' &&	33✔
262	(link.accessServiceProtocol === 'wfs' \|\|
263	link.accessServiceProtocol === 'esriRest' \|\|
264	link.accessServiceProtocol === 'ogcFeatures')) \|\|
265	link.type === 'download'
266	) {
267	const cacheActive = true // TODO implement whether should be true or false	14✔
268	return this.dataService.readAsGeoJson(link, cacheActive).pipe(	14✔
269	map((data) => ({	6✔
270	type: 'geojson',
271	data,
272	}))
273	)
274	}
UNCOV 275	return throwError(() => 'protocol not supported')	×
276	}
277
278	selectLinkToDisplay(link: number) {
279	this.selectedLinkIndex$.next(link)	13✔
280	}
281
282	handleError(error: FetchError \| Error \| string) {
283	if (error instanceof FetchError) {	7✔
284	this.error = this.translateService.instant(	1✔
285	`dataset.error.${error.type}`,
286	{
287	info: error.info,
288	}
289	)
290	console.warn(error.message)	1✔
291	} else if (error instanceof Error) {	6✔
292	this.error = this.translateService.instant(error.message)	4✔
293	console.warn(error.stack \|\| error)	4!
294	} else {
295	this.error = this.translateService.instant(error)	2✔
296	console.warn(error)	2✔
297	}
298	this.loading = false	7✔
299	this.changeRef.detectChanges()	7✔
300	}
301	}

geonetwork / geonetwork-ui / 14498284719

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous