diff --git a/Makefile b/Makefile
index 3fe6c27..3cb0fe7 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@ clean-deploy:
# OpenLayers
OPENLAYERS_VERSION = 2.13.1
-OPENLAYERS_NAME = OpenLayers-$(OPENLAYERS_VERSION)
+OPENLAYERS_NAME = openlayers-$(OPENLAYERS_VERSION)
OPENLAYERS_ARCHIVE = $(OPENLAYERS_NAME).tar.gz
-OPENLAYERS_URL = http://github.com/openlayers/openlayers/releases/download/release-$(OPENLAYERS_VERSION)/$(OPENLAYERS_ARCHIVE)
+OPENLAYERS_URL = https://github.com/openlayers/openlayers/archive/v$(OPENLAYERS_VERSION).tar.gz
OPENLAYERS_JS_FOLDER = $(JS_FOLDER)/OpenLayers
OPENLAYERS_IMG_FOLDER = $(IMG_FOLDER)/OpenLayers
@@ -38,12 +38,13 @@ $(DOWNLOAD_FOLDER)/$(OPENLAYERS_ARCHIVE):
# MooTools
+# http://ajax.googleapis.com/ajax/libs/mootools/1.4.5/mootools.js
MOOTOOLS_CORE_VERSION = 1.4.5
-MOOTOOLS_CORE_FILE = mootools-core-$(MOOTOOLS_CORE_VERSION)-full-compat.js
-MOOTOOLS_CORE_URL = http://mootools.net/download/get/$(MOOTOOLS_CORE_FILE)
+MOOTOOLS_CORE_FILE = mootools.js
+MOOTOOLS_CORE_URL = http://ajax.googleapis.com/ajax/libs/mootools/$(MOOTOOLS_CORE_VERSION)/$(MOOTOOLS_CORE_FILE)
MOOTOOLS_MORE_VERSION = 1.4.0.1
-MOOTOOLS_MORE_ARCHIVE = $(MOOTOOLS_MORE_VERSION).tar.gz
+MOOTOOLS_MORE_ARCHIVE = mootools-more-$(MOOTOOLS_MORE_VERSION).tar.gz
MOOTOOLS_MORE_URL = https://github.com/mootools/mootools-more/archive/$(MOOTOOLS_MORE_ARCHIVE)
MOOTOOLS_MORE_FOLDER = $(DOWNLOAD_FOLDER)/mootools-more-$(MOOTOOLS_MORE_VERSION)
MOOTOOLS_MORE_COMPONENTS = \
diff --git a/deploy/deploy.py b/deploy/deploy.py
index 45572e5..e908591 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
import sys
import os
diff --git a/manage.py b/manage.py
index d7e0f02..7006dd8 100755
--- a/manage.py
+++ b/manage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
from flask.ext.script import Manager
diff --git a/prosoar/igc/trace.py b/prosoar/igc/trace.py
index 10dc4fc..4f46725 100644
--- a/prosoar/igc/trace.py
+++ b/prosoar/igc/trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
from pyproj import Proj, transform
import math
diff --git a/prosoar/templates/index.html b/prosoar/templates/index.html
index 59ac51d..8b6ec65 100644
--- a/prosoar/templates/index.html
+++ b/prosoar/templates/index.html
@@ -9,8 +9,10 @@
+ {% if get_locale() != 'en'%}
-
+
+ {% endif %}
diff --git a/prosoar/waypoints/welt2000.py b/prosoar/waypoints/welt2000.py
index 89091dc..46fd326 100644
--- a/prosoar/waypoints/welt2000.py
+++ b/prosoar/waypoints/welt2000.py
@@ -15,7 +15,7 @@ def __get_database_file(dir_data):
# Download the current file
# (only if server file is newer than local file)
- url = 'http://www.segelflug.de/vereine/welt2000/download/WELT2000.TXT'
+ url = 'https://raw.githubusercontent.com/skylines-project/welt2000/master/WELT2000.TXT'
subprocess.check_call(['wget', '-N', '-P', os.path.dirname(path), url])
# Check if download succeeded
diff --git a/scripts/cleanup_prosoar b/scripts/cleanup_prosoar
index 9f0fbe6..f34784d 100755
--- a/scripts/cleanup_prosoar
+++ b/scripts/cleanup_prosoar
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
import os
import sys
diff --git a/scripts/gen_airports b/scripts/gen_airports
index 01bb569..27f43b5 100755
--- a/scripts/gen_airports
+++ b/scripts/gen_airports
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
import os
import sys
diff --git a/web_dev/js/proSoar/map.js b/web_dev/js/proSoar/map.js
index 140bb71..5068098 100644
--- a/web_dev/js/proSoar/map.js
+++ b/web_dev/js/proSoar/map.js
@@ -56,68 +56,24 @@ var MapWindow = new Class({
this.epsg4326 = new OpenLayers.Projection("EPSG:4326");
var hillshading = new OpenLayers.Layer.XYZ(_("Hill shading"),
- "http://toolserver.org/~cmarqu/hill/${z}/${x}/${y}.png", {
-// "terrain/${z}/${x}/${y}.png", {
+ "http://c.tiles.wmflabs.org/hillshading/${z}/${x}/${y}.png", {
isBaseLayer: false,
sphericalMercator: true,
transparent: true,
'visibility': true,
'displayInLayerSwitcher': false,
});
-
-/*
- var hillshading = new OpenLayers.Layer.TMS(_("Hill shading"),
-// "http://toolserver.org/~cmarqu/hill/", {
- "terrain/", {
- type: 'png',
- getURL: function osm_getTileURL(bounds) {
- var res = this.map.getResolution();
- var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
- var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
- var z = this.map.getZoom();
- var limit = Math.pow(2, z);
- if (y < 0 || y >= limit) return OpenLayers.Util.getImagesLocation() + "404.png";
- else x = ((x % limit) + limit) % limit;
- return this.url + z + "/" + x + "/" + y + "." + this.type;
- },
- isBaseLayer: false,
- transparent: true,
- 'visibility': true,
- 'displayInLayerSwitcher': false,
- });
-*/
this.map.addLayer(hillshading);
osm.events.register('visibilitychanged', this, function() { hillshading.setVisibility(osm.getVisibility()); });
var airspace = new OpenLayers.Layer.XYZ(_("Airspace"),
- "https://www.skylines-project.org/mapproxy/tiles/1.0.0/airspace/${z}/${x}/${y}.png", {
+ "https://www.skylines.aero/mapproxy/tiles/1.0.0/airspace/${z}/${x}/${y}.png", {
isBaseLayer: false,
transparent: true,
'visibility': true,
'displayInLayerSwitcher': true
});
-
-/*
- var airspace = new OpenLayers.Layer.TMS(_("Airspace"),
- "airspace/", {
- type: 'png',
- getURL: function osm_getTileURL(bounds) {
- var res = this.map.getResolution();
- var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
- var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
- var z = this.map.getZoom();
- var limit = Math.pow(2, z);
- if (y < 0 || y >= limit) return OpenLayers.Util.getImagesLocation() + "404.png";
- else x = ((x % limit) + limit) % limit;
- return this.url + z + "/" + x + "/" + y + "." + this.type;
- },
- isBaseLayer: false,
- transparent: true,
- 'visibility': true,
- 'displayInLayerSwitcher': true
- });
-*/
this.map.addLayer(airspace);
OpenLayers.Feature.Vector.style['default']['strokeWidth'] = '4';