From eebf22de84d295094e01e04cc6d45c3a3f79dd5c Mon Sep 17 00:00:00 2001 From: afischerdev Date: Wed, 3 Apr 2024 14:38:57 +0200 Subject: [PATCH 1/3] updated for next version --- docs/revisions.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/revisions.md b/docs/revisions.md index 4169388..c2647e6 100644 --- a/docs/revisions.md +++ b/docs/revisions.md @@ -2,6 +2,29 @@ (ZIP-Archives including APK, readme + profiles) + +### Changes since last version + +Library + +- new "DIVIDE" command for profile calculation +- new "maxslope" and "maxslopecost" parameters +- new parameter collector +- new output logic +- rework on voice hints and roundabouts +- enabled elevation raster files with 1 asec + + +Android + +- BRouter translations +- fallback on certificate problems + + +- Minor bug fixes + +[Solved issues](https://github.com/abrensch/brouter/issues?q=is%3Aissue+milestone%3A%22Version+1.7.4%22+is%3Aclosed) + ### [brouter-1.7.3.zip](../brouter_bin/brouter-1.7.3.zip) (current revision, 19.08.2023) - Minor bug fixes From a4388ce5c9d766706505c811ba953f487196c678 Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Wed, 3 Apr 2024 21:14:17 +0200 Subject: [PATCH 2/3] `bundle update` ruby dependencies --- docs/Gemfile.lock | 110 +++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 50 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 068424c..e51aaf0 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,23 +1,31 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.8) + activesupport (7.1.3.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - base64 (0.1.1) + base64 (0.2.0) + bigdecimal (3.1.7) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.11.1) + coffee-script-source (1.12.2) colorator (1.1.0) commonmarker (0.23.10) - concurrent-ruby (1.2.2) - dnsruby (1.70.0) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + dnsruby (1.72.0) simpleidn (~> 0.2.1) + drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -25,24 +33,23 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.9.1) - faraday (2.7.11) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - ffi (1.15.5) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http + ffi (1.16.3) forwardable-extended (2.6.0) - gemoji (3.0.1) - github-pages (228) - github-pages-health-check (= 1.17.9) - jekyll (= 3.9.3) - jekyll-avatar (= 0.7.0) - jekyll-coffeescript (= 1.1.1) + gemoji (4.1.0) + github-pages (231) + github-pages-health-check (= 1.18.2) + jekyll (= 3.9.5) + jekyll-avatar (= 0.8.0) + jekyll-coffeescript (= 1.2.2) jekyll-commonmark-ghpages (= 0.4.0) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.15.1) + jekyll-default-layout (= 0.1.5) + jekyll-feed (= 0.17.0) jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.13.0) + jekyll-github-metadata (= 2.16.1) jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) @@ -69,28 +76,28 @@ GEM jekyll-theme-tactile (= 0.2.0) jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) - jemoji (= 0.12.0) - kramdown (= 2.3.2) + jemoji (= 0.13.0) + kramdown (= 2.4.0) kramdown-parser-gfm (= 1.1.0) liquid (= 4.0.4) mercenary (~> 0.3) minima (= 2.5.1) nokogiri (>= 1.13.6, < 2.0) - rouge (= 3.26.0) + rouge (= 3.30.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.9) + github-pages-health-check (1.18.2) addressable (~> 2.3) dnsruby (~> 1.60) - octokit (~> 4.0) - public_suffix (>= 3.0, < 5.0) + octokit (>= 4, < 8) + public_suffix (>= 3.0, < 6.0) typhoeus (~> 1.3) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) - jekyll (3.9.3) + jekyll (3.9.5) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -103,11 +110,11 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.7.0) + jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) - jekyll-coffeescript (1.1.1) + jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) + coffee-script-source (~> 1.12) jekyll-commonmark (1.4.0) commonmarker (~> 0.22) jekyll-commonmark-ghpages (0.4.0) @@ -115,15 +122,15 @@ GEM jekyll (~> 3.9.0) jekyll-commonmark (~> 1.4.0) rouge (>= 2.0, < 5.0) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.15.1) + jekyll-default-layout (0.1.5) + jekyll (>= 3.0, < 5.0) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.13.0) + jekyll-github-metadata (2.16.1) jekyll (>= 3.4, < 5.0) - octokit (~> 4.0, != 4.4.0) + octokit (>= 4, < 7, != 4.4.0) jekyll-include-cache (0.2.1) jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) @@ -194,16 +201,16 @@ GEM jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.2) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) @@ -211,22 +218,24 @@ GEM jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.20.0) - nokogiri (1.15.4-x86_64-linux) + minitest (5.22.3) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.7) - racc (1.7.1) + public_suffix (5.0.5) + racc (1.7.3) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.6) - rouge (3.26.0) - ruby2_keywords (0.0.5) + rouge (3.30.0) rubyzip (2.3.2) safe_yaml (1.0.5) sass (3.7.4) @@ -241,14 +250,15 @@ GEM unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9.1) unicode-display_width (1.8.0) + uri (0.13.0) webrick (1.8.1) PLATFORMS @@ -262,4 +272,4 @@ DEPENDENCIES webrick (~> 1.8) BUNDLED WITH - 2.4.20 + 2.5.4 From 616266084c54783935cafe204018f36910a86eea Mon Sep 17 00:00:00 2001 From: afischerdev Date: Fri, 5 Apr 2024 13:29:52 +0200 Subject: [PATCH 3/3] changed version numbers --- brouter-core/src/main/java/btools/router/OsmTrack.java | 4 ++-- brouter-routing-app/build.gradle | 2 +- build.gradle | 2 +- docs/revisions.md | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index a6c9817..f18d4da 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -23,8 +23,8 @@ import btools.util.CompactLongMap; import btools.util.FrozenLongMap; public final class OsmTrack { - final public static String version = "1.7.3"; - final public static String versionDate = "19082023"; + final public static String version = "1.7.4"; + final public static String versionDate = "09042024"; // csv-header-line private static final String MESSAGES_HEADER = "Longitude\tLatitude\tElevation\tDistance\tCostPerKm\tElevCost\tTurnCost\tNodeCost\tInitialCost\tWayTags\tNodeTags\tTime\tEnergy"; diff --git a/brouter-routing-app/build.gradle b/brouter-routing-app/build.gradle index 2300600..4a160af 100644 --- a/brouter-routing-app/build.gradle +++ b/brouter-routing-app/build.gradle @@ -11,7 +11,7 @@ android { namespace 'btools.routingapp' applicationId "btools.routingapp" - versionCode 50 + versionCode 51 versionName project.version resValue('string', 'app_version', defaultConfig.versionName) diff --git a/build.gradle b/build.gradle index 6f0c33d..b8dd9aa 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { // app: build.gradle (versionCode only) // OsmTrack (version and versionDate) // docs revisions.md (version and versionDate) - project.version "1.7.3" + project.version "1.7.4" group 'org.btools' repositories { diff --git a/docs/revisions.md b/docs/revisions.md index c2647e6..97a53c3 100644 --- a/docs/revisions.md +++ b/docs/revisions.md @@ -3,7 +3,7 @@ (ZIP-Archives including APK, readme + profiles) -### Changes since last version +### [brouter-1.7.4.zip](../brouter_bin/brouter-1.7.4.zip) (current revision, 09.04.2024) Library @@ -25,7 +25,8 @@ Android [Solved issues](https://github.com/abrensch/brouter/issues?q=is%3Aissue+milestone%3A%22Version+1.7.4%22+is%3Aclosed) -### [brouter-1.7.3.zip](../brouter_bin/brouter-1.7.3.zip) (current revision, 19.08.2023) + +### [brouter-1.7.3.zip](../brouter_bin/brouter-1.7.3.zip) (19.08.2023) - Minor bug fixes