-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/components/ors-panel-routing/ors-export-route/ors-export-route.js b/app/components/ors-panel-routing/ors-export-route/ors-export-route.js
index 6fa8ea83..eb4ebd7f 100755
--- a/app/components/ors-panel-routing/ors-export-route/ors-export-route.js
+++ b/app/components/ors-panel-routing/ors-export-route/ors-export-route.js
@@ -10,6 +10,7 @@ angular
let ctrl = this;
ctrl.elevation = true;
ctrl.instructions = false;
+ ctrl.toGpx = true;
ctrl.filename = "ors-export-linestring";
ctrl.gpxOptShow = true;
ctrl.tcxOptShow = false;
@@ -88,10 +89,11 @@ angular
ctrl.exportRoute = () => {
let options = {
elevation: ctrl.elevation,
- instructions: ctrl.instructions
+ instructions: ctrl.instructions,
+ toGpx: ctrl.toGpx
};
let currentRoute = null;
- if (ctrl.currentFileFormat == "rawjson") {
+ if (ctrl.currentFileFormat === "rawjson") {
currentRoute =
orsRouteService.data.routes[orsRouteService.getCurrentRouteIdx()];
} else {
diff --git a/app/includes/info.html b/app/includes/info.html
index b0d821ea..66a068c4 100755
--- a/app/includes/info.html
+++ b/app/includes/info.html
@@ -55,8 +55,10 @@
-
- ![]()
+
+
+
+
diff --git a/app/infrastructure/ors-importexport-service.js b/app/infrastructure/ors-importexport-service.js
index 57512144..3fcf2048 100755
--- a/app/infrastructure/ors-importexport-service.js
+++ b/app/infrastructure/ors-importexport-service.js
@@ -1,7 +1,8 @@
-angular.module("orsApp.GeoFileHandler-service", ["ngFileSaver"])
-/**
+angular
+ .module("orsApp.GeoFileHandler-service", ["ngFileSaver"])
+ /**
/*** Export Factory
- **/.factory("orsExportFactory", [
+ **/ .factory("orsExportFactory", [
"FileSaver",
"Blob",
"orsNamespaces",
@@ -9,177 +10,222 @@ angular.module("orsApp.GeoFileHandler-service", ["ngFileSaver"])
"orsSettingsFactory",
"orsUtilsService",
"orsRouteService",
- (FileSaver, Blob, orsNamespaces, orsRequestService, orsSettingsFactory, orsUtilsService, orsRouteService) => {
- var orsExportFactory = {}
- /**
- * Export any vector element on the map to GPX
- * @param {Object} geometry: the route object (leaflet object) to export
- * @param {String} geomType: the type of geometry which is passed
- * @param {Object} options: export options
- * @param {String} format: the file format to export
- * @param {String} filename: the filename of the exported file
- */
- orsExportFactory.exportFile = (geometry, geomType, options, format, filename) => {
- let exportData, geojsonData, extension
- extension = "." + format
- switch (format) {
- /**
- * To generate the gpx file the ORS API is called with format=gpx and current settings.
- * Instructions can be included when needed.
- */
- case "gpx":
- let userOptions = orsSettingsFactory.getUserOptions()
- let settings = orsSettingsFactory.getSettings()
- let payload = orsUtilsService.routingPayload(settings, userOptions)
- payload.format = "gpx"
- if (!options.instructions) payload.instructions = false
- const request = orsRouteService.fetchRoute(payload)
- orsRouteService.routingRequests.requests.push(request)
- request.promise.then(function (response) {
- // parsing xml to js object using https://www.npmjs.com/package/xml-js
- exportData = xml2js(response)
- let metadata = exportData.elements[0].elements[0].elements
- metadata[0].elements[0].text = filename
- // description node can be
-
+
- -
diff --git a/app/infrastructure/ors-importexport-service.js b/app/infrastructure/ors-importexport-service.js
index 57512144..3fcf2048 100755
--- a/app/infrastructure/ors-importexport-service.js
+++ b/app/infrastructure/ors-importexport-service.js
@@ -1,7 +1,8 @@
-angular.module("orsApp.GeoFileHandler-service", ["ngFileSaver"])
-/**
+angular
+ .module("orsApp.GeoFileHandler-service", ["ngFileSaver"])
+ /**
/*** Export Factory
- **/.factory("orsExportFactory", [
+ **/ .factory("orsExportFactory", [
"FileSaver",
"Blob",
"orsNamespaces",
@@ -9,177 +10,222 @@ angular.module("orsApp.GeoFileHandler-service", ["ngFileSaver"])
"orsSettingsFactory",
"orsUtilsService",
"orsRouteService",
- (FileSaver, Blob, orsNamespaces, orsRequestService, orsSettingsFactory, orsUtilsService, orsRouteService) => {
- var orsExportFactory = {}
- /**
- * Export any vector element on the map to GPX
- * @param {Object} geometry: the route object (leaflet object) to export
- * @param {String} geomType: the type of geometry which is passed
- * @param {Object} options: export options
- * @param {String} format: the file format to export
- * @param {String} filename: the filename of the exported file
- */
- orsExportFactory.exportFile = (geometry, geomType, options, format, filename) => {
- let exportData, geojsonData, extension
- extension = "." + format
- switch (format) {
- /**
- * To generate the gpx file the ORS API is called with format=gpx and current settings.
- * Instructions can be included when needed.
- */
- case "gpx":
- let userOptions = orsSettingsFactory.getUserOptions()
- let settings = orsSettingsFactory.getSettings()
- let payload = orsUtilsService.routingPayload(settings, userOptions)
- payload.format = "gpx"
- if (!options.instructions) payload.instructions = false
- const request = orsRouteService.fetchRoute(payload)
- orsRouteService.routingRequests.requests.push(request)
- request.promise.then(function (response) {
- // parsing xml to js object using https://www.npmjs.com/package/xml-js
- exportData = xml2js(response)
- let metadata = exportData.elements[0].elements[0].elements
- metadata[0].elements[0].text = filename
- // description node can be