diff --git a/src/components/Map/EditingToolbar.vue b/src/components/Map/EditingToolbar.vue index d202e137a0ec4b88b14fb5df120bb12c4c7addd5..e0d7f4a975dbde278d4b83fe8fd9a2b076ff1140 100644 --- a/src/components/Map/EditingToolbar.vue +++ b/src/components/Map/EditingToolbar.vue @@ -57,7 +57,6 @@ export default { }, methods: { update(){ - console.log(this.editionService.editing_feature); editionService.activeUpdateFeature(); }, deleteObj(){ diff --git a/src/services/edition-service.js b/src/services/edition-service.js index d592a45e0ccc36a6e69ef946ae773f3f2ce03bf2..dffdb9153beddf50d8da416f539b14d3f83b0c7a 100644 --- a/src/services/edition-service.js +++ b/src/services/edition-service.js @@ -90,7 +90,6 @@ const editionService = { this.draw.on('drawend', (evt) => { var feature = evt.feature; - console.log(feature); this.setEditingFeature(feature); this.draw.setActive(false); }); diff --git a/src/services/map-service.js b/src/services/map-service.js index 5c98cb19d12f91bc8b97077ac874296b48336522..c00f4c58b2878fea73cc9bdae1758f312001abae 100644 --- a/src/services/map-service.js +++ b/src/services/map-service.js @@ -57,7 +57,7 @@ const mapService = { return this.map; }, destroyMap() { - this.map=undefined; + this.map = undefined; }, createMap(el, options) { const { @@ -69,6 +69,11 @@ const mapService = { zoomControl = true, interactions = { doubleClickZoom: false, mouseWheelZoom: false, dragPan: true }, } = options; + + if (el.innerHTML) { + el.innerHTML = ''; + } + this.map = new Map({ layers: [], target: el, @@ -105,12 +110,14 @@ const mapService = { duration: 500, }, }); - const overlay = this.overlay; - closer.onclick = function () { - overlay.setPosition(undefined); - closer.blur(); - return false; - }; + let overlay = this.overlay; + if (closer) { + closer.onclick = function () { + overlay.setPosition(undefined); + closer.blur(); + return false; + }; + } this.map.addOverlay(this.overlay); this.map.on('click', this.onMapClick.bind(this)); @@ -342,7 +349,11 @@ 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({ @@ -437,17 +448,17 @@ const mapService = { features.forEach((feature) => { retour = new GeoJSON().readFeature(feature, { dataProjection: 'EPSG:4326', featureProjection: 'EPSG:3857' }); drawSource.addFeature(retour); - const featureProperties = feature.properties ? feature.properties : feature; - const featureType = featureTypes - .find((ft) => ft.slug === (featureProperties.feature_type.slug || featureProperties.feature_type)); - let filters = []; - if (filter) { - const typeCheck = filter.featureType && featureProperties.feature_type.slug === filter.featureType; - const statusCheck = filter.featureStatus && featureProperties.status.value === filter.featureStatus; - const titleCheck = filter.featureTitle && featureProperties.title.includes(filter.featureTitle); - filters = [typeCheck, statusCheck, titleCheck]; - } - console.log(featureType, filters); + // const featureProperties = feature.properties ? feature.properties : feature; + // const featureType = featureTypes + // .find((ft) => ft.slug === (featureProperties.feature_type.slug || featureProperties.feature_type)); + // let filters = []; + // if (filter) { + // const typeCheck = filter.featureType && featureProperties.feature_type.slug === filter.featureType; + // const statusCheck = filter.featureStatus && featureProperties.status.value === filter.featureStatus; + // const titleCheck = filter.featureTitle && featureProperties.title.includes(filter.featureTitle); + // filters = [typeCheck, statusCheck, titleCheck]; + // } + // console.log(featureType, filters); }); const styleFunction = (feature) => this.getStyle(feature, featureTypes, filter); diff --git a/src/store/modules/map.store.js b/src/store/modules/map.store.js index 1a153cea78ff9639f5edc66281999d15f3b9a471..1a87098abcbd86423c00101f56f2b19fcc7061c1 100644 --- a/src/store/modules/map.store.js +++ b/src/store/modules/map.store.js @@ -108,8 +108,8 @@ const map = { const mapDefaultViewCenter = [46, 2]; // defaultMapView.center; const mapDefaultViewZoom = 5; // defaultMapView.zoom; mapService.createMap(el, { - mapDefaultViewCenter, - mapDefaultViewZoom, + mapDefaultViewCenter: mapDefaultViewCenter, + mapDefaultViewZoom: mapDefaultViewZoom, }); commit('SET_MAP', mapService.getMap()); mapService.addLayers( diff --git a/src/views/Project/ProjectDetail.vue b/src/views/Project/ProjectDetail.vue index 15cf5da86dd3bc8fc105964d4facf49db8669948..452a9067c61469a8eeefc0884de1f0d0fd6eb5ea 100644 --- a/src/views/Project/ProjectDetail.vue +++ b/src/views/Project/ProjectDetail.vue @@ -390,7 +390,7 @@ export default { .then((response) => { this.CLOSE_PROJECT_MODAL(); if (response === 'success') { - this.GET_PROJECT(); + this.GET_PROJECT(this.slug); this.retrieveProjectInfo(); this.DISPLAY_MESSAGE({ comment: `Le type de signalement ${this.featureTypeToDelete.title} a bien été supprimé.`,