fix(*): minors fix

infra-geo-ouverte · Jan 21, 2020 · f40c785 · f40c785
1 parent 97c81b5
commit f40c785
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 11 deletions.
diff --git a/packages/common/src/lib/confirm-dialog/confirm-dialog.component.html b/packages/common/src/lib/confirm-dialog/confirm-dialog.component.html
@@ -1,5 +1,5 @@
-<h2 mat-dialog-title>{{'igo.common.confirmDialog.title' | translate}}</h2>
-<div mat-dialog-content>{{confirmMessage}}</div>
+<h2 mat-dialog-title class="mat-typography">{{'igo.common.confirmDialog.title' | translate}}</h2>
+<div mat-dialog-content class="mat-typography">{{confirmMessage}}</div>
 <div mat-dialog-actions>
   <button mat-button color="primary" (click)="dialogRef.close(true)">{{'igo.common.confirmDialog.confirmBtn' | translate}}</button>
   <button mat-button (click)="dialogRef.close(false)">{{'igo.common.confirmDialog.cancelBtn' | translate}}</button>

diff --git a/packages/common/src/lib/json-dialog/json-dialog.component.html b/packages/common/src/lib/json-dialog/json-dialog.component.html
@@ -1,6 +1,6 @@
-<h1 mat-dialog-title>{{ title }}</h1>
+<h1 mat-dialog-title class="mat-typography">{{ title }}</h1>
 
-<div mat-dialog-content>
+<div mat-dialog-content class="mat-typography">
   <ng-container *ngTemplateOutlet="loopObject;context:{ obj: data }"></ng-container>
 
   <ng-template #loopObject let-obj='obj' let-baseKey='baseKey'>

diff --git a/packages/context/src/lib/context-map-button/bookmark-button/bookmark-dialog.component.html b/packages/context/src/lib/context-map-button/bookmark-button/bookmark-dialog.component.html
@@ -1,5 +1,5 @@
-<h1 mat-dialog-title>{{ 'igo.context.bookmarkButton.dialog.title' | translate }}</h1>
-<div mat-dialog-content>
+<h1 mat-dialog-title class="mat-typography">{{ 'igo.context.bookmarkButton.dialog.title' | translate }}</h1>
+<div mat-dialog-content class="mat-typography">
   <mat-form-field>
     <input matInput required autocomplete="off"
       [placeholder]="'igo.context.bookmarkButton.dialog.placeholder' | translate"

diff --git a/packages/context/src/lib/context-map-button/poi-button/poi-dialog.component.html b/packages/context/src/lib/context-map-button/poi-button/poi-dialog.component.html
@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>{{ 'igo.context.poiButton.dialog.title' | translate }}</h1>
+<h1 mat-dialog-title class="mat-typography">{{ 'igo.context.poiButton.dialog.title' | translate }}</h1>
 <div mat-dialog-content>
   <mat-form-field>
     <input matInput required autocomplete="off"

diff --git a/packages/context/src/lib/context-map-button/user-button/user-dialog.component.html b/packages/context/src/lib/context-map-button/user-button/user-dialog.component.html
@@ -1,5 +1,5 @@
-<h1 mat-dialog-title>{{'igo.context.userButton.infoTitle' | translate}}</h1>
-<div mat-dialog-content>
+<h1 mat-dialog-title class="mat-typography">{{'igo.context.userButton.infoTitle' | translate}}</h1>
+<div mat-dialog-content class="mat-typography">
   <p>{{'igo.context.userButton.dialog.user' | translate}}: {{user.sourceId}}</p>
   <p>{{'igo.context.userButton.dialog.email' | translate}}: {{user.email}}</p>
   <p>{{'igo.context.userButton.dialog.expiration' | translate}}: {{exp}}</p>

diff --git a/packages/context/src/locale/fr.context.json b/packages/context/src/locale/fr.context.json
@@ -16,7 +16,7 @@
         "dialog": {
           "cloneMsg": "Le contexte '{{value}}' a été cloné",
           "cloneTitle": "Contexte cloné",
-          "confirmDelete": "Êtes-vous sûr de vouloir supprimer ce context ?",
+          "confirmDelete": "Êtes-vous sûr de vouloir supprimer ce contexte ?",
           "deleteMsg": "Le contexte '{{value}}' a été supprimé",
           "deleteTitle": "Contexte supprimé",
           "favoriteMsg": "Le contexte '{{value}}' a été défini comme favori",

diff --git a/packages/core/src/lib/message/message-center/message-center.component.html b/packages/core/src/lib/message/message-center/message-center.component.html
@@ -1,4 +1,5 @@
 <simple-notifications
+  class="mat-typography"
   [ngClass]="{closeIcon: options.hasCloseIcon}"
   [options]="options">
 </simple-notifications>
diff --git a/packages/geo/src/lib/routing/routing-form/routing-form.component.ts b/packages/geo/src/lib/routing/routing-form/routing-form.component.ts
@@ -289,7 +289,7 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
                 let resultPos = 0;
                 for (let i = 0; i < results.length; i++) {
                   const feature: any = results[i].data;
-                  if (feature.properties.type === 'adresse') {
+                  if (feature.properties.type === 'adresses') {
                     resultPos = i;
                     break;
                   }

diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.interfaces.ts b/packages/geo/src/lib/search/shared/sources/ilayer.interfaces.ts
@@ -27,6 +27,7 @@ export interface ILayerDataSource {
   type?: string;
   name?: string;
   queryable?: boolean;
+  metadataUrl?: string;
   maxScaleDenom?: string;
   minScaleDenom?: string;
 }

diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.ts b/packages/geo/src/lib/search/shared/sources/ilayer.ts
@@ -257,6 +257,10 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
         Infinity,
       minResolution:
         getResolutionFromScale(Number(data.properties.minScaleDenom)) || 0,
+      metadata: {
+        url: data.properties.metadataUrl,
+        extern: true
+      },
       properties: this.formatter.formatResult(data).properties
     };
   }