Changed version to 3.4.0.

[philipp/winterrodeln/mediawiki_extensions/wrmap.git] / wrmap.js

diff --git a/wrmap.js b/wrmap.js
index d62b37b48f72c3c865b6ae9393de3dd97862ee66..0fdedef60d3124911567cab1e25da5d80e9d3c3f 100644 (file)
--- a/wrmap.js
+++ b/wrmap.js
@@ -1,5 +1,18 @@
 "use strict";
 
+// "User defined" popup class to be able to specify a minimum size for the popup,
+// so that Safari 7.0 displays it correctly (see ticket #89).
+OpenLayers.Popup.WrInfo = OpenLayers.Class(OpenLayers.Popup.FramedCloud, {
+       minSize: new OpenLayers.Size(180, 260),
+
+       initialize: function(id, lonlat, contentSize, contentHTML, anchor, closeBox, closeCallback) {
+               OpenLayers.Popup.FramedCloud.prototype.initialize.apply(this, arguments);
+       },
+
+       CLASS_NAME: "OpenLayers.Popup.WrInfo"
+});
+
+
 function init_wrmap(i, jq_map) {
        // define constants
        var EPSG4326 = new OpenLayers.Projection("EPSG:4326"); // lon/lat
@@ -48,18 +61,26 @@ function init_wrmap(i, jq_map) {
 
        // background layer
        // ----------------
-       var layer_map = new OpenLayers.Layer.Google("Google Physical", {
-               type: google.maps.MapTypeId.TERRAIN
-       });
+       // // 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
+       // });
 
        // // Alternative: OSM map
        // var layer_map = new OpenLayers.Layer.OSM();
        
-       // // Alternative: Microsoft Bing Maps
-       // var layer_map = new OpenLayers.Layer.Bing({
-       //     type: "Road",
-       //     key: "AgPH3SlIXAwajrJKf0FORQyhTqsP8KIlvtN6RKfvxe6fOB6q6-HFmg8EOFm7LSOA"});
+       // Microsoft Bing Maps
+       var layer_map = new OpenLayers.Layer.Bing({
+               type: "Road",
+               key: "AgPH3SlIXAwajrJKf0FORQyhTqsP8KIlvtN6RKfvxe6fOB6q6-HFmg8EOFm7LSOA"});
+
+       // // Alternative: Base map
+       // // see: http://www.basemap.at
        
+       // // Alternative: OpenTopoMap
+       // // see: https://opentopomap.org/about
+
        // // Alternative: Dummy base layer
        // var layer_map = new OpenLayers.Layer.Vector("Base Layer", {
        //     isBaseLayer: true});
@@ -80,7 +101,7 @@ function init_wrmap(i, jq_map) {
                                                if (feature.attributes.type == 'alternative') return '#7f7fff';
                                                if (feature.attributes.type == 'lift') return '#000000';
                                                if (feature.attributes.type == 'anfahrt') return '#e1e100';
-                                               return '#ee9900';
+                                               return '#e7525b';
                                        },
                                        getStrokeWidth: function(feature) {
                                                if (feature.attributes.strokeWidth !== undefined) return feature.attributes.strokeWidth;
@@ -141,7 +162,7 @@ function init_wrmap(i, jq_map) {
                                                new OpenLayers.Rule({
                                                        elseFilter: true,
                                                        symbolizer: {
-                                                               externalGraphic: img_path + '/marker_c_shadow.png',
+                                                               externalGraphic: img_path + '/marker_p_${getSymbol}.png',
                                                                graphicWidth: 20,
                                                                graphicHeight: 34,
                                                                graphicXOffset: -10,
@@ -298,7 +319,7 @@ function init_wrmap(i, jq_map) {
 
                        // Open popup
                        var selectFeatureControl = this;
-                       var popup = new OpenLayers.Popup.FramedCloud('sledruninfopopup_' + attr.wiki,
+                       var popup = new OpenLayers.Popup.WrInfo('sledruninfopopup_' + attr.wiki,
                        feature.geometry.getBounds().getCenterLonLat(),
                        null,
                        popup_div.html(),