From 8254b034c3f89315936985109abc201620c0ce13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Lord?= <pe_lord@yahoo.ca>
Date: Fri, 31 Jan 2020 12:02:05 -0500
Subject: [PATCH 1/2] fix(feature-details) Show all fields (with alias) despite
 if the field is empty

---
 .../lib/feature/feature-details/feature-details.component.ts  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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
index 962a174ab3..ef19a49446 100644
--- 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 {

From 6e98cbbfbc925bc7505a906f5f55fff7ff1c9af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Lord?= <pe_lord@yahoo.ca>
Date: Fri, 31 Jan 2020 12:32:47 -0500
Subject: [PATCH 2/2] fix(*) Set uppercase service value

---
 .../geo/src/lib/datasource/shared/capabilities.service.ts   | 2 +-
 .../src/lib/datasource/shared/datasources/wms-datasource.ts | 2 +-
 .../src/lib/datasource/shared/datasources/wms-wfs.utils.ts  | 6 +++---
 packages/geo/src/lib/search/shared/sources/storedqueries.ts | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/geo/src/lib/datasource/shared/capabilities.service.ts b/packages/geo/src/lib/datasource/shared/capabilities.service.ts
index a33fde7e29..e5d4a46a14 100644
--- 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
index 4663be862d..e166e938fd 100644
--- 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
index 2b2bb57f0c..70ea0dd7e5 100644
--- 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/search/shared/sources/storedqueries.ts b/packages/geo/src/lib/search/shared/sources/storedqueries.ts
index cdc4a0b135..8f39b29d73 100644
--- 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,