From 238e7a98a940ae182d4fab3b64f1e03c43033316 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 19 Mar 2024 15:26:48 +0100
Subject: [PATCH 01/11] fix(carto): marker size & details width
---
.vscode/settings.json | 3 ++-
src/app/map/services/marker.ts | 8 ++++----
.../structure-details/structure-details.component.scss | 4 +++-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 64c345aa1..7fd950c18 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -74,5 +74,6 @@
"xsmall",
"xxsmall"
],
- "svg.preview.background": "dark-transparent"
+ "svg.preview.background": "dark-transparent",
+ "conventionalCommits.scopes": ["carto"]
}
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 7fff26a5a..d20504bf5 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -3,14 +3,14 @@ import { divIcon } from 'leaflet';
export const markerIcon = divIcon({
className: null,
html: '<svg width="16" height="16" fill="#4C4D53"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
- iconAnchor: [24, 48],
- popupAnchor: [0, -48],
+ iconAnchor: [8, 8],
+ popupAnchor: [0, -24],
});
export const markerIconHover = divIcon({
className: 'on-top-marker',
html: '<svg width="16" height="16"><use xlink:href="assets/ico/sprite.svg#map-markerHover"></use></svg>',
- iconAnchor: [24, 48],
- popupAnchor: [0, -48],
+ iconAnchor: [8, 8],
+ popupAnchor: [0, -24],
});
export const markerIconActive = divIcon({
className: 'on-top-marker',
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss
index f31d1b982..389ca37c9 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.scss
+++ b/src/app/structure-list/components/structure-details/structure-details.component.scss
@@ -15,7 +15,9 @@
position: fixed;
z-index: $structure-details-z-index;
height: 100%;
- width: 100%;
+ @media #{$tablet} {
+ width: 100%;
+ }
h1 {
@include font-bold-24;
--
GitLab
From f68ea71dd608723923278ef5ca5a20cf30dcb427 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 19 Mar 2024 15:31:28 +0100
Subject: [PATCH 02/11] consistent media query
---
.../structure-details/structure-details.component.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss
index 389ca37c9..36460364b 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.scss
+++ b/src/app/structure-list/components/structure-details/structure-details.component.scss
@@ -41,7 +41,7 @@
box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1);
background-color: $white;
- @media (max-width: 600px) {
+ @media #{$tablet} {
width: 100%;
}
}
@@ -86,7 +86,7 @@ section.actions {
justify-content: space-around;
overflow-y: auto;
- @media (max-width: 600px) {
+ @media #{$tablet} {
flex-wrap: wrap;
row-gap: 16px;
}
--
GitLab
From a3327aa2890d19df49fd35d7558844895ca38ace Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 19 Mar 2024 17:36:43 +0100
Subject: [PATCH 03/11] adjust mdm
---
src/app/map/services/marker.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index d20504bf5..3d836ffa4 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -35,8 +35,7 @@ export const userLocationIcon = divIcon({
export const markerIconMdm = divIcon({
className: null,
html: '<svg width="19" height="24" fill="#D4C4A9" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>',
- iconSize: [19, 24],
- iconAnchor: [9, 0],
+ iconAnchor: [9, 12],
});
export const markerIconFranceService = divIcon({
className: null,
--
GitLab
From 6a3b91d4f3d3b660c2b8dc019acfa2e38964bd17 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Mon, 25 Mar 2024 11:35:20 +0100
Subject: [PATCH 04/11] remove "conseillerFranceServiceAdded"
---
src/app/map/services/map.service.ts | 1 -
src/app/map/services/marker.ts | 7 -------
src/assets/ico/sprite.svg | 12 ------------
3 files changed, 20 deletions(-)
diff --git a/src/app/map/services/map.service.ts b/src/app/map/services/map.service.ts
index 64014df9f..d96d1c1de 100644
--- a/src/app/map/services/map.service.ts
+++ b/src/app/map/services/map.service.ts
@@ -71,7 +71,6 @@ export class MapService {
private getAddedToListMarkerIcon(markerType: MarkerType): DivIcon {
switch (markerType) {
case MarkerType.conseillerFrance:
- // return markerIconFranceServiceAddedToList;
return markerIconAddedToList;
case MarkerType.user:
return userLocationIcon;
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 3d836ffa4..7458f7b23 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -58,10 +58,3 @@ export const markerIconFranceServiceHover = divIcon({
iconAnchor: [24, 48],
popupAnchor: [0, -48],
});
-export const markerIconFranceServiceAddedToList = divIcon({
- className: null,
- html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#conseillerFranceServiceAdded"></use></svg>',
- iconSize: [48, 48],
- iconAnchor: [24, 48],
- popupAnchor: [0, -48],
-});
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index b8962b1dc..65b44da6f 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -70,18 +70,6 @@
fill="#3B3BE7" />
</symbol>
- <symbol id="conseillerFranceServiceAdded" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z"
- fill="#47C562" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z"
- fill="white" />
- <path d="M32.5 23.5746V13.9001L24.25 9L16 13.9001V23.5746L24.25 28.4118L32.5 23.5746Z" fill="white" />
- <path
- d="M30.6177 15.3789C29.9985 14.8285 29.0504 14.8843 28.5 15.5035L23.452 21.1104L20.4396 18.507C19.7939 17.988 18.8497 18.0909 18.3308 18.7366C17.8119 19.3824 17.9147 20.3266 18.5605 20.8455L22.6853 24.3429C23.3085 24.8436 24.2149 24.7677 24.746 24.1702L30.7422 17.4966C31.2926 16.8774 31.2368 15.9293 30.6177 15.3789Z"
- fill="#47C562" />
- </symbol>
-
<symbol id="conseillerFranceServiceHover" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z"
fill="#A00000" />
--
GitLab
From 52e6d0d8bf6e6cdb7ff781fad96e92f83c29b73e Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Mon, 25 Mar 2024 11:36:05 +0100
Subject: [PATCH 05/11] remove "conseillerFranceServiceHover"
---
src/app/map/services/marker.ts | 7 -------
src/assets/ico/sprite.svg | 13 -------------
2 files changed, 20 deletions(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 7458f7b23..5114aea31 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -51,10 +51,3 @@ export const markerIconFranceServiceActive = divIcon({
iconAnchor: [24, 48],
popupAnchor: [0, -48],
});
-export const markerIconFranceServiceHover = divIcon({
- className: null,
- html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#conseillerFranceServiceHover"></use></svg>',
- iconSize: [48, 48],
- iconAnchor: [24, 48],
- popupAnchor: [0, -48],
-});
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 65b44da6f..7b1c3759f 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -70,19 +70,6 @@
fill="#3B3BE7" />
</symbol>
- <symbol id="conseillerFranceServiceHover" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z"
- fill="#A00000" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z"
- fill="white" />
- <path
- d="M27.661 16.3823H32.2657V13.7028L24.175 9.02002L16.0582 13.7028V23.0682L24.175 27.725L32.2657 23.0682V20.3887H27.661V16.3823Z"
- fill="white" fill-opacity="0.8" />
- <path d="M27.661 20.3886V16.3823L24.1749 14.3531L20.6889 16.3823V20.3886L24.1749 22.3918L27.661 20.3886Z"
- fill="#010176" />
- </symbol>
-
<symbol id="address" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M11 2C12.6055 2.0145 14.1397 2.68885 15.265 3.87463C16.3902 5.06042 17.0142 6.66048 16.9998 8.32269C16.9998 11.8208 12.1242 19 11 19C9.87584 19 5.00025 11.8208 5.00025 8.32269C4.98578 6.66048 5.60982 5.06042 6.73504 3.87463C7.86026 2.68885 9.39446 2.0145 11 2ZM10.9999 5.55695C12.0865 5.53677 13.0768 6.19906 13.5059 7.23274C13.9349 8.26643 13.7173 9.4661 12.9553 10.2683C12.1933 11.0704 11.0384 11.3157 10.0329 10.8888C9.02744 10.4619 8.37129 9.44779 8.37266 8.32272C8.36215 6.80858 9.53743 5.57133 10.9999 5.55695Z"
--
GitLab
From 290eed5f3143ec98234ffb60f81d560ae86aa175 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Mon, 25 Mar 2024 11:36:50 +0100
Subject: [PATCH 06/11] remove "conseillerFranceService"
---
src/app/map/services/marker.ts | 7 -------
src/assets/ico/sprite.svg | 13 -------------
2 files changed, 20 deletions(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 5114aea31..0a7ae35f4 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -44,10 +44,3 @@ export const markerIconFranceService = divIcon({
iconAnchor: [24, 48],
popupAnchor: [0, -48],
});
-export const markerIconFranceServiceActive = divIcon({
- className: null,
- html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#conseillerFranceServiceSelected"></use></svg>',
- iconSize: [48, 48],
- iconAnchor: [24, 48],
- popupAnchor: [0, -48],
-});
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 7b1c3759f..18e7a04c5 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -57,19 +57,6 @@
fill="#000091" />
</symbol>
- <symbol id="conseillerFranceServiceSelected" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z"
- fill="white" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z"
- fill="#ED3939" />
- <path
- d="M27.661 16.3823H32.2657V13.7028L24.175 9.02002L16.0582 13.7028V23.0682L24.175 27.725L32.2657 23.0682V20.3887H27.661V16.3823Z"
- fill="#ED3939" />
- <path d="M27.661 20.3886V16.3823L24.1749 14.3531L20.6889 16.3823V20.3886L24.1749 22.3918L27.661 20.3886Z"
- fill="#3B3BE7" />
- </symbol>
-
<symbol id="address" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M11 2C12.6055 2.0145 14.1397 2.68885 15.265 3.87463C16.3902 5.06042 17.0142 6.66048 16.9998 8.32269C16.9998 11.8208 12.1242 19 11 19C9.87584 19 5.00025 11.8208 5.00025 8.32269C4.98578 6.66048 5.60982 5.06042 6.73504 3.87463C7.86026 2.68885 9.39446 2.0145 11 2ZM10.9999 5.55695C12.0865 5.53677 13.0768 6.19906 13.5059 7.23274C13.9349 8.26643 13.7173 9.4661 12.9553 10.2683C12.1933 11.0704 11.0384 11.3157 10.0329 10.8888C9.02744 10.4619 8.37129 9.44779 8.37266 8.32272C8.36215 6.80858 9.53743 5.57133 10.9999 5.55695Z"
--
GitLab
From 86dbb513899f89ba3abe93cfa9c40044e194f043 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Mon, 25 Mar 2024 11:37:25 +0100
Subject: [PATCH 07/11] remove "conseillerFranceService"
---
src/app/map/services/marker.ts | 7 -------
src/assets/ico/sprite.svg | 12 ------------
2 files changed, 19 deletions(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 0a7ae35f4..5ba4103dc 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -37,10 +37,3 @@ export const markerIconMdm = divIcon({
html: '<svg width="19" height="24" fill="#D4C4A9" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>',
iconAnchor: [9, 12],
});
-export const markerIconFranceService = divIcon({
- className: null,
- html: '<svg width="48" height="48" fill="#ED3939" class="france-service"><use xlink:href="assets/ico/sprite.svg#conseillerFranceService"></use></svg>',
- iconSize: [48, 48],
- iconAnchor: [24, 48],
- popupAnchor: [0, -48],
-});
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 18e7a04c5..bcec355de 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -45,18 +45,6 @@
fill="white" />
</symbol>
- <symbol id="conseillerFranceService" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z"
- fill="white" />
- <path
- d="M27.661 16.3823H32.2657V13.7028L24.175 9.02002L16.0582 13.7028V23.0682L24.175 27.725L32.2657 23.0682V20.3887H27.661V16.3823Z"
- fill="white" />
- <path d="M27.661 20.3886V16.3823L24.1749 14.3531L20.6889 16.3823V20.3886L24.1749 22.3918L27.661 20.3886Z"
- fill="#000091" />
- </symbol>
-
<symbol id="address" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M11 2C12.6055 2.0145 14.1397 2.68885 15.265 3.87463C16.3902 5.06042 17.0142 6.66048 16.9998 8.32269C16.9998 11.8208 12.1242 19 11 19C9.87584 19 5.00025 11.8208 5.00025 8.32269C4.98578 6.66048 5.60982 5.06042 6.73504 3.87463C7.86026 2.68885 9.39446 2.0145 11 2ZM10.9999 5.55695C12.0865 5.53677 13.0768 6.19906 13.5059 7.23274C13.9349 8.26643 13.7173 9.4661 12.9553 10.2683C12.1933 11.0704 11.0384 11.3157 10.0329 10.8888C9.02744 10.4619 8.37129 9.44779 8.37266 8.32272C8.36215 6.80858 9.53743 5.57133 10.9999 5.55695Z"
--
GitLab
From 223986f6efe7c1ed01c3609993ed4e8f80e00ade Mon Sep 17 00:00:00 2001
From: Pierre Ecarlat <pecarlat@grandlyon.com>
Date: Tue, 26 Mar 2024 14:46:44 +0100
Subject: [PATCH 08/11] Changed the marker for address in orientation
---
src/app/map/services/marker.ts | 6 +++---
src/assets/ico/sprite.svg | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 5ba4103dc..0d97845a0 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -28,9 +28,9 @@ export const markerIconAddedToList = divIcon({
});
export const userLocationIcon = divIcon({
className: null,
- html: '<svg width="34" height="34"><use xlink:href="assets/ico/sprite.svg#user-location"></use></svg>',
- iconSize: [34, 34],
- iconAnchor: [17, 0],
+ html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#user-location"></use></svg>',
+ iconSize: [48, 48],
+ iconAnchor: [24, 48],
});
export const markerIconMdm = divIcon({
className: null,
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index bcec355de..5e123a4ba 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -37,12 +37,12 @@
fill="#DA3635" />
</symbol>
- <symbol id="user-location" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
- <circle cx="17" cy="17" r="16.5" fill="#ED3939" fill-opacity="0.15" stroke="white" />
- <circle cx="17" cy="17" r="6" fill="#ED3939" />
- <path opacity="0.35"
- d="M19.625 12.9167C18.1502 12.2215 16.7083 12.0417 15.25 12.9167C16.4166 12.9167 18.7694 14.3782 19.3737 15.1918C20.5 16.7084 20.6016 19.0553 20.2083 19.3334C20.4541 19.4724 21.5026 18.3063 21.6666 17C21.8306 15.6948 21.0998 13.6119 19.625 12.9167Z"
- fill="white" />
+ <symbol id="user-location" viewBox="0 0 34 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <ellipse cx="17" cy="39" rx="17" ry="5" fill="#333333" fill-opacity="0.25" />
+ <path
+ d="M16.7837 36.7307L17.4904 37.3909L18.1739 36.7067C19.8607 35.0181 21.5177 33.5089 23.0886 32.0784C23.1471 32.025 23.2056 31.9718 23.264 31.9186C28.4811 27.1684 32.9328 23.1151 32.9328 16.4815C32.9328 7.93228 26.0092 1 17.4664 1C8.92355 1 2 7.93228 2 16.4815C2 19.9604 2.90658 22.5499 4.66826 25.0002C6.37177 27.3696 8.87867 29.6061 12.0062 32.3963L12.0831 32.4649C13.5072 33.7354 15.073 35.1324 16.7837 36.7307ZM22.1271 16.4815C22.1271 19.0598 20.0395 21.1481 17.4664 21.1481C14.8933 21.1481 12.8056 19.0598 12.8056 16.4815C12.8056 13.9032 14.8933 11.8148 17.4664 11.8148C20.0395 11.8148 22.1271 13.9032 22.1271 16.4815Z"
+ fill="#333333" stroke="white" stroke-width="2" />
+ <circle cx="17.5323" cy="16.5113" r="5.39024" fill="white" />
</symbol>
<symbol id="address" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
--
GitLab
From 1dec8dab0fc3af238961abcdf83250fc9a2e41f7 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 26 Mar 2024 16:27:47 +0100
Subject: [PATCH 09/11] update mdm
---
src/app/map/services/marker.ts | 4 ++--
src/assets/ico/sprite.svg | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 0d97845a0..32bba6220 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -2,7 +2,7 @@ import { divIcon } from 'leaflet';
export const markerIcon = divIcon({
className: null,
- html: '<svg width="16" height="16" fill="#4C4D53"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
+ html: '<svg width="16" height="16"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
iconAnchor: [8, 8],
popupAnchor: [0, -24],
});
@@ -34,6 +34,6 @@ export const userLocationIcon = divIcon({
});
export const markerIconMdm = divIcon({
className: null,
- html: '<svg width="19" height="24" fill="#D4C4A9" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>',
+ html: '<svg width="14" height="14" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>',
iconAnchor: [9, 12],
});
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 5e123a4ba..fef3c111b 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -33,8 +33,11 @@
<symbol id="mdm" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
- d="M12.543 6.41671C12.7063 6.41671 12.8346 6.28838 12.8346 6.12504V5.40171C12.8346 5.30838 12.788 5.21504 12.7121 5.16254L7.3338 1.40004C7.13547 1.26004 6.86714 1.26004 6.66297 1.40004L1.29047 5.16254C1.21464 5.21504 1.16797 5.30838 1.16797 5.40171V6.12504C1.16797 6.28838 1.2963 6.41671 1.45964 6.41671H2.33464V11.6667H1.7513C1.43047 11.6667 1.16797 11.9292 1.16797 12.25C1.16797 12.5709 1.43047 12.8334 1.7513 12.8334H12.2513C12.5721 12.8334 12.8346 12.5709 12.8346 12.25C12.8346 11.9292 12.5721 11.6667 12.2513 11.6667H11.668V6.41671H12.543ZM9.33464 9.91671C9.33464 10.2375 9.07214 10.5 8.7513 10.5C8.43047 10.5 8.16797 10.2375 8.16797 9.91671V8.16671L7.48547 9.18754C7.25214 9.53171 6.74464 9.53171 6.51714 9.18754L5.83464 8.16671V9.91671C5.83464 10.2375 5.57214 10.5 5.2513 10.5C4.93047 10.5 4.66797 10.2375 4.66797 9.91671V7.17504C4.66797 6.75504 5.0063 6.41671 5.4263 6.41671C5.67714 6.41671 5.9163 6.54504 6.0563 6.75504L7.0013 8.16671L7.94047 6.75504C8.0863 6.54504 8.31964 6.41671 8.5763 6.41671C8.9963 6.41671 9.33464 6.75504 9.33464 7.17504V9.91671Z"
- fill="#DA3635" />
+ d="M12.8333 6.41666V5.24999L7 1.16666L1.16667 5.24999V6.41666H2.33334V11.6667H1.16667V12.8333H12.8333V11.6667H11.6667V6.41666H12.8333ZM10.5 11.6667H3.50001V5.24999H10.5V11.6667Z"
+ fill="#696969" />
+ <path
+ d="M5.83334 8.16666L7.00001 9.91666L8.16667 8.16666V10.5H9.33334V6.41666H8.16667L7.00001 8.16666L5.83334 6.41666H4.66667V10.5H5.83334V8.16666Z"
+ fill="#696969" />
</symbol>
<symbol id="user-location" viewBox="0 0 34 44" fill="none" xmlns="http://www.w3.org/2000/svg">
--
GitLab
From 27bee85c08aeb258275dc90c589b6436d221c11b Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 26 Mar 2024 16:28:17 +0100
Subject: [PATCH 10/11] update mdm anchor
---
src/app/map/services/marker.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 32bba6220..74f9d22c7 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -35,5 +35,5 @@ export const userLocationIcon = divIcon({
export const markerIconMdm = divIcon({
className: null,
html: '<svg width="14" height="14" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>',
- iconAnchor: [9, 12],
+ iconAnchor: [7, 7],
});
--
GitLab
From 28466f5729bfac168a4e5d0ec9db0f80052d6318 Mon Sep 17 00:00:00 2001
From: Etienne LOUPIAS <eloupias@grandlyon.com>
Date: Tue, 26 Mar 2024 16:47:20 +0100
Subject: [PATCH 11/11] fix user-location size
---
src/app/map/services/marker.ts | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts
index 74f9d22c7..8eed6ea66 100644
--- a/src/app/map/services/marker.ts
+++ b/src/app/map/services/marker.ts
@@ -28,9 +28,8 @@ export const markerIconAddedToList = divIcon({
});
export const userLocationIcon = divIcon({
className: null,
- html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#user-location"></use></svg>',
- iconSize: [48, 48],
- iconAnchor: [24, 48],
+ html: '<svg width="34" height="44"><use xlink:href="assets/ico/sprite.svg#user-location"></use></svg>',
+ iconAnchor: [17, 40],
});
export const markerIconMdm = divIcon({
className: null,
--
GitLab