From 5cb7e1f3ce32a18b868453ccc6f3fb7fea04b876 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 22 Apr 2013 22:51:34 +0200 Subject: Add more cluster levels --- chimere/src/marker-cluster-large.xcf | Bin 0 -> 4179 bytes chimere/src/marker-cluster-medium.xcf | Bin 0 -> 2883 bytes chimere/src/marker-cluster-small.xcf | Bin 0 -> 2423 bytes chimere/src/marker-cluster-xlarge.xcf | Bin 0 -> 3125 bytes chimere/src/marker-cluster-xsmall.xcf | Bin 0 -> 2407 bytes chimere/src/marker-cluster-xxlarge.xcf | Bin 0 -> 4257 bytes chimere/src/share-icon.xcf | Bin 0 -> 5431 bytes chimere/static/chimere/css/styles.css | 120 +++++++++++++++++++-- .../static/chimere/img/marker-cluster-large.png | Bin 1182 -> 1115 bytes .../static/chimere/img/marker-cluster-small.png | Bin 701 -> 2067 bytes .../static/chimere/img/marker-cluster-xlarge.png | Bin 0 -> 1182 bytes .../static/chimere/img/marker-cluster-xsmall.png | Bin 0 -> 693 bytes .../static/chimere/img/marker-cluster-xxlarge.png | Bin 0 -> 1364 bytes chimere/static/chimere/img/share-icon.xcf | Bin 5431 -> 0 bytes .../static/chimere/js/jquery.chimere-leaflet.js | 12 ++- 15 files changed, 118 insertions(+), 14 deletions(-) create mode 100755 chimere/src/marker-cluster-large.xcf create mode 100755 chimere/src/marker-cluster-medium.xcf create mode 100755 chimere/src/marker-cluster-small.xcf create mode 100755 chimere/src/marker-cluster-xlarge.xcf create mode 100755 chimere/src/marker-cluster-xsmall.xcf create mode 100755 chimere/src/marker-cluster-xxlarge.xcf create mode 100755 chimere/src/share-icon.xcf create mode 100644 chimere/static/chimere/img/marker-cluster-xlarge.png create mode 100644 chimere/static/chimere/img/marker-cluster-xsmall.png create mode 100644 chimere/static/chimere/img/marker-cluster-xxlarge.png delete mode 100644 chimere/static/chimere/img/share-icon.xcf diff --git a/chimere/src/marker-cluster-large.xcf b/chimere/src/marker-cluster-large.xcf new file mode 100755 index 0000000..ac0e14d Binary files /dev/null and b/chimere/src/marker-cluster-large.xcf differ diff --git a/chimere/src/marker-cluster-medium.xcf b/chimere/src/marker-cluster-medium.xcf new file mode 100755 index 0000000..85de110 Binary files /dev/null and b/chimere/src/marker-cluster-medium.xcf differ diff --git a/chimere/src/marker-cluster-small.xcf b/chimere/src/marker-cluster-small.xcf new file mode 100755 index 0000000..3e38c15 Binary files /dev/null and b/chimere/src/marker-cluster-small.xcf differ diff --git a/chimere/src/marker-cluster-xlarge.xcf b/chimere/src/marker-cluster-xlarge.xcf new file mode 100755 index 0000000..6c9c890 Binary files /dev/null and b/chimere/src/marker-cluster-xlarge.xcf differ diff --git a/chimere/src/marker-cluster-xsmall.xcf b/chimere/src/marker-cluster-xsmall.xcf new file mode 100755 index 0000000..f0787cc Binary files /dev/null and b/chimere/src/marker-cluster-xsmall.xcf differ diff --git a/chimere/src/marker-cluster-xxlarge.xcf b/chimere/src/marker-cluster-xxlarge.xcf new file mode 100755 index 0000000..4c9be7c Binary files /dev/null and b/chimere/src/marker-cluster-xxlarge.xcf differ diff --git a/chimere/src/share-icon.xcf b/chimere/src/share-icon.xcf new file mode 100755 index 0000000..d149768 Binary files /dev/null and b/chimere/src/share-icon.xcf differ diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index a123a5d..b9c9975 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -1110,45 +1110,110 @@ div.pp_default .pp_expand{ bottom:5px; } -.marker-cluster.marker-cluster-large { +.marker-cluster.marker-cluster-xxlarge { + border-radius: 27px; +} + +.marker-cluster.marker-cluster-xlarge { border-radius: 25px; } +.marker-cluster.marker-cluster-large { + border-radius: 22px; +} + +.marker-cluster.marker-cluster-medium { + border-radius: 20px; +} + .marker-cluster.marker-cluster-small { + border-radius: 17px; +} + +.marker-cluster.marker-cluster-xsmall { border-radius: 15px; } -.marker-cluster.marker-cluster-large div { +.marker-cluster.marker-cluster-xxlarge div { + width: 44px; + height: 44px; + border-radius: 22px; +} + +.marker-cluster.marker-cluster-xlarge div { width: 40px; height: 40px; border-radius: 20px; } +.marker-cluster.marker-cluster-large div { + width: 34px; + height: 34px; + border-radius: 17px; +} + +.marker-cluster.marker-cluster-medium div { + width: 30px; + height: 30px; + border-radius: 15px; +} + .marker-cluster.marker-cluster-small div { + width: 24px; + height: 24px; + border-radius: 12px; +} + +.marker-cluster.marker-cluster-xsmall div { width: 20px; height: 20px; border-radius: 10px; } -.marker-cluster.marker-cluster-large span { +.marker-cluster.marker-cluster-xxlarge span { + line-height: 44px; +} + +.marker-cluster.marker-cluster-xlarge span { line-height: 40px; } +.marker-cluster.marker-cluster-large span { + line-height: 34px; +} + .marker-cluster.marker-cluster-small span { + line-height: 24px; +} + +.marker-cluster.marker-cluster-xsmall span { line-height: 20px; } +.marker-cluster-xsmall-number, .marker-cluster-small-number, .marker-cluster-medium-number, -.marker-cluster-large-number{ +.marker-cluster-large-number +.marker-cluster-xlarge-number +.marker-cluster-xxlarge-number{ position: relative; font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif; text-align: center; } -.marker-cluster-small-number{ - width: 30px; - top: -22px; +.marker-cluster-xxlarge-number{ + width: 55px; + top: -35px; +} + +.marker-cluster-xlarge-number{ + width: 50px; + top: -32px; +} + +.marker-cluster-large-number{ + width: 45px; + top: -30px; } .marker-cluster-medium-number{ @@ -1156,7 +1221,42 @@ div.pp_default .pp_expand{ top: -27px; } -.marker-cluster-large-number{ - width: 50px; - top: -32px; +.marker-cluster-small-number{ + width: 35px; + top: -25px; +} + +.marker-cluster-xsmall-number{ + width: 30px; + top: -22px; +} + +.marker-cluster-xsmall { + background-color: rgba(221, 255, 180, 0.6); +} + +.marker-cluster-xsmall div { + background-color: rgba(150, 244, 97, 0.6); +} + +.marker-cluster-large { + background-color: rgba(255, 214, 140, 0.6); } +.marker-cluster-large div { + background-color: rgba(255, 183, 54, 0.6); +} + +.marker-cluster-xlarge { + background-color: rgba(253, 156, 115, 0.6); +} +.marker-cluster-xlarge div { + background-color: rgba(241, 128, 23, 0.6); +} + +.marker-cluster-xxlarge { + background-color: rgba(255, 174, 176, 0.6); +} +.marker-cluster-xxlarge div { + background-color: rgba(255, 48, 54, 0.6); +} + diff --git a/chimere/static/chimere/img/marker-cluster-large.png b/chimere/static/chimere/img/marker-cluster-large.png index 477e2b8..eef6a73 100644 Binary files a/chimere/static/chimere/img/marker-cluster-large.png and b/chimere/static/chimere/img/marker-cluster-large.png differ diff --git a/chimere/static/chimere/img/marker-cluster-small.png b/chimere/static/chimere/img/marker-cluster-small.png index ae5ce5a..0620694 100644 Binary files a/chimere/static/chimere/img/marker-cluster-small.png and b/chimere/static/chimere/img/marker-cluster-small.png differ diff --git a/chimere/static/chimere/img/marker-cluster-xlarge.png b/chimere/static/chimere/img/marker-cluster-xlarge.png new file mode 100644 index 0000000..477e2b8 Binary files /dev/null and b/chimere/static/chimere/img/marker-cluster-xlarge.png differ diff --git a/chimere/static/chimere/img/marker-cluster-xsmall.png b/chimere/static/chimere/img/marker-cluster-xsmall.png new file mode 100644 index 0000000..748b3ed Binary files /dev/null and b/chimere/static/chimere/img/marker-cluster-xsmall.png differ diff --git a/chimere/static/chimere/img/marker-cluster-xxlarge.png b/chimere/static/chimere/img/marker-cluster-xxlarge.png new file mode 100644 index 0000000..d7b435f Binary files /dev/null and b/chimere/static/chimere/img/marker-cluster-xxlarge.png differ diff --git a/chimere/static/chimere/img/share-icon.xcf b/chimere/static/chimere/img/share-icon.xcf deleted file mode 100644 index d149768..0000000 Binary files a/chimere/static/chimere/img/share-icon.xcf and /dev/null differ diff --git a/chimere/static/chimere/js/jquery.chimere-leaflet.js b/chimere/static/chimere/js/jquery.chimere-leaflet.js index 5cbeaac..0b417e5 100644 --- a/chimere/static/chimere/js/jquery.chimere-leaflet.js +++ b/chimere/static/chimere/js/jquery.chimere-leaflet.js @@ -96,11 +96,15 @@ See the file COPYING for details. icon_start: null, icon_step: null, icon_end: null, - weight_steps: new Array(6, 15), - weight_icon_sizes: new Array(30, 40, 50), - weight_icon_classes: new Array('marker-cluster-small', + weight_steps: new Array(10, 50, 100, 500, 1000), + weight_icon_sizes: new Array(30, 34, 40, 44, 50, 54), + weight_icon_classes: new Array('marker-cluster-xsmall', + 'marker-cluster-small', 'marker-cluster-medium', - 'marker-cluster-large'), + 'marker-cluster-large', + 'marker-cluster-xlarge', + 'marker-cluster-xxlarge' + ) }; var settings = {}; /* -- cgit v1.2.3