Merge branch 'trunk' into androidmaxmapfilesizeandroidmaxmapfilesize

6 files changed, 77 insertions, 49 deletions

diff --git a/AUTHORS b/AUTHORS
index c920b0c85..02f20dee2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,14 @@
 # Active contributors:
+Benjamin Davies
 Bignaux Ronan
 Charles Curley
+David Heidelberg
+emaiannone
 gefin
 jandegr
 jkoan
+Johan Fitié
 Joseph Herlant
-KAMiKAZOW
 lains
 Lionel AINS
 metalstrolch
@@ -15,9 +18,6 @@ Patrick Höhn
 Pierre Grandin
 Robert Pohlink
 Stefan Wildemann
-tengel
-Timo
-youte62
 
 # Retired contributors:
 afaber
@@ -38,7 +38,7 @@ gotwo
 greg
 hafting
 hawke666
-Johan Fitié
+KAMiKAZOW
 kelvinzhao
 klausg
 korrosa
@@ -65,10 +65,13 @@ singesang
 spaetz
 steven_s
 tegzed
+tengel
+Timo
 tinloaf
 trldp
 woglinde
 worldcitizen
+youte62
 zaxl
 zintor
 zoff99
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe557eac9..9ec7e02e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ Navit follows the semantic versioning:
   replacement for the previous version (all data formats and interfaces are still
   supported); minor UI changes (such as moving individual menu items) are also
   allowed
