WIP: Add export in flarmcfg.txt format

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 = \

deploy/deploy.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import sys
 import os

manage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 from flask.ext.script import Manager
 

prosoar/igc/trace.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 from pyproj import Proj, transform
 import math

prosoar/task/flarm_writer.py

@@ -0,0 +1,21 @@
+from aerofiles.flarmcfg import Writer
+
+
+def write_flarm_task(fp, task, taskname=''):
+    writer = Writer(fp)
+
+    writer.write_waypoint(None, None, 'TAKEOFF')
+
+    for i, turnpoint in enumerate(task):
+        if turnpoint.name == 'Free turnpoint':
+            name = '{0:0=2d} '.format(i + 1) + turnpoint.name
+        else:
+            name = turnpoint.name
+
+        writer.write_waypoint(
+            latitude=float(turnpoint.lat),
+            longitude=float(turnpoint.lon),
+            description=name,
+        )
+
+    writer.write_waypoint(None, None, 'LANDING')

prosoar/templates/index.html

@@ -9,8 +9,10 @@
 
   <script type="text/javascript" src="js/MooTools/mootools-core.js"></script>
   <script type="text/javascript" src="js/MooTools/mootools-more.js"></script>
+  {% if get_locale() != 'en'%}
 
-  <link rel="gettext" href="LC_MESSAGES/{{ get_locale() }}.json" />
+    <link rel="gettext" href="LC_MESSAGES/{{ get_locale() }}.json" />
+  {% endif %}
 
   <script type="text/javascript" src="settings/initial.js"></script>
 

prosoar/views/tasks.py

@@ -10,6 +10,7 @@
 
 from prosoar.task.json_reader import parse_json_task
 from prosoar.task.json_writer import write_json_task
+from prosoar.task.flarm_writer import write_flarm_task
 from prosoar.task.seeyou_writer import write_seeyou_task
 from prosoar.task.xcsoar_reader import parse_xcsoar_task
 from prosoar.task.xcsoar_writer import write_xcsoar_task
@@ -83,6 +84,10 @@ def download(uid, taskname, filetype, temptask=False):
         mimetype = 'application/seeyou'
         file_extension = 'cup'
         write_seeyou_task(io, task, taskname)
+    elif filetype == 'flarm':
+        mimetype = 'text/plain'
+        file_extension = 'txt'
+        write_flarm_task(io, task, taskname)
 
     io.seek(0)
 
@@ -247,5 +252,10 @@ def save_temp():
                 'url': base_url + '/seeyou',
                 'qrcode': base_url + '/seeyou/qr',
             },
+            'flarm': {
+                'name': 'Flarm (flarmcfg.txt)',
+                'url': base_url + '/flarm',
+                'qrcode': base_url + '/flarm/qr',
+            },
         }
     })

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

scripts/cleanup_prosoar

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import os
 import sys

scripts/gen_airports

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import os
 import sys

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';