Merge pull request #158 from telemaxx/map25-experimental

Map25 experimental: satellite maps and more
mytourbook · Nov 11, 2019 · c98edb2 · c98edb2
2 parents 822f184 + 9160398
commit c98edb2
Show file tree

Hide file tree

Showing 401 changed files with 39,702 additions and 187,725 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,15 +3,19 @@ bin
 dist/
 target/
 repositories/
-**/build/
+
 **/node_modules/
 **/tmp/
 **/node_modules/
 
+**/build/**/*.jar
+**/*vtm*/**/build/
+
 .apt_generated
+.log
 
 .gradle
+gradle
 
 *.js.map
 *.js.uncompressed.js
-/features/
diff --git a/INSTALL-UPDATES/installer-net.tourbook/win-Inno.Setup/mytourbook-include-app.iss b/INSTALL-UPDATES/installer-net.tourbook/win-Inno.Setup/mytourbook-include-app.iss
@@ -1,6 +1,6 @@
 
 #define AppYear         "2019"
-#define AppVersion      "19.7.1"
+#define AppVersion      "19.10.0"
 
 #define AppSubVersion   ""
 ;#define AppSubVersion   "_BETA_1"

diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.chart.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.chart.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.chart.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.chart
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.common.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.common.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.common.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.common
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.device.garmin.fit.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.device.garmin.fit.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device.garmin.fit.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.device.garmin.fit
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.device.garmin.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.device.garmin.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device.garmin.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.device.garmin
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.device.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.device.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.device
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.device.nmea.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.device.nmea.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device.nmea.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.device.nmea
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.photo.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.photo.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.photo.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.photo
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.printing.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.printing.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.printing.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.printing
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.statistics.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.statistics.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.statistics.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.statistics
diff --git a/LANGUAGE-FRAGMENTS/net.tourbook.web.nl/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/net.tourbook.web.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.web.nl;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
 Fragment-Host: net.tourbook.web
diff --git a/LANGUAGE-FRAGMENTS/pom.xml b/LANGUAGE-FRAGMENTS/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>mytourbook-i18</artifactId>			<groupId>net.tourbook</groupId>
-																	<version>19.7.1-SNAPSHOT</version>
+																	<version>19.10.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<artifactId>mytourbook-app</artifactId>		<groupId>net.tourbook</groupId>
-																	<version>19.7.1-SNAPSHOT</version>
+																	<version>19.10.0-SNAPSHOT</version>
 
 		<relativePath>../../MT/mytourbook/pom.xml</relativePath>
 	</parent>

diff --git a/LANGUAGE-FRAGMENTS/translation-test/feature.xml b/LANGUAGE-FRAGMENTS/translation-test/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="feature.net.tourbook.app.nl"
       label="MyTourbook Translation Test"
-      version="19.7.0.qualifier">
+      version="19.10.0.qualifier">
 
    <description>
       Test translated texts.

diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.chart/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.chart/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.chart;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.common/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.common/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.common;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device.garmin.fit/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device.garmin.fit/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device.garmin.fit;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device.garmin/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device.garmin/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device.garmin;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device.nmea/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device.nmea/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device.nmea;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.device/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.device;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.photo/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.photo/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.photo;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.printing/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.printing/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.printing;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.statistics/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.statistics/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.statistics;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.web/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook.web/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook.web;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook/META-INF/MANIFEST.MF b/LANGUAGE-FRAGMENTS/z-DUMMY-HOST.net.tourbook/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language support
 Bundle-SymbolicName: net.tourbook;singleton:=true
-Bundle-Version: 19.7.0.qualifier
+Bundle-Version: 19.10.0.qualifier
 Bundle-Vendor: MyTourbook
diff --git a/README.md b/README.md
@@ -40,9 +40,11 @@ _This document will not repeat already written text in the documentation._
 
 ### Other
 
-**Scramble calendar content/values**
+**Scramble content/values**
 
--DscrambleCalendar
+It is scrambeling text and values. This is used to create anynymous screenshots
+
+-DscrambleData
 
 **Each tour has a unique id so that a tour can be imported multiple times**
 

diff --git a/build/build.eclipse.3.8.2.nl.update-site/.gitignore b/build/build.eclipse.3.8.2.nl.update-site/.gitignore
diff --git a/build/build.eclipse.3.8.2.nl.update-site/.project b/build/build.eclipse.3.8.2.nl.update-site/.project
diff --git a/build/build.eclipse.3.8.2.nl.update-site/site.xml b/build/build.eclipse.3.8.2.nl.update-site/site.xml
diff --git a/build/build.eclipse.4.12.nl.repo/.project b/build/build.eclipse.4.12.nl.repo/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>build.eclipse.4.12.nl.repo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/build/build.eclipse.4.12.nl.repo/How to update this p2 repo.txt b/build/build.eclipse.4.12.nl.repo/How to update this p2 repo.txt
@@ -0,0 +1,6 @@
+###########################
+ Update Eclipse NL repo
+###########################
+
+   - Update Eclipse NL jar files in the current Eclipse installation
+   - Export "feature.net.tourbook.ext.eclipse.nl" as deployable feature into this folder "build\build.eclipse.4.12.nl.repo"
diff --git a/build/build.eclipse.4.12.nl.repo/clear-repo-content.xml b/build/build.eclipse.4.12.nl.repo/clear-repo-content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="create-translation-file" default="clear-update-site" basedir=".">
+
+	<target name="clear-update-site">
+
+		<delete>
+			<fileset dir="plugins" includes="**/*" />
+		</delete>
+
+		<delete>
+			<fileset dir="features" includes="**/*" />
+		</delete>
+
+		<delete file="content.jar" />
+		<delete file="artifacts.jar" />
+		<delete file="logs.zip" />
+
+	</target>
+
+</project>
diff --git a/build/build.net.tourbook.feature/feature.xml b/build/build.net.tourbook.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="build.net.tourbook.feature"
       label="MyTourbook Product Features"
-      version="19.7.1.qualifier"
+      version="19.10.0.qualifier"
       provider-name="MyTourbook">
 
    <description>