dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12866 from vvlladd28/improvement/map/shape7-change

Browse Source 
Fixed fill-opacity in marker shape7.svg
This commit is contained in:
Igor Kulikov 2025-03-10 12:12:44 +02:00 committed by GitHub
commit 7e0ad92a75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/shared/models/widget/maps/marker-shape.models.ts
View File

@ -224,14 +224,6 @@ const createColorMarkerShape = (iconRegistry: MatIconRegistry, domSanitizer: Dom
el.setAttribute('fill', '#'+color.toHex()); el.setAttribute('fill', '#'+color.toHex());
el.setAttribute('fill-opacity', `${color.getAlpha()}`); el.setAttribute('fill-opacity', `${color.getAlpha()}`);
}); });
const strokeElements = Array.from(svgElement.getElementsByClassName('marker-stroke'));
if (svgElement.classList.contains('marker-stroke')) {
strokeElements.push(svgElement);
}
strokeElements.forEach(el => {
el.setAttribute('stroke', '#'+color.toHex());
el.setAttribute('stroke-opacity', `${color.getAlpha()}`);
});
const opacityElements = Array.from(svgElement.getElementsByClassName('marker-opacity')); const opacityElements = Array.from(svgElement.getElementsByClassName('marker-opacity'));
if (svgElement.classList.contains('marker-opacity')) { if (svgElement.classList.contains('marker-opacity')) {
opacityElements.push(svgElement); opacityElements.push(svgElement);

26
ui-ngx/src/assets/markers/shape7.svg
View File

@ -1,13 +1,12 @@
<svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34" fill="none"> <svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34" class="marker-color" fill="#307FE5">
<g filter="url(#shadow-filter)"> <g filter="url(#shadow-filter)">
<path class="marker-opacity" d="M19 24.5C17.4075 27.4125 17 33 17 33C17 33 27.0858 32.1955 30.9992 27.4998C34 23.8992 31.9992 19 27.9992 19C23.9993 19 21.1929 20.4894 19 24.5Z" fill="black" fill-opacity="0.24"/> <path class="marker-opacity" d="M 19,24.5 C 17.4075,27.4125 17,33 17,33 17,33 27.0858,32.1955 30.9992,27.4998 34,23.8992 31.9992,19 27.9992,19 23.9993,19 21.1929,20.4894 19,24.5 Z" fill="#000000" fill-opacity="0.24"/>
</g> </g>
<path class="marker-color" d="M9.5 23L17 34L24.5 23C24.5 23 22 25.5 17 25.5C12 25.5 9.5 23 9.5 23Z" fill="#307FE5"/> <path d="M 9.5,23 17,34 24.5,23 C 24.5,23 22,25.5 17,25.5 12,25.5 9.5,23 9.5,23 Z" style="filter:url(#filterLeg)"/>
<path d="M9.5 23L17 34L24.5 23C24.5 23 22 25.5 17 25.5C12 25.5 9.5 23 9.5 23Z" fill="black" fill-opacity="0.38"/> <path d="M 27,13 C 27,18.5227 22.523,23 17,23 11.4773,23 7,18.523 7,13 7,7.47733 11.477,3 17,3 22.5227,3 27,7.47703 27,13 Z"/>
<path class="marker-color" d="M28 13C28 19.0749 23.0753 24 17 24C10.9251 24 6 19.0753 6 13C6 6.92506 10.9247 2 17 2C23.0749 2 28 6.92473 28 13Z" fill="#307FE5"/> <path d="M 27,13 C 27,18.5227 22.523,23 17,23 11.4773,23 7,18.523 7,13 7,7.47733 11.477,3 17,3 22.5227,3 27,7.47703 27,13 Z" fill="url(#innerGradient)"/>
<path d="M28 13C28 19.0749 23.0753 24 17 24C10.9251 24 6 19.0753 6 13C6 6.92506 10.9247 2 17 2C23.0749 2 28 6.92473 28 13Z" fill="url(#paint0_radial_8816_263885)"/> <path d="m 17,3.59375 c -5.195,0 -9.40625,4.21148 -9.40625,9.40625 0,5.195 4.21145,9.4062 9.40625,9.4062 5.195,0 9.4062,-4.2114 9.4062,-9.4062 C 26.4062,7.80497 22.1948,3.59375 17,3.59375 Z M 4.40625,13 C 4.40625,6.04489 10.0445,0.40625 17,0.40625 23.9551,0.40625 29.5938,6.0445 29.5938,13 29.5938,19.9551 23.9555,25.5938 17,25.5938 10.0449,25.5938 4.40625,19.9555 4.40625,13 Z"/>
<path class="marker-stroke" d="M28 13C28 19.0749 23.0753 24 17 24C10.9251 24 6 19.0753 6 13C6 6.92506 10.9247 2 17 2C23.0749 2 28 6.92473 28 13Z" stroke="#307FE5" stroke-width="3.1875"/> <path d="m 17,3.59375 c -5.195,0 -9.40625,4.21148 -9.40625,9.40625 0,5.195 4.21145,9.4062 9.40625,9.4062 5.195,0 9.4062,-4.2114 9.4062,-9.4062 C 26.4062,7.80497 22.1948,3.59375 17,3.59375 Z M 4.40625,13 C 4.40625,6.04489 10.0445,0.40625 17,0.40625 23.9551,0.40625 29.5938,6.0445 29.5938,13 29.5938,19.9551 23.9555,25.5938 17,25.5938 10.0449,25.5938 4.40625,19.9555 4.40625,13 Z" fill="url(#radiusGradient)"/>
<path d="M28 13C28 19.0749 23.0753 24 17 24C10.9251 24 6 19.0753 6 13C6 6.92506 10.9247 2 17 2C23.0749 2 28 6.92473 28 13Z" stroke="url(#paint1_linear_8816_263885)" stroke-width="3.1875"/>
<defs> <defs>
<filter id="shadow-filter" x="12.75" y="14.75" width="23.9434" height="22.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> <filter id="shadow-filter" x="12.75" y="14.75" width="23.9434" height="22.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/> <feFlood flood-opacity="0" result="BackgroundImageFix"/>
@ -16,13 +15,16 @@
<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_8817_262071" result="shape"/> <feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_8817_262071" result="shape"/>
<feGaussianBlur stdDeviation="0.5" result="effect2_foregroundBlur_8817_262071"/> <feGaussianBlur stdDeviation="0.5" result="effect2_foregroundBlur_8817_262071"/>
</filter> </filter>
<radialGradient id="paint0_radial_8816_263885" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(21.4 5.3) rotate(126.87) scale(13.75 14.648)"> <radialGradient id="innerGradient" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-7.5,10,-10.7,-8,21,6)">
<stop stop-opacity="0.25"/> <stop offset="0" stop-opacity="0.25"/>
<stop offset="1" stop-opacity="0"/> <stop offset="1" stop-opacity="0"/>
</radialGradient> </radialGradient>
<linearGradient id="paint1_linear_8816_263885" x1="9.3" y1="20.7" x2="21.95" y2="3.1" gradientUnits="userSpaceOnUse"> <linearGradient id="radiusGradient" x1="9.3" y1="20.7" x2="21.95" y2="3.1" gradientUnits="userSpaceOnUse">
<stop stop-opacity="0.25"/> <stop offset="0" stop-opacity="0.25"/>
<stop offset="1" stop-opacity="0"/> <stop offset="1" stop-opacity="0"/>
</linearGradient> </linearGradient>
<filter color-interpolation-filters="sRGB" id="filterLeg" x="0" y="0" width="1" height="1">
<feColorMatrix values="0.6 0 0 0 0 0 0.6 0 0 0 0 0 0.6 0 0 0 0 0 1 0" />
</filter>
</defs> </defs>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB