fix(queryFormat): fix layer's queryFormat htmlgml2 (#620)

* fix(queryFormat): fix HTMLGML2 query format * WIP * WIP
infra-geo-ouverte · Apr 30, 2020 · 6023480 · 6023480
1 parent 7343cd7
commit 6023480
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/packages/geo/src/lib/catalog/shared/catalog.service.ts b/packages/geo/src/lib/catalog/shared/catalog.service.ts
@@ -319,7 +319,7 @@ export class CatalogService {
       crossOrigin: catalog.setCrossOriginAnonymous ? 'anonymous' : undefined,
       queryFormat: configuredQueryFormat,
       queryHtmlTarget:
-        configuredQueryFormat === QueryFormat.HTML ? 'iframe' : undefined,
+        configuredQueryFormat === (QueryFormat.HTML || QueryFormat.HTMLGML2) ? 'iframe' : undefined,
       optionsFromCapabilities: true
     };
 

diff --git a/packages/geo/src/lib/feature/feature-details/feature-details.component.html b/packages/geo/src/lib/feature/feature-details/feature-details.component.html
@@ -28,4 +28,4 @@
   </tbody>
 </table>
 
-<iframe *ngIf="feature && isObject(feature.properties) && feature.properties.target === 'iframe'" [src]='htmlSanitizer(feature.properties.url)'></iframe>
+<iframe *ngIf="feature && isObject(feature.properties) && feature.properties.target === 'iframe'" [src]="htmlSanitizer(feature.properties.url)"></iframe>
diff --git a/packages/geo/src/lib/feature/feature-details/feature-details.component.ts b/packages/geo/src/lib/feature/feature-details/feature-details.component.ts
@@ -18,6 +18,7 @@ import { SearchSource } from '../../search/shared/sources/source';
   styleUrls: ['./feature-details.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
+
 export class FeatureDetailsComponent {
   private state: ConnectionState;
 

diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.ts b/packages/geo/src/lib/search/shared/sources/ilayer.ts
@@ -315,7 +315,7 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
         }
       }
 
-      if (queryFormat === QueryFormat.HTML) {
+      if (queryFormat === QueryFormat.HTML || QueryFormat.HTMLGML2) {
         queryHtmlTarget = 'iframe';
       }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
           }
-          if (queryFormat === QueryFormat.HTML) {
+          if (queryFormat === QueryFormat.HTML || QueryFormat.HTMLGML2) {
             queryHtmlTarget = 'iframe';
           }
         }
@@ Expand Down @@