diff --git a/src/app/actions/spotsAdd.actions.ts b/src/app/actions/spotsAdd.actions.ts index 6d5af87..538ce6f 100644 --- a/src/app/actions/spotsAdd.actions.ts +++ b/src/app/actions/spotsAdd.actions.ts @@ -28,12 +28,10 @@ export class SpotsAddActions { numspots: spot.numspots }); - for (let i = 0; i < spot.numspots; i++) { - this.ngRedux.dispatch({ - type: SpotsAddActions.ADD, - payload: spotFeature - }); - } + this.ngRedux.dispatch({ + type: SpotsAddActions.ADD, + payload: spotFeature + }); this.addSpotsService.addSpot(spotFeature); } diff --git a/src/app/components/map/mapgl/mapgl.component.ts b/src/app/components/map/mapgl/mapgl.component.ts index f6f4bc8..8cabaa5 100644 --- a/src/app/components/map/mapgl/mapgl.component.ts +++ b/src/app/components/map/mapgl/mapgl.component.ts @@ -110,7 +110,14 @@ export class MapGLComponent implements OnInit, OnChanges { this.zoomChange.emit(this.map.getZoom()); }); - this.map.on('click', 'unclustered-points', function (e) { + this.map.on('click', 'unclustered-points-v2', function (e) { + new mapboxgl.Popup({offset: 25}) + .setLngLat(e.features[0].geometry.coordinates) + .setHTML(`Navigate`) + .addTo(this.map); + }.bind(this)); + + this.map.on('click', 'unclustered-points-v3', function (e) { new mapboxgl.Popup({offset: 25}) .setLngLat(e.features[0].geometry.coordinates) .setHTML(`Navigate`) diff --git a/src/app/components/map/mapgl/style_parkabler.json b/src/app/components/map/mapgl/style_parkabler.json index 9cdffd4..383d6e7 100644 --- a/src/app/components/map/mapgl/style_parkabler.json +++ b/src/app/components/map/mapgl/style_parkabler.json @@ -3984,47 +3984,50 @@ } }, { - "id": "unclustered-points", + "id": "unclustered-points-v2", "type": "symbol", "source": "spots", "filter": ["!has", "point_count"], "layout": { - "icon-image": "pin", + "icon-image": "pin-v2", "icon-size": 1, "icon-offset": [0, -12], "icon-allow-overlap": true, + "text-field": "{numspots}", "text-font": [ "DIN Offc Pro Medium", "Arial Unicode MS Bold" ], - "text-size": 16, - "text-offset": [0, -1], + "text-size": 20, + "text-offset": [-0.3, -0.6], "text-anchor": "center", - "text-allow-overlap": true + "text-allow-overlap": true, + "visibility": "none" }, "paint": { "text-color": "#ffffff" } }, { - "id": "unclustered-points-count", + "id": "unclustered-points-v3", "type": "symbol", "source": "spots", "filter": ["!has", "point_count"], "layout": { - "icon-image": "circle-15", - "icon-size": 2, - "icon-offset": [5, -15], + "icon-image": "pin-v3", + "icon-size": 1, + "icon-offset": [0, -12], "icon-allow-overlap": true, + "text-field": "{numspots}", "text-font": [ "DIN Offc Pro Medium", "Arial Unicode MS Bold" ], - "text-field": "{numspots}", "text-size": 16, - "text-offset": [0.6, -1.9], + "text-offset": [0.6, -1.7], "text-anchor": "center", - "text-allow-overlap": true + "text-allow-overlap": true, + "visibility": "visible" }, "paint": { "text-color": "#ffffff" diff --git a/src/assets/img/pin-v2.svg b/src/assets/img/pin-v2.svg new file mode 100644 index 0000000..4a59345 --- /dev/null +++ b/src/assets/img/pin-v2.svg @@ -0,0 +1,97 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/assets/img/pin-v3.svg b/src/assets/img/pin-v3.svg new file mode 100644 index 0000000..b5dc6ca --- /dev/null +++ b/src/assets/img/pin-v3.svg @@ -0,0 +1,97 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/assets/img/pin.svg b/src/assets/img/pin.svg index ceea9c1..7d4ab14 100644 --- a/src/assets/img/pin.svg +++ b/src/assets/img/pin.svg @@ -18,7 +18,7 @@ viewBox="198 218 50 50" xml:space="preserve" inkscape:version="0.48.4 r9939" - sodipodi:docname="pin.svg">image/svg+xml