parent
9caa02c2b4
commit
70e7d288f7
|
|
@ -1776,7 +1776,7 @@ function popup(){
|
||||||
|
|
||||||
var clusterer = null;
|
var clusterer = null;
|
||||||
var clusterInfoGlobal = null;
|
var clusterInfoGlobal = null;
|
||||||
var typeOrder = { "#FF0000": 1, "#800080": 2, "#FF80FF": 3, "#7B7A7A": 4 }; // Request > Scheduled > Normal > Finished
|
var typeOrder = { "#FF0000": 1, "#800080": 2, "#FF80FF": 3, "#FFFDD5": 4, "#7B7A7A": 5 }; // Request > Scheduled > Normal > Normal(driver add) > Finished
|
||||||
|
|
||||||
var rstInqPoint = function(json) {
|
var rstInqPoint = function(json) {
|
||||||
if (clusterInfoGlobal) {
|
if (clusterInfoGlobal) {
|
||||||
|
|
@ -1945,6 +1945,7 @@ function popup(){
|
||||||
|
|
||||||
const topColor = markers[0]?.property?.color || "#4285f4";
|
const topColor = markers[0]?.property?.color || "#4285f4";
|
||||||
const size = Math.min(50, 30 + Math.log(count) * 10);
|
const size = Math.min(50, 30 + Math.log(count) * 10);
|
||||||
|
const textColor = (String(topColor).toUpperCase() === "#FFFDD5") ? "#000" : "#fff";
|
||||||
|
|
||||||
return new google.maps.Marker({
|
return new google.maps.Marker({
|
||||||
position,
|
position,
|
||||||
|
|
@ -1956,7 +1957,7 @@ function popup(){
|
||||||
<circle cx="15" cy="15" r="13"
|
<circle cx="15" cy="15" r="13"
|
||||||
fill="${topColor}" />
|
fill="${topColor}" />
|
||||||
<text x="15" y="20" text-anchor="middle"
|
<text x="15" y="20" text-anchor="middle"
|
||||||
font-size="12" fill="#fff">${count}</text>
|
font-size="12" fill="${textColor}">${count}</text>
|
||||||
</svg>
|
</svg>
|
||||||
`),
|
`),
|
||||||
scaledSize: new google.maps.Size(30, 30),
|
scaledSize: new google.maps.Size(30, 30),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue