Added a minimum width to the sledrun info popup so that hopefully ticket #89 (size...

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

diff --git a/wrmap.js b/wrmap.js
index aeaf86d09f24894a983fc410fae7461b635a91f8..5bbdcabc5ccfc16b47cbb38bc5f8b2604de4d73b 100644 (file)
--- a/wrmap.js
+++ b/wrmap.js
@@ -1,20 +1,35 @@
 "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
        var EPSG3857 = new OpenLayers.Projection("EPSG:3857"); // google
 
        // tool functions
-       function createElement(tagName, attributes={}) {
+       function createElement(tagName, attributes) {
                var element = $(document.createElement(tagName));
+               if (attributes === undefined) return element;
                for (var attribute in attributes) {
                        element.attr(attribute, attributes[attribute]);
                }
                return element;
        }
 
-       function appendElement(parentElement, tagName, attributes={}) {
+       function appendElement(parentElement, tagName, attributes) {
+               if (attributes === undefined) attributes = {};
                var element = createElement(tagName, attributes);
                parentElement.append(element);
                return element;
@@ -23,7 +38,9 @@ function init_wrmap(i, jq_map) {
 
        // extract geojson from map element and clear map element's content
        jq_map = $(jq_map);
-       OpenLayers.ImgPath = jq_map.attr('data-img-path'); // e.g. "/mediawiki/extensions/wrmap/openlayers/img/"
+       var ext_path = jq_map.attr('data-ext-path'); // e.g. '/mediawiki/extensions/wrmap'
+       var img_path = ext_path + '/img';
+       OpenLayers.ImgPath = ext_path + '/openlayers/img/'; // e.g. '/mediawiki/extensions/wrmap/openlayers/img/'
        var json_string = jq_map.children().last().text();
        jq_map.empty(); // once parsed, remove geojson string from the map element.
        var format_json = new OpenLayers.Format.JSON();
@@ -76,7 +93,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;
@@ -122,12 +139,12 @@ function init_wrmap(i, jq_map) {
                                                new OpenLayers.Rule({
                                                        filter: filter_point_sledrun,
                                                        symbolizer: {
-                                                               externalGraphic: '/vorlagen/bahnzustand${getCondition}nn.png',
+                                                               externalGraphic: img_path + '/marker_c_sledrun_${getCondition}nn.png',
                                                                graphicWidth: 17,
                                                                graphicHeight: 17,
                                                                graphicXOffset: -8,
                                                                graphicYOffset: -8,
-                                                               backgroundGraphic: "/vorlagen/gmap_rodelbahn_c_s.png",
+                                                               backgroundGraphic: img_path + '/marker_c_shadow.png',
                                                                backgroundWidth: 23,
                                                                backgroundHeight: 23,
                                                                backgroundXOffset: -8,
@@ -137,7 +154,7 @@ function init_wrmap(i, jq_map) {
                                                new OpenLayers.Rule({
                                                        elseFilter: true,
                                                        symbolizer: {
-                                                               externalGraphic: '/vorlagen/gmap_${getSymbol}.png',
+                                                               externalGraphic: img_path + '/marker_p_${getSymbol}.png',
                                                                graphicWidth: 20,
                                                                graphicHeight: 34,
                                                                graphicXOffset: -10,
@@ -170,7 +187,7 @@ function init_wrmap(i, jq_map) {
                                                        symbolizer: {
                                                                label: "${name}",
                                                                labelYOffset: 14,
-                                                               externalGraphic: '/vorlagen/bahnzustand${getCondition}nh.png'
+                                                               externalGraphic: img_path + '/marker_c_sledrun_${getCondition}nh.png'
                                                        }
                                                }),
                                                new OpenLayers.Rule({
@@ -191,8 +208,14 @@ function init_wrmap(i, jq_map) {
                                                new OpenLayers.Rule({
                                                        filter: filter_point_sledrun,
                                                        symbolizer: {
-                                                               externalGraphic: '/vorlagen/bahnzustand${getCondition}nh.png'
+                                                               externalGraphic: img_path + '/marker_c_sledrun_${getCondition}nh.png',
+                                                               backgroundGraphic: false,
+                                                               graphicXOffset: -6,
+                                                               graphicYOffset: -6
                                                        }
+                                               }),
+                                               new OpenLayers.Rule({
+                                                       elseFilter: true
                                                })
                                        ]
                                })
@@ -288,7 +311,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(),