Skip to content

Commit

Permalink
version 2.72.1
Browse files Browse the repository at this point in the history
  • Loading branch information
haighr authored and cran-robot committed Mar 15, 2019
1 parent 9c3ebbe commit b96658e
Show file tree
Hide file tree
Showing 89 changed files with 5,835 additions and 4,325 deletions.
12 changes: 6 additions & 6 deletions DESCRIPTION
@@ -1,6 +1,6 @@
Package: PBSmapping
Version: 2.70.5
Date: 2018-06-05
Version: 2.72.1
Date: 2019-03-14
Title: Mapping Fisheries Data and Spatial Analysis Tools
Authors@R: c(
person(c("Jon", "T."), "Schnute", role = "aut", email = "schnutej-dfo@shaw.ca"),
Expand All @@ -26,8 +26,8 @@ Author: Jon T. Schnute [aut],
Nicholas J. Lewin-Koh [ctb],
Roger Bivand [ctb]
Maintainer: Rowan Haigh <rowan.haigh@dfo-mpo.gc.ca>
Copyright: 2003-2018, Fisheries and Oceans Canada
Depends: R (>= 3.0.0)
Copyright: 2003-2019, Fisheries and Oceans Canada
Depends: R (>= 3.5.0)
Suggests: foreign, maptools, deldir
SystemRequirements: C++11
NeedsCompilation: yes
Expand All @@ -47,6 +47,6 @@ License: GPL (>= 2)
URL: https://github.com/pbs-software/pbs-mapping,
https://github.com/pbs-software/pbs-mapx,
http://www.angusj.com/delphi/clipper.php
Packaged: 2018-06-05 20:59:26 UTC; HaighR
Packaged: 2019-03-14 18:13:33 UTC; haighr
Repository: CRAN
Date/Publication: 2018-06-06 14:38:08 UTC
Date/Publication: 2019-03-15 09:13:49 UTC
172 changes: 87 additions & 85 deletions MD5
@@ -1,10 +1,11 @@
fdafc691aa5fb7f8e2a9e9521fef771b *COPYING
128c5de1ed999b50ab2497cdba29679d *DESCRIPTION
00611876b0ab76057ecee8d1045a1c2f *NAMESPACE
5f07e99543239ea37d7be3c1d2810700 *DESCRIPTION
fd51a4314f6d9787ab263a7325edf059 *NAMESPACE
2aaa6670072e4057adb2943ca66912dc *R/PBSfigs.r
9a0acb31ef0c1995e86e9c94098a079b *R/PBSmapping.r
cf888f8fc0e074e5f13ca071645b14ab *R/extraCode.r
577a08c81e94aea40cd0b8a67201bc2a *R/zzz.r
d039931d09844b20f1636bfc04e17c02 *R/PBSmapping.r
b92aae9c61052e9bb6d1f41e5f97ca06 *R/dotFuns.r
56fdec6c28e6a68559068b854312e894 *R/extraFuns.r
2a32132ec3e1b4be6b7fc74a0a26675e *R/zzz.r
136624c7e3127f342e87cdeed7499257 *data/bcBathymetry.rda
1c4c62a7a7e60d00109cfa1017dfabd6 *data/datalist
7b1ece2d94c990f7906e4d88bd0f2a4d *data/nepacLL.rda
Expand Down Expand Up @@ -33,93 +34,94 @@ cc92eb29d7511570a1731573ae79b8ce *demo/PBSfig10.R
2f48af60f9c6db579e84ac778e118375 *inst/Utils/convUL.cpp
be1e9279f6857513285e1aa1c3fdc826 *inst/Utils/findPolys.cpp
24a6b8609209cd7c9717c6cdad14c6ec *inst/Utils/makeUtils.bat
68216a991c29c3dcf7f1914611dc490e *inst/doc/ChangeLog.txt
4e8f8ae7db6872e5f430458671779bc6 *inst/doc/ChangeLog.txt
52bdac8b5374a8ac860af1fd5d5cea17 *inst/doc/Links.html
5782e96a9b7a620764b0aee2c4e8bd1c *inst/doc/PBSmapping-UG.pdf
d15904d4cbe8472e7f8cf4273788dd77 *inst/doc/PBSmappingIntro.pdf
92bdeab8c40aeabcc96ed368356c2323 *man/EventData.Rd
3610778a04a223adc1f1691a1b8b92e6 *man/LocationSet.Rd
2ee40a576f79049484b467d30868f65d *man/PBSmapping.Rd
78782467396d9684d48a9e024f2f3f0b *man/PBSprint.Rd
d15376238b59bcd42184559a4e2d3550 *man/PolyData.Rd
46c3f9fbd30a9ee3362049de0fa82223 *man/PolySet.Rd
d913105215bb18d02ab6e0d8830225c9 *man/addBubbles.Rd
b5a8d206ff2ae76694e27f84aec67a7c *man/addCompass.Rd
0af3599eb211623fe87dab118ce53634 *man/addLabels.Rd
fa5ab146e4e9b0d6d0c3aec5fb282776 *man/addLines.Rd
eeb1ccc2fed00c74e9ed61a5a40dd7a3 *man/addPoints.Rd
b8b4b7d09402bc70a4f833b98c4214d5 *man/addPolys.Rd
88a23ef31b3b18e0b9e2079171de3901 *man/addStipples.Rd
c95476d6eba33c91b7b9d44c340e6f5d *man/appendPolys.Rd
abedfcd698e25aca0c22c7e616409ba0 *man/bcBathymetry.Rd
3858f42450ed716d0971157882a80b08 *man/calcArea.Rd
af56a2b427e508631ca063cc30b62421 *man/calcCentroid.Rd
c125022783e23b5b7e417c231dd3813c *man/calcConvexHull.Rd
8246ffb2de83143896bf60d05d4e1d21 *man/calcGCdist.Rd
3590d1d425219e54f35fd64b8b0bfd54 *man/calcLength.Rd
10b47446dd164f76c0c5c2d023fe3fd4 *man/calcMidRange.Rd
58f264f314b5bfda54157667f4ef2d59 *man/calcSummary.Rd
ad3241565ecbbbadd43188dc5ac023a7 *man/calcVoronoi.Rd
cb42c5b1974fa353f6dd30387b196442 *man/clipLines.Rd
3ea84dc7ceb7a8ef43a75cdfeba5f7e7 *man/clipPolys.Rd
074a70ced643d125ae4a9a67a12ddd7d *man/closePolys.Rd
3e13ddad0b7d4c5ab3517c8e990f57e0 *man/combineEvents.Rd
ee09ec276f44ec2449756ef0b3d55cb6 *man/combinePolys.Rd
594e35970c82fe9991f6eea66ecb365d *man/convCP.Rd
986ca3e50934f7699281c53222a40bb6 *man/convDP.Rd
eed45a56c5ebf8bf7a6261c523076eba *man/convLP.Rd
e215a4cd99089c07c3d9c482785c239b *man/convUL.Rd
55207b0ed7c09c01011bb405af469604 *man/dividePolys.Rd
b284c1a0b0892ba42b1f8e93dd606984 *man/extractPolyData.Rd
83e83ef1419fad511e1f77c7e5e8cb83 *man/findCells.Rd
8a3c49d1475f6111820a402199d91fed *man/findPolys.Rd
34f30e84b211a65c08ba6628f62f0f2a *man/fixBound.Rd
a9c7906f64f051fc39c13a96824f9f94 *man/fixPOS.Rd
361b3decaa8b40efa2eb2dc67093c394 *man/importEvents.Rd
fbcc63b8ff61b3e57836a2995c10d486 *man/importGSHHS.Rd
8fa45acf0363a9baf18db3eecee1e6ab *man/importLocs.Rd
45c634aab5acf1073e8508a758a6edc4 *man/importPolys.Rd
41a6fce0dcfc181028da09126afde525 *man/importShapefile.Rd
ad2026e011fcc83ec0951c1172528e89 *man/isConvex.Rd
c13e087fd7391578b8a6caa9342a3ade *man/isIntersecting.Rd
4a54ca8812e2c13e17d2bc7be64d865c *man/joinPolys.Rd
d30df33a692387b66fa235e62ebe7a6a *man/locateEvents.Rd
9f28ba188883df59a1553827c4d8b6c6 *man/locatePolys.Rd
a15483ec6821df3595df61795cd221cb *man/makeGrid.Rd
0cc4a5d74c373de745c08ff6492bda25 *man/makeProps.Rd
c62329a6882e8ce0883de756fcd3a158 *man/makeTopography.Rd
35829aedbbd1c2b353b7a8b686285ab2 *man/nepacLL.Rd
aa848b8069f5b6d0fb7305129cfab665 *man/placeHoles.Rd
1672fd3c95e30cc62ad4b5996777ce53 *man/plotLines.Rd
e4805487cbe60179449880c5029c63a3 *man/plotMap.Rd
f548dc20f5bb0d958807c0f26102e645 *man/plotPoints.Rd
d5768b1e92fec3aff532f334c7bfcfb4 *man/plotPolys.Rd
a5c8ee37490b3ca4d795a9fb5cad5ea0 *man/print.Rd
ef337e4eb8304651cf3e87f4fe1a2aec *man/pythagoras.Rd
703ccfe84885bd3f5db53a194ffcd43a *man/refocusWorld.Rd
31c2f352bc4f783929fe9e4bf77804b1 *man/summary.Rd
dd537c1c145dabd9166500c1b0a36290 *man/surveyData.Rd
e12e0e9c1c15f2aaa0801417c16f24b7 *man/thickenPolys.Rd
ff038b1797a8355d7a29ae7825091c9a *man/thinPolys.Rd
5ca29e5d8995cfbe941e06324d02a503 *man/towData.Rd
3394c254e57ca9ac1c9d394bc8f86cda *man/towTracks.Rd
d6ec5a3f986b516e0e737749ed75473a *src/PBSmapping.c
84a0f61892aba9ad732026771bafda43 *src/PBSmapping.h
ad36524b4f150dc47b8ceb8b6bab4c5c *man/EventData.Rd
b4913585229b99a8aab5def1f9e5f71c *man/LocationSet.Rd
49c15c819d58173f6a614b2989b02fc3 *man/PBSmapping.Rd
8a70984ed8165cd269a37dd477986fe1 *man/PBSprint.Rd
b659d384f9ac95f6e55952f1a57b7f8e *man/PolyData.Rd
926978296eb34daaa3372dc46f3c68d9 *man/PolySet.Rd
a712a89c9fd16e6cef49d8ba0a7375fb *man/addBubbles.Rd
692bef5245178bdba71c8eba7d3d713e *man/addCompass.Rd
74b1d9e5bc874ffefb46d059ad86a436 *man/addLabels.Rd
1cdb7c6a41e400fd118f3c3d3b985570 *man/addLines.Rd
cad3a6947910bc577c80ea8b8efe3df7 *man/addPoints.Rd
ec136831fd593d97cabb439603666c0b *man/addPolys.Rd
3f0bbea2be178fa872378460d4602492 *man/addStipples.Rd
3b7eecabf53c4db6e272f863bd1326db *man/appendPolys.Rd
ad2afca1345e68086b5ec6397dc2a7a9 *man/bcBathymetry.Rd
79f29e174a44229685257dbe521bc886 *man/calcArea.Rd
c0ddc71fc48b3ea15ade87d2c7bde052 *man/calcCentroid.Rd
61c5f9259b6251327044a28579e21009 *man/calcConvexHull.Rd
a8a1efad8e96d4447d224d936e899793 *man/calcGCdist.Rd
7d7b0f4e4c72bd0ea5b7bac926ff0fd6 *man/calcLength.Rd
594eba62f06d44fb12be6a27ff3acabd *man/calcMidRange.Rd
ea0c090d72551957fa2e44bb9db9caa8 *man/calcSummary.Rd
33e4ab9b41517e4d24a6ef56701102a1 *man/calcVoronoi.Rd
32cf509e22b1e904ea19b4c0c469106b *man/clipLines.Rd
ff93995c063676099ba0cb05b1b84508 *man/clipPolys.Rd
12575d909c6140d5051cc5f3aec493c6 *man/closePolys.Rd
edbcdb31734e0516fa12d6be9be22765 *man/combineEvents.Rd
48533f4a279c5dd3a7cf8cfdadb403e6 *man/combinePolys.Rd
75bf4507547f0f4c8b3d3a0f28e6c20c *man/convCP.Rd
cb01392e29ccb7e9a160defecec881c6 *man/convDP.Rd
bc01c055f29aaa81fac8b8e5f3ef2453 *man/convLP.Rd
be9c0a72a7081e1239462fce48d2a441 *man/convUL.Rd
b311f3062011736f60e11c61604adecb *man/dividePolys.Rd
e961ebada429da044bd5687ae97a518a *man/extractPolyData.Rd
224a789ca07c788682b7529feb59c918 *man/findCells.Rd
1bb34fa6f9791a1c0677c6693f91adec *man/findPolys.Rd
3db38253fbb88b528fc49a7a71fa1873 *man/fixBound.Rd
f3c06292db780f7316f4308e1252984a *man/fixPOS.Rd
d28a99fff6da49a22b72792a226987c5 *man/importEvents.Rd
39eefcdebc85e16b6ffa9d49b9e0dddc *man/importGSHHS.Rd
62f31cec91f8a78b86fc203b051aed27 *man/importLocs.Rd
16e6b5b84cc488370bdb31dda84cde67 *man/importPolys.Rd
ff578bbb3ac8917f78a7539d71873e2a *man/importShapefile.Rd
3cfff9ae8aa5c1640e48b1e401495b75 *man/isConvex.Rd
3ca543c252b59b450ac62f7e4186c7df *man/isIntersecting.Rd
187e81caf6caa516cc2256d44bd6bc7d *man/joinPolys.Rd
1d51d96ff5ff536391da8223246dcfec *man/locateEvents.Rd
07568598cfc973703f045bc447f680a3 *man/locatePolys.Rd
0779199fcbeca18e27be51874b516b64 *man/makeGrid.Rd
cad3268f59dc491d4d274f83edf7ccef *man/makeProps.Rd
416b126263994059fd97387459c0182d *man/makeTopography.Rd
28c0f770f2450627bde16af7d73c514b *man/nepacLL.Rd
db89ccbcdd413faac280dc1a254516e9 *man/placeHoles.Rd
63f7a4e1499cbce1714057aa09dc0ac7 *man/plotLines.Rd
310211afaa81d259b4d035663af1a1eb *man/plotMap.Rd
276711e6ece22e4462d4cee78eb16c8a *man/plotPoints.Rd
5df257317a39b686b80d228671106f5e *man/plotPolys.Rd
3a06165201f9a1bfa5f75fc1286dc766 *man/print.Rd
de9c4d6bbd20638991966fe430f1677f *man/pythagoras.Rd
fb17ff0c3cbf73f90c5e72b1d09b4e55 *man/refocusWorld.Rd
a3a697eb0b93d5d2ae23502e9cad0d01 *man/rotatePolys.Rd
2d20ba4f1da71a3142ef70d1fde28439 *man/summary.Rd
b6e03ef76ad6f6ee663ff3de1f5932a5 *man/surveyData.Rd
489976f72d261a128ec7b33f3958c689 *man/thickenPolys.Rd
ca379e3a9982513666f7742b2b456c23 *man/thinPolys.Rd
4e6d0f4e0b5f62fa33796830e7ee7595 *man/towData.Rd
a3b00ece57ade0235a378191c2d1f19b *man/towTracks.Rd
6e9a8d7c89e80274a97d9a91a8d385f5 *src/PBSmapping.c
5172d5f8ab1e22e1d419e45aaad8bdee *src/PBSmapping.h
e2c7090ceaeb5528cf330f065c836195 *src/clipper.cpp
1eeec7850af4db031408aea184bc99c6 *src/clipper.h
fb25149639efcc05e356e78e3adead48 *src/clipperWrapper.cpp
061237a75456892594da02e471b03e32 *src/clipperWrapper.h
44e8bbc0c3e2f0329b3f467b687a0b35 *src/convGSHHS.c
12d0fcd30b651f42fb70a744b8c401bb *src/convGSHHS.h
1f89d1d325fbe61583000e7341e09587 *src/conversions.c
4afe54d1b89d2b32d25a946ca23fc786 *src/conversions.h
26698e96cea34910f4b21dac66aff84e *src/floating.h
2c3726bb579c0e8b824c66dbb232ede9 *src/globals.h
48363c9bdc8ba34ff299f28b58313c44 *src/clipperWrapper.cpp
ef0208a71c48c2ec78fa5d79edbd31a5 *src/clipperWrapper.h
dd7cc17985480b2ce93337f2e7b1877c *src/convGSHHS.c
ef5525f010f7bc6182a316dbe987086c *src/convGSHHS.h
c6817253b15f09be8966d92b841eb763 *src/conversions.c
59db4b1e04491de814430b7e32e12276 *src/conversions.h
2ffbd1e0cdf0eba775ad4a97c5e74dc1 *src/floating.h
7a36ad87fdae3907af71dc74379febf0 *src/globals.h
47b5701e0851c52cf794dcdca2a035bf *src/gshhs.c
96beb769b5645e84b7f2d589b879a1e2 *src/gshhs.h
c69b21e01c5dd38c60c4feda341fe592 *src/init.c
194fb0c76489084c4890b02583faf481 *src/polygons.c
2a0bc4bc0c1f6fcc8ff8f7e8e42e056a *src/polygons.h
7ee3bb93e4b635706fda6fa6a2dc6ba2 *src/init.c
092fd1fc0bccfa0cb2bd6c7a1a05cb2c *src/polygons.c
c19c5d6c892449a413100962040f5a9e *src/polygons.h
2e3e19c588a284896a2ae8407b65751b *src/thin.c
25a14aaea155bb6ab1e2454507c44f9f *src/thin.h
17d603ae064f2cb31054c0c39a592ec7 *vignettes/PBSmappingIntro.Rnw
7 changes: 4 additions & 3 deletions NAMESPACE
Expand Up @@ -19,6 +19,7 @@ exportPattern("^\\.prepare")
exportPattern("^\\.rollup")
exportPattern("^\\.validate")

export(.is.in)
export(.mat2df)

S3method(print, EventData)
Expand All @@ -34,10 +35,10 @@ S3method(summary, PolySet)
# Import all packages listed as Imports or Depends
# import( some package )

importFrom("grDevices", "col2rgb", "colorRamp", "contourLines", "dev.list", "dev.new", "rgb")
importFrom("grDevices", "col2rgb", "colorRamp", "contourLines", "dev.list", "dev.new", "extendrange", "rgb")
importFrom("graphics", "abline", "axis", "box", "frame", "legend",
"lines", "locator", "par", "points", "polygon", "strheight",
"strwidth", "symbols", "text", "title")
importFrom("stats", "median", "na.omit", "runif")
importFrom("utils", "data", "read.table")
importFrom("stats", "median", "na.omit", "quantile", "runif")
importFrom("utils", "data", "flush.console", "read.table")

0 comments on commit b96658e

Please sign in to comment.