]> ToastFreeware Gitweb - philipp/winterrodeln/mediawiki_extensions/wrmap.git/blobdiff - wrmap.js
Remove unnecessary whitespace.
[philipp/winterrodeln/mediawiki_extensions/wrmap.git] / wrmap.js
index 54d8ba4108dafe59f7e8d2ea8d0a9fa341fbafbc..24d42e51bd7f1b39af6d03097cb6570b31b238a2 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();
@@ -44,6 +61,8 @@ function init_wrmap(i, jq_map) {
 
        // background layer
        // ----------------
+       // // 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
        });
@@ -51,11 +70,18 @@ function init_wrmap(i, jq_map) {
        // // Alternative: OSM map
        // var layer_map = new OpenLayers.Layer.OSM();
        
-       // // Alternative: Microsoft Bing Maps
+       // Microsoft Bing Maps
        // var layer_map = new OpenLayers.Layer.Bing({
-       //     type: "Road",
-       //     key: "AgPH3SlIXAwajrJKf0FORQyhTqsP8KIlvtN6RKfvxe6fOB6q6-HFmg8EOFm7LSOA"});
+       //      type: "Road",
+       //      key: "AgPH3SlIXAwajrJKf0FORQyhTqsP8KIlvtN6RKfvxe6fOB6q6-HFmg8EOFm7LSOA",
+       //      tileOptions: {crossOriginKeyword: null}});
+
+       // // 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});
@@ -76,7 +102,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 +122,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 +138,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 +148,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 +163,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 +178,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 +195,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 +206,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}
        });
@@ -201,7 +254,7 @@ function init_wrmap(i, jq_map) {
                center: new OpenLayers.LonLat(lon, lat).transform(EPSG4326, EPSG3857),
                zoom: zoom
        });
-       
+
 
        // add features
        // if this would be done before the layer is added to the map, the features are not added
@@ -232,30 +285,34 @@ function init_wrmap(i, jq_map) {
                        var popup_div = createElement('div');
 
                        // name
-                       if (attr.name !== undefined && (attr.wiki !== undefined || attr.thumb_url !== undefined))
-                               popup_div.append(createElement('h2').text(attr.name));
+                       if (attr.name !== undefined && (attr.wiki !== undefined || attr.thumb_url !== undefined)) {
+                               var h2 = appendElement(popup_div, 'h2');
+                               if (attr.wiki === undefined) h2.text(attr.name);
+                               else appendElement(h2, 'a', {href: attr.wiki}).text(attr.name);
+                       }
 
                        // sledrun information
                        if (attr.type == 'sledrun') {
-                               var ul = appendElement(popup_div, 'ul');
-                               ul.append(createElement('li').append(createElement('a', {href: attr.wiki}).text('Details zur Rodelbahn')));
-                               var li = appendElement(ul, 'li').text('Rodelbahnzustand').append(createElement('br'));
+                               var p = appendElement(popup_div, 'p').text('Rodelbahnzustand').append(createElement('br'));
                                if (attr.condition !== undefined) {
                                        var condition_text = {1: 'Sehr gut', 2: 'Gut', 3: 'Mittelmäßig', 4: 'Schlecht', 5: 'Geht nicht'};
                                        var year_month_day = attr.date_report.split('-');
-                                       li.append(createElement('a', {href: attr.wiki + '#Eintr.C3.A4ge'}).text(condition_text[attr.condition]), ' ');
-                                       li.append(createElement('small').text(year_month_day[2] + '.' + year_month_day[1] + '.'), ' ');
-                                       li.append(createElement('em').append(createElement('a', {href: attr.wiki + '#Eintragen'}).text('Neu')));
+                                       p.append(createElement('a', {href: attr.wiki + '#Eintr.C3.A4ge'}).text(condition_text[attr.condition]), ' ');
+                                       p.append(createElement('small').text(year_month_day[2] + '.' + year_month_day[1] + '.'), ' ');
+                                       p.append(createElement('em').append(createElement('a', {href: attr.wiki + '#Eintragen'}).text('Neu')));
                                } else {
-                                       li.append(createElement('em').append(createElement('a', {href: attr.wiki + '#Eintragen'}).text('Bitte eintragen')));
+                                       p.append(createElement('em').append(createElement('a', {href: attr.wiki + '#Eintragen'}).text('Bitte eintragen')));
                                }
                        }
 
                        // wiki link
-                       if (attr.wiki !== undefined && attr.type !== 'sledrun') {
+                       if (attr.wiki !== undefined) {
                                var a = appendElement(appendElement(popup_div, 'p'), 'a', {href: attr.wiki});
-                               if (attr.thumb_url === undefined) a.text('Details');
-                               else a.append(createElement('img', {src: attr.thumb_url, alt: 'Details'}));
+                               var detail_text = 'Details';
+                               if (attr.type == 'sledrun') detail_text += ' zur Rodelbahn';
+                               if (attr.type == 'gasthaus') detail_text += ' zum Gasthaus';
+                               if (attr.thumb_url === undefined) a.text(detail_text);
+                               else a.append(createElement('img', {src: attr.thumb_url, alt: detail_text, title: detail_text}));
                        }
 
                        // no popup if we don't have anything to say
@@ -263,7 +320,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(),