diff --git a/.gitignore b/.gitignore index c9e6f76..054c085 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,8 @@ yarn-error.log* .zanata-cache po/*.po po/*.pot -tests/*.gpx +tests/gpx/* +tests/mock_gpx.json # Editor directories and files .idea diff --git a/README.md b/README.md index 4d7d239..15d35a4 100644 --- a/README.md +++ b/README.md @@ -172,6 +172,8 @@ Icons are made from the original works: licensed under CC BY-SA on Wikimedia. * [Pothole icon](https://commons.wikimedia.org/wiki/File:France_road_sign_A2a.svg) licensed under CC BY-SA on Wikimedia. +* [Compass icon](https://commons.wikimedia.org/wiki/File:Black_and_white_compass.svg) + licensed in public domain on Wikimedia. * [Work icons](https://www.vecteezy.com/vector-art/87351-road-traffic-cartoon-icons-vector) were designed by Vecteezy. * [Trash icon](https://pixabay.com/en/trash-waste-trashcan-garbage-99257/) is diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 1be900f..961661c 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -44,10 +44,12 @@ module.exports = { }, }, resolve: { - extensions: ['.js', '.vue', '.json'], alias: { '@': utils.resolve('src'), - } + }, + extensions: ['.js', '.vue', '.json'], + // Load mock_gpx.json from tests first, tests/default then + modules: ['tests/', 'tests/default', 'node_modules'], }, stats: { children: false, diff --git a/package.json b/package.json index c621e8b..b12a455 100644 --- a/package.json +++ b/package.json @@ -18,16 +18,15 @@ "file-saver": "^1.3.8", "gps-to-gpx": "^1.4.0", "howler": "^2.0.14", - "leaflet": "^1.3.1", - "leaflet-tracksymbol": "^1.0.8", "material-icons": "^0.2.3", "moment": "^2.22.2", "nosleep.js": "^0.7.0", + "ol": "^5.1.3", "roboto-fontface": "^0.9.0", "vue": "^2.5.2", "vue-i18n": "^8.0.0", "vue-router": "^3.0.1", - "vue2-leaflet": "^1.0.2", + "vuelayers": "^0.10.13", "vuetify": "^1.1.11", "vuex": "^3.0.1", "whatwg-fetch": "^2.0.4" diff --git a/scripts/gps_to_js.py b/scripts/gps_to_js.py old mode 100644 new mode 100755 index 0a8ffe8..0e5d4f8 --- a/scripts/gps_to_js.py +++ b/scripts/gps_to_js.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python import json import os import sys @@ -15,13 +16,12 @@ if __name__ == "__main__": for track in gpx.tracks: for segment in track.segments: for point in segment.points: - # TODO: Other fields json_out.append({ 'time': point.time.isoformat(), 'coords': { 'accuracy': point.horizontal_dilution, 'altitudeAccuracy': point.vertical_dilution, - 'heading': None, + 'heading': point.course, 'latitude': point.latitude, 'longitude': point.longitude } @@ -30,5 +30,5 @@ if __name__ == "__main__": break script_dir = os.path.dirname(os.path.realpath(__file__)) - with open(os.path.join(script_dir, '../src/tools/mock_gpx.json'), 'w') as fh: + with open(os.path.join(script_dir, '../tests/mock_gpx.json'), 'w') as fh: json.dump(json_out, fh) diff --git a/src/components/LeafletTrackSymbol.vue b/src/components/LeafletTrackSymbol.vue deleted file mode 100644 index f42894a..0000000 --- a/src/components/LeafletTrackSymbol.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/src/components/Map.vue b/src/components/Map.vue index ee2abd2..21f7017 100644 --- a/src/components/Map.vue +++ b/src/components/Map.vue @@ -1,38 +1,8 @@