Bug fix in plot.symbolmap

spatstat · Jul 1, 2024 · 0cc22fd · 0cc22fd
1 parent 061ca98
commit 0cc22fd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: spatstat.geom
-Version: 3.2-9.028
-Date: 2024-06-28
+Version: 3.2-9.029
+Date: 2024-07-01
 Title: Geometrical Functionality of the 'spatstat' Family 
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre", "cph"),

diff --git a/NEWS b/NEWS
@@ -1,4 +1,4 @@
-        CHANGES IN spatstat.geom VERSION 3.2-9.028
+        CHANGES IN spatstat.geom VERSION 3.2-9.029
 
 OVERVIEW
 
@@ -116,6 +116,10 @@ BUG FIXES
     o plot.ppp, default.symbolmap.ppp
     Ignored 'zerosize' in some cases.
     Fixed.
+
+    o plot.symbolmap
+    Issued strange warnings in some cases.
+    Fixed.
 
     o symbolmap
     Crashed in some instances when 'inputs' was given

diff --git a/R/symbolmap.R b/R/symbolmap.R
@@ -1,7 +1,7 @@
 ##
 ## symbolmap.R
 ##
-##   $Revision: 1.56 $  $Date: 2024/05/01 05:11:57 $
+##   $Revision: 1.57 $  $Date: 2024/07/01 04:12:07 $
 ##
 
 symbolmap <- local({
@@ -665,6 +665,11 @@ plot.symbolmap <- function(x, ..., main,
                    angleref=if(vertical) 90 else 0)
 
   ## ................. draw annotation ..................
+  dotargs <- list(...)
+  if(length(dotargs$col) > 1) {
+    ## colourmap or multiple colour values - remove
+    dotargs$col <- NULL
+  }
   if(annotate && length(ll) > 0) {
     if(vertical) {
       ## default axis position is to the right 
@@ -676,7 +681,7 @@ plot.symbolmap <- function(x, ..., main,
       pos <- c(ylim[1], xlim[1], ylim[2], xlim[2])[sidecode]
       ## draw axis
       do.call.matched(graphics::axis,
-                      resolve.defaults(list(...),
+                      resolve.defaults(dotargs,
                                        list(side=sidecode, pos=pos, at=yp,
                                             labels=ll, tick=FALSE, las=1)),
                       extrargs=graphicsPars("axis"))
@@ -690,7 +695,7 @@ plot.symbolmap <- function(x, ..., main,
       pos <- c(ylim[1], xlim[1], ylim[2], xlim[2])[sidecode]
       ## draw axis
       do.call.matched(graphics::axis,
-                      resolve.defaults(list(...),
+                      resolve.defaults(dotargs,
                                        list(side = sidecode, pos = pos,
                                             at = xp, labels=ll, tick=FALSE)),
                       extrargs=graphicsPars("axis"))

diff --git a/inst/doc/packagesizes.txt b/inst/doc/packagesizes.txt
@@ -26,4 +26,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2023-10-20" "3.2-7" 451 1203 0 35983 15822
 "2024-01-26" "3.2-8" 452 1204 0 36234 15822
 "2024-02-28" "3.2-9" 452 1209 0 36325 15824
-"2024-06-28" "3.2-9.028" 442 1186 0 35631 15596
+"2024-07-01" "3.2-9.029" 442 1186 0 35636 15596
diff --git a/inst/info/packagesizes.txt b/inst/info/packagesizes.txt
@@ -26,4 +26,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2023-10-20" "3.2-7" 451 1203 0 35983 15822
 "2024-01-26" "3.2-8" 452 1204 0 36234 15822
 "2024-02-28" "3.2-9" 452 1209 0 36325 15824
-"2024-06-28" "3.2-9.028" 442 1186 0 35631 15596
+"2024-07-01" "3.2-9.029" 442 1186 0 35636 15596