Merge Clustering

commit 866d551
Author: Joe Hawes <[email protected]>
Date:   Sat Dec 16 16:59:18 2023 -0800

    Update version number

commit 73c43a3
Author: Joe Hawes <[email protected]>
Date:   Sat Dec 16 16:37:06 2023 -0800

    Don't animate clustering

commit 19d39ac
Author: Joe Hawes <>
Date:   Sat Dec 16 15:36:47 2023 -0800

    Clustering working well.

commit 0f743bc
Author: Joe Hawes <>
Date:   Sat Dec 16 14:42:33 2023 -0800

    3

commit 16daef8
Author: Joe Hawes <>
Date:   Sat Dec 16 13:51:50 2023 -0800

    Settings & Shortcode option working

commit 9faa62c
Author: Joe Hawes <>
Date:   Sat Dec 16 13:15:58 2023 -0800

     2

commit 9e887df
Author: Joe Hawes <>
Date:   Sat Dec 16 12:04:13 2023 -0800

    Clustering basics

commit bee1ebb
Author: Joe Hawes <>
Date:   Sat Dec 16 11:37:57 2023 -0800

    Clustering Groups working(!)

commit 4aa6450
Merge: 0554f6f 08de758
Author: Joe Hawes <>
Date:   Sat Dec 16 09:47:58 2023 -0800

    Merge branch '0_9_30_staging' into cluster

    # Conflicts:
    #	assets/dist/waymark-js/js/waymark-js.js
    #	assets/dist/waymark-js/js/waymark-js.min.js
    #	languages/waymark.pot
    #	waymark-js/dist/js/waymark-js.js
    #	waymark-js/dist/js/waymark-js.min.js
    #	waymark-js/src/js/Waymark_Map.js
    #	waymark-js/src/js/Waymark_Map_Viewer.js

commit 08de758
Author: Joe Hawes <>
Date:   Sat Dec 16 09:44:22 2023 -0800

    Prettier

commit 0554f6f
Merge: 09b0bdb 6e4f240
Author: Joe Hawes <>
Date:   Thu Nov 2 06:01:17 2023 -0700

    Merge branch 'cluster_merge' into cluster

commit 6e4f240
Author: Joe Hawes <>
Date:   Wed Nov 1 12:04:39 2023 -0700

    Only show count if more than "1".

commit 00e228a
Merge: 09b0bdb a6c5ed0
Author: Joe Hawes <>
Date:   Wed Nov 1 10:51:45 2023 -0700

    Merge branch 'master' into cluster_merge

    # Conflicts:
    #	assets/dist/waymark-js/js/waymark-js.min.js
    #	languages/waymark.pot
    #	waymark-js/dist/js/waymark-js.min.js

commit 09b0bdb
Author: Joe Hawes <>
Date:   Mon Sep 11 14:58:44 2023 -0700

    Code organising

commit 64460d6
Author: Joe Hawes <>
Date:   Mon Sep 11 13:53:42 2023 -0700

    Minor tweaks

commit 03e87d8
Author: Joe Hawes <>
Date:   Mon Sep 11 12:47:05 2023 -0700

    Improvements

commit 0f0b078
Author: Joe Hawes <>
Date:   Mon Sep 11 11:02:35 2023 -0700

    HTML & CSS structure

commit a36b158
Author: Joe Hawes <>
Date:   Mon Sep 11 10:46:40 2023 -0700

    HTML working

commit bd87fd6
Author: Joe Hawes <>
Date:   Mon Sep 11 09:59:26 2023 -0700

    Restructure using Map

commit 2c750d8
Merge: 1e64fa9 e596657
Author: Joe Hawes <>
Date:   Mon Sep 11 07:24:07 2023 -0700

    Merge branch 'master' into cluster

    # Conflicts:
    #	assets/dist/waymark-js/js/waymark-js.min.js
    #	languages/waymark.pot
    #	waymark-js/dist/js/waymark-js.min.js

commit 1e64fa9
Author: Joe Hawes <>
Date:   Mon Jun 12 18:13:45 2023 -0700

    3 - Basic counts

commit af20fca
Author: Joe Hawes <>
Date:   Mon Jun 12 17:44:27 2023 -0700

    2

commit 2630367
Author: Joe Hawes <>
Date:   Mon Jun 12 15:50:37 2023 -0700

    1 - Basics

Author: morehawes

Waymark.php

@@ -1,34 +1,34 @@
 <?php
