gpf - use geoadmin.ch iframe

for records which refers a map.geoadmin.ch link
camptocamp · Nov 29, 2024 · fd31fc5 · fd31fc5
1 parent 84f29c7
commit fd31fc5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/apps/datahub/src/app/record/record-metadata/record-metadata.component.html b/apps/datahub/src/app/record/record-metadata/record-metadata.component.html
@@ -81,7 +81,14 @@
                 style="height: 500px"
                 *ngIf="displayMap$ | async"
               >
-                <gn-ui-map-view></gn-ui-map-view>
+                <gn-ui-map-view
+                  *ngIf="(geoAdminUrl$ | async) === null"
+                ></gn-ui-map-view>
+                <iframe
+                  class="w-full h-full"
+                  *ngIf="geoAdminUrl$ | async"
+                  [src]="geoAdminUrl$ | async"
+                ></iframe>
               </div>
             </mat-tab>
             <mat-tab [disabled]="(displayData$ | async) === false">
@@ -106,7 +113,10 @@
     </div>
   </div>
   <gn-ui-data-view-share
-    *ngIf="(displayMap$ | async) || (displayData$ | async)"
+    *ngIf="
+      (geoAdminUrl$ | async) === false &&
+      ((displayMap$ | async) || (displayData$ | async))
+    "
     [viewType]="selectedView$ | async"
   ></gn-ui-data-view-share>
   <div

diff --git a/apps/datahub/src/app/record/record-metadata/record-metadata.component.ts b/apps/datahub/src/app/record/record-metadata/record-metadata.component.ts
@@ -5,7 +5,6 @@ import {
   ErrorComponent,
   ErrorType,
   ImageOverlayPreviewComponent,
-  MetadataCatalogComponent,
   MetadataContactComponent,
   MetadataInfoComponent,
   MetadataQualityComponent,
@@ -31,6 +30,7 @@ import { RecordApisComponent } from '../record-apis/record-apis.component'
 import { RecordOtherlinksComponent } from '../record-otherlinks/record-otherlinks.component'
 import { RecordRelatedRecordsComponent } from '../record-related-records/record-related-records.component'
 import { TranslateModule } from '@ngx-translate/core'
+import { DomSanitizer } from '@angular/platform-browser'
 
 @Component({
   selector: 'datahub-record-metadata',
@@ -51,7 +51,6 @@ import { TranslateModule } from '@ngx-translate/core'
     MetadataInfoComponent,
     MetadataContactComponent,
     MetadataQualityComponent,
-    MetadataCatalogComponent,
     RecordRelatedRecordsComponent,
     DataViewComponent,
     MapViewComponent,
@@ -71,6 +70,21 @@ export class RecordMetadataComponent {
     startWith(false)
   )
 
+  geoAdminUrl$ = this.metadataViewFacade.otherLinks$.pipe(
+    map((mapApiLinks) => {
+      return mapApiLinks?.find((link) =>
+        link?.url.toString().startsWith('https://map.geo.admin.ch/')
+      )
+    }),
+    filter((geoAdminUrl) => !!geoAdminUrl),
+    map((link) =>
+      this.sanitizer.bypassSecurityTrustResourceUrl(
+        link.url.toString().replace('?layers=', '#/embed?layers=')
+      )
+    ),
+    startWith(null)
+  )
+
   displayData$ = combineLatest([
     this.metadataViewFacade.dataLinks$,
     this.metadataViewFacade.geoDataLinks$,
@@ -149,6 +163,7 @@ export class RecordMetadataComponent {
     public metadataViewFacade: MdViewFacade,
     private searchService: SearchService,
     private sourceService: SourcesService,
+    private sanitizer: DomSanitizer,
     private orgsService: OrganizationsServiceInterface
   ) {}