From 6f2eccf406339f688950d20d1918c93b946ed338 Mon Sep 17 00:00:00 2001
From: "ext.sopra.ncastejon" <castejon.nicolas@gmail.com>
Date: Thu, 26 Mar 2020 14:11:16 +0100
Subject: [PATCH] Fix issue 157: images from WMS are flatten.
---
.../resource-queryable.component.ts | 22 +++++++++++++++++--
src/assets/config/config.json | 4 ++--
src/index.html | 2 +-
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts
index 48189aab..3f5494db 100644
--- a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts
+++ b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts
@@ -197,6 +197,24 @@ export class ResourceQueryableComponent implements OnInit {
`&typename=${this.resource.metadataLink.name}`;
}
+ if (this.resource.type === linkFormats.wms) {
+ // Set the dimension of the image based no the bbox ratio
+ const width = 700;
+ const longDiff = this.metadata.max_east - this.metadata.max_west;
+ const latDiff = this.metadata.max_north - this.metadata.max_south;
+ const ratio = longDiff / latDiff;
+ const height = Math.round(width * ratio);
+ console.log(longDiff);
+ console.log(latDiff);
+
+ console.log(ratio);
+
+ console.log(height);
+
+ this.queryableParameters.baseParameters += `&WIDTH=${width}&HEIGHT=${height}`;
+ console.log(this.queryableParameters.baseParameters);
+ }
+
this.setProjection(this.selectedProjection);
if (this.resource.isStandard) {
@@ -479,13 +497,13 @@ export class ResourceQueryableComponent implements OnInit {
this.messageClipboardRoot = geosource.mapMessages.copied;
setTimeout(() => {
this.messageClipboardRoot = geosource.mapMessages.share;
- // tslint:disable-next-line: align
+ // tslint:disable-next-line: align
}, 2000);
} else {
this.messageClipboard = geosource.mapMessages.copied;
setTimeout(() => {
this.messageClipboard = geosource.mapMessages.share;
- // tslint:disable-next-line: align
+ // tslint:disable-next-line: align
}, 2000);
}
diff --git a/src/assets/config/config.json b/src/assets/config/config.json
index aab11038..3b4e163b 100644
--- a/src/assets/config/config.json
+++ b/src/assets/config/config.json
@@ -8,10 +8,10 @@
"middlewareLegacyAuth": "https://data-reloaded-dev.alpha.grandlyon.com/api/middleware-legacy/",
"email": "http://localhost:3001",
"matomo": "https://matomo-intothesky.alpha.grandlyon.com",
- "elasticsearch": "https://data-reloaded-dev.alpha.grandlyon.com/api/es-consumer-aware",
+ "elasticsearch": "https://data-reloaded-dev.alpha.grandlyon.com/api/elasticsearch",
"catalogue": "https://data-reloaded-dev.alpha.grandlyon.com/api/catalogue",
"reuses": "https://data-reloaded-dev.alpha.grandlyon.com/api/reuses/reuses",
- "proxyMap": "https://data-reloaded-dev.alpha.grandlyon.com/api/services",
+ "proxyMap": "https://data-reloaded-dev.alpha.grandlyon.com/api/map-services",
"geocoder": "https://download.data.grandlyon.com/geocoding/photon",
"seo": "/share"
},
diff --git a/src/index.html b/src/index.html
index 928d06f9..a2794675 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>Acceuil - data.grandlyon.com</title>
+ <title>Accueil - data.grandlyon.com</title>
<meta name="description" content="Les données des acteurs du territoire de la Métropole de Lyon">
<base href="/">
--
GitLab