diff --git a/package.json b/package.json index a4fbe531d15252875841c55d2bada6cbbfbee938..327d9691e05de873b23bb7cf5e29f727e7357fff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webapp", - "version": "2.1.7", + "version": "2.1.8", "license": "MIT", "scripts": { "ng": "ng", diff --git a/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.html b/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.html index d30ab6058fed997f6ee49eb5c90bbe26d37126e3..374ca38e116bf6efd03bd401623199bbfa63e227 100644 --- a/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.html +++ b/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.html @@ -215,7 +215,7 @@ </span> <span *ngIf="resource.type === linkFormats.ws" [ngClass]="{'is-active-parameter': queryableParameters.countFeatures}"> - ?maxfeatures={{ countFeatures }} + {{ selectedFormat.name === 'JSON' ? '?maxfeatures='+countFeatures : '&maxfeatures='+countFeatures}} </span> <span *ngIf="resource.type === linkFormats.ws" [ngClass]="{'is-active-parameter': queryableParameters.fromFeature}"> diff --git a/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.ts b/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.ts index 11eacd5f09239ac038250b1ea04ea7143b720379..3236dca23b1347f54d827119bbe3e1c744f07e52 100644 --- a/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.ts +++ b/src/app/geosource/components/dataset-detail/dataset-resources/resources-queryable/resource-queryable/resource-queryable.component.ts @@ -175,7 +175,7 @@ export class ResourceQueryableComponent implements OnInit { this.queryableParameters.baseParameters = this.resource.parametersUrl ? `?${this.resource.parametersUrl}` : ''; if (this.resource.type === linkFormats.kml) { - this.queryableParameters.baseParameters = this.resource.parametersUrl + this.resource.metadataLink.name; + this.queryableParameters.baseParameters = `?${this.resource.parametersUrl}&${this.resource.metadataLink.name}`; } this.setProjection(this.selectedProjection); @@ -205,7 +205,11 @@ export class ResourceQueryableComponent implements OnInit { this.queryableUrl += `&count=${this.countFeatures}&startIndex=${this.fromFeature}`; } if (this.resource.type === linkFormats.ws) { - this.queryableUrl += `?maxfeatures=${this.countFeatures}&start=${this.fromFeature}`; + if (this.selectedFormat.name === 'JSON') { + this.queryableUrl += `?maxfeatures=${this.countFeatures}&start=${this.fromFeature}`; + } else { + this.queryableUrl += `&maxfeatures=${this.countFeatures}&start=${this.fromFeature}`; + } } } @@ -227,7 +231,7 @@ export class ResourceQueryableComponent implements OnInit { // depending the json or shapefile format wanted if (this.selectedFormat.name === 'JSON') { const specificRootURL = this.resource.metadataLink.url.replace('all.json', ''); - this.queryableParameters.baseUrl = `${specificRootURL}${this.resource.metadataLink.name}/all.json`; + this.queryableParameters.baseUrl = `${specificRootURL}/${this.resource.metadataLink.name}/all.json`; this.selectedInsee = null; this.queryableParameters.insee = ''; this.queryableParameters.projection = '';