diff --git a/www/events.js b/www/events.js index 40169de..14b4501 100644 --- a/www/events.js +++ b/www/events.js @@ -242,12 +242,12 @@ function toggleFilteredMarkers() { * other event is selected */ function highlightFirstEvent() { var highlightStyle = { - color: 'red', - fillColor: '#f03', + color: config['event']['markerColorH'], + fillColor: config['event']['markerColorH'], }; var normalStyle = { - fillColor: "#FFF500", - color: "#FFF500" + fillColor: config['event']['markerColor'], + color: config['event']['markerColor'] }; $("#eventstable a.map-link").each( function() { if ( $(this).attr("eventid") ) { @@ -267,12 +267,12 @@ function highlightFirstEvent() { function highlightEvent( id ) { var highlightStyle = { - color: 'red', - fillColor: '#f03', + color: config['event']['markerColorH'], + fillColor: config['event']['markerColorH'], }; var normalStyle = { - fillColor: "#FFF500", - color: "#FFF500" + fillColor: config['event']['markerColor'], + color: config['event']['markerColorH'] }; $("#eventstable > tbody > tr:not(.filtered)").find("a.map-link").each( function() { if ( $(this).attr("eventid") ) { diff --git a/www/map.js b/www/map.js index 7150158..b53ec36 100644 --- a/www/map.js +++ b/www/map.js @@ -43,8 +43,8 @@ function addStationMarker(id, lat, lng) { /* add event marker */ function addEventMarker(id, lat, lng, mag) { var markerOptions = { - fillColor: "#FFF500", - color: "#FFF500", + fillColor: config['event']['markerColor'], + color: config['event']['markerColor'], weight: 1, opacity: 1, fillOpacity: config['event']['markerOpacity'], @@ -59,13 +59,13 @@ function addEventMarker(id, lat, lng, mag) { function initMapLink() { $("#eventstable > tbody > tr > td > a.map-link").on('click' , function(){ var highlightStyle = { - color: 'red', - fillColor: '#f03', + color: config['event']['markerColorH'], + fillColor: config['event']['markerColorH'], className: $(this).attr('eventid') } var normalStyle = { - fillColor: "#FFF500", - color: "#FFF500" + fillColor: config['event']['markerColor'], + color: config['event']['markerColor'] }; // mark currently selected link and remove class selected from all other links // set everything to normal state diff --git a/www/misc.js b/www/misc.js index 621ea11..aca89d2 100644 --- a/www/misc.js +++ b/www/misc.js @@ -87,9 +87,11 @@ var config = { event: { evaluationBlacklist: ['automatic', 'preliminary', 'rejected'], markerOpacity: 0.3, + markerColor: '#FFD500', + markerColorH: '#FF0000', minMag: 1.2, minMagDelta: 0.1, - typeWhitelist: ['earthquake', 'induced or triggered event'], + typeWhitelist: ['earthquake', 'induced or triggered event', 'quarry blast'], }, map: { zoomDefault: 9,