Update to 1.1p13.

Changes since previous:
Bug fixes
- boundary lines
- guard zones attached to boat

4 files changed, 14 insertions, 150 deletions

diff --git a/geography/opencpn-plugin-draw/Makefile b/geography/opencpn-plugin-draw/Makefile
index 9305c3ec001..3c8e54e5079 100644
--- a/geography/opencpn-plugin-draw/Makefile
+++ b/geography/opencpn-plugin-draw/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2016/05/23 13:10:15 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/16 15:57:02 bouyer Exp $
 #
 
-VERSION=	20160415
-PKGREVISION=	2
+VERSION=	1.1p13
+#PKGREVISION=	2
 DISTNAME=	ocpn_draw_pi-${VERSION}
 PKGNAME=	opencpn-plugin-draw-${VERSION}
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jongough/}
 GITHUB_PROJECT=	ocpn_draw_pi
-GITHUB_TAG=	047bb4c19c45e75f0bef3aba17ef7b52ef43d8af
+GITHUB_TAG=	6f831259b474295559a0823f53d8f57a0dc35fdc
 
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://opencpn.org/ocpn/Plugins_external_odraw
diff --git a/geography/opencpn-plugin-draw/PLIST b/geography/opencpn-plugin-draw/PLIST
index 583002527e2..40c10affc7b 100644
--- a/geography/opencpn-plugin-draw/PLIST
+++ b/geography/opencpn-plugin-draw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/04/24 10:21:54 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/06/16 15:57:02 bouyer Exp $
 lib/opencpn/libocpn_draw_pi.so
 share/locale/ca/LC_MESSAGES/opencpn-ocpn_draw_pi.mo
 share/locale/cs/LC_MESSAGES/opencpn-ocpn_draw_pi.mo
@@ -30,6 +30,10 @@ share/opencpn/plugins/ocpn_draw_pi/data/EBL.png
 share/opencpn/plugins/ocpn_draw_pi/data/EBL.svg
 share/opencpn/plugins/ocpn_draw_pi/data/EBLgrey.png
 share/opencpn/plugins/ocpn_draw_pi/data/EBLgrey.svg
+share/opencpn/plugins/ocpn_draw_pi/data/GZ.png
+share/opencpn/plugins/ocpn_draw_pi/data/GZ.svg
+share/opencpn/plugins/ocpn_draw_pi/data/GZgrey.png
+share/opencpn/plugins/ocpn_draw_pi/data/GZgrey.svg
 share/opencpn/plugins/ocpn_draw_pi/data/ODManager.png
 share/opencpn/plugins/ocpn_draw_pi/data/ODManager.svg
 share/opencpn/plugins/ocpn_draw_pi/data/ODManagerGrey.png
diff --git a/geography/opencpn-plugin-draw/distinfo b/geography/opencpn-plugin-draw/distinfo
index ef1f294ec6b..2461dfe544e 100644
--- a/geography/opencpn-plugin-draw/distinfo
+++ b/geography/opencpn-plugin-draw/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/05/23 13:10:15 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2016/06/16 15:57:02 bouyer Exp $
 
