From 3b28fdeebaeacce339569d36235df33c902d54fe Mon Sep 17 00:00:00 2001
From: florent <flavelle@neogeo.fr>
Date: Thu, 21 Apr 2022 17:17:54 +0200
Subject: [PATCH] fix merge
---
src/services/map-service.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/services/map-service.js b/src/services/map-service.js
index c00f4c58..7a9afd5e 100644
--- a/src/services/map-service.js
+++ b/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({
--
GitLab