-	
+
 /*
 Plugin Name: Waymark
 Plugin URI: https://www.waymark.dev/
 Description: Mapping with WordPress made easy. With Waymark enabled, click on the "Maps" link in the sidebar to create and edit Maps. Once you are happy with your Map, copy the Waymark shortcode and add it to your content.
-Version: 0.9.29.5
+Version: 0.9.30
 Text Domain: waymark
 Author: Joe Hawes
 Author URI: https://www.morehawes.co.uk/
 License: GPLv2
-*/
+ */
 
 //Base
-require_once('inc/Waymark_Config.php');
-require_once('inc/Waymark_Types.php');
-require_once('inc/Waymark_Taxonomies.php');
-require_once('inc/Waymark_Install.php');
+require_once 'inc/Waymark_Config.php';
+require_once 'inc/Waymark_Types.php';
+require_once 'inc/Waymark_Taxonomies.php';
+require_once 'inc/Waymark_Install.php';
 
 //Objects
-require_once('inc/Objects/Waymark_Map.php');
-require_once('inc/Objects/Waymark_Collection.php');
+require_once 'inc/Objects/Waymark_Map.php';
+require_once 'inc/Objects/Waymark_Collection.php';
 
 //Helpers
-require_once('inc/Helpers/Waymark_Helper.php');
-require_once('inc/Helpers/Waymark_Input.php');
-require_once('inc/Helpers/Waymark_GeoJSON.php');
-require_once('inc/Helpers/Waymark_Lang.php');
+require_once 'inc/Helpers/Waymark_Helper.php';
+require_once 'inc/Helpers/Waymark_Input.php';
+require_once 'inc/Helpers/Waymark_GeoJSON.php';
+require_once 'inc/Helpers/Waymark_Lang.php';
 
 //Front
-require_once('inc/Waymark_Front.php');
+require_once 'inc/Waymark_Front.php';
 
 //Admin
-require_once('inc/Waymark_Admin.php');
+require_once 'inc/Waymark_Admin.php';

assets/css/admin.css

@@ -110,7 +110,7 @@ div.waymark-accordion-container .waymark-accordion-group .waymark-parameter-grou
   display: none !important;
 }
 .waymark-icon {
-  background-image: url('../img/waymark-icon-primary.png');
+  background-image: url("../img/waymark-icon-primary.png");
   background-size: 20px 20px;
   background-position: left center;
   background-repeat: no-repeat;
@@ -148,7 +148,7 @@ div.postbox#waymark_map_shortcode h2.hndle span,
 div.postbox#waymark_map_export h2.hndle span,
 div.postbox#waymark_map_help h2.hndle span {
   padding-left: 24px;
-  background-image: url('../img/waymark-icon-dark.png');
+  background-image: url("../img/waymark-icon-dark.png");
   background-size: 20px 20px;
   background-position: left center;
   background-repeat: no-repeat;
@@ -306,17 +306,17 @@ li#toplevel_page_edit-post_type-waymark_map li.hidden {
 }
 li#toplevel_page_edit-post_type-waymark_map .wp-menu-image {
   height: 34px !important;
-  background-image: url('../img/waymark-icon-light.png');
+  background-image: url("../img/waymark-icon-light.png");
   background-size: 18px 18px;
   background-position: center center;
   background-repeat: no-repeat;
 }
 li#toplevel_page_edit-post_type-waymark_map:hover .wp-menu-image {
-  background-image: url('../img/waymark-icon-white.png');
+  background-image: url("../img/waymark-icon-white.png");
 }
 li#toplevel_page_edit-post_type-waymark_map.wp-has-current-submenu .wp-menu-image,
 li#toplevel_page_edit-post_type-waymark_map.wp-menu-open .wp-menu-image {
-  background-image: url('../img/waymark-icon-white.png');
+  background-image: url("../img/waymark-icon-white.png");
 }
 /* Shortcode UI */
 div#waymark_shortcode_ui-insert-dialog div.waymark-parameters-container {
@@ -358,7 +358,7 @@ body.waymark_page_waymark-settings div#waymark-settings-nav {
   height: 35px;
   margin-bottom: 5px;
   padding-left: 45px;
-  background-image: url('../img/waymark-icon-primary.png');
+  background-image: url("../img/waymark-icon-primary.png");
   background-size: 35px 35px;
   background-position: center left;
   background-repeat: no-repeat;