-* `X.y.z` (major): at least one of the following:
+* X.y.z (major): at least one of the following:
   * Major new functionality (such as Augmented Reality, inertial navigation or
     support for live traffic services): de-facto standard for end-user apps
   * New user interface (such as moving from the old pulldown menu UI to the Internal
@@ -29,6 +29,71 @@ Navit follows the semantic versioning:
 To get the list of all the unreleased commits, see:
 [Full Changelog](https://github.com/navit-gps/navit/compare/v0.5.4...HEAD)
 
+
+## [0.5.5] - 2020-08-08
+
+## Added
+
+* Add poly\_swimming\_pool. [Stefan Wildemann]
+* Add:maptool:enhance leisure=track handling and add poi\_archeaological\_site (#1005) [Stefan Wildemann]
+* Add:graphics:gtk\_drawing\_area:textured polygons (#1004) [Stefan Wildemann]
+* Add:maptool:add waterway=weir as poly\_dam to map. [Stefan Wildemann]
+* Add:layout:add textures for quarry and scrub. (#997) [Stefan Wildemann]
+* Add:Core:Add mapfeatures (#990) [Stefan Wildemann]
+* Add:Core+Graphics+Qt5:Add support for textured polygons (#989) [Stefan Wildemann]
+* Add:build:Android build and signing. Also add fastlane for metadata. Set execute on scripts/\*.sh. [jkoan]
+* Add:cmake: add compilation flags to harden the security of navit (#969) [Joseph Herlant]
+
+## Changed
+
+* Change:core:Remove unused argument from attr\_search. [jkoan]
+* Change\_layout:Make sure park, meadow, scrub, and wood render in correct order (#1017) [Johan Fitié]
+* Change:style:Reformated style to match gradle. [jkoan]
+* Change:core:Reformat all files for ci check (even those i havent touched) [jkoan]
+* Change:fastlane:Remove tailing whitespaces from files. [jkoan]
+* Change:android:build:Fix empty Variable handling. [jkoan]
+* Change:metadata:Rename Title to "Navit" only because everybody knows that its for Android when found within F-Droid or Google Play store. [jkoan]
+
+## Fixed
+
+* Android:Remove old, confusing AndroidManifest.xml. [jkoan]
+* Android:Readd android:sharedUserId to allow for Updates. [jkoan]
+* Readme:Fixed broken link #914 (#1031) [Benjamin Davies]
+* Maptool:better map aerodroms and military areas (#1022) [Stefan Wildemann]
+* Maptool:Duplicte multipolygons if required (#1019) [Stefan Wildemann]
+* Layout:Order Parking (can be covered by Meadow, Wood) and Playground (can cover Meadow) (#1023) [Johan Fitié]
+* Build:android: Don't sign apk if no valid keyring is available. [Stefan Wildemann]
+* Icons:Update svgz files to be valid for librsvg \> 2.47 (#991) [jkoan]
+* POI/poly/labels:Small visual improvements to POI order, poly colors, and labels (#993) [Johan Fitié]
+* Android:build:Check if Variables are filled before useing them to avoid errors. [jkoan]
+* Metadata:Move Screenshots with German text to German translation. [jkoan]
+* Metadata:Rename directorys to prepare for Translations. [jkoan]
+* Build:versioncode needs to use 24h format. [jkoan]
+* Build:Only master, not all others :D booleans. [jkoan]
+* Gui:qml:Fix format string. [jkoan]
+* Gui:qml:Add missing NULL to vehicle\_attr\_iter\_new. [jkoan]
+* Change:Disable CXX on the the build\_script as well. [jkoan]
+* Android:build:css is the other way around, so enable the disable. [jkoan]
+* Build:Fdroid buildenviroment has no CXX and failes doue to this/CXX not needed anyway. [jkoan]
+* Graphics/android: polygons with hole drawing (#973) [Stefan Wildemann]
+* Plugins: too few arguments to functions navit\_attr\_iter\_new and config\_attr\_iter\_new (#966) [Joseph Herlant]
+* Port/android:Use new icon for notification (#963) [mvglasow]
+
+## Other
+
+* Android: Activate downloaded maps automatically (#1027) [Johan Fitié]
+* Improvement:layout:car-dark Improve Car-Dark layout colors (#1028) [Johan Fitié]
+* Improvement:layout: Improve Car Dark layout colors, bring all layers up to date with Car Light, automate changes in all layers with script (#1026) [Johan Fitié]
+* Improve:layout Improve Car Dark layout polygon colors, bring up to date with Car Light polys, automate changes with script (#1025) [Johan Fitié]
+* Improvement:layout: Small color tweaks and added polylines (#1024) [Johan Fitié]
+* Enhancement:layout\_car:Add stripes to danger\_area (#1020) [Stefan Wildemann]
+* Make sure industry, sport, meadow, scrub, and cemetery render in correct order (#1021) [Johan Fitié]
+* Refactor Member Ignoring Method smell in NavitMapDownloader class. [emaiannone]
+* Treat sports\_centres as building if building=yes. [Stefan Wildemann]
+* Refactoring:GTK: use GDK\_KEY for keys instead of GDK\_ [David Heidelberg]
+* Improve layout (#1002) [Johan Fitié]
+* Use debian:latest in the CI to get more up-to-date tools (#971) [Joseph Herlant]
+
 ## [0.5.4] - 2020-01-18
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1717d1a5..f392e1f92 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ endif(NOT DISABLE_CXX)
 
 set(NAVIT_VERSION_MAJOR "0")
 set(NAVIT_VERSION_MINOR "5")
-set(NAVIT_VERSION_PATCH "4")
+set(NAVIT_VERSION_PATCH "5")
 if(ANDROID)
     set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVIT_VERSION_PATCH}.${ANDROID_ABI}")
 else(ANDROID)
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec
index 8091533c3..e2b49aea2 100755
--- a/contrib/sailfish/navit-sailfish.spec
+++ b/contrib/sailfish/navit-sailfish.spec
@@ -9,7 +9,7 @@
 Name: harbour-navit
 Summary: Open Source car navigation system
 #Version: %{navit_version}_%{git_version}
-Version: 0.5.4
+Version: 0.5.5
 Release: 1
 License: GPL
 Group: Applications/Productivity
diff --git a/navit/android/AndroidManifest.xml b/navit/android/AndroidManifest.xml
index 5978512ed..27c7c3359 100644
--- a/navit/android/AndroidManifest.xml
+++ b/navit/android/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.navitproject.navit"
+    android:sharedUserId="org.navitproject.navit"
     android:installLocation="auto">
     <uses-feature android:name="android.hardware.location.network" android:required="false"/>
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake
deleted file mode 100644
index 811a895d2..000000000
--- a/navit/android/AndroidManifest.xml.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.navitproject.navit"
-      android:sharedUserId="org.navitproject.navit"
-      android:versionCode="@ANDROID_VERSION_INT@"
-      android:versionName="@ANDROID_VERSION_NAME@-@ANDROID_VERSION_INT@"
-      android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
-    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-    <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
-    @ANDROID_PERMISSIONS@
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <application android:label="@string/app_name"
-                 android:icon="@drawable/icon"
-                 android:name=".NavitAppConfig"
-                 android:theme="@style/NavitBaseTheme">
-        <activity android:name="Navit"
-                  android:label="@string/app_name"
-                  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale|screenSize"
-                  android:theme="@style/NavitTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="google.navigation" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".NavitAddressSearchActivity"></activity>
-        <activity android:name=".NavitDownloadSelectMapActivity"></activity>
-        <activity android:name=".NavitAddressResultListActivity"></activity>
-        <activity android:name=".FileBrowserActivity"></activity>
-    </application>
-</manifest>