-SHA1 (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = a1e06d6c810ad8e02a1f8f35677517e18adc28f6
-RMD160 (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = 60c84b16d04a2e10a189a7c72e14b4f1405c9686
-SHA512 (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = 639392c7c219cafcbcba88f04f9b75801c4f7e66a4c641fb28af79025333b9b57a16d37820a04cc353432f775e2fa3ee7d556d49f61c8d4741ba373998c27ee9
-Size (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = 1124238 bytes
+SHA1 (ocpn_draw_pi-1.1p13-6f831259b474295559a0823f53d8f57a0dc35fdc.tar.gz) = 95a9de54fda77c532ca576afb12fc93243405be1
+RMD160 (ocpn_draw_pi-1.1p13-6f831259b474295559a0823f53d8f57a0dc35fdc.tar.gz) = e1092dbd2d6b0f01bc02e6e247bd6fc6c1bcedac
+SHA512 (ocpn_draw_pi-1.1p13-6f831259b474295559a0823f53d8f57a0dc35fdc.tar.gz) = 2cafc46d311ba3a9b5adccd08bb6bee8bbc40baecb579fc7883f7132f8f4a67242aeb7e99b571c176b771e3e731be78c996b4d3178da9a7d3c7e84b28b4961b2
+Size (ocpn_draw_pi-1.1p13-6f831259b474295559a0823f53d8f57a0dc35fdc.tar.gz) = 1147228 bytes
 SHA1 (patch-cmake_PluginConfigure.cmake) = 62dbbc6d13959fa313e6ea91ad6a28ee37da5fdd
 SHA1 (patch-cmake_PluginInstall.cmake) = 43a906b0a75a1e358ccd96992e1c14d526d07b4b
-SHA1 (patch-src_ocpn_draw_pi.cpp) = f67b33fc833e0c282508e7d2cb4930d95df4901c
diff --git a/geography/opencpn-plugin-draw/patches/patch-src_ocpn_draw_pi.cpp b/geography/opencpn-plugin-draw/patches/patch-src_ocpn_draw_pi.cpp
deleted file mode 100644
index 52324a3e533..00000000000
--- a/geography/opencpn-plugin-draw/patches/patch-src_ocpn_draw_pi.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD: patch-src_ocpn_draw_pi.cpp,v 1.2 2016/05/23 13:10:15 bouyer Exp $
-https://github.com/jongough/ocpn_draw_pi/issues/250
-
---- src/ocpn_draw_pi.cpp.orig	2016-04-13 08:28:11.000000000 +0200
-+++ src/ocpn_draw_pi.cpp	2016-05-23 14:51:23.159399881 +0200
-@@ -217,7 +217,6 @@
- 
- PlugIn_ViewPort *g_pVP;
- PlugIn_ViewPort g_VP;
--ODDC          *g_pDC;
- bool            g_bShowMag;
- double          g_dVar;
- double          g_UserVar;
-@@ -2385,6 +2384,7 @@
-         format = wxS("%4.0f ");
-     }
-     result << wxString::Format(format, usrDistance ) << *sUnit;
-+    delete sUnit;
-     return result;
- }
- void ocpn_draw_pi::latlong_to_chartpix(double lat, double lon, double &pixx, double &pixy) 
-@@ -2417,14 +2417,14 @@
-     m_chart_scale = pivp->chart_scale;
-     m_view_scale = pivp->view_scale_ppm;
-     
--    g_pDC = new ODDC( dc );
-+    ODDC g_pDC(dc);
-     LLBBox llbb;
-     llbb.SetMin( pivp->lon_min, pivp->lat_min );
-     llbb.SetMax( pivp->lon_max, pivp->lat_max );
-     
--    DrawAllPathsInBBox( *g_pDC, llbb );
--    DrawAllODPointsInBBox( *g_pDC, llbb );
--    RenderPathLegs( *g_pDC );
-+    DrawAllPathsInBBox( g_pDC, llbb );
-+    DrawAllODPointsInBBox( g_pDC, llbb );
-+    RenderPathLegs( g_pDC );
-     
-     return TRUE;
- }
-@@ -2438,20 +2438,20 @@
-     m_chart_scale = pivp->chart_scale;
-     m_view_scale = pivp->view_scale_ppm;
-     
--    g_pDC = new ODDC();
-+    ODDC g_pDC;
-     LLBBox llbb;
-     llbb.SetMin( pivp->lon_min, pivp->lat_min );
-     llbb.SetMax( pivp->lon_max, pivp->lat_max );
-     
-     //    DrawAllODPointsInBBox( *g_pDC, llbb );
--    RenderPathLegs( *g_pDC );
-+    RenderPathLegs( g_pDC );
-     
-     if (m_pMouseBoundary) m_pMouseBoundary->DrawGL( *pivp );
-     
-     DrawAllPathsAndODPoints( *pivp );
- 
-     if( g_pODRolloverWin && g_pODRolloverWin->IsActive() && g_pODRolloverWin->GetBitmap() != NULL ) {
--        g_pDC->DrawBitmap( *(g_pODRolloverWin->GetBitmap()),
-+        g_pDC.DrawBitmap( *(g_pODRolloverWin->GetBitmap()),
-                        g_pODRolloverWin->GetPosition().x,
-                        g_pODRolloverWin->GetPosition().y, false );
-     }
-@@ -2461,8 +2461,6 @@
- 
- void ocpn_draw_pi::RenderPathLegs( ODDC &dc ) 
- {
--    ODDC tdc( dc );
--    
-     if( nBoundary_State >= 2) {
-         
-         Boundary* boundary = 0;
-@@ -2492,7 +2490,7 @@
-         }
-         
-         //        if( !IsTouchInterface_PlugIn) {
--        boundary->DrawPointWhich( tdc, boundary->m_lastMousePointIndex, &lastPoint );
-+        boundary->DrawPointWhich( dc, boundary->m_lastMousePointIndex, &lastPoint );
-         if( boundary->m_NextLegGreatCircle ) {
-             for( int i=1; i<=milesDiff; i++ ) {
-                 double p = (double)i * (1.0/(double)milesDiff);
-@@ -2500,24 +2498,24 @@
-                 Geodesic::GreatCircleTravel( m_prev_rlon, m_prev_rlat, gcDist*p, brg, &pLon, &pLat, &gcBearing2 );
-                 GetCanvasPixLL( m_pVP, &destPoint, m_cursor_lat, m_cursor_lon);
-                 //destPoint = VPoint.GetPixFromLL( pLat, pLon );
--                boundary->DrawSegment( tdc, &lastPoint, &destPoint, *m_pVP, false );
-+                boundary->DrawSegment( dc, &lastPoint, &destPoint, *m_pVP, false );
-                 wxPoint rpn;
--                boundary->GetPoint( 1 )->Draw( tdc, &rpn );
--                boundary->DrawSegment( tdc, &rpn , &destPoint, *m_pVP, false );
-+                boundary->GetPoint( 1 )->Draw( dc, &rpn );
-+                boundary->DrawSegment( dc, &rpn , &destPoint, *m_pVP, false );
-                 lastPoint = destPoint;
-             }
-         }
-         else {
--            boundary->DrawSegment( tdc, &lastPoint, &r_rband, *m_pVP, false );
-+            boundary->DrawSegment( dc, &lastPoint, &r_rband, *m_pVP, false );
-             if ( nBoundary_State >= 2) { 
-                 wxPoint rpn;
--                boundary->GetPoint( 1 )->Draw( tdc, &rpn );
--                boundary->DrawSegment( tdc, &rpn , &r_rband, *m_pVP, false );
-+                boundary->GetPoint( 1 )->Draw( dc, &rpn );
-+                boundary->DrawSegment( dc, &rpn , &r_rband, *m_pVP, false );
-             }
-         }
-         
--        wxString info = CreateExtraPathLegInfo(tdc, boundary, brg, dist, m_cursorPoint);
--        RenderExtraPathLegInfo( tdc, r_rband, info );
-+        wxString info = CreateExtraPathLegInfo(dc, boundary, brg, dist, m_cursorPoint);
-+        RenderExtraPathLegInfo( dc, r_rband, info );
-     } else if( nEBL_State > 0 || m_bEBLMoveOrigin ) {
-         EBL *ebl = new EBL();
-         double brg, dist;
-@@ -2526,19 +2524,17 @@
-             ODPoint *tp = (ODPoint *) m_pSelectedEBL->m_pODPointList->GetLast()->GetData();
-             GetCanvasPixLL( g_pVP, &tpoint, tp->m_lat, tp->m_lon );
-             DistanceBearingMercator_Plugin( m_cursor_lat, m_cursor_lon, tp->m_lat, tp->m_lon, &brg, &dist );
--            ebl->DrawSegment( tdc, &tpoint, &m_cursorPoint, *m_pVP, false );
-+            ebl->DrawSegment( dc, &tpoint, &m_cursorPoint, *m_pVP, false );
-         } else {
-             GetCanvasPixLL( g_pVP, &tpoint, g_pfFix.Lat, g_pfFix.Lon );
-             DistanceBearingMercator_Plugin( m_cursor_lat, m_cursor_lon, g_pfFix.Lat, g_pfFix.Lon, &brg, &dist );
--            ebl->DrawSegment( tdc, &tpoint, &m_cursorPoint, *m_pVP, false );
-+            ebl->DrawSegment( dc, &tpoint, &m_cursorPoint, *m_pVP, false );
-         }
--        wxString info = CreateExtraPathLegInfo(tdc, ebl, brg, dist, m_cursorPoint);
-+        wxString info = CreateExtraPathLegInfo(dc, ebl, brg, dist, m_cursorPoint);
-         if(info.length() > 0)
--            RenderExtraPathLegInfo( tdc, m_cursorPoint, info );
-+            RenderExtraPathLegInfo( dc, m_cursorPoint, info );
-         delete ebl;
-     }
--        
--        
- }
- 
- wxString ocpn_draw_pi::CreateExtraPathLegInfo(ODDC &dc, ODPath *path, double brg, double dist, wxPoint ref_point)