summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-22 22:51:34 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-22 22:51:34 +0200
commit5cb7e1f3ce32a18b868453ccc6f3fb7fea04b876 (patch)
treeb977028c458477665ee6b469eae9660723cf194d
parentaaa90f1194646386344b1d5ca2f83a609beee17f (diff)
downloadChimère-5cb7e1f3ce32a18b868453ccc6f3fb7fea04b876.tar.bz2
Chimère-5cb7e1f3ce32a18b868453ccc6f3fb7fea04b876.zip
Add more cluster levels
-rwxr-xr-xchimere/src/marker-cluster-large.xcfbin0 -> 4179 bytes
-rwxr-xr-xchimere/src/marker-cluster-medium.xcfbin0 -> 2883 bytes
-rwxr-xr-xchimere/src/marker-cluster-small.xcfbin0 -> 2423 bytes
-rwxr-xr-xchimere/src/marker-cluster-xlarge.xcfbin0 -> 3125 bytes
-rwxr-xr-xchimere/src/marker-cluster-xsmall.xcfbin0 -> 2407 bytes
-rwxr-xr-xchimere/src/marker-cluster-xxlarge.xcfbin0 -> 4257 bytes
-rwxr-xr-x[-rw-r--r--]chimere/src/share-icon.xcf (renamed from chimere/static/chimere/img/share-icon.xcf)bin5431 -> 5431 bytes
-rw-r--r--chimere/static/chimere/css/styles.css120
-rw-r--r--chimere/static/chimere/img/marker-cluster-large.pngbin1182 -> 1115 bytes
-rw-r--r--chimere/static/chimere/img/marker-cluster-small.pngbin701 -> 2067 bytes
-rw-r--r--chimere/static/chimere/img/marker-cluster-xlarge.pngbin0 -> 1182 bytes
-rw-r--r--chimere/static/chimere/img/marker-cluster-xsmall.pngbin0 -> 693 bytes
-rw-r--r--chimere/static/chimere/img/marker-cluster-xxlarge.pngbin0 -> 1364 bytes
-rw-r--r--chimere/static/chimere/js/jquery.chimere-leaflet.js12
14 files changed, 118 insertions, 14 deletions
diff --git a/chimere/src/marker-cluster-large.xcf b/chimere/src/marker-cluster-large.xcf
new file mode 100755
index 0000000..ac0e14d
--- /dev/null
+++ b/chimere/src/marker-cluster-large.xcf
Binary files differ
diff --git a/chimere/src/marker-cluster-medium.xcf b/chimere/src/marker-cluster-medium.xcf
new file mode 100755
index 0000000..85de110
--- /dev/null
+++ b/chimere/src/marker-cluster-medium.xcf
Binary files differ
diff --git a/chimere/src/marker-cluster-small.xcf b/chimere/src/marker-cluster-small.xcf
new file mode 100755
index 0000000..3e38c15
--- /dev/null
+++ b/chimere/src/marker-cluster-small.xcf
Binary files differ
diff --git a/chimere/src/marker-cluster-xlarge.xcf b/chimere/src/marker-cluster-xlarge.xcf
new file mode 100755
index 0000000..6c9c890
--- /dev/null
+++ b/chimere/src/marker-cluster-xlarge.xcf
Binary files differ
diff --git a/chimere/src/marker-cluster-xsmall.xcf b/chimere/src/marker-cluster-xsmall.xcf
new file mode 100755
index 0000000..f0787cc
--- /dev/null
+++ b/chimere/src/marker-cluster-xsmall.xcf
Binary files differ
diff --git a/chimere/src/marker-cluster-xxlarge.xcf b/chimere/src/marker-cluster-xxlarge.xcf
new file mode 100755
index 0000000..4c9be7c
--- /dev/null
+++ b/chimere/src/marker-cluster-xxlarge.xcf
Binary files differ
diff --git a/chimere/static/chimere/img/share-icon.xcf b/chimere/src/share-icon.xcf
index d149768..d149768 100644..100755
--- a/chimere/static/chimere/img/share-icon.xcf
+++ b/chimere/src/share-icon.xcf
Binary files 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
--- a/chimere/static/chimere/img/marker-cluster-large.png
+++ b/chimere/static/chimere/img/marker-cluster-large.png
Binary files 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
--- a/chimere/static/chimere/img/marker-cluster-small.png
+++ b/chimere/static/chimere/img/marker-cluster-small.png
Binary files 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
--- /dev/null
+++ b/chimere/static/chimere/img/marker-cluster-xlarge.png
Binary files 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
--- /dev/null
+++ b/chimere/static/chimere/img/marker-cluster-xsmall.png
Binary files 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
--- /dev/null
+++ b/chimere/static/chimere/img/marker-cluster-xxlarge.png
Binary files 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 = {};
/*