Merge branch 'master' into feature/distance-marker

package.json

@@ -10,7 +10,7 @@
         "layers": "node layers/josm/extract.js && node layers/collection/extract.js",
         "test": "gulp",
         "prettier": "prettier --write '**/*'",
-        "serve": "gulp debug && gulp serve watch"
+        "serve": "gulp serve watch"
     },
     "husky": {
         "hooks": {
@@ -26,6 +26,7 @@
     "dependencies": {
         "@bagage/leaflet.restoreview": "1.0.1",
         "@mapbox/polyline": "^0.2.0",
+        "@mapbox/togeojson": "^0.16.0",
         "@turf/turf": "^5.1.6",
         "async": "~0.9.2",
         "bootbox": "~5.1.3",
@@ -47,6 +48,7 @@
         "leaflet-easybutton": "*",
         "leaflet-editable": "^1.1.0",
         "leaflet-elevation": "nrenner/Leaflet.Elevation#dev",
+        "leaflet-filelayer": "^1.2.0",
         "leaflet-geometryutil": "^0.9.1",
         "leaflet-plugins": "~3.0.0",
         "leaflet-providers": "^1.5.0",