ig_markerfactory - npm Package Compare versions

Comparing version 2.7.3 to 2.7.4

dist/markerfactory.esm.js

@@ -40,8 +40,11 @@ var MarkerFactory = {};
 
-var darken = function (stringcolor) {
+var darken = function (stringcolor, factor) {
     var darkercolor = {};
+    if (!factor) {
+        factor = 1;
+    }
     if (stringcolor.fillColor.indexOf('rgb') !== -1) {
-        darkercolor.r = parseHalf(stringcolor.r);
-        darkercolor.g = parseHalf(stringcolor.g);
-        darkercolor.b = parseHalf(stringcolor.b);
+        darkercolor.r = factor * parseHalf(stringcolor.r);
+        darkercolor.g = factor * parseHalf(stringcolor.g);
+        darkercolor.b = factor * parseHalf(stringcolor.b);
         darkercolor.fillColor = 'rgba(' + darkercolor.r + ',' + darkercolor.g + ',' + darkercolor.b + ',0.99)';
@@ -51,3 +54,3 @@ } else if (stringcolor.fillColor.indexOf('hsl') !== -1) {
         darkercolor.s = stringcolor.s;
-        darkercolor.l = stringcolor.l - 30;
+        darkercolor.l = factor * stringcolor.l - 30;
         darkercolor.fillColor = 'hsl(' + darkercolor.h + ',' + darkercolor.s + '%,' + darkercolor.l + '%)';
@@ -460,10 +463,11 @@ }
 
+        var color0, color1;
 
-        var color0;
-
         if (options.index !== undefined && options.count > 0) {
             color0 = getColor(options.index, options.count);
+            color1 = getColor1();
         } else {
             var deccolor = toDecColor(options.color);
             color0 = deccolor.fillColor;
+            color1 = darken(deccolor, 0.8).fillColor;
         }
@@ -473,19 +477,10 @@
         context.beginPath();
-        // Render Label
-        //context.font = "11pt Arial";
-
         context.font = "40px '" + options.font + "'";
         context.fillStyle = color0;
-
+        context.strokeStyle = color1;
         context.textBaseline = "top";
-
         var textWidth = context.measureText(options.label);
+        context.fillText(options.label, 1 + Math.floor((canvas.width / 2) - (textWidth.width / 2)), 49 - canvas.height);
+        context.strokeText(options.label, 2 + Math.floor((canvas.width / 2) - (textWidth.width / 2)), 50 - canvas.height);
 
-
-        // centre the text.
-        context.fillText(options.label,
-            1 + Math.floor((canvas.width / 2) - (textWidth.width / 2)),
-            49 - canvas.height
-        );
-
         canvas.fillColor = color0;
@@ -492,0 +487,0 @@

dist/markerfactory.js

@@ -46,8 +46,11 @@ (function (global, factory) {
 
-    var darken = function (stringcolor) {
+    var darken = function (stringcolor, factor) {
         var darkercolor = {};
+        if (!factor) {
+            factor = 1;
+        }
         if (stringcolor.fillColor.indexOf('rgb') !== -1) {
-            darkercolor.r = parseHalf(stringcolor.r);
-            darkercolor.g = parseHalf(stringcolor.g);
-            darkercolor.b = parseHalf(stringcolor.b);
+            darkercolor.r = factor * parseHalf(stringcolor.r);
+            darkercolor.g = factor * parseHalf(stringcolor.g);
+            darkercolor.b = factor * parseHalf(stringcolor.b);
             darkercolor.fillColor = 'rgba(' + darkercolor.r + ',' + darkercolor.g + ',' + darkercolor.b + ',0.99)';
@@ -57,3 +60,3 @@ } else if (stringcolor.fillColor.indexOf('hsl') !== -1) {
             darkercolor.s = stringcolor.s;
-            darkercolor.l = stringcolor.l - 30;
+            darkercolor.l = factor * stringcolor.l - 30;
             darkercolor.fillColor = 'hsl(' + darkercolor.h + ',' + darkercolor.s + '%,' + darkercolor.l + '%)';
@@ -466,10 +469,11 @@ }
 
+            var color0, color1;
 
-            var color0;
-
             if (options.index !== undefined && options.count > 0) {
                 color0 = getColor(options.index, options.count);
+                color1 = getColor1();
             } else {
                 var deccolor = toDecColor(options.color);
                 color0 = deccolor.fillColor;
+                color1 = darken(deccolor, 0.8).fillColor;
             }
@@ -479,19 +483,10 @@
             context.beginPath();
-            // Render Label
-            //context.font = "11pt Arial";
-
             context.font = "40px '" + options.font + "'";
             context.fillStyle = color0;
-
+            context.strokeStyle = color1;
             context.textBaseline = "top";
-
             var textWidth = context.measureText(options.label);
+            context.fillText(options.label, 1 + Math.floor((canvas.width / 2) - (textWidth.width / 2)), 49 - canvas.height);
+            context.strokeText(options.label, 2 + Math.floor((canvas.width / 2) - (textWidth.width / 2)), 50 - canvas.height);
 
-
-            // centre the text.
-            context.fillText(options.label,
-                1 + Math.floor((canvas.width / 2) - (textWidth.width / 2)),
-                49 - canvas.height
-            );
-
             canvas.fillColor = color0;
@@ -498,0 +493,0 @@

package.json

@@ -5,3 +5,3 @@ {
   "jsnext:main": "markerfactory.esm.js",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "license": "MIT",
@@ -8,0 +8,0 @@ "repository": {

src/markerfactory.js

@@ -40,8 +40,11 @@ var MarkerFactory = {};
 
-var darken = function (stringcolor) {
+var darken = function (stringcolor, factor) {
     var darkercolor = {};
+    if (!factor) {
+        factor = 1;
+    }
     if (stringcolor.fillColor.indexOf('rgb') !== -1) {
-        darkercolor.r = parseHalf(stringcolor.r);
-        darkercolor.g = parseHalf(stringcolor.g);
-        darkercolor.b = parseHalf(stringcolor.b);
+        darkercolor.r = factor * parseHalf(stringcolor.r);
+        darkercolor.g = factor * parseHalf(stringcolor.g);
+        darkercolor.b = factor * parseHalf(stringcolor.b);
         darkercolor.fillColor = 'rgba(' + darkercolor.r + ',' + darkercolor.g + ',' + darkercolor.b + ',0.99)';
@@ -51,3 +54,3 @@ } else if (stringcolor.fillColor.indexOf('hsl') !== -1) {
         darkercolor.s = stringcolor.s;
-        darkercolor.l = stringcolor.l - 30;
+        darkercolor.l = factor * stringcolor.l - 30;
         darkercolor.fillColor = 'hsl(' + darkercolor.h + ',' + darkercolor.s + '%,' + darkercolor.l + '%)';
@@ -460,10 +463,11 @@ }
 
+        var color0, color1;
 
-        var color0;
-
         if (options.index !== undefined && options.count > 0) {
             color0 = getColor(options.index, options.count);
+            color1 = getColor1();
         } else {
             var deccolor = toDecColor(options.color);
             color0 = deccolor.fillColor;
+            color1 = darken(deccolor, 0.8).fillColor;
         }
@@ -473,19 +477,10 @@
         context.beginPath();
-        // Render Label
-        //context.font = "11pt Arial";
-
         context.font = "40px '" + options.font + "'";
         context.fillStyle = color0;
-
+        context.strokeStyle = color1;
         context.textBaseline = "top";
-
         var textWidth = context.measureText(options.label);
+        context.fillText(options.label, 1 + Math.floor((canvas.width / 2) - (textWidth.width / 2)), 49 - canvas.height);
+        context.strokeText(options.label, 2 + Math.floor((canvas.width / 2) - (textWidth.width / 2)), 50 - canvas.height);
 
-
-        // centre the text.
-        context.fillText(options.label,
-            1 + Math.floor((canvas.width / 2) - (textWidth.width / 2)),
-            49 - canvas.height
-        );
-
         canvas.fillColor = color0;
@@ -492,0 +487,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1365062

increased by0.08%

Lines of code

4542

increased by0.07%

No dependency changes