patch for hextorgb

SymbolixAU · Aug 14, 2018 · f16fa9c · f16fa9c
1 parent 0f3bb95
commit f16fa9c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: mapdeck
 Type: Package
 Title: Interactive Maps Using 'Mapbox GL JS' and 'Deck.gl'
-Version: 0.1.0
+Version: 0.1.1
 Date: 2018-08-11
 Authors@R: c(
     person("David", "Cooley", ,"dcooley@symbolix.com.au", role = c("aut", "cre"))

diff --git a/inst/htmlwidgets/lib/polygon/polygon.js b/inst/htmlwidgets/lib/polygon/polygon.js
@@ -12,7 +12,7 @@ function add_polygon( map_id, polygon_data, layer_id, light_settings ) {
     extruded: true,
     lineWidthMinPixels: 1,
     getPolygon: d => decode_polygons( d.polyline ),
-    getLineColor: d => hexToRgb( d.stroke_colour ),
+    getLineColor: d => hexToRgb_simple( d.stroke_colour ),
     getFillColor: d => hexToRGBA( d.fill_colour, d.fill_opacity ),
     getLineWidth: d => d.stroke_width,
     getElevation: d => d.elevation,

diff --git a/inst/htmlwidgets/mapdeck.js b/inst/htmlwidgets/mapdeck.js
@@ -172,7 +172,7 @@ function update_layer( map_id, layer_id, layer ) {
  *
  * Converts hex colours to rgb
  */
-const hexToRgb = hex =>
+const hexToRgb_simple = hex =>
   hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i
              ,(m, r, g, b) => '#' + r + r + g + g + b + b)
     .substring(1).match(/.{2}/g)
@@ -197,7 +197,7 @@ function to_rgb( colour_range ) {
 	n = colour_range.length;
 
 	for (i = 0; i < n; i++) {
-		arr.push( hexToRgb( colour_range[i]) );
+		arr.push( hexToRgb_simple( colour_range[i]) );
 	}
   return arr;
 }