@@ -535,7 +535,7 @@ div#waymark-admin-container.waymark-top p.lead small {
 div#waymark-admin-container h1 {
   padding-bottom: 9px;
   padding-left: 34px;
-  background-image: url('../img/waymark-icon-primary.png');
+  background-image: url("../img/waymark-icon-primary.png");
   background-size: 30px 30px;
   background-position: left center;
   background-repeat: no-repeat;
@@ -609,7 +609,7 @@ div#waymark-admin-container .waymark-settings-tab input[type="text"] {
   width: 200px;
   border-style: solid;
   border-width: 1px;
-  border-color: #DDDDDD;
+  border-color: #dddddd;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07) inset;
 }
 div#waymark-admin-container .waymark-settings-tab .waymark-short-input select,
@@ -688,7 +688,7 @@ body.post-type-waymark_map.edit-php div#waymark-admin-container ol {
 }
 /* Shortcode */
 i.mce-i-waymark-shortcode-icon {
-  background-image: url('../img/waymark-editor-icon.png');
+  background-image: url("../img/waymark-editor-icon.png");
   background-position: center center;
   background-repeat: no-repeat;
   background-size: 20px 20px;
@@ -708,7 +708,7 @@ body.wp-admin {
 }
 */
 #waymark_shortcode_ui-insert-dialog-dragh {
-  background-image: url('../img/waymark-icon-primary.png');
+  background-image: url("../img/waymark-icon-primary.png");
   background-size: 24px 24px;
   background-position: center center;
   background-repeat: no-repeat;

assets/dist/waymark-js/css/waymark-js.css

@@ -537,6 +537,81 @@
 .leaflet-control-fullscreen a{background:#fff url('../images/fullscreen.png') no-repeat 0 0;background-size:26px 52px}.leaflet-touch .leaflet-control-fullscreen a{background-position:2px 2px}.leaflet-fullscreen-on .leaflet-control-fullscreen a{background-position:0 -26px}.leaflet-touch.leaflet-fullscreen-on .leaflet-control-fullscreen a{background-position:2px -24px}.leaflet-container:-webkit-full-screen{width:100%!important;height:100%!important}.leaflet-container.leaflet-fullscreen-on{width:100%!important;height:100%!important}.leaflet-pseudo-fullscreen{position:fixed!important;width:100%!important;height:100%!important;top:0!important;left:0!important;z-index:99999}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){.leaflet-control-fullscreen a{background-image:url('../images/[email protected]')}}
 
 .leaflet-pane,.leaflet-tile,.leaflet-marker-icon,.leaflet-marker-shadow,.leaflet-tile-container,.leaflet-pane>svg,.leaflet-pane>canvas,.leaflet-zoom-box,.leaflet-image-layer,.leaflet-layer{position:absolute;left:0;top:0}.leaflet-container{overflow:hidden}.leaflet-tile,.leaflet-marker-icon,.leaflet-marker-shadow{-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-user-drag:none}.leaflet-tile::selection{background:transparent}.leaflet-safari .leaflet-tile{image-rendering:-webkit-optimize-contrast}.leaflet-safari .leaflet-tile-container{width:1600px;height:1600px;-webkit-transform-origin:0 0}.leaflet-marker-icon,.leaflet-marker-shadow{display:block}.leaflet-container .leaflet-overlay-pane svg,.leaflet-container .leaflet-marker-pane img,.leaflet-container .leaflet-shadow-pane img,.leaflet-container .leaflet-tile-pane img,.leaflet-container img.leaflet-image-layer,.leaflet-container .leaflet-tile{max-width:none!important;max-height:none!important}.leaflet-container.leaflet-touch-zoom{-ms-touch-action:pan-x pan-y;touch-action:pan-x pan-y}.leaflet-container.leaflet-touch-drag{-ms-touch-action:pinch-zoom;touch-action:none;touch-action:pinch-zoom}.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom{-ms-touch-action:none;touch-action:none}.leaflet-container{-webkit-tap-highlight-color:transparent}.leaflet-container a{-webkit-tap-highlight-color:rgba(51,181,229,0.4)}.leaflet-tile{filter:inherit;visibility:hidden}.leaflet-tile-loaded{visibility:inherit}.leaflet-zoom-box{width:0;height:0;-moz-box-sizing:border-box;box-sizing:border-box;z-index:800}.leaflet-overlay-pane svg{-moz-user-select:none}.leaflet-pane{z-index:400}.leaflet-tile-pane{z-index:200}.leaflet-overlay-pane{z-index:400}.leaflet-shadow-pane{z-index:500}.leaflet-marker-pane{z-index:600}.leaflet-tooltip-pane{z-index:650}.leaflet-popup-pane{z-index:700}.leaflet-map-pane canvas{z-index:100}.leaflet-map-pane svg{z-index:200}.leaflet-vml-shape{width:1px;height:1px}.lvml{behavior:url(#default#VML);display:inline-block;position:absolute}.leaflet-control{position:relative;z-index:800;pointer-events:visiblePainted;pointer-events:auto}.leaflet-top,.leaflet-bottom{position:absolute;z-index:1000;pointer-events:none}.leaflet-top{top:0}.leaflet-right{right:0}.leaflet-bottom{bottom:0}.leaflet-left{left:0}.leaflet-control{float:left;clear:both}.leaflet-right .leaflet-control{float:right}.leaflet-top .leaflet-control{margin-top:10px}.leaflet-bottom .leaflet-control{margin-bottom:10px}.leaflet-left .leaflet-control{margin-left:10px}.leaflet-right .leaflet-control{margin-right:10px}.leaflet-fade-anim .leaflet-tile{will-change:opacity}.leaflet-fade-anim .leaflet-popup{opacity:0;-webkit-transition:opacity .2s linear;-moz-transition:opacity .2s linear;transition:opacity .2s linear}.leaflet-fade-anim .leaflet-map-pane .leaflet-popup{opacity:1}.leaflet-zoom-animated{-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0}.leaflet-zoom-anim .leaflet-zoom-animated{will-change:transform}.leaflet-zoom-anim .leaflet-zoom-animated{-webkit-transition:-webkit-transform .25s cubic-bezier(0,0,0.25,1);-moz-transition:-moz-transform .25s cubic-bezier(0,0,0.25,1);transition:transform .25s cubic-bezier(0,0,0.25,1)}.leaflet-zoom-anim .leaflet-tile,.leaflet-pan-anim .leaflet-tile{-webkit-transition:none;-moz-transition:none;transition:none}.leaflet-zoom-anim .leaflet-zoom-hide{visibility:hidden}.leaflet-interactive{cursor:pointer}.leaflet-grab{cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.leaflet-crosshair,.leaflet-crosshair .leaflet-interactive{cursor:crosshair}.leaflet-popup-pane,.leaflet-control{cursor:auto}.leaflet-dragging .leaflet-grab,.leaflet-dragging .leaflet-grab .leaflet-interactive,.leaflet-dragging .leaflet-marker-draggable{cursor:move;cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.leaflet-marker-icon,.leaflet-marker-shadow,.leaflet-image-layer,.leaflet-pane>svg path,.leaflet-tile-container{pointer-events:none}.leaflet-marker-icon.leaflet-interactive,.leaflet-image-layer.leaflet-interactive,.leaflet-pane>svg path.leaflet-interactive,svg.leaflet-image-layer.leaflet-interactive path{pointer-events:visiblePainted;pointer-events:auto}.leaflet-container{background:#ddd;outline:0}.leaflet-container a{color:#0078a8}.leaflet-container a.leaflet-active{outline:2px solid orange}.leaflet-zoom-box{border:2px dotted #38f;background:rgba(255,255,255,0.5)}.leaflet-container{font:12px/1.5 "Helvetica Neue",Arial,Helvetica,sans-serif}.leaflet-bar{box-shadow:0 1px 5px rgba(0,0,0,0.65);border-radius:4px}.leaflet-bar a,.leaflet-bar a:hover{background-color:#fff;border-bottom:1px solid #ccc;width:26px;height:26px;line-height:26px;display:block;text-align:center;text-decoration:none;color:black}.leaflet-bar a,.leaflet-control-layers-toggle{background-position:50% 50%;background-repeat:no-repeat;display:block}.leaflet-bar a:hover{background-color:#f4f4f4}.leaflet-bar a:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.leaflet-bar a:last-child{border-bottom-left-radius:4px;border-bottom-right-radius:4px;border-bottom:0}.leaflet-bar a.leaflet-disabled{cursor:default;background-color:#f4f4f4;color:#bbb}.leaflet-touch .leaflet-bar a{width:30px;height:30px;line-height:30px}.leaflet-touch .leaflet-bar a:first-child{border-top-left-radius:2px;border-top-right-radius:2px}.leaflet-touch .leaflet-bar a:last-child{border-bottom-left-radius:2px;border-bottom-right-radius:2px}.leaflet-control-zoom-in,.leaflet-control-zoom-out{font:bold 18px 'Lucida Console',Monaco,monospace;text-indent:1px}.leaflet-touch .leaflet-control-zoom-in,.leaflet-touch .leaflet-control-zoom-out{font-size:22px}.leaflet-control-layers{box-shadow:0 1px 5px rgba(0,0,0,0.4);background:#fff;border-radius:5px}.leaflet-control-layers-toggle{background-image:url('../images/layers.png');width:36px;height:36px}.leaflet-retina .leaflet-control-layers-toggle{background-image:url('../images/layers-2x.png');background-size:26px 26px}.leaflet-touch .leaflet-control-layers-toggle{width:44px;height:44px}.leaflet-control-layers .leaflet-control-layers-list,.leaflet-control-layers-expanded .leaflet-control-layers-toggle{display:none}.leaflet-control-layers-expanded .leaflet-control-layers-list{display:block;position:relative}.leaflet-control-layers-expanded{padding:6px 10px 6px 6px;color:#333;background:#fff}.leaflet-control-layers-scrollbar{overflow-y:scroll;overflow-x:hidden;padding-right:5px}.leaflet-control-layers-selector{margin-top:2px;position:relative;top:1px}.leaflet-control-layers label{display:block}.leaflet-control-layers-separator{height:0;border-top:1px solid #ddd;margin:5px -10px 5px -6px}.leaflet-default-icon-path{background-image:url(images/marker-icon.png)}.leaflet-container .leaflet-control-attribution{background:#fff;background:rgba(255,255,255,0.7);margin:0}.leaflet-control-attribution,.leaflet-control-scale-line{padding:0 5px;color:#333}.leaflet-control-attribution a{text-decoration:none}.leaflet-control-attribution a:hover{text-decoration:underline}.leaflet-container .leaflet-control-attribution,.leaflet-container .leaflet-control-scale{font-size:11px}.leaflet-left .leaflet-control-scale{margin-left:5px}.leaflet-bottom .leaflet-control-scale{margin-bottom:5px}.leaflet-control-scale-line{border:2px solid #777;border-top:0;line-height:1.1;padding:2px 5px 1px;font-size:11px;white-space:nowrap;overflow:hidden;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;background:rgba(255,255,255,0.5)}.leaflet-control-scale-line:not(:first-child){border-top:2px solid #777;border-bottom:0;margin-top:-2px}.leaflet-control-scale-line:not(:first-child):not(:last-child){border-bottom:2px solid #777}.leaflet-touch .leaflet-control-attribution,.leaflet-touch .leaflet-control-layers,.leaflet-touch .leaflet-bar{box-shadow:none}.leaflet-touch .leaflet-control-layers,.leaflet-touch .leaflet-bar{border:2px solid rgba(0,0,0,0.2);background-clip:padding-box}.leaflet-popup{position:absolute;text-align:center;margin-bottom:20px}.leaflet-popup-content-wrapper{padding:1px;text-align:left;border-radius:12px}.leaflet-popup-content{margin:13px 19px;line-height:1.4}.leaflet-popup-content p{margin:18px 0}.leaflet-popup-tip-container{width:40px;height:20px;position:absolute;left:50%;margin-left:-20px;overflow:hidden;pointer-events:none}.leaflet-popup-tip{width:17px;height:17px;padding:1px;margin:-10px auto 0;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.leaflet-popup-content-wrapper,.leaflet-popup-tip{background:white;color:#333;box-shadow:0 3px 14px rgba(0,0,0,0.4)}.leaflet-container a.leaflet-popup-close-button{position:absolute;top:0;right:0;padding:4px 4px 0 0;border:0;text-align:center;width:18px;height:14px;font:16px/14px Tahoma,Verdana,sans-serif;color:#c3c3c3;text-decoration:none;font-weight:bold;background:transparent}.leaflet-container a.leaflet-popup-close-button:hover{color:#999}.leaflet-popup-scrolled{overflow:auto;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.leaflet-oldie .leaflet-popup-content-wrapper{zoom:1}.leaflet-oldie .leaflet-popup-tip{width:24px;margin:0 auto;-ms-filter:"progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";filter:progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678,M12=0.70710678,M21=-0.70710678,M22=0.70710678)}.leaflet-oldie .leaflet-popup-tip-container{margin-top:-1px}.leaflet-oldie .leaflet-control-zoom,.leaflet-oldie .leaflet-control-layers,.leaflet-oldie .leaflet-popup-content-wrapper,.leaflet-oldie .leaflet-popup-tip{border:1px solid #999}.leaflet-div-icon{background:#fff;border:1px solid #666}.leaflet-tooltip{position:absolute;padding:6px;background-color:#fff;border:1px solid #fff;border-radius:3px;color:#222;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;box-shadow:0 1px 3px rgba(0,0,0,0.4)}.leaflet-tooltip.leaflet-clickable{cursor:pointer;pointer-events:auto}.leaflet-tooltip-top:before,.leaflet-tooltip-bottom:before,.leaflet-tooltip-left:before,.leaflet-tooltip-right:before{position:absolute;pointer-events:none;border:6px solid transparent;background:transparent;content:""}.leaflet-tooltip-bottom{margin-top:6px}.leaflet-tooltip-top{margin-top:-6px}.leaflet-tooltip-bottom:before,.leaflet-tooltip-top:before{left:50%;margin-left:-6px}.leaflet-tooltip-top:before{bottom:0;margin-bottom:-12px;border-top-color:#fff}.leaflet-tooltip-bottom:before{top:0;margin-top:-12px;margin-left:-6px;border-bottom-color:#fff}.leaflet-tooltip-left{margin-left:-6px}.leaflet-tooltip-right{margin-left:6px}.leaflet-tooltip-left:before,.leaflet-tooltip-right:before{top:50%;margin-top:-6px}.leaflet-tooltip-left:before{right:0;margin-right:-12px;border-left-color:#fff}.leaflet-tooltip-right:before{left:0;margin-left:-12px;border-right-color:#fff}
+.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
+	-webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
+	-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
+	-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
+	transition: transform 0.3s ease-out, opacity 0.3s ease-in;
+}
+
+.leaflet-cluster-spider-leg {
+	/* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */
+	-webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in;
+	-moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in;
+	-o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in;
+	transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in;
+}
+
+.marker-cluster-small {
+	background-color: rgba(181, 226, 140, 0.6);
+	}
+.marker-cluster-small div {
+	background-color: rgba(110, 204, 57, 0.6);
+	}
+
+.marker-cluster-medium {
+	background-color: rgba(241, 211, 87, 0.6);
+	}
+.marker-cluster-medium div {
+	background-color: rgba(240, 194, 12, 0.6);
+	}
+
+.marker-cluster-large {
+	background-color: rgba(253, 156, 115, 0.6);
+	}
+.marker-cluster-large div {
+	background-color: rgba(241, 128, 23, 0.6);
+	}
+
+	/* IE 6-8 fallback colors */
+.leaflet-oldie .marker-cluster-small {
+	background-color: rgb(181, 226, 140);
+	}
+.leaflet-oldie .marker-cluster-small div {
+	background-color: rgb(110, 204, 57);
+	}
+
+.leaflet-oldie .marker-cluster-medium {
+	background-color: rgb(241, 211, 87);
+	}
+.leaflet-oldie .marker-cluster-medium div {
+	background-color: rgb(240, 194, 12);
+	}
+
+.leaflet-oldie .marker-cluster-large {
+	background-color: rgb(253, 156, 115);
+	}
+.leaflet-oldie .marker-cluster-large div {
+	background-color: rgb(241, 128, 23);
+}
+
+.marker-cluster {
+	background-clip: padding-box;
+	border-radius: 20px;
+	}
+.marker-cluster div {
+	width: 30px;
+	height: 30px;
+	margin-left: 5px;
+	margin-top: 5px;
+
+	text-align: center;
+	border-radius: 15px;
+	font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
+.marker-cluster span {
+	line-height: 30px;
+	}
 @-webkit-keyframes spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -920,6 +995,20 @@
   background-repeat: no-repeat;
   background-position: left center;
 }
+.waymark-map-container.waymark-is-viewer.waymark-has-cluster .waymark-cluster .waymark-marker {
+  position: absolute;
+}
+.waymark-map-container.waymark-is-viewer.waymark-has-cluster .waymark-cluster .waymark-marker .waymark-cluster-count {
+  position: absolute;
+  top: -3px;
+  right: -3px;
+  padding: 1px 3px;
+  font-size: 8px;
+  color: black;
+  border: 1px solid #333;
+  border-radius: 3px;
+  background: rgba(255, 255, 255, 0.7);
+}
 
 /*
 	==================================