[3.0] Improvement map (#2706)

* Fix load custom marker image for Firefox

* Fix update polygon color

ui-ngx/src/app/core/utils.ts

@@ -15,8 +15,8 @@
 ///
 
 import _ from 'lodash';
-import { Observable, Subject, fromEvent, of } from 'rxjs';
+import { Observable, Observer, of, Subject } from 'rxjs';
-import { finalize, share, map } from 'rxjs/operators';
+import { finalize, map, share } from 'rxjs/operators';
 import base64js from 'base64-js';
 import { Datasource } from '@app/shared/models/widget.models';
 
@@ -224,11 +224,14 @@ function scrollParents(node: Node): Node[] {
 
 function hashCode(str) {
   let hash = 0;
-  let i, char;
+  let i;
+  let char;
   if (str.length === 0) return hash;
   for (i = 0; i < str.length; i++) {
     char = str.charCodeAt(i);
+    // tslint:disable-next-line:no-bitwise
     hash = ((hash << 5) - hash) + char;
+    // tslint:disable-next-line:no-bitwise
     hash = hash & hash; // Convert to 32bit integer
   }
   return hash;
@@ -430,10 +433,24 @@ export function getDescendantProp(obj: any, path: string): any {
 }
 
 export function imageLoader(imageUrl: string): Observable<HTMLImageElement> {
-  const image = new Image();
+  return new Observable((observer: Observer<HTMLImageElement>) => {
-  const imageLoad$ = fromEvent(image, 'load').pipe(map(() => image));
+    const image = new Image();
-  image.src = imageUrl;
+    image.style.position = 'absolute';
-  return imageLoad$;
+    image.style.left = '-99999px';
+    image.style.top = '-99999px';
+    image.onload = () => {
+      observer.next(image);
+      document.body.removeChild(image);
+      observer.complete();
+    };
+    image.onerror = err => {
+      observer.error(err);
+      document.body.removeChild(image);
+      observer.complete();
+    };
+    document.body.appendChild(image)
+    image.src = imageUrl;
+  });
 }
 
 export function createLabelFromDatasource(datasource: Datasource, pattern: string) {

ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts

@@ -69,8 +69,8 @@ export class Polygon {
     updatePolygonColor(settings) {
         const style: L.PathOptions = {
             fill: true,
-            fillColor: settings.color,
+            fillColor: settings.polygonColor,
-            color: settings.color,
+            color: settings.polygonStrokeColor,
             weight: settings.polygonStrokeWeight,
             fillOpacity: settings.polygonOpacity,
             opacity: settings.polygonStrokeOpacity
@@ -86,4 +86,4 @@ export class Polygon {
         this.leafletPoly.setLatLngs(latLngs);
         this.leafletPoly.redraw();
     }
-}
+}