X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/mediawiki_extensions/wrmap.git/blobdiff_plain/139b5bd439c7c771dad8c8a1ab1c776edf536122..527e5780153d4792e6bd680be38576b95f3e0b5f:/wrmap.body.php

diff --git a/wrmap.body.php b/wrmap.body.php
index afd1a9e..60fbf18 100644
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -1,139 +1,51 @@
 <?php
 
-function wrMapParserFirstCallInit() {
-	global $wgParser;
-	global $wgGoogleMapsKey;
-	$wrGoogleMaps = new WrGoogleMaps($wgGoogleMapsKey);
-	$wgParser->setHook('wrgmap', array($wrGoogleMaps, 'render'));
-	return true;
-}
-
-
-
-// Java script
-// -----------
-
-// Global JavaScript functions
-define(WRGMAPJSFUNCTIONS, <<<JAVASCRIPT
-<script type="text/javascript">
-//<![CDATA[
-var wrSleddingIcon = new GIcon(G_DEFAULT_ICON);
-wrSleddingIcon.image = "/vorlagen/gmap_rodelbahn_c.png";
-wrSleddingIcon.shadow = "/vorlagen/gmap_rodelbahn_c_s.png";
-wrSleddingIcon.iconSize = new GSize(17, 17);
-wrSleddingIcon.shadowSize = new GSize(23, 23);
-wrSleddingIcon.iconAnchor = new GPoint(9, 9);
-wrSleddingIcon.infoWindowAnchor = new GPoint(9, 9);
-
-
-function wrCreateMarker(latitude, longitude, name, icon) {
-	var point = new GLatLng(latitude, longitude);
-	var marker = new GMarker(point, icon);
-	var articlePath = "$wgArticlePath";
-	var p = articlePath.replace("\$1", name.replace(' ', '_'));
-	GEvent.addListener(marker, "click", function() {marker.openInfoWindowHtml("<strong><a href='" + p + "'>" + name+ "</a></strong>");});
-	return marker;
-}
-//]]>
-</script>
-JAVASCRIPT
-);
-
-
-/** This class was inpired by the GoogleMaps class of the GoogleMaps extension. */
-class WrGoogleMaps {
-	/// the Google API key (obtained from
-	/// http://www.google.com/apis/maps/signup.html)
-	private $apiKey = null;
-	
-	/// How many <wrgmap> tags are on the current page?
-	private $mapsCount = 0;
-	
-	/// Constructor
-	function WrGoogleMaps($apiKey) {
-		$this->apiKey = $apiKey;
-	}
-	
+class WrMap {
 	/// Renders the <wrgmap> tag
 	/// @param $content string - the content of the <wrgmap> tag
 	/// @param $args array - the array of attribute name/value pairs for the tag
 	/// @param $parser Parser - the MW Parser object for the current page
 	///
 	/// @return string - the html for rendering the map
-	function render($content, $args, &$parser) {
-		++$this->mapsCount;
-		
-		// Decode data
-		if (isset($args['lat'])) $latitude = floatval($args['lat']); else $latitude = 47.267648;
-		if (isset($args['lon'])) $longitude = floatval($args['lon']); else $longitude = 11.404655;
+	public static function render($content, $args, $parser, $frame) {
+		// Get center and zoom level from $args
+		if (isset($args['lat'])) $latitude = floatval($args['lat']); else $latitude = 47.267648;   // latitude as float value
+		if (isset($args['lon'])) $longitude = floatval($args['lon']); else $longitude = 11.404655; // longitude as float value
 		if (isset($args['zoom'])) $zoom = intval($args['zoom']); else $zoom = 10; // Google Zoom Level
-		$staticSizeX = 600;
-		$staticSizeY = 450;
+		$latitude_s = sprintf('%.6F', $latitude);
+		$longitude_s = sprintf('%.6F', $longitude);
 
 		// Query database
 		$dbr = wfGetDB(DB_SLAVE);
-		$res = $dbr->select('wrsleddingcache', array('page_title', 'position_latitude', 'position_longitude'), array('show_in_overview', 'not under_construction'));
-		$sleddingRoutes = array();
-		while ($sleddingRoute = $dbr->fetchRow($res)) $sleddingRoutes[] = $sleddingRoute;
+		$res = $dbr->select(array('wrsledruncache', 'wrreportcache'), array('wrsledruncache.page_title', 'position_latitude', 'position_longitude', 'date_report', '`condition`'), array('show_in_overview', 'not under_construction'), __METHOD__, array(), array('wrreportcache' => array('left outer join', 'wrsledruncache.page_id=wrreportcache.page_id')));
+		$sledruns = array();
+		while ($sledrun = $dbr->fetchRow($res)) $sledruns[] = $sledrun;
 		$dbr->freeResult($res);
 		
-		// Load Google Maps Script and define functions
-		$output = '';
-		if ($this->mapsCount == 1) {
-			$output .= '<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=' . htmlspecialchars($this->apiKey) . '" type="text/javascript"></script>' . "\n";
-			$output .= WRGMAPJSFUNCTIONS;
-		}
-			
-		// Create static map image link
-		$staticLink = "http://maps.google.com/staticmap?center=$latitude,$longitude&zoom=$zoom&size=${staticSizeX}x$staticSizeY&key=$this->apiKey";
-		$staticMarkers = array();
-		foreach ($sleddingRoutes as $s) {
-			$lat = $s['position_latitude'];
-			$lon = $s['position_longitude'];
-			$staticMarkers[] = sprintf('%.3f,%.3f,bluer', $lat, $lon);
-		}
-		if (count($staticMarkers) > 0) $staticLink .= '&markers=' . implode('|', $staticMarkers);
-
-		// Create <div/> element where the map is placed in
-		$mapName = 'wrgmap' . $this->mapsCount;
-		$output .= '<div id="' . $mapName . '" style="width: 100%; height: 450px; border-style:none; display:none;"></div>';
+		$parserOutput = $parser->getOutput();
+		$parserOutput->addHeadItem('<script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.8&amp;sensor=false"></script>', 'googlemaps');
+		$parserOutput->addModules('ext.wrmap');
 		
-		// Return output
-		$output .= '<script type="text/javascript">' . "\n//<![CDATA[\n";
-		$output .= 'if (GBrowserIsCompatible()) {' . "\n";
-		$output .= "\tdocument.getElementById(\"$mapName\").style.display = \"block\";\n";
-		$output .= $this->addMap($mapName, $latitude, $longitude, $zoom);
-		foreach ($sleddingRoutes as $s) {
-			$lat = $s['position_latitude'];
-			$lon = $s['position_longitude'];
-			$pageTitle = $s['page_title'];
+		// Create <div/> element where the map is placed in
+		global $wgExtensionAssetsPath;
+		$output = "<div class=\"wrmap\" style=\"width: 100%; height: 450px; border-style:none;\" data-center-lon=\"$longitude_s\" data-center-lat=\"$latitude_s\" data-zoom=\"$zoom\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">\n";
+		foreach ($sledruns as $sledrun) {
+			$lat = $sledrun['position_latitude'];
+			$lon = $sledrun['position_longitude'];
 			if (!$lat || !$lon) continue;
-			$output .= $this->addJsMarker($lat, $lon, $pageTitle);
+			$title = Title::newFromText($sledrun['page_title']);
+			$title_text = htmlspecialchars($title->getText());
+			$title_url = htmlspecialchars($title->getLocalUrl());
+			$output .= "<p data-lon=\"$lon\" data-lat=\"$lat\" data-title=\"$title_text\" data-url=\"$title_url\" ";
+			if (!is_null($sledrun['date_report'])) $output .= "data-date_report=\"{$sledrun['date_report']}\" ";
+			if (!is_null($sledrun['condition'])) $output .= "data-condition=\"{$sledrun['condition']}\" ";
+			$output .= "/>\n";
 		}
-		$output .= "} else {\n"; // browser not compatible -> create static map
-		$output .= "\tdocument.write(\"<img alt=\\\"Landkarte mit Rodelbahnen\\\" src=\\\"" . htmlspecialchars($staticLink) . "\\\" width=\\\"$staticSizeX\\\" height=\\\"$staticSizeY\\\" />\");\n";
-		$output .= "}\n//]]>\n</script>\n";
-		$output .= '<noscript><img alt="Landkarte mit Rodelbahnen" src="' . htmlspecialchars($staticLink) . "\" width=\"$staticSizeX\" height=\"$staticSizeY\" /></noscript>\n";
-
-		return wrCommonReplaceByMarker($output, 'wrmap');
-	}
-	
-	// returns a string that creates a map object called 'map'
-	private function addMap($mapName, $latitude, $longitude, $zoom) {
-		return "\tvar map = new GMap2(document.getElementById('$mapName'), {'mapTypes': [G_NORMAL_MAP, G_HYBRID_MAP, G_PHYSICAL_MAP, G_SATELLITE_MAP]});\n" .
-		"\tmap.addControl(new GLargeMapControl());\n" .
-		"\tmap.addControl(new GMapTypeControl());\n" .
-		"\tmap.addControl(new GScaleControl());\n" .
-		"\tmap.setCenter(new GLatLng($latitude, $longitude), $zoom);\n" .
-		"\tmap.setMapType(G_PHYSICAL_MAP);\n" .
-		"\tmap.enableScrollWheelZoom();\n";
+		$output .= "</div>\n";
+		
+		return $output;
 	}
 
-	// returns a string with a add marker javascript call
-	private function addJsMarker($latitude, $longitude, $pageTitle) {
-		return "\tmap.addOverlay(wrCreateMarker($latitude, $longitude, \"" . htmlspecialchars(addslashes($pageTitle)) . "\", wrSleddingIcon));\n";
-	}
-	
 }