From c41f7b4cf8df5dc507c144e574537e021061b803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20Schl=C3=BCter?= Date: Mon, 9 Feb 2015 00:11:05 +0100 Subject: [PATCH] Fix weird clustering and change marker colors --- static/css/style.css | 4 ++-- static/js/main.js | 2 +- static/js/visualization.js | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 55785ee..be7f690 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -106,7 +106,7 @@ a { } .category-filter .racism a:after { - border-color: #F8B195; + border-color: #355C7D; } .category-filter .antisemitism a:after { @@ -122,7 +122,7 @@ a { } .category-filter .uncategorized a:after { - border-color: #355C7D; + border-color: #888888; } .circle-marker { diff --git a/static/js/main.js b/static/js/main.js index d25dd50..1dfb2d8 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -2,7 +2,7 @@ import Visualization from './visualization' // http://www.colourlovers.com/palette/1811244/1001_Stories -var colors = [ '#F8B195', '#F67280', '#C06C84', '#6C5B7B', '#355C7D' ] +var colors = [ '#355C7D', '#F67280', '#C06C84', '#6C5B7B', '#888888' ] // set up background map var map = L.map('map').setView([52.50, 13.40], 11) diff --git a/static/js/visualization.js b/static/js/visualization.js index 0978a51..f655910 100644 --- a/static/js/visualization.js +++ b/static/js/visualization.js @@ -23,9 +23,14 @@ class Visualization { // set up OMS this.oms = new OverlappingMarkerSpiderfier(map, { keepSpiderfied: true, - circleSpiralSwitchover: 12, + nearbyDistance: 1 }) + this.oms.legColors = { + usual: 'rgba(0,0,0,.1)', + highlighted: 'rgba(0,0,0,.4)' + } + var popup = new L.Popup(); this.oms.addListener('click', function (marker) { popup.setContent(marker.description.replace(/\n/g, '
'))