fix merge

src/services/map-service.js

@@ -349,11 +349,7 @@ const mapService = {
     options.format = mvt;
     const layerSource = new VectorTileSource(options);
     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}`;
->>>>>>> develop
     });
     const styleFunction = (feature) => this.getStyle(feature, featureTypes, formFilters);
     this.mvtLayer = new VectorTileLayer({