Skip to content

Commit 434a4da

Browse files
authored
Merge pull request projecthorus#90 from LukePrior/testing
cluster icons
2 parents 3273dc2 + 0271913 commit 434a4da

File tree

6 files changed

+105
-512
lines changed

6 files changed

+105
-512
lines changed

css/MarkerCluster.Default.css

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
.marker-cluster-launch {
2+
background-color: rgba(0, 0, 0, 0.1);
3+
border-style: solid;
4+
border-width: 3px;
5+
border-color: black;
6+
}
7+
.marker-cluster-station {
8+
background-color: rgba(0, 128, 0, 0.1);
9+
border-style: solid;
10+
border-width: 3px;
11+
border-color: rgb(0, 128, 0);
12+
}
13+
14+
/* IE 6-8 fallback colors */
15+
.leaflet-oldie .marker-cluster-launch {
16+
background-color: rgb(0, 0, 0);
17+
}
18+
.leaflet-oldie .marker-cluster-station {
19+
background-color: rgb(0, 128, 0);
20+
}
21+
22+
.marker-cluster {
23+
background-clip: padding-box;
24+
border-radius: 20px;
25+
}
26+
.marker-cluster-launch div {
27+
width: 30px;
28+
height: 30px;
29+
margin-left: 5px;
30+
margin-top: 5px;
31+
color: black;
32+
33+
text-align: center;
34+
border-radius: 15px;
35+
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
36+
}
37+
.marker-cluster-station div {
38+
width: 30px;
39+
height: 30px;
40+
margin-left: 5px;
41+
margin-top: 5px;
42+
color: black;
43+
44+
text-align: center;
45+
border-radius: 15px;
46+
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
47+
}
48+
.marker-cluster span {
49+
line-height: 30px;
50+
}

css/MarkerCluster.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
2+
-webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
3+
-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
4+
-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
5+
transition: transform 0.3s ease-out, opacity 0.3s ease-in;
6+
}
7+
8+
.leaflet-cluster-spider-leg {
9+
/* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */
10+
-webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in;
11+
-moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in;
12+
-o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in;
13+
transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in;
14+
}

index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<link rel="stylesheet" href="css/mobile.css"/>
2323
<link rel="stylesheet" href="css/leaflet.css" />
2424
<link rel="stylesheet" href="css/leaflet.fullscreen.css" />
25+
<link rel="stylesheet" href="css/MarkerCluster.css" />
26+
<link rel="stylesheet" href="css/MarkerCluster.Default.css" />
2527
</head>
2628
<body>
2729

@@ -365,6 +367,7 @@ <h3>Report Recovery</h3>
365367
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
366368
<script type="text/javascript" language="javascript" src="js/leaflet.js"></script>
367369
<script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js"></script>
370+
<script type="text/javascript" language="javascript" src="js/leaflet.markercluster.js"></script>
368371
<script type="text/javascript" language="javascript" src="js/L.Terminator.js"></script>
369372
<script type="text/javascript" language="javascript" src="js/paho-mqtt.js"></script>
370373
<script src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js" async defer></script>
@@ -377,9 +380,6 @@ <h3>Report Recovery</h3>
377380
-->
378381
<script type="text/javascript" language="javascript" src="js/mobile.js"></script>
379382
<script type="text/javascript" language="javascript" src="js/rbush.js"></script>
380-
<script>var module = {};</script>
381-
<script src="js/leaflet.canvas-markers.js"></script>
382-
<script>module.exports(L);</script>
383383
<script type="text/javascript" language="javascript" src="js/pwa.js"></script>
384384

385385
</body>

0 commit comments

Comments
 (0)