Added new funcionality: special events can now be loaded to the table and map, eg. Seeheim-Jugenheim event of May 17th, 2014.

r658 www/trunk

www/events.js

@@ -50,24 +50,29 @@ function getGeolocation(id, lat, lng) {
 };
 
 /* Load events using ajax */
-function ajaxLoadEvents(stime, etime) {
+function ajaxLoadEvents(stime, etime, id) {
-	var request_data = {};
-	if ( !stime ) {
-		stime = new Date();
-		stime.setDate(stime.getDate()-config['map']['timespan']);
-	};
 	var mapBounds = map.getBounds();
-	request_data = {
+	var request_data = {};
-		starttime: sprintf("%d-%02d-%02d", stime.getFullYear(), stime.getMonth()+1, stime.getDate()),
+	if ( id ) {
-		orderby: 'time-asc',
+		if ( id == 'bug2014jptq' ) console.log('Loading special event '+id);
-		minlat: sprintf('%.2f', mapBounds.getSouth()-config['map']['latlngDelta']),
+		request_data = { eventid: id };
-		maxlat: sprintf('%.2f', mapBounds.getNorth()+config['map']['latlngDelta']),
+	} else {
-		minlon: sprintf('%.2f', mapBounds.getWest()-config['map']['latlngDelta']),
+		if ( !stime ) {
-		maxlon: sprintf('%.2f', mapBounds.getEast()+config['map']['latlngDelta']),
+			stime = new Date();
-		minmag: sprintf('%.1f', config['event']['minMag']-config['event']['minMagDelta']),
+			stime.setDate(stime.getDate()-config['map']['timespan']);
-	};
+		};
-	if ( etime ) {
+		request_data = {
-		request_data['endtime'] = sprintf("%d-%02d-%02d", etime.getFullYear(), etime.getMonth()+1, etime.getDate());
+			starttime: sprintf("%d-%02d-%02d", stime.getFullYear(), stime.getMonth()+1, stime.getDate()),
+			orderby: 'time-asc',
+			minlat: sprintf('%.2f', mapBounds.getSouth()-config['map']['latlngDelta']),
+			maxlat: sprintf('%.2f', mapBounds.getNorth()+config['map']['latlngDelta']),
+			minlon: sprintf('%.2f', mapBounds.getWest()-config['map']['latlngDelta']),
+			maxlon: sprintf('%.2f', mapBounds.getEast()+config['map']['latlngDelta']),
+			minmag: sprintf('%.1f', config['event']['minMag']-config['event']['minMagDelta']),
+		};
+		if ( etime ) {
+			request_data['endtime'] = sprintf("%d-%02d-%02d", etime.getFullYear(), etime.getMonth()+1, etime.getDate());
+		};
 	};
 	$.ajax({
 		type: "GET",
@@ -87,10 +92,12 @@ function ajaxLoadEvents(stime, etime) {
 				var type = $(this).find('type').last().text();
 				var location
 				// get location, try this in order:
-				// cached value, nominatim lookup, regional map name, or given value
+				// regional map name, given value, cached value,  or nominatim lookup
-				location = geolocationTable[id] || getGeolocation(id, lat, lng) || getLocation(lat, lng)[0] || $(this).find('description > text').text();
+				location = ( getLocation(lat, lng)[0] || $(this).find('description > text').text() );
+				location = ( geolocationTable[id] || getGeolocation(id, lat, lng) );
 				// create table row: Date, Time, Mag, Location
 				if ( !eventTable[id] && $.inArray(type, config['event']['typeWhitelist'] )+1 && $.inArray(evaluationStatus, config['event']['evaluationBlacklist'])<0 && Number(mag)+0.05 >= config['event']['minMag'] ) {
+					if ( id == 'bug2014jptq' ) console.log('Adding row for special event '+id);
 					// general event info (1st line)
 					var row = '<tr class="tablesorter-hasChildRow">'
 							+ '<td class="utctime-date">'+otime.split('.')[0]+'Z</td>'

www/map.js

@@ -42,25 +42,32 @@ function addStationMarker(id, lat, lng, station) {
 
 /* add event marker */
 function addEventMarker(id, lat, lng, mag) {
-	var markerOptions = {
+	if ( id == 'bug2014jptq' ) console.log('Adding marker for special event '+id);
-		gradient: true,
+	if ( eventTable[id] ) {
-		dropShadow: false,
+		return eventTable[id];
-		fillColor: config['event']['markerColor'],
+		console.log('Marker allready exists ID: '+id);
-		fillOpacity: config['event']['markerOpacity'],
+	} else {
-		color: config['event']['markerColor'],
+		var markerOptions = {
-		weight: 0,
+			gradient: true,
-		opacity: 1,
+			dropShadow: false,
-		className: id+' eventMarker',
+			fillColor: config['event']['markerColor'],
-		radius: mag2radius(mag)
+			fillOpacity: config['event']['markerOpacity'],
+			color: config['event']['markerColor'],
+			weight: 0,
+			opacity: 1,
+			className: id+' eventMarker',
+			radius: mag2radius(mag)
+		};
+		var marker = L.circleMarker(L.latLng(lat, lng), markerOptions);
+		eventLayer.addLayer(marker);
+		eventTable[id] = marker;
+		return marker;
 	};
-	var marker = L.circleMarker(L.latLng(lat, lng), markerOptions);
-	eventLayer.addLayer(marker);
-	eventTable[id] = marker;
-	return marker;
 }; 
 
 /* handle to show events on map */
 function initMapLink() {
+	$("#eventstable > tbody > tr > td > a.map-link").off('click');
 	$("#eventstable > tbody > tr > td > a.map-link").on('click' , function(){
 		var highlightStyle = {
 			color: config['event']['markerColorH'],
@@ -89,15 +96,15 @@ function initMapLink() {
 			if ( $(this).hasClass('selected') ) {
 				$(this).removeClass('selected');
 				$(this).text('Karte');
-				eventTable[$(this).attr('eventid')].setStyle(normalStyle);
 				map.setView(config['map']['centerDefault'], config['map']['zoomDefault']);
+				eventTable[$(this).attr('eventid')].setStyle(normalStyle);
 				highlightFirstEvent();
 			// unselected -> selected
 			} else {
 				$(this).addClass('selected');
 				$(this).text('im Fokus (rot)');
-				eventTable[$(this).attr('eventid')].setStyle(highlightStyle);
 				map.setView(eventTable[$(this).attr('eventid')].getLatLng(), config['map']['zoomFocus']);
+				eventTable[$(this).attr('eventid')].setStyle(highlightStyle)
 			};
 		});
 		return false;
@@ -116,6 +123,12 @@ $(document).ready(function() {
 
 	// create baselayer
 	switch ( config['map']['baselayer'] ) {
+	case 'osmde': // add OpenStreetMap.DE tile layer
+		L.tileLayer('http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
+		{
+			attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+		}).addTo(map);
+		break;
 	case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
 		L.tileLayer('//server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}',
 		{
@@ -123,6 +136,12 @@ $(document).ready(function() {
 			maxZoom: 16
 		}).addTo(map);
 		break;
+	case 'aerial': // add ESRI WordImagery tile layer
+		L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
+		{
+			attribution: 'Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community'
+		}).addTo(map);
+		break;
 	case 'mapquestgray': // add MapQuestOSM tile layer
 		L.tileLayer.grayscale('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg',
 		{
@@ -150,6 +169,8 @@ $(document).ready(function() {
 
 	// load events
 	ajaxLoadEvents();
+	//ajaxLoadEvents([], [], ['bug2014jptq', 'gfz2013yvko']);
+	ajaxLoadEvents([], [], 'bug2014jptq');
 	toggleFilteredMarkers();
 
 	// bind popupopen event