kasper/seisobs-webapp
1
0
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Merge.

Browse Source
This commit is contained in:
Kasper D. Fischer 2014-05-08 09:12:32 +00:00
commit c1fbfcd2c4
Notes: subgit 2018-03-07 17:58:49 +01:00 
r621 www/branches/life
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/events.js
View File

@ -242,12 +242,12 @@ function toggleFilteredMarkers() {
* other event is selected */ * other event is selected */
function highlightFirstEvent() { function highlightFirstEvent() {
var highlightStyle = { var highlightStyle = {
color: 'red', color: config['event']['markerColorH'],
fillColor: '#f03', fillColor: config['event']['markerColorH'],
}; };
var normalStyle = { var normalStyle = {
fillColor: "#FFF500", fillColor: config['event']['markerColor'],
color: "#FFF500" color: config['event']['markerColor']
}; };
$("#eventstable a.map-link").each( function() { $("#eventstable a.map-link").each( function() {
if ( $(this).attr("eventid") ) { if ( $(this).attr("eventid") ) {
@ -267,12 +267,12 @@ function highlightFirstEvent() {
function highlightEvent( id ) { function highlightEvent( id ) {
var highlightStyle = { var highlightStyle = {
color: 'red', color: config['event']['markerColorH'],
fillColor: '#f03', fillColor: config['event']['markerColorH'],
}; };
var normalStyle = { var normalStyle = {
fillColor: "#FFF500", fillColor: config['event']['markerColor'],
color: "#FFF500" color: config['event']['markerColorH']
}; };
$("#eventstable > tbody > tr:not(.filtered)").find("a.map-link").each( function() { $("#eventstable > tbody > tr:not(.filtered)").find("a.map-link").each( function() {
if ( $(this).attr("eventid") ) { if ( $(this).attr("eventid") ) {

12
www/map.js
View File

@ -43,8 +43,8 @@ function addStationMarker(id, lat, lng) {
/* add event marker */ /* add event marker */
function addEventMarker(id, lat, lng, mag) { function addEventMarker(id, lat, lng, mag) {
var markerOptions = { var markerOptions = {
fillColor: "#FFF500", fillColor: config['event']['markerColor'],
color: "#FFF500", color: config['event']['markerColor'],
weight: 1, weight: 1,
opacity: 1, opacity: 1,
fillOpacity: config['event']['markerOpacity'], fillOpacity: config['event']['markerOpacity'],
@ -59,13 +59,13 @@ function addEventMarker(id, lat, lng, mag) {
function initMapLink() { function initMapLink() {
$("#eventstable > tbody > tr > td > a.map-link").on('click' , function(){ $("#eventstable > tbody > tr > td > a.map-link").on('click' , function(){
var highlightStyle = { var highlightStyle = {
color: 'red', color: config['event']['markerColorH'],
fillColor: '#f03', fillColor: config['event']['markerColorH'],
className: $(this).attr('eventid') className: $(this).attr('eventid')
} }
var normalStyle = { var normalStyle = {
fillColor: "#FFF500", fillColor: config['event']['markerColor'],
color: "#FFF500" color: config['event']['markerColor']
}; };
// mark currently selected link and remove class selected from all other links // mark currently selected link and remove class selected from all other links
// set everything to normal state // set everything to normal state

4
www/misc.js
View File

@ -87,9 +87,11 @@ var config = {
event: { event: {
evaluationBlacklist: ['automatic', 'preliminary', 'rejected'], evaluationBlacklist: ['automatic', 'preliminary', 'rejected'],
markerOpacity: 0.3, markerOpacity: 0.3,
markerColor: '#FFD500',
markerColorH: '#FF0000',
minMag: 1.2, minMag: 1.2,
minMagDelta: 0.1, minMagDelta: 0.1,
typeWhitelist: ['earthquake', 'induced or triggered event'], typeWhitelist: ['earthquake', 'induced or triggered event', 'quarry blast'],
}, },
map: { map: {
zoomDefault: 9, zoomDefault: 9,