Added a comment mentioning www.basemap.at.

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

diff --git a/wrmap.js b/wrmap.js
index 51ea34d17dabb0bb284cc60942509aa5eb1d2200..50244117db6859fb0ebe3692b10033948169ca88 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();
@@ -55,6 +72,9 @@ function init_wrmap(i, jq_map) {
        // var layer_map = new OpenLayers.Layer.Bing({
        //     type: "Road",
        //     key: "AgPH3SlIXAwajrJKf0FORQyhTqsP8KIlvtN6RKfvxe6fOB6q6-HFmg8EOFm7LSOA"});
+
+       // // Alternative: Base map
+       // // see: http://www.basemap.at
        
        // // Alternative: Dummy base layer
        // var layer_map = new OpenLayers.Layer.Vector("Base Layer", {
@@ -76,7 +96,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;
@@ -96,6 +116,13 @@ function init_wrmap(i, jq_map) {
                value: 'sledrun'
        });
 
+       // Returns 0 to 5 for features that represent sledruns as their condition
+       var get_sledrun_condition = function(feature) {
+               if (feature.attributes.condition === undefined) return 0;
+               return feature.attributes.condition;
+       }
+
+
        var layer_point = new OpenLayers.Layer.Vector("Point", {
                styleMap: new OpenLayers.StyleMap({
                        'default': new OpenLayers.Style({
@@ -105,10 +132,7 @@ function init_wrmap(i, jq_map) {
                                        context: {
                                                // the following context functions should only be available in the rule that uses them,
                                                // but the rule dependent contexts are ignored by OpenLayers (I think that's a bug)
-                                               getCondition: function(feature) {
-                                                       if (feature.attributes.condition === undefined) return 0;
-                                                       return feature.attributes.condition;
-                                               },
+                                               getCondition: get_sledrun_condition,
                                                getSymbol: function(feature) {
                                                        var name = feature.attributes.type;
                                                        return name;
@@ -118,12 +142,12 @@ function init_wrmap(i, jq_map) {
                                                new OpenLayers.Rule({
                                                        filter: filter_point_sledrun,
                                                        symbolizer: {
-                                                               externalGraphic: '/vorlagen/bahnzustand${getCondition}_0.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,
@@ -133,7 +157,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,
@@ -148,6 +172,7 @@ function init_wrmap(i, jq_map) {
                                        fontWeight: "bold"
                                }, {
                                        context: {
+                                               getCondition: get_sledrun_condition,
                                                getTitle: function(feature) {
                                                        var title = '';
                                                        if (feature.attributes.type != 'point') {
@@ -164,7 +189,8 @@ function init_wrmap(i, jq_map) {
                                                        filter: filter_point_sledrun,
                                                        symbolizer: {
                                                                label: "${name}",
-                                                               labelYOffset: 14
+                                                               labelYOffset: 14,
+                                                               externalGraphic: img_path + '/marker_c_sledrun_${getCondition}nh.png'
                                                        }
                                                }),
                                                new OpenLayers.Rule({
@@ -174,7 +200,28 @@ function init_wrmap(i, jq_map) {
                                                        }
                                                })
                                        ]
-                               }) 
+                               }),
+                       select: new OpenLayers.Style({
+                                       fillOpacity: 1.
+                               }, {
+                                       context: {
+                                               getCondition: get_sledrun_condition,
+                                       },
+                                       rules: [
+                                               new OpenLayers.Rule({
+                                                       filter: filter_point_sledrun,
+                                                       symbolizer: {
+                                                               externalGraphic: img_path + '/marker_c_sledrun_${getCondition}nh.png',
+                                                               backgroundGraphic: false,
+                                                               graphicXOffset: -6,
+                                                               graphicYOffset: -6
+                                                       }
+                                               }),
+                                               new OpenLayers.Rule({
+                                                       elseFilter: true
+                                               })
+                                       ]
+                               })
                }),
                rendererOptions: {yOrdering: true}
        });
@@ -267,7 +314,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(),