Update to 20180405. Changes:
support sparse polars with automatic interpolation ADD cursor bar on the plot to show where we are in time Add option cursor route enable/disable Add wind barbs on the weather route. Updated translations Lots of UI improvements and general bug fixes
This commit is contained in:
bouyer
parent
2ebac8db68
commit
e81f7f2e30
6 changed files with 53 additions and 102 deletions
|
|
@ -1,14 +1,13 @@
|
|||
# $NetBSD: Makefile,v 1.14 2018/03/12 11:16:38 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2018/04/05 16:49:15 bouyer Exp $
|
||||
#
|
||||
|
||||
VERSION= 20170414
|
||||
VERSION= 20180405
|
||||
DISTNAME= weather_routing_pi-${VERSION}
|
||||
PKGNAME= opencpn-plugin-weather_routing-${VERSION}
|
||||
PKGREVISION= 6
|
||||
CATEGORIES= geography
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
|
||||
GITHUB_PROJECT= weather_routing_pi
|
||||
GITHUB_TAG= d65c968479af4fee78aa28b4b3f2c54660597eac
|
||||
GITHUB_TAG= c4dc8231ef0da6c7da52be22f2cded1c2880dfa4
|
||||
|
||||
MAINTAINER= bouyer@NetBSD.org
|
||||
HOMEPAGE= https://opencpn.org/OpenCPN/plugins/weatherroute.html
|
||||
|
|
|
|||
|
|
@ -1,28 +1,41 @@
|
|||
@comment $NetBSD: PLIST,v 1.4 2016/06/16 16:03:55 bouyer Exp $
|
||||
@comment $NetBSD: PLIST,v 1.5 2018/04/05 16:49:15 bouyer Exp $
|
||||
lib/opencpn/libweather_routing_pi.so
|
||||
share/locale/ca/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/cs/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/da/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/de/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/el/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/es/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/et/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/fi/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/fr/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/gl/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/hu/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/it/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/ja/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/nb/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/nl/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/pl/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/pt/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/ru/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/sv/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/tr/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/vi/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/zh/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/ar_SA/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/ca_ES/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/cs_CZ/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/da_DK/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/de_DE/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/el_GR/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/es_ES/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/et_EE/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/fi_FI/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/fil_PH/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/fr_FR/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/gl_ES/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/hi_IN/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/hu_HU/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/id_ID/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/it_IT/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/ja_JP/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/mr_IN/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/nb_NO/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/nl_NL/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/pl_PL/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/pt_PT/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/ro_RO/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/ru_RU/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/sv_SE/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/th_TH/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/tr_TR/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/vi_VN/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/opencpn-weather_routing_pi.mo
|
||||
share/opencpn/plugins/weather_routing_pi/data/WeatherRoutingConfiguration.xml
|
||||
share/opencpn/plugins/weather_routing_pi/data/WeatherRoutingInformation.html
|
||||
share/opencpn/plugins/weather_routing_pi/data/boats/Boat-Climatology.xml
|
||||
share/opencpn/plugins/weather_routing_pi/data/boats/Boat-Test-Power.xml
|
||||
share/opencpn/plugins/weather_routing_pi/data/boats/Boat-Test.xml
|
||||
share/opencpn/plugins/weather_routing_pi/data/boats/Boat.xml
|
||||
share/opencpn/plugins/weather_routing_pi/data/info.html
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/60ft_mono.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/60ft_multi_1.pol
|
||||
|
|
@ -71,6 +84,11 @@ share/opencpn/plugins/weather_routing_pi/data/polars/Deerfoot64K.pol
|
|||
share/opencpn/plugins/weather_routing_pi/data/polars/Deerfoot_74.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Endeavor40.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Erickson29.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Example/Example-0-10.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Example/Example-0-6-Power.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Example/Example-06-24.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Example/Example-15-30.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Example/Example-24-60.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Express37.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/FACIL_30.txt
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/FARR_40.txt
|
||||
|
|
@ -130,6 +148,7 @@ share/opencpn/plugins/weather_routing_pi/data/polars/Tartan41.pol
|
|||
share/opencpn/plugins/weather_routing_pi/data/polars/Tayana37.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Tayana42.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Tayana52.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Test-TWS-0-20+60.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Valiant40.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Valiant47.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/Volvo_70.txt
|
||||
|
|
@ -159,3 +178,6 @@ share/opencpn/plugins/weather_routing_pi/data/polars/hanse_400.txt
|
|||
share/opencpn/plugins/weather_routing_pi/data/polars/mumm_30.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/scanmar_33.txt
|
||||
share/opencpn/plugins/weather_routing_pi/data/polars/small_polar.pol
|
||||
share/opencpn/plugins/weather_routing_pi/data/weather_routing_pi.svg
|
||||
share/opencpn/plugins/weather_routing_pi/data/weather_routing_pi_rollover.svg
|
||||
share/opencpn/plugins/weather_routing_pi/data/weather_routing_pi_toggled.svg
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.9 2017/08/24 13:01:33 bouyer Exp $
|
||||
$NetBSD: distinfo,v 1.10 2018/04/05 16:49:15 bouyer Exp $
|
||||
|
||||
SHA1 (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = e28c7831b923293a1e0d874150f038090979e181
|
||||
RMD160 (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = 54d584a02d811c17626e4969817a44d03f3b93de
|
||||
SHA512 (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = 20607b864eef999bfbf1b05f62661479eed484a4e1c407dac4605f703f59faf91f684acd34e078bbf3c89d6aca128000f3d6fd45e7f767f16fd888382e15f0bd
|
||||
Size (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = 847684 bytes
|
||||
SHA1 (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = 9e6147e75957637129bc91a44d2eab592e1e1c6a
|
||||
RMD160 (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = c3573cabfb0a18ac6f1c47da6cf951960989f0a9
|
||||
SHA512 (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = 3584effab662dc3343e14b12d37399f06116b0386f92491c5cc4bd46c08915f1cc6e8861ac1dbadebfe5c3bc3383f31a2c7634574cf333d23f7865c82b46feb2
|
||||
Size (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = 918697 bytes
|
||||
SHA1 (patch-cmake_PluginConfigure.cmake) = 5f0b145d34c064870090eaa598b5474020eb887d
|
||||
SHA1 (patch-src_Polar.cpp) = fa7af26e0dcba1dda3ae358c35353c6304d4f941
|
||||
SHA1 (patch-src_RouteMap.cpp) = a733a901f04eeb1699805e590325c0485ce26d1b
|
||||
SHA1 (patch-src_RouteMapOverlay.cpp) = 075ca5206f03e83277060bae1776ba77d26bd990
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_Polar.cpp,v 1.1 2017/02/08 00:05:55 joerg Exp $
|
||||
|
||||
Pointers are not relative to 0, so check correct variable.
|
||||
|
||||
--- src/Polar.cpp.orig 2017-01-08 19:55:10.199446917 +0000
|
||||
+++ src/Polar.cpp
|
||||
@@ -180,7 +180,7 @@ Polar::Polar()
|
||||
|
||||
#define MAX_WINDSPEEDS_IN_TABLE 200
|
||||
#define MESSAGE(S) (S + wxString(_T("\n")) + wxString::FromUTF8(filename) \
|
||||
- + (line > 0 ? (_(" line ") + wxString::Format(_T("%d"), linenum)) : _T("")))
|
||||
+ + (linenum > 0 ? (_(" line ") + wxString::Format(_T("%d"), linenum)) : _T("")))
|
||||
#define PARSE_WARNING(S) do { if(message.empty()) message = MESSAGE(S); } while (0)
|
||||
#define PARSE_ERROR(S) if(message.empty()) do { message = _("Boat polar failed") + wxString(_T("\n")) \
|
||||
+ MESSAGE(S); goto failed; } while (0)
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
$NetBSD: patch-src_RouteMap.cpp,v 1.2 2016/07/18 14:23:46 bouyer Exp $
|
||||
|
||||
--- src/RouteMap.cpp.orig 2016-07-16 16:02:32.000000000 +0200
|
||||
+++ src/RouteMap.cpp 2016-07-18 15:51:20.000000000 +0200
|
||||
@@ -546,7 +546,7 @@
|
||||
VB = polar.Speed(H, VW);
|
||||
|
||||
/* failed to determine speed.. */
|
||||
- if(isnan(B) || isnan(VB)) {
|
||||
+ if(std::isnan(B) || std::isnan(VB)) {
|
||||
// when does this hit??
|
||||
printf("polar failed bad! %f %f %f %f\n", W, VW, B, VB);
|
||||
configuration.polar_failed = true;
|
||||
@@ -662,7 +662,7 @@
|
||||
B = W + H; /* rotated relative to true wind */
|
||||
|
||||
/* test to avoid extra computations related to backtracking */
|
||||
- if(!isnan(bearing1)) {
|
||||
+ if(!std::isnan(bearing1)) {
|
||||
double bearing3 = heading_resolve(B);
|
||||
if((bearing1 > bearing2 && bearing3 > bearing2 && bearing3 < bearing1) ||
|
||||
(bearing1 < bearing2 && (bearing3 > bearing2 || bearing3 < bearing1))) {
|
||||
@@ -2089,7 +2089,7 @@
|
||||
|
||||
/* did we tack thru the wind? apply penalty */
|
||||
bool tacked = false;
|
||||
- if(!isnan(dt) && p->parent_heading*H < 0 && fabs(p->parent_heading - H) < 180) {
|
||||
+ if(!std::isnan(dt) && p->parent_heading*H < 0 && fabs(p->parent_heading - H) < 180) {
|
||||
tacked = true;
|
||||
dt += configuration.TackingTime;
|
||||
#if 0
|
||||
@@ -2098,7 +2098,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
- if(!isnan(dt) && dt < mindt) {
|
||||
+ if(!std::isnan(dt) && dt < mindt) {
|
||||
mindt = dt;
|
||||
minH = H;
|
||||
endp = p;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
$NetBSD: patch-src_RouteMapOverlay.cpp,v 1.1 2017/04/18 16:54:35 bouyer Exp $
|
||||
--- src/RouteMapOverlay.cpp.orig 2017-04-14 13:36:07.000000000 +0200
|
||||
+++ src/RouteMapOverlay.cpp 2017-04-14 13:36:23.000000000 +0200
|
||||
@@ -1186,7 +1186,7 @@
|
||||
}
|
||||
Unlock();
|
||||
|
||||
- if(isinf(mindt))
|
||||
+ if(std::isinf(mindt))
|
||||
goto not_able_to_propagate;
|
||||
|
||||
destination_position = new Position(configuration.EndLat, configuration.EndLon,
|
||||
Loading…
Reference in a new issue