Increased the version number to 3.2.0.

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

diff --git a/wrmap.js b/wrmap.js
index f6b23ec17177ec27394e547ce8a9e10bb2581239..51ea34d17dabb0bb284cc60942509aa5eb1d2200 100644 (file)
--- a/wrmap.js
+++ b/wrmap.js
@@ -5,6 +5,22 @@ function init_wrmap(i, jq_map) {
        var EPSG4326 = new OpenLayers.Projection("EPSG:4326"); // lon/lat
        var EPSG3857 = new OpenLayers.Projection("EPSG:3857"); // google
 
+       // tool functions
+       function createElement(tagName, attributes={}) {
+               var element = $(document.createElement(tagName));
+               for (var attribute in attributes) {
+                       element.attr(attribute, attributes[attribute]);
+               }
+               return element;
+       }
+
+       function appendElement(parentElement, tagName, attributes={}) {
+               var element = createElement(tagName, attributes);
+               parentElement.append(element);
+               return element;
+       }
+
+
        // 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/"
@@ -212,33 +228,49 @@ function init_wrmap(i, jq_map) {
                autoActivate: true,
                toggle: true,
                onSelect: function(feature) {
-                       var popup_text = '';
-                       if (feature.attributes.type == 'sledrun') {
-                               popup_text += "<h2>" + feature.attributes.name + '</h2>\n' +
-                               '<ul>\n' +
-                               '<li><a href="' + feature.attributes.wiki + '">Details zur Rodelbahn</a></li>\n' + 
-                               '<li>Rodelbahnzustand<br/>';
-                               if (feature.attributes.condition !== undefined) {
-                                       var condition_text = {1: 'Sehr gut', 2: 'Gut', 3: 'Mittelm&auml;&szlig;ig', 4: 'Schlecht', 5: 'Geht nicht'};
-                                       var year_month_day = feature.attributes.date_report.split('-');
-                                       popup_text += '<a href="' + feature.attributes.wiki + '#Eintr.C3.A4ge">' + condition_text[feature.attributes.condition] + '</a> ' + 
-                                       '<small>' + year_month_day[2] + '.' + year_month_day[1] + '.</small> ' +
-                                       '<em><a href="' + feature.attributes.wiki + '#Eintragen">Neu</a></em>';
+                       var attr = feature.attributes;
+                       var popup_div = createElement('div');
+
+                       // 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 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('-');
+                                       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 {
-                                       popup_text += '<em><a href="' + feature.attributes.wiki + '#Eintragen">Bitte eintragen</a></em>';
+                                       p.append(createElement('em').append(createElement('a', {href: attr.wiki + '#Eintragen'}).text('Bitte eintragen')));
                                }
-                               popup_text += '</li>\n</ul>\n';
-                       } else if (feature.attributes.wiki !== undefined) {
-                               if (feature.attributes.name != undefined) popup_text += '<h2>' + feature.attributes.name + '</h2>\n';
-                               popup_text += '<p><a href="' + feature.attributes.wiki + '">Details</a></p>\n';
-                       } else return;
+                       }
+
+                       // wiki link
+                       if (attr.wiki !== undefined) {
+                               var a = appendElement(appendElement(popup_div, 'p'), 'a', {href: attr.wiki});
+                               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
+                       if (popup_div.children().length == 0) return;
 
                        // Open popup
                        var selectFeatureControl = this;
-                       var popup = new OpenLayers.Popup.FramedCloud('sledruninfopopup_' + feature.attributes.wiki, 
+                       var popup = new OpenLayers.Popup.FramedCloud('sledruninfopopup_' + attr.wiki,
                        feature.geometry.getBounds().getCenterLonLat(),
                        null,
-                       popup_text,
+                       popup_div.html(),
                        null, true, function(event) {
                                // onPopupClose
                                selectFeatureControl.unselectAll();