@kizmann/pico-js 0.3.10 → 0.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kizmann/pico-js",
-    "version": "0.3.10",
+    "version": "0.3.16",
     "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;
@@ -46,7 +48,7 @@ export default class Map
         return this;
     }
 
-    static setMarkerStyle(key, style = {})
+    static setMarkerStyle(key, style = {}, extra = {})
     {
         if ( ! Obj.has(style, 'default') ) {
             return console.error('Marker style requires default property')
@@ -91,12 +93,16 @@ export default class Map
             final.active = final.default;
         }
 
+        Obj.each(extra, (value, prop) => {
+            final[prop] = Obj.assign({}, final.default, { url: value });
+        });
+
         Obj.set(Map.markerStyles, key, final);
 
         return this;
     }
 
-    clusterMarkers(options = {}, allowCreate = true)
+    clusterMarkers(options = {}, filter = null, allowCreate = true)
     {
         if ( ! this.cluster && ! allowCreate ) {
             return;
@@ -111,11 +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) => {
-            return this.getMarkerVisibility(item.key);
+
+            let visible = this.getMarkerVisibility(item.key);
+
+            if ( ! Any.isFunction(this.clusterFilter) ) {
+                return visible;
+            }
+
+            return visible && this.clusterFilter.call(this, item);
         });
 
         this.cluster = new global.MarkerClusterer(this.map, Arr.each(markers, (item) => item.marker),
@@ -361,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);
@@ -449,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/array.js

@@ -66,7 +66,7 @@ export class Arr
 
         if ( Any.isFunction(key) ) {
             keys = keys.sort((a, b) => {
-                return Any.integer(Obj.get(obj[a], key)) - Any.integer(Obj.get(obj[b], key));
+                return key.call({}, obj[a], obj[b]);
             });
         }
 
@@ -90,16 +90,6 @@ export class Arr
     {
         let keys = Any.keys(obj);
 
-        if ( Any.isFunction(key) ) {
-            keys = keys.sort((a, b) => {
-
-                let va = Any.string(Obj.get(obj[a], key)).toLowerCase();
-                let vb = Any.string(Obj.get(obj[b], key)).toLowerCase();
-
-                return(va < vb) ? -1 : (va > vb) ? 1 : 0;
-            });
-        }
-
         if ( ! Any.isFunction(key) ) {
             keys = keys.sort((a, b) => {
 

package/src/utility/dom.js

@@ -300,7 +300,7 @@ export class Dom
             return Dom.find(null);
         }
 
-        return Dom.find(this.el.parentNode);
+        return Dom.find(el.parentNode);
     }
 
     child(selector)

package/src/utility/number.js

@@ -1,16 +1,16 @@
-import { Any, Arr } from "../index"
+import { Any, Arr, Obj } from "../index"
 
 export class Num
 {
     static int(num)
     {
-        return ! Any.isString(num) ? parseInt(num) :
+        return !Any.isString(num) ? parseInt(num) :
             parseInt(num.replace('px', ''));
     }
 
     static float(num)
     {
-        return ! Any.isString(num) ? parseFloat(num) :
+        return !Any.isString(num) ? parseFloat(num) :
             parseFloat(num.replace('px', ''));
     }
 
@@ -43,9 +43,10 @@ export class Num
     {
         let value = 0;
 
-        for ( let i = 20; i >= 0; i-- ) {
+        for ( let i = 20; i >= 0; i -- ) {
             if ( num >= (value = Math.pow(2, i)) ) {
-                base.push(value); num -= value;
+                base.push(value);
+                num -= value;
             }
         }
 
@@ -57,11 +58,42 @@ export class Num
         return Arr.reduce(arr, (acc, val) => acc + val, 0);
     }
 
+    static distance(cord1, cord2, miles = false)
+    {
+        let defaultCord = {
+            lat: 0, lng: 0
+        };
+
+        cord1 = Obj.assign({}, defaultCord, cord1);
+        cord2 = Obj.assign({}, defaultCord, cord2);
+
+        let radlat1 = (Math.PI * this.float(cord1.lat)) / 180;
+        let radlat2 = (Math.PI * this.float(cord2.lat)) / 180;
+
+        let theta = this.float(cord1.lng) - this.float(cord2.lng);
+        let radtheta = (Math.PI * theta) / 180;
+
+        let dist = Math.sin(radlat1) * Math.sin(radlat2) +
+            Math.cos(radlat1) * Math.cos(radlat2) * Math.cos(radtheta);
+
+        if ( dist > 1 ) {
+            dist = 1;
+        }
+
+        dist = (Math.acos(dist) * 180) / Math.PI * 60 * 1.1515;
+
+        if ( !miles ) {
+            dist = dist * 1.609344;
+        }
+
+        return dist;
+    }
+
     static format(num, decimal = '.', thousand = ',', fixed = null)
     {
         let value = num.toString();
 
-        if ( fixed !== null && fixed !== -1 ) {
+        if ( fixed !== null && fixed !== - 1 ) {
             value = num.toFixed(fixed);
         }
 
@@ -80,7 +112,7 @@ export class Num
 
         let result = splits.reverse().join(thousand);
 
-        if ( fixed !== -1 && fixed !== 0 && value.match(/\./) ) {
+        if ( fixed !== - 1 && fixed !== 0 && value.match(/\./) ) {
             result += decimal + minals;
         }
 

package/src/utility/object.js

@@ -144,7 +144,7 @@ export class Obj
 
         if ( Any.isFunction(key) ) {
             keys = keys.sort((a, b) => {
-                return Any.integer(Obj.get(obj[a], key)) - Any.integer(Obj.get(obj[b], key));
+                return key.call({}, obj[a], obj[b]);
             });
         }
 
@@ -168,16 +168,6 @@ export class Obj
     {
         let keys = Any.keys(obj);
 
-        if ( Any.isFunction(key) ) {
-            keys = keys.sort((a, b) => {
-
-                let va = Any.string(Obj.get(obj[a], key)).toLowerCase();
-                let vb = Any.string(Obj.get(obj[b], key)).toLowerCase();
-
-                return(va < vb) ? -1 : (va > vb) ? 1 : 0;
-            });
-        }
-
         if ( ! Any.isFunction(key) ) {
             keys = keys.sort((a, b) => {