fix(feature-details) Show all fields (with alias) despite if the fiel…

…d is empty (#570) * fix(feature-details) Show all fields (with alias) despite if the field is empty * fix(*) Set uppercase service value
infra-geo-ouverte · Feb 3, 2020 · 37e2276 · 37e2276
1 parent e40495e
commit 37e2276
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/packages/geo/src/lib/datasource/shared/capabilities.service.ts b/packages/geo/src/lib/datasource/shared/capabilities.service.ts
@@ -138,7 +138,7 @@ export class CapabilitiesService {
     const params = new HttpParams({
       fromObject: {
         request: 'GetCapabilities',
-        service,
+        service: service.toUpperCase(),
         version: version || '1.3.0',
         _i: 'true'
       }

diff --git a/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts
@@ -154,7 +154,7 @@ export class WMSDataSource extends DataSource {
     const baseUrl = this.options.url.replace(/\?$/, '');
     const params = [
       'REQUEST=GetLegendGraphic',
-      'SERVICE=wms',
+      'SERVICE=WMS',
       'FORMAT=image/png',
       'SLD_VERSION=1.1.0',
       `VERSION=${sourceParams.VERSION || '1.3.0'}`

diff --git a/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts b/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts
@@ -71,11 +71,11 @@ export function formatWFSQueryString(
     }`;
   }
 
-  const getCapabilities = `${url}?service=wfs&request=GetCapabilities&${version}`;
-  let getFeature = `${url}?service=wfs&request=GetFeature&${version}&${featureTypes}&`;
+  const getCapabilities = `${url}?service=WFS&request=GetCapabilities&${version}`;
+  let getFeature = `${url}?service=WFS&request=GetFeature&${version}&${featureTypes}&`;
   getFeature += `${outputFormat}&${srs}&${cnt}&${propertyName}`;
 
-  let getpropertyvalue = `${url}?service=wfs&request=GetPropertyValue&version=${versionWfs200}&${featureTypes}&`;
+  let getpropertyvalue = `${url}?service=WFS&request=GetPropertyValue&version=${versionWfs200}&${featureTypes}&`;
   getpropertyvalue += `&${cnt}&${valueReference}`;
 
   return [

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
@@ -90,9 +90,7 @@ export class FeatureDetailsComponent {
 
     if (allowedFieldsAndAlias) {
       Object.keys(allowedFieldsAndAlias).forEach(field => {
-        if (feature.properties[field]) {
-          properties[allowedFieldsAndAlias[field]] = feature.properties[field];
-        }
+        properties[allowedFieldsAndAlias[field]] = feature.properties[field];
       });
       return properties;
     } else {

diff --git a/packages/geo/src/lib/search/shared/sources/storedqueries.ts b/packages/geo/src/lib/search/shared/sources/storedqueries.ts
@@ -452,7 +452,7 @@ export class StoredQueriesReverseSearchSource extends SearchSource
     return new HttpParams({
       fromObject: Object.assign(
         {
-          service: 'wfs',
+          service: 'WFS',
           version: '1.1.0',
           request: 'GetFeature',
           storedquery_id: this.storedQueriesOptions.storedquery_id,