polygon colours for #287

SymbolixAU · Apr 4, 2020 · d4d39b9 · d4d39b9
1 parent ba8e434
commit d4d39b9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: mapdeck
 Type: Package
 Title: Interactive Maps Using 'Mapbox GL JS' and 'Deck.gl'
-Version: 0.3.1001
-Date: 2020-03-23
+Version: 0.3.2
+Date: 2020-04-05
 Authors@R: c(
     person("David", "Cooley", ,"dcooley@symbolix.com.au", role = c("aut", "cre"))
     )

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # v0.3.2
 
+* better handling of polygon colours [issue287](https://github.com/SymbolixAU/mapdeck/issues/287)
+* bug fixed when clearing a layer [issue286](https://github.com/SymbolixAU/mapdeck/issues/286)
 * layers can repeat at low zoom levels [issue282](https://github.com/SymbolixAU/mapdeck/issues/282)
 * mapbox dependencies udpated to 1.9.0
 * tooltip for binary layers fixed [issue280](https://github.com/SymbolixAU/mapdeck/issues/280)

diff --git a/R/map_layer_polygon.R b/R/map_layer_polygon.R
@@ -162,7 +162,11 @@ add_polygon <- function(
 	focus_layer <- force( focus_layer )
 	elevation_scale <- force( elevation_scale )
 
-	is_extruded <- TRUE
+	is_extruded <- FALSE
+	## issue 287
+	if( !is.null( elevation ) ) {
+		is_extruded <- TRUE
+	}
 	if( !is.null( l[["stroke_width"]] ) | !is.null( l[["stroke_colour"]] ) ) {
 		is_extruded <- FALSE
 		if( !is.null( elevation ) ) {

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,7 +1,7 @@
 ## Comments
 
-* Updates v0.3.0 to v0.3.1
-* one bug fix found in v0.3.0
+* Updates v0.3.1 to v0.3.2
+* two bug fixes
 
 ## Tests
 

diff --git a/src/polygon.cpp b/src/polygon.cpp
@@ -8,7 +8,8 @@ Rcpp::List polygon_defaults(int n) {
 	return Rcpp::List::create(
 		_["elevation"] = mapdeck::defaults::default_elevation(n),
 		_["fill_colour"] = mapdeck::defaults::default_fill_colour(n),
-		_["stroke_colour"] = mapdeck::defaults::default_stroke_colour(n)
+		_["stroke_colour"] = mapdeck::defaults::default_stroke_colour(n),
+		_["stroke_width"] = mapdeck::defaults::default_stroke_width(n)
 	);
 }