merge fixes

@@ -15,13 +15,8 @@
 ///
 ///
 
 
 import _ from 'lodash';
 import _ from 'lodash';
-<<<<<<< HEAD
 import { Observable, Subject, fromEvent, of } from 'rxjs';
 import { Observable, Subject, fromEvent, of } from 'rxjs';
 import { finalize, share, map } from 'rxjs/operators';
 import { finalize, share, map } from 'rxjs/operators';
-=======
-import { fromEvent, Observable, of, Subject } from 'rxjs';
-import { finalize, map, share } from 'rxjs/operators';
->>>>>>> 8cfe4ef44f356d9e920189664df3abb9e89b708c
 import base64js from 'base64-js';
 import base64js from 'base64-js';
 
 
 export function onParentScrollOrWindowResize(el: Node): Observable<Event> {
 export function onParentScrollOrWindowResize(el: Node): Observable<Event> {

@@ -445,71 +445,6 @@ export const mapPolygonSchema =
         title: 'Map Polygon Configuration',
         title: 'Map Polygon Configuration',
         type: 'object',
         type: 'object',
         properties: {
         properties: {
-            polygonKeyName: {
-                title: 'Polygon key name',
-                type: 'string',
-                default: 'coordinates'
-            },
-            polygonColor: {
-                title: 'Polygon color',
-                type: 'string'
-            },
-            polygonOpacity: {
-                title: 'Polygon opacity',
-                type: 'number',
-                default: 0.5
-            },
-            polygonStrokeColor: {
-                title: 'Stroke color',
-                type: 'string'
-            },
-            polygonStrokeOpacity: {
-                title: 'Stroke opacity',
-                type: 'number',
-                default: 1
-            },
-            polygonStrokeWeight: {
-                title: 'Stroke weight',
-                type: 'number',
-                default: 1
-            },
-            usePolygonColorFunction: {
-                title: 'Use polygon color function',
-                type: 'boolean',
-                default: false
-            },
-            polygonColorFunction: {
-                title: 'Polygon Color function: f(data, dsData, dsIndex)',
-                type: 'string'
-            },
-        },
-        required: []
-    },
-    form: [
-        'polygonKeyName',
-        {
-            key: 'polygonColor',
-            type: 'color'
-        },
-        'polygonOpacity',
-        {
-            key: 'polygonStrokeColor',
-            type: 'color'
-        },
-        'polygonStrokeOpacity', 'polygonStrokeWeight', 'usePolygonColorFunction',
-        {
-            key: 'polygonColorFunction',
-            type: 'javascript'
-        },
-    ]
-};
-
-export const mapPolygonSchema =
-{
-    schema: {
-        title: 'Map Polygon Configuration',
-        type: 'object',
-        properties: {
             showPolygon: {
             showPolygon: {
                 title: 'Show polygon',
                 title: 'Show polygon',
                 type: 'boolean',
                 type: 'boolean',