g

Author: rhijmans

R/plot_raster.R

@@ -392,13 +392,14 @@
 			graphics::rect(x$lim[1], x$lim[3], x$lim[2], x$lim[4], col=x$background, border=x$box)			
 		}
 	}
+	try(set.clip(x$lim, x$lonlat))
 	if (!x$values) {
-		if (!x$add) try(set.clip(x$lim, x$lonlat))
+		#if (!x$add) try(set.clip(x$lim, x$lonlat))
 		return(x)
 	}
 	if (!x$legend_only) {
-		graphics::rasterImage(x$r, x$ext[1], x$ext[3], x$ext[2], x$ext[4], angle = 0, interpolate = x$interpolate)
 		x <- .plot.axes(x)
+		graphics::rasterImage(x$r, x$ext[1], x$ext[3], x$ext[2], x$ext[4], angle = 0, interpolate = x$interpolate)
 	}
 
 	if (x$legend_draw) {

R/plot_vector.R

@@ -390,10 +390,10 @@ setMethod("dots", signature(x="SpatVector"),
 		if (!out$add) {
 			try(set.clip(out$lim, out$lonlat))
 		}
+		out <- .plot.axes(out)
 		out <- .vplot(x, out, ...)
 	}
 
-	out <- .plot.axes(out)
 
 	if (out$legend_draw) {
 		if (out$legend_type == "continuous") {

src/Makevars.ucrt

@@ -14,14 +14,14 @@ endif
 
 CXX_STD = CXX
 
-all: clean winlibs
+#all: clean winlibs
 
-winlibs:
-	cp -r "$(R_TOOLS_SOFT)/share/gdal" ../inst/
-	cp -r "$(R_TOOLS_SOFT)/share/proj" ../inst/
+#winlibs:
+#	cp -r "$(R_TOOLS_SOFT)/share/gdal" ../inst/
+#	cp -r "$(R_TOOLS_SOFT)/share/proj" ../inst/
 
-clean:
-	rm -f $(SHLIB) $(OBJECTS)
+#clean:
+#	rm -f $(SHLIB) $(OBJECTS)
 
-.PHONY: all winlibs clean
+#.PHONY: all winlibs clean