mirror of
https://github.com/haiwen/seahub.git
synced 2025-10-20 18:32:41 +00:00
Merge pull request #7275 from haiwen/optimize/map_view
Optimize/map view
This commit is contained in:
杨国璇
GitHub
@@ -1,11 +1,11 @@
|
||||
@font-face {
|
||||
font-family: "sf3-font"; /* Project id 1230969 */
|
||||
src: url('./iconfont.eot?t=1733301127109'); /* IE9 */
|
||||
src: url('./iconfont.eot?t=1733301127109#iefix') format('embedded-opentype'), /* IE6-IE8 */
|
||||
url('./iconfont.woff2?t=1733301127109') format('woff2'),
|
||||
url('./iconfont.woff?t=1733301127109') format('woff'),
|
||||
url('./iconfont.ttf?t=1733301127109') format('truetype'),
|
||||
url('./iconfont.svg?t=1733301127109#sf3-font') format('svg');
|
||||
src: url('./iconfont.eot?t=1736476800596'); /* IE9 */
|
||||
src: url('./iconfont.eot?t=1736476800596#iefix') format('embedded-opentype'), /* IE6-IE8 */
|
||||
url('./iconfont.woff2?t=1736476800596') format('woff2'),
|
||||
url('./iconfont.woff?t=1736476800596') format('woff'),
|
||||
url('./iconfont.ttf?t=1736476800596') format('truetype'),
|
||||
url('./iconfont.svg?t=1736476800596#sf3-font') format('svg');
|
||||
}
|
||||
|
||||
.sf3-font {
|
||||
@@ -16,6 +16,30 @@
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.sf3-font-zoom-out:before {
|
||||
content: "\e630";
|
||||
}
|
||||
|
||||
.sf3-font-current-location:before {
|
||||
content: "\e62e";
|
||||
}
|
||||
|
||||
.sf3-font-zoom-in:before {
|
||||
content: "\e62f";
|
||||
}
|
||||
|
||||
.sf3-font-ai:before {
|
||||
content: "\e854";
|
||||
}
|
||||
|
||||
.sf3-font-time:before {
|
||||
content: "\e852";
|
||||
}
|
||||
|
||||
.sf3-font-description:before {
|
||||
content: "\e853";
|
||||
}
|
||||
|
||||
.sf3-font-hi:before {
|
||||
content: "\e603";
|
||||
}
|
||||
@@ -24,10 +48,6 @@
|
||||
content: "\e851";
|
||||
}
|
||||
|
||||
.sf3-font-current-location:before {
|
||||
content: "\e850";
|
||||
}
|
||||
|
||||
.sf3-font-ai_generated:before {
|
||||
content: "\e84f";
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -14,12 +14,22 @@
|
||||
/>
|
||||
<missing-glyph />
|
||||
|
||||
<glyph glyph-name="zoom-out" unicode="" d="M0 440.888889m56.888889 0l910.222222 0q56.888889 0 56.888889-56.888889l0 0q0-56.888889-56.888889-56.888889l-910.222222 0q-56.888889 0-56.888889 56.888889l0 0q0 56.888889 56.888889 56.888889Z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="current-location" unicode="" d="M512 896c282.7776 0 512-229.2224 512-512s-229.2224-512-512-512S0 101.2224 0 384 229.2224 896 512 896z m51.2512-105.5744L563.2 691.2a51.2 51.2 0 0 0-102.4 0V790.4256a409.8048 409.8048 0 0 1-355.2256-355.328L107.52 435.2h102.4a51.2 51.2 0 1 0 0-102.4h-102.4l-1.9456 0.0512A409.8048 409.8048 0 0 1 460.8-22.4768V76.8a51.2 51.2 0 0 0 102.4 0l0.0512-99.2256a409.8048 409.8048 0 0 1 355.1744 355.1744L824.32 332.8a51.2 51.2 0 0 0 0 102.4h94.1056a409.8048 409.8048 0 0 1-355.1744 355.2256zM384 512m128 0l0 0q128 0 128-128l0 0q0-128-128-128l0 0q-128 0-128 128l0 0q0 128 128 128Z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="zoom-in" unicode="" d="M19.132632 448.512m53.894736 0l862.31579 0q53.894737 0 53.894737-53.894737l0 0q0-53.894737-53.894737-53.894737l-862.31579 0q-53.894737 0-53.894736 53.894737l0 0q0 53.894737 53.894736 53.894737ZM450.290526-36.540632V825.775158a53.894737 53.894737 0 0 0 107.789474 0v-862.31579a53.894737 53.894737 0 1 0-107.789474 0z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="ai" unicode="" d="M515.2 896C796.8 896 1024 678.4 1024 416s-227.2-480-508.8-480h-19.2c-12.8 0-118.4-6.4-156.8-19.2-32-6.4-89.6-28.8-124.8-38.4-3.2-3.2-16-6.4-22.4-6.4-16 0-28.8 12.8-32 32-6.4 35.2-6.4 96 12.8 150.4C67.2 144 0 268.8 0 416 3.2 678.4 230.4 896 515.2 896zM512 800C281.6 800 96 620.8 96 403.2c0-112 54.4-211.2 144-291.2l38.4-35.2c-12.8-25.6-22.4-41.6-25.6-54.4-6.4-16-9.6-41.6-6.4-54.4 25.6 12.8 64 32 92.8 38.4 54.4 12.8 134.4 19.2 172.8 19.2 182.4 0 416 160 416 377.6S742.4 800 512 800z m-92.8-124.8C329.6 675.2 256 604.8 256 518.4v-320c0-3.2 3.2-9.6 9.6-9.6h89.6V515.2c0 32 28.8 60.8 60.8 60.8s60.8-28.8 60.8-60.8v-73.6H384c-3.2 0-9.6 0-12.8-3.2-3.2-3.2-3.2-9.6-3.2-12.8v-60.8c0-12.8 9.6-19.2 19.2-19.2H480v-156.8h89.6c3.2 0 9.6 3.2 9.6 9.6v320c0 86.4-70.4 156.8-160 156.8z m297.6-131.2h-57.6c-12.8 0-19.2-6.4-19.2-19.2v-313.6c0-12.8 6.4-19.2 19.2-19.2h57.6c12.8 0 19.2 6.4 19.2 19.2v313.6c0 12.8-6.4 19.2-19.2 19.2z m-28.8 32c25.6 0 48 22.4 48 48S713.6 672 688 672 640 649.6 640 624s22.4-48 48-48z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="time" unicode="" d="M896 384c0 211.2-172.8 384-384 384S128 595.2 128 384s172.8-384 384-384 384 172.8 384 384m96 0c0-262.4-217.6-480-480-480S32 121.6 32 384 249.6 864 512 864s480-217.6 480-480m-192-48c0-25.6-22.4-48-48-48h-192c-54.4 0-96 41.6-96 96V624c0 25.6 22.4 48 48 48s48-22.4 48-48v-192c0-25.6 22.4-48 48-48h144c25.6 0 48-22.4 48-48" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="description" unicode="" d="M800 809.6l134.4-134.4c32-32 32-86.4 0-115.2L332.8-44.8 64-64l16 265.6 604.8 608c32 28.8 86.4 28.8 115.2 0z m-204.8-230.4L179.2 160l-6.4-118.4 118.4 9.6 416 416-112 112z m150.4 150.4l-80-80 112-112 80 80-112 112z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="hi" unicode="" d="M512 864c262.4 0 480-214.4 480-480 0-96-28.8-188.8-76.8-262.4l64-150.4c3.2-9.6 0-19.2-9.6-22.4-3.2 0-6.4-3.2-9.6 0l-172.8 44.8c-80-54.4-172.8-83.2-272-83.2C249.6-96 32 121.6 32 384S249.6 864 512 864zM512 528v-131.2H390.4V528h-64v-326.4h64V336H512v-134.4h60.8V528H512z m147.2-67.2c22.4 0 38.4 16 38.4 38.4 0 19.2-16 38.4-38.4 38.4-19.2 0-38.4-19.2-38.4-38.4 3.2-19.2 22.4-38.4 38.4-38.4z m-25.6-259.2h57.6V435.2h-57.6v-233.6z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="refresh" unicode="" d="M512 864c163.2 0 304-76.8 390.4-201.6V742.4c0 25.6 22.4 44.8 44.8 44.8S992 768 992 742.4v-179.2c0-25.6-22.4-44.8-44.8-44.8h-195.2c-16 0-32 9.6-38.4 22.4-9.6 16-9.6 35.2 0 48 6.4 12.8 22.4 19.2 38.4 19.2h76.8c-70.4 99.2-185.6 166.4-316.8 166.4C294.4 774.4 121.6 601.6 121.6 384S294.4-6.4 512-6.4c182.4 0 332.8 121.6 377.6 291.2 6.4 19.2 19.2 32 41.6 32 12.8 0 25.6-3.2 38.4-16 16-16 12.8-32 9.6-51.2C921.6 48 729.6-96 512-96 249.6-96 32 121.6 32 384S249.6 864 512 864z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="current-location" unicode="" d="M512 864c265.6 0 480-214.4 480-480s-214.4-480-480-480S32 118.4 32 384 246.4 864 512 864z m48-118.4v-96c0-25.6-22.4-48-48-48s-48 22.4-48 48v96c-160-22.4-288-150.4-310.4-310.4h96c25.6 0 48-22.4 48-48s-22.4-48-48-48h-96c22.4-163.2 150.4-291.2 310.4-313.6v99.2c0 25.6 22.4 48 48 48s48-22.4 48-48v-99.2c163.2 22.4 291.2 150.4 313.6 313.6h-99.2c-25.6 0-48 22.4-48 48s22.4 48 48 48h99.2c-22.4 160-153.6 288-313.6 310.4zM512 512c70.4 0 128-57.6 128-128s-57.6-128-128-128-128 57.6-128 128 57.6 128 128 128z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="ai_generated" unicode="" d="M486.4 896C214.4 883.2 0 659.2 0 384c0-115.2 35.2-220.8 105.6-313.6L6.4-105.6c-3.2-3.2-3.2-9.6 0-12.8 3.2-6.4 9.6-9.6 12.8-9.6H512c275.2 0 499.2 214.4 512 486.4 6.4 144-44.8 278.4-140.8 380.8S656 896 512 896h-25.6z m-121.6-288h102.4L640 160h-102.4l-41.6 102.4h-160L294.4 160H192l172.8 448z m336 0H800v-448h-99.2V608zM416 499.2l-60.8-156.8h118.4L416 499.2z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="map" unicode="" d="M976 646.4c9.6-6.4 16-19.2 16-32v-563.2c0-16-9.6-32-25.6-38.4l-281.6-105.6c-9.6-3.2-19.2-3.2-25.6 0L352 9.6l-265.6-102.4c-12.8-3.2-25.6-3.2-38.4 3.2-9.6 6.4-16 19.2-16 32V505.6c0 16 9.6 32 25.6 38.4l128 48c-6.4-35.2-6.4-73.6 0-108.8l-64-28.8v-428.8l179.2 76.8v172.8l89.6-112v-86.4l240-80v166.4l89.6 112v-256l179.2 70.4V531.2l-60.8-25.6c3.2 35.2 3.2 70.4-6.4 105.6l102.4 38.4c16 6.4 28.8 3.2 41.6-3.2zM297.6 777.6C416 892.8 604.8 892.8 723.2 777.6c105.6-99.2 118.4-256 35.2-374.4l-198.4-246.4-9.6-9.6c-28.8-22.4-67.2-19.2-89.6 9.6l-195.2 243.2c-83.2 118.4-67.2 275.2 32 377.6z m355.2-67.2c-76.8 70.4-204.8 70.4-281.6 0-70.4-64-76.8-163.2-22.4-236.8l131.2-176c16-22.4 48-22.4 64 0l131.2 176c54.4 73.6 48 172.8-22.4 236.8zM512 704c70.4 0 128-57.6 128-128 0-44.8-25.6-86.4-64-112s-89.6-22.4-128 0-64 64-64 112c0 70.4 57.6 128 128 128z m0-96c-19.2 0-32-12.8-32-32s12.8-32 32-32 32 12.8 32 32-12.8 32-32 32z" horiz-adv-x="1024" />
|
||||
@@ -188,7 +198,7 @@
|
||||
|
||||
<glyph glyph-name="ai-search" unicode="" d="M448.099844 896c246.015601 0 447.301092-201.285491 447.301092-447.301092 0-95.850234-28.75507-182.115445-79.875195-255.600624l182.115445-182.115445c31.950078-31.950078 31.950078-83.070203 0-115.02028s-83.070203-31.950078-115.020281 0L703.700468 78.078003c-73.485179-51.120125-159.75039-79.875195-255.600624-79.875195-246.015601 0-447.301092 201.285491-447.301092 447.301092C0.798752 694.714509 202.084243 896 448.099844 896z m0-127.800312C272.374415 768.199688 128.599064 624.424337 128.599064 448.698908s143.775351-319.50078 319.50078-319.50078 319.50078 143.775351 319.50078 319.50078S623.825273 768.199688 448.099844 768.199688zM396.979719 640.399376c15.975039 0 28.75507-9.585023 35.145086-25.560062l99.045242-309.915757c6.390016-22.365055-9.585023-47.925117-35.145086-47.925117h-3.195008c-15.975039 0-31.950078 9.585023-35.145086 25.560062l-19.170046 70.290172H317.104524l-19.170047-70.290172c-6.390016-15.975039-19.170047-25.560062-38.340093-25.560062-25.560062 0-41.535101 25.560062-35.145086 47.925117l99.045242 309.915757c6.390016 15.975039 22.365055 25.560062 38.340093 25.560062h35.145086z m-19.170047-57.51014c-12.780031-41.535101-22.365055-86.265211-35.145085-124.605305l-12.780032-41.535101h92.655227l-12.780032 41.535101c-9.585023 38.340094-19.170047 83.070203-31.950078 124.605305zM636.605304 640.399376c19.170047 0 35.145086-15.975039 35.145086-35.145086v-309.915756c0-19.170047-15.975039-35.145086-35.145086-35.145086h-3.195008c-19.170047 0-35.145086 15.975039-35.145085 35.145086V605.25429c0 19.170047 15.975039 35.145086 35.145085 35.145086h3.195008z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="search" unicode="" d="M448.099844 896c246.015601 0 447.301092-201.285491 447.301092-447.301092 0-95.850234-28.75507-182.115445-79.875195-255.600624l182.115445-182.115445c31.950078-31.950078 31.950078-83.070203 0-115.02028s-83.070203-31.950078-115.020281 0L703.700468 78.078003c-73.485179-51.120125-159.75039-79.875195-255.600624-79.875195-246.015601 0-447.301092 201.285491-447.301092 447.301092C0.798752 694.714509 202.084243 896 448.099844 896z m0-127.800312C272.374415 768.199688 128.599064 624.424337 128.599064 448.698908s143.775351-319.50078 319.50078-319.50078 319.50078 143.775351 319.50078 319.50078S623.825273 768.199688 448.099844 768.199688z" horiz-adv-x="1024" />
|
||||
<glyph glyph-name="search" unicode="" d="M448 864c230.4 0 416-185.6 416-416 0-99.2-35.2-188.8-89.6-259.2l204.8-204.8c19.2-19.2 19.2-48 0-67.2-19.2-19.2-48-19.2-67.2 0l-204.8 204.8C636.8 64 547.2 32 448 32 217.6 32 32 217.6 32 448S217.6 864 448 864z m0-96C272 768 128 624 128 448s144-320 320-320 320 144 320 320S624 768 448 768z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="set-up" unicode="" d="M512 576c105.6 0 192-86.4 192-192s-86.4-192-192-192-192 86.4-192 192 86.4 192 192 192z m0-96c-54.4 0-96-41.6-96-96s41.6-96 96-96 96 41.6 96 96-41.6 96-96 96zM432 835.2c-9.6 19.2-32 28.8-54.4 22.4-83.2-19.2-153.6-60.8-214.4-112-12.8-16-16-35.2-9.6-54.4 6.4-12.8 9.6-25.6 9.6-41.6 0-51.2-44.8-92.8-92.8-92.8-19.2 0-38.4-12.8-44.8-32-19.2-41.6-25.6-92.8-25.6-144 0-35.2 3.2-67.2 9.6-99.2 3.2-22.4 25.6-38.4 51.2-35.2h9.6c54.4 0 92.8-41.6 92.8-92.8 0-22.4-9.6-41.6-22.4-57.6-16-16-12.8-41.6 3.2-60.8 60.8-60.8 137.6-105.6 224-131.2 22.4-6.4 51.2 6.4 57.6 28.8 12.8 38.4 48 64 89.6 64s76.8-25.6 89.6-64c6.4-22.4 32-35.2 57.6-28.8 86.4 25.6 163.2 70.4 224 131.2 16 16 16 41.6 3.2 60.8-12.8 16-22.4 35.2-22.4 57.6 0 51.2 44.8 92.8 92.8 92.8h9.6c22.4-3.2 48 12.8 51.2 35.2 6.4 32 9.6 67.2 9.6 99.2 0 51.2-6.4 102.4-22.4 150.4-6.4 19.2-22.4 32-44.8 32-54.4 0-92.8 41.6-92.8 92.8 0 16 3.2 28.8 9.6 41.6 3.2 16-3.2 38.4-16 51.2-60.8 54.4-134.4 92.8-211.2 115.2-19.2 0-44.8-9.6-54.4-28.8-16-28.8-48-51.2-83.2-51.2s-70.4 22.4-83.2 51.2zM262.4 656c0 16-3.2 32-6.4 44.8 35.2 28.8 76.8 48 118.4 67.2 32-41.6 83.2-67.2 140.8-67.2 57.6 0 108.8 25.6 140.8 67.2 44.8-12.8 83.2-38.4 118.4-67.2-3.2-12.8-6.4-32-6.4-44.8 0-86.4 64-166.4 150.4-179.2 6.4-32 9.6-64 9.6-96 0-16 0-32-3.2-48-89.6-9.6-160-86.4-160-179.2 0-28.8 6.4-57.6 19.2-80-35.2-32-76.8-57.6-118.4-73.6-32 51.2-89.6 83.2-153.6 83.2s-121.6-35.2-153.6-83.2c-44.8 16-83.2 41.6-118.4 73.6 6.4 25.6 16 51.2 16 80 0 89.6-67.2 169.6-160 179.2 3.2 12.8 3.2 32 3.2 44.8 0 32 3.2 64 9.6 96 89.6 16 153.6 89.6 153.6 182.4z" horiz-adv-x="1024" />
|
||||
|
||||
@@ -224,7 +234,7 @@
|
||||
|
||||
<glyph glyph-name="helpful" unicode="" d="M988.8 496c-32 44.8-83.2 67.2-137.6 70.4l-150.4 3.2c12.8 51.2 16 99.2 12.8 140.8-6.4 48-19.2 89.6-44.8 121.6-16 22.4-35.2 38.4-60.8 48-16 9.6-35.2 16-57.6 16-83.2 0-147.2-64-147.2-140.8 0-124.8-80-227.2-176-227.2H86.4c-48 0-86.4-38.4-86.4-89.6v-480C0-89.6 38.4-128 86.4-128h678.4c41.6 0 80 12.8 112 38.4 32 25.6 54.4 60.8 64 102.4L1020.8 352c9.6 51.2 0 102.4-32 144zM185.6-44.8h-96-3.2V438.4c0 3.2 3.2 3.2 3.2 3.2h96v-486.4z m755.2 416L860.8 32c-6.4-22.4-16-41.6-35.2-54.4-19.2-12.8-41.6-22.4-64-22.4H265.6V448c22.4 3.2 41.6 12.8 64 22.4 32 16 57.6 38.4 83.2 67.2 48 57.6 73.6 134.4 73.6 217.6 0 32 28.8 54.4 67.2 54.4 3.2 0 32 0 54.4-28.8 32-44.8 35.2-131.2 3.2-243.2-3.2-12.8 0-25.6 6.4-35.2 6.4-9.6 19.2-16 32-16l201.6-3.2c28.8 0 57.6-12.8 76.8-38.4 12.8-19.2 16-48 12.8-73.6z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="x-01" unicode="" d="M851.2 723.2c19.2-19.2 19.2-48 0-67.2L579.2 384l272-268.8c16-16 19.2-44.8 3.2-64l-3.2-3.2c-19.2-19.2-48-19.2-67.2 0L512 316.79999999999995l-272-272c-19.2-19.2-48-19.2-67.2 0-19.2 19.2-19.2 48 0 67.2l272 268.8-272 272c-16 19.2-16 48-3.2 64l3.2 3.2c19.2 19.2 51.2 19.2 70.4 3.2l272-272 268.8 272c16 16 48 16 67.2 0z" horiz-adv-x="1024" />
|
||||
<glyph glyph-name="x-01" unicode="" d="M880 752c19.2-19.2 19.2-54.4 0-73.6L585.6 384l294.4-294.4c19.2-19.2 19.2-48 3.2-70.4l-3.2-3.2c-19.2-19.2-54.4-19.2-73.6 0L512 310.4l-294.4-294.4c-19.2-19.2-54.4-19.2-73.6 0-19.2 19.2-19.2 54.4 0 73.6l294.4 294.4-294.4 294.4c-19.2 19.2-22.4 51.2-3.2 70.4l3.2 3.2c19.2 19.2 54.4 19.2 73.6 0l294.4-294.4 294.4 294.4c22.4 22.4 54.4 22.4 73.6 0z" horiz-adv-x="1024" />
|
||||
|
||||
<glyph glyph-name="desktop" unicode="" d="M928 832c35.2 0 64-28.8 64-64v-608c0-35.2-28.8-64-64-64H604.8c3.2-25.6 9.6-44.8 16-64h121.6c32 0 57.6-25.6 57.6-57.6s-25.6-57.6-57.6-57.6H281.6c-32 0-57.6 25.6-57.6 57.6S249.6 32 281.6 32h121.6c6.4 19.2 12.8 38.4 19.2 64H96c-35.2 0-64 28.8-64 64V768c0 35.2 28.8 64 64 64h832z m-51.2-112H147.2v-486.4h729.6V720z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 79 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @fileoverview MarkerClusterer标记聚合器用来解决加载大量点要素到地图上产生覆盖现象的问题，并提高性能。
|
||||
* 主入口类是<a href="symbols/BMapLib.MarkerClusterer.html">MarkerClusterer</a>，
|
||||
* @fileoverview MarkerCluster标记聚合器用来解决加载大量点要素到地图上产生覆盖现象的问题，并提高性能。
|
||||
* 主入口类是<a href="symbols/BMapLib.MarkerCluster.html">MarkerCluster</a>，
|
||||
* 基于Baidu Map API 1.2。
|
||||
*
|
||||
* @author Baidu Map Api Group
|
||||
@@ -15,11 +15,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 获取一个扩展的视图范围，把上下左右都扩大一样的像素值。
|
||||
* @param {Map} map BMap.Map的实例化对象
|
||||
* @param {BMap.Bounds} bounds BMap.Bounds的实例化对象
|
||||
* @param {Map} map BMapGL.Map的实例化对象
|
||||
* @param {BMapGL.Bounds} bounds BMapGL.Bounds的实例化对象
|
||||
* @param {Number} gridSize 要扩大的像素值
|
||||
*
|
||||
* @return {BMap.Bounds} 返回扩大后的视图范围。
|
||||
* @return {BMapGL.Bounds} 返回扩大后的视图范围。
|
||||
*/
|
||||
var getExtendedBounds = function(map, bounds, gridSize){
|
||||
bounds = cutBoundsInRange(bounds);
|
||||
@@ -31,21 +31,22 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
pixelSW.y += gridSize;
|
||||
var newNE = map.pixelToPoint(pixelNE);
|
||||
var newSW = map.pixelToPoint(pixelSW);
|
||||
return new BMap.Bounds(newSW, newNE);
|
||||
if (!newSW || !newNE) return null;
|
||||
return new BMapGL.Bounds(newSW, newNE);
|
||||
};
|
||||
|
||||
/**
|
||||
* 按照百度地图支持的世界范围对bounds进行边界处理
|
||||
* @param {BMap.Bounds} bounds BMap.Bounds的实例化对象
|
||||
* @param {BMapGL.Bounds} bounds BMapGL.Bounds的实例化对象
|
||||
*
|
||||
* @return {BMap.Bounds} 返回不越界的视图范围
|
||||
* @return {BMapGL.Bounds} 返回不越界的视图范围
|
||||
*/
|
||||
var cutBoundsInRange = function (bounds) {
|
||||
var maxX = getRange(bounds.getNorthEast().lng, -180, 180);
|
||||
var minX = getRange(bounds.getSouthWest().lng, -180, 180);
|
||||
var maxY = getRange(bounds.getNorthEast().lat, -74, 74);
|
||||
var minY = getRange(bounds.getSouthWest().lat, -74, 74);
|
||||
return new BMap.Bounds(new BMap.Point(minX, minY), new BMap.Point(maxX, maxY));
|
||||
var maxY = getRange(bounds.getNorthEast().lat, -90, 90);
|
||||
var minY = getRange(bounds.getSouthWest().lat, -90, 90);
|
||||
return new BMapGL.Bounds(new BMapGL.Point(minX, minY), new BMapGL.Point(maxX, maxY));
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -97,11 +98,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
};
|
||||
|
||||
/**
|
||||
*@exports MarkerClusterer as BMapLib.MarkerClusterer
|
||||
*@exports MarkerCluster as BMapLib.MarkerCluster
|
||||
*/
|
||||
var MarkerClusterer =
|
||||
var MarkerCluster =
|
||||
/**
|
||||
* MarkerClusterer
|
||||
* MarkerCluster
|
||||
* @class 用来解决加载大量点要素到地图上产生覆盖现象的问题，并提高性能
|
||||
* @constructor
|
||||
* @param {Map} map 地图的一个实例。
|
||||
@@ -110,10 +111,10 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* girdSize {Number} 聚合计算时网格的像素大小，默认60<br />
|
||||
* maxZoom {Number} 最大的聚合级别，大于该级别就不进行相应的聚合<br />
|
||||
* minClusterSize {Number} 最小的聚合数量，小于该数量的不能成为一个聚合，默认为2<br />
|
||||
* isAverangeCenter {Boolean} 聚合点的落脚位置是否是所有聚合在内点的平均值，默认为否，落脚在聚合内的第一个点<br />
|
||||
* isAvgCenter {Boolean} 聚合点的落脚位置是否是所有聚合在内点的平均值，默认为否，落脚在聚合内的第一个点<br />
|
||||
* styles {Array<IconStyle>} 自定义聚合后的图标风格，请参考TextIconOverlay类<br />
|
||||
*/
|
||||
BMapLib.MarkerClusterer = function(map, options){
|
||||
BMapLib.MarkerCluster = function(map, options){
|
||||
if (!map){
|
||||
return;
|
||||
}
|
||||
@@ -123,13 +124,14 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
var opts = options || {};
|
||||
this._gridSize = opts["gridSize"] || 60;
|
||||
this._maxZoom = opts["maxZoom"] || 18;
|
||||
this._maxZoom = opts["maxZoom"] || 21;
|
||||
this._minClusterSize = opts["minClusterSize"] || 2;
|
||||
this._isAverageCenter = false;
|
||||
if (opts['isAverageCenter'] != undefined) {
|
||||
this._isAverageCenter = opts['isAverageCenter'];
|
||||
}
|
||||
this._styles = opts["styles"] || [];
|
||||
this._callback = opts["callback"] || function(){};
|
||||
|
||||
var that = this;
|
||||
this._map.addEventListener("zoomend",function(){
|
||||
@@ -140,8 +142,8 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
// that._redraw();
|
||||
// });
|
||||
|
||||
var mkrs = opts["markers"];
|
||||
isArray(mkrs) && this.addMarkers(mkrs);
|
||||
var markers = opts["markers"];
|
||||
isArray(markers) && this.addMarkers(markers);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -150,7 +152,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
*
|
||||
* @return 无返回值。
|
||||
*/
|
||||
MarkerClusterer.prototype.addMarkers = function(markers){
|
||||
MarkerCluster.prototype.addMarkers = function(markers){
|
||||
for(var i = 0, len = markers.length; i <len ; i++){
|
||||
this._pushMarkerTo(markers[i]);
|
||||
}
|
||||
@@ -159,11 +161,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 把一个标记添加到要聚合的标记数组中
|
||||
* @param {BMap.Marker} marker 要添加的标记
|
||||
* @param {BMapGL.Marker} marker 要添加的标记
|
||||
*
|
||||
* @return 无返回值。
|
||||
*/
|
||||
MarkerClusterer.prototype._pushMarkerTo = function(marker){
|
||||
MarkerCluster.prototype._pushMarkerTo = function(marker){
|
||||
var index = indexOf(marker, this._markers);
|
||||
if(index === -1){
|
||||
marker.isInCluster = false;
|
||||
@@ -173,10 +175,10 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 添加一个聚合的标记。
|
||||
* @param {BMap.Marker} marker 要聚合的单个标记。
|
||||
* @param {BMapGL.Marker} marker 要聚合的单个标记。
|
||||
* @return 无返回值。
|
||||
*/
|
||||
MarkerClusterer.prototype.addMarker = function(marker) {
|
||||
MarkerCluster.prototype.addMarker = function(marker) {
|
||||
this._pushMarkerTo(marker);
|
||||
this._createClusters();
|
||||
};
|
||||
@@ -185,11 +187,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 根据所给定的标记，创建聚合点，并且遍历所有聚合点
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype._createClusters = function(){
|
||||
MarkerCluster.prototype._createClusters = function(){
|
||||
var mapBounds = this._map.getBounds();
|
||||
var extendedBounds = getExtendedBounds(this._map, mapBounds, this._gridSize);
|
||||
for(var i = 0, marker; marker = this._markers[i]; i++){
|
||||
if(!marker.isInCluster && extendedBounds.containsPoint(marker.getPosition()) ){
|
||||
if(!marker.isInCluster && extendedBounds && extendedBounds.containsPoint(marker._position) ){
|
||||
this._addToClosestCluster(marker);
|
||||
}
|
||||
}
|
||||
@@ -204,11 +206,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 根据标记的位置，把它添加到最近的聚合中
|
||||
* @param {BMap.Marker} marker 要进行聚合的单个标记
|
||||
* @param {BMapGL.Marker} marker 要进行聚合的单个标记
|
||||
*
|
||||
* @return 无返回值。
|
||||
*/
|
||||
MarkerClusterer.prototype._addToClosestCluster = function (marker){
|
||||
MarkerCluster.prototype._addToClosestCluster = function (marker){
|
||||
var distance = 4000000;
|
||||
var clusterToAddTo = null;
|
||||
var position = marker.getPosition();
|
||||
@@ -236,7 +238,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 清除上一次的聚合的结果
|
||||
* @return 无返回值。
|
||||
*/
|
||||
MarkerClusterer.prototype._clearLastClusters = function(){
|
||||
MarkerCluster.prototype._clearLastClusters = function(){
|
||||
for(var i = 0, cluster; cluster = this._clusters[i]; i++){
|
||||
cluster.remove();
|
||||
}
|
||||
@@ -248,7 +250,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 清除某个聚合中的所有标记
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype._removeMarkersFromCluster = function(){
|
||||
MarkerCluster.prototype._removeMarkersFromCluster = function(){
|
||||
for(var i = 0, marker; marker = this._markers[i]; i++){
|
||||
marker.isInCluster = false;
|
||||
}
|
||||
@@ -258,7 +260,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 把所有的标记从地图上清除
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype._removeMarkersFromMap = function(){
|
||||
MarkerCluster.prototype._removeMarkersFromMap = function(){
|
||||
for(var i = 0, marker; marker = this._markers[i]; i++){
|
||||
marker.isInCluster = false;
|
||||
this._map.removeOverlay(marker);
|
||||
@@ -267,11 +269,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 删除单个标记
|
||||
* @param {BMap.Marker} marker 需要被删除的marker
|
||||
* @param {BMapGL.Marker} marker 需要被删除的marker
|
||||
*
|
||||
* @return {Boolean} 删除成功返回true，否则返回false
|
||||
*/
|
||||
MarkerClusterer.prototype._removeMarker = function(marker) {
|
||||
MarkerCluster.prototype._removeMarker = function(marker) {
|
||||
var index = indexOf(marker, this._markers);
|
||||
if (index === -1) {
|
||||
return false;
|
||||
@@ -283,11 +285,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 删除单个标记
|
||||
* @param {BMap.Marker} marker 需要被删除的marker
|
||||
* @param {BMapGL.Marker} marker 需要被删除的marker
|
||||
*
|
||||
* @return {Boolean} 删除成功返回true，否则返回false
|
||||
*/
|
||||
MarkerClusterer.prototype.removeMarker = function(marker) {
|
||||
MarkerCluster.prototype.removeMarker = function(marker) {
|
||||
var success = this._removeMarker(marker);
|
||||
if (success) {
|
||||
this._clearLastClusters();
|
||||
@@ -298,11 +300,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 删除一组标记
|
||||
* @param {Array<BMap.Marker>} markers 需要被删除的marker数组
|
||||
* @param {Array<BMapGL.Marker>} markers 需要被删除的marker数组
|
||||
*
|
||||
* @return {Boolean} 删除成功返回true，否则返回false
|
||||
*/
|
||||
MarkerClusterer.prototype.removeMarkers = function(markers) {
|
||||
MarkerCluster.prototype.removeMarkers = function(markers) {
|
||||
var success = false;
|
||||
for (var i = 0; i < markers.length; i++) {
|
||||
var r = this._removeMarker(markers[i]);
|
||||
@@ -320,7 +322,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 从地图上彻底清除所有的标记
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype.clearMarkers = function() {
|
||||
MarkerCluster.prototype.clearMarkers = function() {
|
||||
this._clearLastClusters();
|
||||
this._removeMarkersFromMap();
|
||||
this._markers = [];
|
||||
@@ -330,7 +332,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 重新生成，比如改变了属性等
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype._redraw = function () {
|
||||
MarkerCluster.prototype._redraw = function () {
|
||||
this._clearLastClusters();
|
||||
this._createClusters();
|
||||
};
|
||||
@@ -339,7 +341,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取网格大小
|
||||
* @return {Number} 网格大小
|
||||
*/
|
||||
MarkerClusterer.prototype.getGridSize = function() {
|
||||
MarkerCluster.prototype.getGridSize = function() {
|
||||
return this._gridSize;
|
||||
};
|
||||
|
||||
@@ -348,7 +350,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @param {Number} size 网格大小
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype.setGridSize = function(size) {
|
||||
MarkerCluster.prototype.setGridSize = function(size) {
|
||||
this._gridSize = size;
|
||||
this._redraw();
|
||||
};
|
||||
@@ -357,7 +359,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取聚合的最大缩放级别。
|
||||
* @return {Number} 聚合的最大缩放级别。
|
||||
*/
|
||||
MarkerClusterer.prototype.getMaxZoom = function() {
|
||||
MarkerCluster.prototype.getMaxZoom = function() {
|
||||
return this._maxZoom;
|
||||
};
|
||||
|
||||
@@ -366,7 +368,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @param {Number} maxZoom 聚合的最大缩放级别
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype.setMaxZoom = function(maxZoom) {
|
||||
MarkerCluster.prototype.setMaxZoom = function(maxZoom) {
|
||||
this._maxZoom = maxZoom;
|
||||
this._redraw();
|
||||
};
|
||||
@@ -375,7 +377,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取聚合的样式风格集合
|
||||
* @return {Array<IconStyle>} 聚合的样式风格集合
|
||||
*/
|
||||
MarkerClusterer.prototype.getStyles = function() {
|
||||
MarkerCluster.prototype.getStyles = function() {
|
||||
return this._styles;
|
||||
};
|
||||
|
||||
@@ -384,7 +386,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @param {Array<IconStyle>} styles 样式风格数组
|
||||
* @return 无返回值
|
||||
*/
|
||||
MarkerClusterer.prototype.setStyles = function(styles) {
|
||||
MarkerCluster.prototype.setStyles = function(styles) {
|
||||
this._styles = styles;
|
||||
this._redraw();
|
||||
};
|
||||
@@ -393,7 +395,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取单个聚合的最小数量。
|
||||
* @return {Number} 单个聚合的最小数量。
|
||||
*/
|
||||
MarkerClusterer.prototype.getMinClusterSize = function() {
|
||||
MarkerCluster.prototype.getMinClusterSize = function() {
|
||||
return this._minClusterSize;
|
||||
};
|
||||
|
||||
@@ -402,7 +404,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @param {Number} size 单个聚合的最小数量。
|
||||
* @return 无返回值。
|
||||
*/
|
||||
MarkerClusterer.prototype.setMinClusterSize = function(size) {
|
||||
MarkerCluster.prototype.setMinClusterSize = function(size) {
|
||||
this._minClusterSize = size;
|
||||
this._redraw();
|
||||
};
|
||||
@@ -411,7 +413,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取单个聚合的落脚点是否是聚合内所有标记的平均中心。
|
||||
* @return {Boolean} true或false。
|
||||
*/
|
||||
MarkerClusterer.prototype.isAverageCenter = function() {
|
||||
MarkerCluster.prototype.isAverageCenter = function() {
|
||||
return this._isAverageCenter;
|
||||
};
|
||||
|
||||
@@ -419,7 +421,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取聚合的Map实例。
|
||||
* @return {Map} Map的示例。
|
||||
*/
|
||||
MarkerClusterer.prototype.getMap = function() {
|
||||
MarkerCluster.prototype.getMap = function() {
|
||||
return this._map;
|
||||
};
|
||||
|
||||
@@ -427,7 +429,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取所有的标记数组。
|
||||
* @return {Array<Marker>} 标记数组。
|
||||
*/
|
||||
MarkerClusterer.prototype.getMarkers = function() {
|
||||
MarkerCluster.prototype.getMarkers = function() {
|
||||
return this._markers;
|
||||
};
|
||||
|
||||
@@ -435,7 +437,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* 获取聚合的总数量。
|
||||
* @return {Number} 聚合的总数量。
|
||||
*/
|
||||
MarkerClusterer.prototype.getClustersCount = function() {
|
||||
MarkerCluster.prototype.getClustersCount = function() {
|
||||
var count = 0;
|
||||
for(var i = 0, cluster; cluster = this._clusters[i]; i++){
|
||||
cluster.isReal() && count++;
|
||||
@@ -443,24 +445,28 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
return count;
|
||||
};
|
||||
|
||||
MarkerCluster.prototype.getCallback = function() {
|
||||
return this._callback;
|
||||
}
|
||||
|
||||
/**
|
||||
* @ignore
|
||||
* Cluster
|
||||
* @class 表示一个聚合对象，该聚合，包含有N个标记，这N个标记组成的范围，并有予以显示在Map上的TextIconOverlay等。
|
||||
* @constructor
|
||||
* @param {MarkerClusterer} markerClusterer 一个标记聚合器示例。
|
||||
* @param {MarkerCluster} markerCluster 一个标记聚合器示例。
|
||||
*/
|
||||
function Cluster(markerClusterer){
|
||||
this._markerClusterer = markerClusterer;
|
||||
this._map = markerClusterer.getMap();
|
||||
this._minClusterSize = markerClusterer.getMinClusterSize();
|
||||
this._isAverageCenter = markerClusterer.isAverageCenter();
|
||||
function Cluster(markerCluster){
|
||||
this._markerCluster = markerCluster;
|
||||
this._map = markerCluster.getMap();
|
||||
this._minClusterSize = markerCluster.getMinClusterSize();
|
||||
this._isAverageCenter = markerCluster.isAverageCenter();
|
||||
this._center = null;//落脚位置
|
||||
this._markers = [];//这个Cluster中所包含的markers
|
||||
this._gridBounds = null;//以中心点为准，向四边扩大gridSize个像素的范围，也即网格范围
|
||||
this._isReal = false; //真的是个聚合
|
||||
|
||||
this._clusterMarker = new BMapLib.TextIconOverlay(this._center, this._markers.length, {"styles":this._markerClusterer.getStyles()});
|
||||
this._clusterMarker = new BMapLib.TextIconOverlay(this._center, this._markers.length, {"styles":this._markerCluster.getStyles()});
|
||||
//this._map.addOverlay(this._clusterMarker);
|
||||
}
|
||||
|
||||
@@ -482,7 +488,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
var l = this._markers.length + 1;
|
||||
var lat = (this._center.lat * (l - 1) + marker.getPosition().lat) / l;
|
||||
var lng = (this._center.lng * (l - 1) + marker.getPosition().lng) / l;
|
||||
this._center = new BMap.Point(lng, lat);
|
||||
this._center = new BMapGL.Point(lng, lat);
|
||||
this.updateGridBounds();
|
||||
}//计算新的Center
|
||||
}
|
||||
@@ -545,8 +551,8 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @return 无返回值。
|
||||
*/
|
||||
Cluster.prototype.updateGridBounds = function() {
|
||||
var bounds = new BMap.Bounds(this._center, this._center);
|
||||
this._gridBounds = getExtendedBounds(this._map, bounds, this._markerClusterer.getGridSize());
|
||||
var bounds = new BMapGL.Bounds(this._center, this._center);
|
||||
this._gridBounds = getExtendedBounds(this._map, bounds, this._markerCluster.getGridSize());
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -554,7 +560,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @return 无返回值。
|
||||
*/
|
||||
Cluster.prototype.updateClusterMarker = function () {
|
||||
if (this._map.getZoom() > this._markerClusterer.getMaxZoom()) {
|
||||
if (this._map.getZoom() > this._markerCluster.getMaxZoom()) {
|
||||
this._clusterMarker && this._map.removeOverlay(this._clusterMarker);
|
||||
for (var i = 0, marker; marker = this._markers[i]; i++) {
|
||||
this._map.addOverlay(marker);
|
||||
@@ -575,10 +581,29 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
var thatMap = this._map;
|
||||
var thatBounds = this.getBounds();
|
||||
this._clusterMarker.addEventListener("click", function(event){
|
||||
thatMap.setViewport(thatBounds);
|
||||
let clickTimeout;
|
||||
this._clusterMarker.addEventListener("click", (event) => {
|
||||
if (clickTimeout) {
|
||||
clearTimeout(clickTimeout);
|
||||
clickTimeout = null;
|
||||
return;
|
||||
}
|
||||
clickTimeout = setTimeout(() => {
|
||||
if (this._markerCluster && typeof this._markerCluster.getCallback() === 'function') {
|
||||
const markers = this._markers;
|
||||
this._markerCluster.getCallback()(event, markers);
|
||||
}
|
||||
clickTimeout = null;
|
||||
}, 300); // Delay to differentiate between single and double click
|
||||
});
|
||||
|
||||
this._clusterMarker.addEventListener("dblclick", (event) => {
|
||||
if (clickTimeout) {
|
||||
clearTimeout(clickTimeout);
|
||||
clickTimeout = null;
|
||||
}
|
||||
// Do nothing on double click
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -596,10 +621,10 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 获取该聚合所包含的所有标记的最小外接矩形的范围。
|
||||
* @return {BMap.Bounds} 计算出的范围。
|
||||
* @return {BMapGL.Bounds} 计算出的范围。
|
||||
*/
|
||||
Cluster.prototype.getBounds = function() {
|
||||
var bounds = new BMap.Bounds(this._center,this._center);
|
||||
var bounds = new BMapGL.Bounds(this._center, this._center);
|
||||
for (var i = 0, marker; marker = this._markers[i]; i++) {
|
||||
bounds.extend(marker.getPosition());
|
||||
}
|
||||
@@ -608,7 +633,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
/**
|
||||
* 获取该聚合的落脚点。
|
||||
* @return {BMap.Point} 该聚合的落脚点。
|
||||
* @return {BMapGL.Point} 该聚合的落脚点。
|
||||
*/
|
||||
Cluster.prototype.getCenter = function() {
|
||||
return this._center;
|
||||
@@ -211,7 +211,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @returns {string} 驼峰化处理后的字符串
|
||||
*/
|
||||
baidu.string.toCamelCase = function (source) {
|
||||
//提前判断，提高getStyle等的效率 thanks xianwei
|
||||
//提前判断，提高getStyle等的效率
|
||||
if (source.indexOf('-') < 0 && source.indexOf('_') < 0) {
|
||||
return source;
|
||||
}
|
||||
@@ -649,7 +649,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
* @grammar obj.dispatchEvent(event, options)
|
||||
* @param {baidu.lang.Event|String} event Event对象，或事件名称(1.1.1起支持)
|
||||
* @param {Object} options 扩展参数,所含属性键值会扩展到Event对象上(1.2起支持)
|
||||
* @remark 处理会调用通过addEventListenr绑定的自定义事件回调函数之外，还会调用直接绑定到对象上面的自定义事件。例如：<br>
|
||||
* @remark 处理会调用通过addEventListener绑定的自定义事件回调函数之外，还会调用直接绑定到对象上面的自定义事件。例如：<br>
|
||||
myobj.onMyEvent = function(){}<br>
|
||||
myobj.addEventListener("onMyEvent", function(){});
|
||||
*/
|
||||
@@ -754,27 +754,28 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
(!this._styles.length) && this._setupDefaultStyles();
|
||||
};
|
||||
|
||||
T.lang.inherits(TextIconOverlay, BMap.Overlay, "TextIconOverlay");
|
||||
T.lang.inherits(TextIconOverlay, BMapGL.Overlay, "TextIconOverlay");
|
||||
|
||||
TextIconOverlay.prototype._setupDefaultStyles = function(){
|
||||
var sizes = [53, 56, 66, 78, 90];
|
||||
for(var i = 0, size; size = sizes[i]; i++){
|
||||
this._styles.push({
|
||||
url:_IMAGE_PATH + i + '.' + _IMAGE_EXTENSION,
|
||||
size: new BMap.Size(size, size)
|
||||
size: new BMapGL.Size(size, size)
|
||||
});
|
||||
}//for循环的简洁写法
|
||||
};
|
||||
|
||||
/**
|
||||
*继承Overlay的intialize方法，自定义覆盖物时必须。
|
||||
*@param {Map} map BMap.Map的实例化对象。
|
||||
*继承Overlay的initialize方法，自定义覆盖物时必须。
|
||||
*@param {Map} map BMapGL.Map的实例化对象。
|
||||
*@return {HTMLElement} 返回覆盖物对应的HTML元素。
|
||||
*/
|
||||
TextIconOverlay.prototype.initialize = function(map){
|
||||
this._map = map;
|
||||
|
||||
this._domElement = document.createElement('div');
|
||||
this._domElement = document.createElement('div');
|
||||
this._domElement.className = 'custom-image-overlay';
|
||||
// this._updateCss();
|
||||
// this._updateText();
|
||||
this._updatePosition();
|
||||
@@ -859,21 +860,20 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
var style = this.getStyleByText(this._text, this._styles);
|
||||
var newStyle = {
|
||||
url: imageUrl,
|
||||
size: {width: 72, height: 72}
|
||||
size: { width: 86, height: 86 }
|
||||
}
|
||||
if (imageUrl) {
|
||||
style = Object.assign(style, {url: imageUrl, size: {width: 72, height: 72}})
|
||||
style = Object.assign(style, { url: imageUrl, size: { width: 86, height: 86 } })
|
||||
}
|
||||
|
||||
const customImageNumber = `<span class="custom-image-number">${this._text}</span>`;
|
||||
const customImageNumber = `<span class="custom-image-number">${this._text < 1000 ? this._text : '1k+'}</span>`;
|
||||
this._domElement.style.cssText = this.buildImageCssText(newStyle);
|
||||
const imageElement = `<img src=${imageUrl} width="72" height="72" />`
|
||||
const imageElement = `<img src=${imageUrl} width="80" height="80" />`
|
||||
const htmlString = `
|
||||
<div class="custom-image-container">
|
||||
${this._text > 1 ? customImageNumber : ''}
|
||||
${imageUrl ? imageElement : '<div class="empty-custom-image-wrapper"></div>'}
|
||||
<i class='plugin-label-arrow dtable-font dtable-icon-drop-down'></i>
|
||||
</div>
|
||||
<div class="custom-image-container">
|
||||
${this._text > 1 ? customImageNumber : ''}
|
||||
${imageUrl ? imageElement : '<div class="empty-custom-image-wrapper"></div>'}
|
||||
</div>
|
||||
`
|
||||
const labelDocument = new DOMParser().parseFromString(htmlString, 'text/html');
|
||||
const label = labelDocument.body.firstElementChild;
|
||||
@@ -887,14 +887,14 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
var textColor = style['textColor'] || 'black';
|
||||
var textSize = style['textSize'] || 10;
|
||||
|
||||
var csstext = [];
|
||||
var cssText = [];
|
||||
|
||||
csstext.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
|
||||
csstext.push('width:' + size.width + 'px; text-align:center;');
|
||||
cssText.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
|
||||
cssText.push('width:' + size.width + 'px; text-align:center;');
|
||||
|
||||
csstext.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
|
||||
cssText.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
|
||||
textSize + 'px; font-family:Arial,sans-serif; font-weight:bold');
|
||||
return csstext.join('');
|
||||
return cssText.join('');
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -936,34 +936,34 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
var textColor = style['textColor'] || 'black';
|
||||
var textSize = style['textSize'] || 10;
|
||||
|
||||
var csstext = [];
|
||||
var cssText = [];
|
||||
if (T.browser["ie"] < 7) {
|
||||
csstext.push('filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(' +
|
||||
cssText.push('filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(' +
|
||||
'sizingMethod=scale,src="' + url + '");');
|
||||
} else {
|
||||
csstext.push('background-image:url(' + url + ');');
|
||||
cssText.push('background-image:url(' + url + ');');
|
||||
var backgroundPosition = '0 0';
|
||||
(offset instanceof BMap.Size) && (backgroundPosition = offset.width + 'px' + ' ' + offset.height + 'px');
|
||||
csstext.push('background-position:' + backgroundPosition + ';');
|
||||
(offset instanceof BMapGL.Size) && (backgroundPosition = offset.width + 'px' + ' ' + offset.height + 'px');
|
||||
cssText.push('background-position:' + backgroundPosition + ';');
|
||||
}
|
||||
|
||||
if (size instanceof BMap.Size){
|
||||
if (anchor instanceof BMap.Size) {
|
||||
if (size instanceof BMapGL.Size){
|
||||
if (anchor instanceof BMapGL.Size) {
|
||||
if (anchor.height > 0 && anchor.height < size.height) {
|
||||
csstext.push('height:' + (size.height - anchor.height) + 'px; padding-top:' + anchor.height + 'px;');
|
||||
cssText.push('height:' + (size.height - anchor.height) + 'px; padding-top:' + anchor.height + 'px;');
|
||||
}
|
||||
if(anchor.width > 0 && anchor.width < size.width){
|
||||
csstext.push('width:' + (size.width - anchor.width) + 'px; padding-left:' + anchor.width + 'px;');
|
||||
cssText.push('width:' + (size.width - anchor.width) + 'px; padding-left:' + anchor.width + 'px;');
|
||||
}
|
||||
} else {
|
||||
csstext.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
|
||||
csstext.push('width:' + size.width + 'px; text-align:center;');
|
||||
cssText.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
|
||||
cssText.push('width:' + size.width + 'px; text-align:center;');
|
||||
}
|
||||
}
|
||||
|
||||
csstext.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
|
||||
cssText.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
|
||||
textSize + 'px; font-family:Arial,sans-serif; font-weight:bold');
|
||||
return csstext.join('');
|
||||
return cssText.join('');
|
||||
};
|
||||
|
||||
|
||||
@@ -998,9 +998,9 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
* <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
|
||||
|
||||
* <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
|
||||
* <br />"<b>point</b> : {BMapGL.Point} 最新添加上的节点BMap.Point对象
|
||||
|
||||
* <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
|
||||
* <br />"<b>pixel</b>：{BMapGL.pixel} 最新添加上的节点BMap.Pixel对象
|
||||
|
||||
*
|
||||
|
||||
@@ -1024,9 +1024,9 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
|
||||
* <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
|
||||
|
||||
* <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
|
||||
* <br />"<b>point</b> : {BMapGL.Point} 最新添加上的节点BMap.Point对象
|
||||
|
||||
* <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
|
||||
* <br />"<b>pixel</b>：{BMapGL.pixel} 最新添加上的节点BMap.Pixel对象
|
||||
|
||||
*
|
||||
|
||||
@@ -1057,7 +1057,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
var y = e.clientY || e.pageY;
|
||||
if (e && be && x && y && elem){
|
||||
var offset = T.dom.getPosition(map.getContainer());
|
||||
be.pixel = new BMap.Pixel(x - offset.left, y - offset.top);
|
||||
be.pixel = new BMapGL.Pixel(x - offset.left, y - offset.top);
|
||||
be.point = map.pixelToPoint(be.pixel);
|
||||
}
|
||||
return be;
|
||||
@@ -1074,4 +1074,4 @@ var BMapLib = window.BMapLib = BMapLib || {};
|
||||
});
|
||||
};
|
||||
|
||||
})();
|
||||
})();
|
||||
|
||||
Reference in New Issue
Block a user