Skip to content
Snippets Groups Projects
Commit 76080be3 authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'fix/merge-leftover' into 'develop' 

FIX: merge raté

See merge request !365
parents 2eaded8f 3b28fdee
No related branches found
No related tags found
2 merge requests!424version 3.1.0,!365FIX: merge raté
Hide whitespace changes
Inline Side-by-side
src/services/map-service.js
+ 0
− 4
View file @ 76080be3
...@@ -349,11 +349,7 @@ const mapService = { ...@@ -349,11 +349,7 @@ const mapService = {
options.format = mvt; options.format = mvt;
const layerSource = new VectorTileSource(options); const layerSource = new VectorTileSource(options);
layerSource.setTileUrlFunction((p0) => { layerSource.setTileUrlFunction((p0) => {
<<<<<<< HEAD
return url+'?tile=' + p0[0] + '/' + p0[1] + '/' + p0[2] + '&project_id=' + project_id;
=======
return `${url}/?tile=${p0[0]}/${p0[1]}/${p0[2]}&project_id=${projectId}`; return `${url}/?tile=${p0[0]}/${p0[1]}/${p0[2]}&project_id=${projectId}`;
>>>>>>> develop
}); });
const styleFunction = (feature) => this.getStyle(feature, featureTypes, formFilters); const styleFunction = (feature) => this.getStyle(feature, featureTypes, formFilters);
this.mvtLayer = new VectorTileLayer({ this.mvtLayer = new VectorTileLayer({
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment