@kizmann/pico-js 0.3.15 → 0.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kizmann/pico-js",
-    "version": "0.3.15",
+    "version": "0.3.18",
     "license": "MIT",
     "private": false,
     "author": "Eduard Kizmann <kizmann@protonmail.ch>",

package/src/library/map.js

@@ -16,6 +16,8 @@ export default class Map
 
     cluster = null;
 
+    clusterFilter = null;
+
     clusterOptions = {};
 
     static hideMarkers = true;
@@ -115,18 +117,22 @@ export default class Map
         }
 
         if ( this.cluster ) {
-            this.cluster.clearMarkers()
+            this.cluster.clearMarkers();
+        }
+
+        if ( Any.isFunction(filter) ) {
+            this.clusterFilter = filter;
         }
 
         let markers = Arr.filter(this.markers, (item) => {
 
             let visible = this.getMarkerVisibility(item.key);
 
-            if ( ! Any.isFunction(filter) ) {
+            if ( ! Any.isFunction(this.clusterFilter) ) {
                 return visible;
             }
 
-            return visible && filter.call(this, item);
+            return visible && this.clusterFilter.call(this, item);
         });
 
         this.cluster = new global.MarkerClusterer(this.map, Arr.each(markers, (item) => item.marker),
@@ -372,7 +378,7 @@ export default class Map
 
         Obj.set(this.markers, key, item);
 
-        this.clusterMarkers(this.clusterOptions, false);
+        this.clusterMarkers(this.clusterOptions, null, false);
 
         if ( ! Obj.has(options, 'html') ) {
             return Obj.get(this.markers, key);
@@ -460,7 +466,7 @@ export default class Map
 
         Obj.each(markers, (item) => this.showMarker(item.key));
 
-        this.clusterMarkers(this.clusterOptions, false);
+        this.clusterMarkers(this.clusterOptions, null, false);
 
         return this;
     }

package/src/utility/number.js

@@ -91,6 +91,10 @@ export class Num
 
     static format(num, decimal = '.', thousand = ',', fixed = null)
     {
+        if ( num === null ) {
+            return null;
+        }
+
         let value = num.toString();
 
         if ( fixed !== null && fixed !== - 1 ) {
@@ -98,7 +102,7 @@ export class Num
         }
 
         let totals = value.replace(/\.[0-9]+$/, ''),
-            minals = value.replace(/^[0-9]+\./, '');
+            minals = value.replace(/^[0-9\-]+\./, '');
 
         let splits = Arr.reduce(totals.split('').reverse(), (result, val, key) => {
 

package/src/utility/string.js

@@ -10,6 +10,11 @@ export class Str
         return String(val).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     }
 
+    static upper(val)
+    {
+        return String(val).toUpperCase();
+    }
+
     static lower(val)
     {
         return String(val).toLowerCase();