From 641680ea3623badf1963e01dadf6b8022d439dcb Mon Sep 17 00:00:00 2001
From: Matthieu Benoist <mbenoist@ausy-group.com>
Date: Mon, 27 Jul 2020 17:28:57 +0200
Subject: [PATCH] Fix the queryable url for the shape files webservice
---
.../resource-queryable.component.ts | 12 +++++++++---
1 file changed, 9 insertions(+), 3 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 ef655da9..20c396af 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
@@ -165,7 +165,7 @@ export class ResourceQueryableComponent implements OnInit {
this.initInseeLabel(this._datasetDetailService.datasetData);
}
else {
- this._datasetDetailService.retrieveDatasetData().subscribe(()=>{
+ this._datasetDetailService.retrieveDatasetData().subscribe(() => {
this.initInseeLabel(this._datasetDetailService.datasetData);
});
}
@@ -236,10 +236,13 @@ export class ResourceQueryableComponent implements OnInit {
this.queryableParameters.baseParameters;
this.queryableUrl += this.queryableParameters.layer +
this.queryableParameters.outputFormat +
- this.queryableParameters.insee +
this.queryableParameters.projection +
+ this.queryableParameters.insee +
this.queryableParameters.bbox
;
+ console.log('before');
+ console.log(this.queryableParameters);
+ console.log(this.queryableUrl);
if (this.resource.type === linkFormats.wfs) {
this.queryableUrl += `&startIndex=${this.fromFeature}`;
@@ -250,6 +253,8 @@ export class ResourceQueryableComponent implements OnInit {
this.queryableUrl += `&maxfeatures=${this.numberFeatures}&start=${this.fromFeature}`;
}
}
+ console.log('debug...');
+ console.log(this.queryableUrl);
if (!this.isAllFeaturesChecked && this.resource.type === linkFormats.wfs) {
this.queryableUrl += `&count=${this.numberFeatures}`;
@@ -258,7 +263,7 @@ export class ResourceQueryableComponent implements OnInit {
}
updateQueryableurlToDisplay() {
- let queryableUrlToDisplay:string = '';
+ let queryableUrlToDisplay: string = '';
queryableUrlToDisplay = this.queryableParameters.baseUrl
+ this.queryableParameters.baseParameters
@@ -389,6 +394,7 @@ export class ResourceQueryableComponent implements OnInit {
} else if (this.resource.type === linkFormats.ws) {
this.queryableParameters.baseUrl = this.resource.metadataLink.url.replace('\/all.json', '');
const match = (/\/ws\/([^\/]+)/g).exec(this.resource.metadataLink.url);
+ this.queryableParameters.baseUrl += `/${this.resource.metadataLink.name}.shp?`;
const serviceName = match[1] ? match[1] : '';
this.queryableParameters.insee = `&mask_db=${serviceName}&mask_layer=adr_voie_lieu.adrcommune` +
`&mask_field=insee&mask_value=${this.selectedInsee.insee}`;
--
GitLab