Switched from Bing map to Google map.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/mediawiki_extensions/wrmap/trunk@2583 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrmap.body.php b/wrmap.body.php
index 6d4c7d6da6545478d2c023d8098bba70554aa24a..4958e22766307003cdb8c07008fa626f88e7d659 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -399,7 +399,7 @@ class WrBaseMap {
                assert(in_array($tagname, array('wrmap', 'wrgmap')));
 
                $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->addHeadItem('<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyABu68dyE3dB_l-UfB_WuyoPAsSTthI4gc&amp;language=de"></script>', 'googlemaps');
                $parserOutput->addModules('ext.wrmap');
 
                // append all sledruns as icon

diff --git a/wrmap.js b/wrmap.js
index f7c575b8197afd4ca788da7dbb3e761479a42b8e..4b922a2202be90eeb8b018d473f0c43266fda069 100644 (file)
--- a/wrmap.js
+++ b/wrmap.js
@@ -63,18 +63,18 @@ function init_wrmap(i, jq_map) {
        // ----------------
        // // Google (since about 19th of November 2015 this doesn't work anymore - white background)
        // // see https://github.com/openlayers/openlayers/issues/1450
-       // var layer_map = new OpenLayers.Layer.Google("Google Physical", {
-       //      type: google.maps.MapTypeId.TERRAIN
-       // });
+       var layer_map = new OpenLayers.Layer.Google("Google Physical", {
+               type: google.maps.MapTypeId.TERRAIN
+       });
 
        // // Alternative: OSM map
        // var layer_map = new OpenLayers.Layer.OSM();
        
        // Microsoft Bing Maps
-       var layer_map = new OpenLayers.Layer.Bing({
-               type: "Road",
-               key: "AgPH3SlIXAwajrJKf0FORQyhTqsP8KIlvtN6RKfvxe6fOB6q6-HFmg8EOFm7LSOA",
-               tileOptions: {crossOriginKeyword: null}});
+       // var layer_map = new OpenLayers.Layer.Bing({
+       //      type: "Road",
+       //      key: "AgPH3SlIXAwajrJKf0FORQyhTqsP8KIlvtN6RKfvxe6fOB6q6-HFmg8EOFm7LSOA",
+       //      tileOptions: {crossOriginKeyword: null}});
 
        // // Alternative: Base map
        // // see: http://www.basemap.at