From 2765de4432147edadbb49b5bb76b314becc7501e Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Fri, 7 Jan 2022 13:15:15 +0100
Subject: [PATCH 1/5] feat: POINT field support

---
 package.json                                  |  3 +
 src/common/fieldTypes.js                      |  8 ++-
 src/renderer/components/BaseMap.vue           | 66 +++++++++++++++++++
 .../components/WorkspaceTabQueryTable.vue     |  4 +-
 .../components/WorkspaceTabQueryTableRow.vue  | 54 +++++++++++++--
 src/renderer/index.js                         |  1 +
 src/renderer/scss/_data-types.scss            |  1 +
 7 files changed, 131 insertions(+), 6 deletions(-)
 create mode 100644 src/renderer/components/BaseMap.vue

diff --git a/package.json b/package.json
index 57917b26..0da8dd9d 100644
--- a/package.json
+++ b/package.json
@@ -105,6 +105,8 @@
   "dependencies": {
     "@electron/remote": "^2.0.1",
     "@mdi/font": "^6.1.95",
+    "@turf/centroid": "^6.5.0",
+    "@turf/helpers": "^6.5.0",
     "@vscode/vscode-languagedetection": "^1.0.21",
     "ace-builds": "^1.4.13",
     "better-sqlite3": "^7.4.4",
@@ -113,6 +115,7 @@
     "electron-updater": "^4.3.9",
     "electron-window-state": "^5.0.3",
     "faker": "^5.5.3",
+    "leaflet": "^1.7.1",
     "marked": "^4.0.0",
     "moment": "^2.29.1",
     "mysql2": "^2.3.2",
diff --git a/src/common/fieldTypes.js b/src/common/fieldTypes.js
index d3a8a1db..e5013eb2 100644
--- a/src/common/fieldTypes.js
+++ b/src/common/fieldTypes.js
@@ -8,7 +8,9 @@ export const TEXT = [
 export const LONG_TEXT = [
    'TEXT',
    'MEDIUMTEXT',
-   'LONGTEXT'
+   'LONGTEXT',
+   'JSON',
+   'VARBINARY'
 ];
 
 export const ARRAY = [
@@ -82,3 +84,7 @@ export const BIT = [
    'BIT',
    'BIT VARYING'
 ];
+
+export const SPATIAL = [
+   'POINT'
+];
diff --git a/src/renderer/components/BaseMap.vue b/src/renderer/components/BaseMap.vue
new file mode 100644
index 00000000..93e92dd9
--- /dev/null
+++ b/src/renderer/components/BaseMap.vue
@@ -0,0 +1,66 @@
+<template>
+   <div id="map" class="map" />
+</template>
+<script>
+import L from 'leaflet';
+import { point } from '@turf/helpers';
+import centroid from '@turf/centroid';
+
+export default {
+   name: 'BaseMap',
+   props: {
+      points: [Object, Array]
+   },
+   data () {
+      return {
+         map: null
+      };
+   },
+   mounted () {
+      const marker = point([this.points.x, this.points.y]);
+      const mapCenter = centroid(marker).geometry.coordinates.reverse();
+
+      this.map = L.map('map', {
+         center: mapCenter,
+         zoom: 15,
+         minZoom: 1
+      });
+
+      const geojsonMarkerOptions = {
+         radius: 8,
+         fillColor: '#ff7800',
+         color: '#000',
+         weight: 1,
+         opacity: 0.6,
+         fillOpacity: 0.8
+      };
+
+      L.geoJSON(marker, {
+         pointToLayer: function (feature, latlng) {
+            return L.circleMarker(latlng, geojsonMarkerOptions);
+         }
+      }).addTo(this.map);
+
+      L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+      }).addTo(this.map);
+   },
+   methods: {
+   }
+};
+</script>
+
+<style lang="scss">
+.map{
+   height: 400px;
+}
+
+.marker-icon{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: $primary-color;
+    border-radius: 50%;
+    box-shadow: 0 0 5px 1px darken($body-font-color-dark, 40%);
+}
+</style>
diff --git a/src/renderer/components/WorkspaceTabQueryTable.vue b/src/renderer/components/WorkspaceTabQueryTable.vue
index 97057456..45b46638 100644
--- a/src/renderer/components/WorkspaceTabQueryTable.vue
+++ b/src/renderer/components/WorkspaceTabQueryTable.vue
@@ -410,7 +410,9 @@ export default {
             `${this.fields[0].table}.${this.selectedCell.field}`,
             `${this.fields[0].tableAlias}.${this.selectedCell.field}`
          ].includes(prop));
-         const valueToCopy = row[cellName];
+         let valueToCopy = row[cellName];
+         if (typeof valueToCopy === 'object')
+            valueToCopy = JSON.stringify(valueToCopy);
          navigator.clipboard.writeText(valueToCopy);
       },
       copyRow () {
diff --git a/src/renderer/components/WorkspaceTabQueryTableRow.vue b/src/renderer/components/WorkspaceTabQueryTableRow.vue
index b31ac667..dab9b60f 100644
--- a/src/renderer/components/WorkspaceTabQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceTabQueryTableRow.vue
@@ -123,6 +123,21 @@
             </div>
          </template>
       </ConfirmModal>
+      <ConfirmModal
+         v-if="isMapModal"
+         :hide-footer="true"
+         size="medium"
+         @hide="hideEditorModal"
+      >
+         <template #header>
+            <div class="d-flex">
+               <i class="mdi mdi-24px mdi-map mr-1" /> <span class="cut-text">"{{ editingField }}"</span>
+            </div>
+         </template>
+         <template #body>
+            <BaseMap :points="editingContent" />
+         </template>
+      </ConfirmModal>
       <ConfirmModal
          v-if="isBlobEditor"
          :confirm-text="$t('word.update')"
@@ -187,10 +202,26 @@ import { mimeFromHex } from 'common/libs/mimeFromHex';
 import { formatBytes } from 'common/libs/formatBytes';
 import { bufferToBase64 } from 'common/libs/bufferToBase64';
 import hexToBinary from 'common/libs/hexToBinary';
-import { TEXT, LONG_TEXT, ARRAY, TEXT_SEARCH, NUMBER, FLOAT, BOOLEAN, DATE, TIME, DATETIME, BLOB, BIT, HAS_TIMEZONE } from 'common/fieldTypes';
+import {
+   TEXT,
+   LONG_TEXT,
+   ARRAY,
+   TEXT_SEARCH,
+   NUMBER,
+   FLOAT,
+   BOOLEAN,
+   DATE,
+   TIME,
+   DATETIME,
+   BLOB,
+   BIT,
+   HAS_TIMEZONE,
+   SPATIAL
+} from 'common/fieldTypes';
 import { VueMaskDirective } from 'v-mask';
 import ConfirmModal from '@/components/BaseConfirmModal';
 import TextEditor from '@/components/BaseTextEditor';
+import BaseMap from '@/components/BaseMap';
 import ForeignKeySelect from '@/components/ForeignKeySelect';
 
 export default {
@@ -198,7 +229,8 @@ export default {
    components: {
       ConfirmModal,
       TextEditor,
-      ForeignKeySelect
+      ForeignKeySelect,
+      BaseMap
    },
    directives: {
       mask: VueMaskDirective
@@ -248,7 +280,10 @@ export default {
             return val;
          }
 
-         return val;
+         if (SPATIAL.includes(type))
+            return val;
+
+         return typeof val === 'object' ? JSON.stringify(val) : val;
       }
    },
    props: {
@@ -263,6 +298,7 @@ export default {
          isInlineEditor: {},
          isTextareaEditor: false,
          isBlobEditor: false,
+         isMapModal: false,
          willBeDeleted: false,
          originalContent: null,
          editingContent: null,
@@ -331,6 +367,9 @@ export default {
          if (BOOLEAN.includes(this.editingType))
             return { type: 'boolean', mask: false };
 
+         if (SPATIAL.includes(this.editingType))
+            return { type: 'map', mask: false };
+
          return { type: 'text', mask: false };
       },
       isImage () {
@@ -403,7 +442,7 @@ export default {
          return bufferToBase64(val);
       },
       editON (event, content, field) {
-         if (!this.isEditable) return;
+         if (!this.isEditable || this.editingType === 'none') return;
 
          window.addEventListener('keydown', this.onKey);
 
@@ -419,6 +458,12 @@ export default {
             return;
          }
 
+         if (SPATIAL.includes(type)) {
+            this.isMapModal = true;
+            this.editingContent = this.$options.filters.typeFormat(content, type);
+            return;
+         }
+
          if (BLOB.includes(type)) {
             this.isBlobEditor = true;
             this.editingContent = content || '';
@@ -490,6 +535,7 @@ export default {
       hideEditorModal () {
          this.isTextareaEditor = false;
          this.isBlobEditor = false;
+         this.isMapModal = false;
       },
       downloadFile () {
          const downloadLink = document.createElement('a');
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 6079c93f..717f39a5 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -3,6 +3,7 @@
 import Vue from 'vue';
 
 import '@mdi/font/css/materialdesignicons.css';
+import 'leaflet/dist/leaflet.css';
 import '@/scss/main.scss';
 
 import App from '@/App.vue';
diff --git a/src/renderer/scss/_data-types.scss b/src/renderer/scss/_data-types.scss
index c82d6e60..66e7337d 100644
--- a/src/renderer/scss/_data-types.scss
+++ b/src/renderer/scss/_data-types.scss
@@ -81,6 +81,7 @@
     "tsvector": $array-color,
     "tsquery": $array-color,
     "pg_node_tree": $array-color,
+    "point": $array-color,
     "aclitem": $array-color,
     "unknown": $unknown-color,
   )

From 94cf5242a298048fdad1652c3629001254d38917 Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Fri, 7 Jan 2022 17:42:54 +0100
Subject: [PATCH 2/5] feat(MySQL): support to LINESTRING, POLYGON and GEOMETRY
 fields

---
 package.json                        |  1 -
 src/common/data-types/mysql.js      | 16 ++++----
 src/common/fieldTypes.js            |  5 ++-
 src/common/libs/getArrayDepth.js    | 10 +++++
 src/renderer/components/BaseMap.vue | 58 ++++++++++++++++++++---------
 src/renderer/scss/_data-types.scss  |  3 ++
 6 files changed, 66 insertions(+), 27 deletions(-)
 create mode 100644 src/common/libs/getArrayDepth.js

diff --git a/package.json b/package.json
index 0da8dd9d..a476a8cb 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,6 @@
   "dependencies": {
     "@electron/remote": "^2.0.1",
     "@mdi/font": "^6.1.95",
-    "@turf/centroid": "^6.5.0",
     "@turf/helpers": "^6.5.0",
     "@vscode/vscode-languagedetection": "^1.0.21",
     "ace-builds": "^1.4.13",
diff --git a/src/common/data-types/mysql.js b/src/common/data-types/mysql.js
index 78e3d2c9..0130b277 100644
--- a/src/common/data-types/mysql.js
+++ b/src/common/data-types/mysql.js
@@ -218,56 +218,56 @@ module.exports = [
       types: [
          {
             name: 'POINT',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
          },
          {
             name: 'LINESTRING',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
          },
          {
             name: 'POLYGON',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
          },
          {
             name: 'GEOMETRY',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
          },
          {
             name: 'MULTIPOINT',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
          },
          {
             name: 'MULTILINESTRING',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
          },
          {
             name: 'MULTIPOLYGON',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
          },
          {
             name: 'GEOMETRYCOLLECTION',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
diff --git a/src/common/fieldTypes.js b/src/common/fieldTypes.js
index e5013eb2..8287965b 100644
--- a/src/common/fieldTypes.js
+++ b/src/common/fieldTypes.js
@@ -86,5 +86,8 @@ export const BIT = [
 ];
 
 export const SPATIAL = [
-   'POINT'
+   'POINT',
+   'LINESTRING',
+   'POLYGON',
+   'GEOMETRY'
 ];
diff --git a/src/common/libs/getArrayDepth.js b/src/common/libs/getArrayDepth.js
new file mode 100644
index 00000000..04e62e77
--- /dev/null
+++ b/src/common/libs/getArrayDepth.js
@@ -0,0 +1,10 @@
+/**
+ *
+ * @param {any[]} array
+ * @returns {number}
+ */
+export function getArrayDepth (array) {
+   return Array.isArray(array)
+      ? 1 + Math.max(0, ...array.map(getArrayDepth))
+      : 0;
+}
diff --git a/src/renderer/components/BaseMap.vue b/src/renderer/components/BaseMap.vue
index 93e92dd9..26178817 100644
--- a/src/renderer/components/BaseMap.vue
+++ b/src/renderer/components/BaseMap.vue
@@ -3,8 +3,8 @@
 </template>
 <script>
 import L from 'leaflet';
-import { point } from '@turf/helpers';
-import centroid from '@turf/centroid';
+import { point, lineString, polygon } from '@turf/helpers';
+import { getArrayDepth } from 'common/libs/getArrayDepth';
 
 export default {
    name: 'BaseMap',
@@ -13,34 +13,58 @@ export default {
    },
    data () {
       return {
-         map: null
+         map: null,
+         markers: null,
+         center: null
       };
    },
    mounted () {
-      const marker = point([this.points.x, this.points.y]);
-      const mapCenter = centroid(marker).geometry.coordinates.reverse();
+      if (Array.isArray(this.points)) {
+         if (getArrayDepth(this.points) === 1)
+            this.markers = lineString(this.points.reduce((acc, curr) => [...acc, [curr.x, curr.y]], []));
+         else
+            this.markers = polygon(this.points.map(arr => arr.reduce((acc, curr) => [...acc, [curr.x, curr.y]], [])));
+      }
+      else {
+         this.center = [this.points.y, this.points.x];
+         this.markers = point([this.points.x, this.points.y]);
+      }
 
       this.map = L.map('map', {
-         center: mapCenter,
+         center: this.center || [0, 0],
          zoom: 15,
          minZoom: 1
       });
 
-      const geojsonMarkerOptions = {
-         radius: 8,
-         fillColor: '#ff7800',
-         color: '#000',
-         weight: 1,
-         opacity: 0.6,
-         fillOpacity: 0.8
-      };
-
-      L.geoJSON(marker, {
+      const geoJsonObj = L.geoJSON(this.markers, {
+         style: function () {
+            return {
+               weight: 2,
+               fillColor: '#ff7800',
+               color: '#ff7800',
+               opacity: 0.8,
+               fillOpacity: 0.4
+            };
+         },
          pointToLayer: function (feature, latlng) {
-            return L.circleMarker(latlng, geojsonMarkerOptions);
+            return L.circleMarker(latlng, {
+               radius: 7,
+               weight: 2,
+               fillColor: '#ff7800',
+               color: '#ff7800',
+               opacity: 0.8,
+               fillOpacity: 0.4
+            });
          }
       }).addTo(this.map);
 
+      const southWest = L.latLng(-90, -180);
+      const northEast = L.latLng(90, 180);
+      const bounds = L.latLngBounds(southWest, northEast);
+      this.map.setMaxBounds(bounds);
+
+      if (!this.center) this.map.fitBounds(geoJsonObj.getBounds());
+
       L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
          attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
       }).addTo(this.map);
diff --git a/src/renderer/scss/_data-types.scss b/src/renderer/scss/_data-types.scss
index 66e7337d..676b79c8 100644
--- a/src/renderer/scss/_data-types.scss
+++ b/src/renderer/scss/_data-types.scss
@@ -82,6 +82,9 @@
     "tsquery": $array-color,
     "pg_node_tree": $array-color,
     "point": $array-color,
+    "linestring": $array-color,
+    "polygon": $array-color,
+    "geometry": $array-color,
     "aclitem": $array-color,
     "unknown": $unknown-color,
   )

From e40ab14adb39618feb9cae67f4ce8bc4fcf22b3a Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Fri, 7 Jan 2022 18:04:46 +0100
Subject: [PATCH 3/5] refactor: removed links from map attribution

---
 src/renderer/components/BaseMap.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/BaseMap.vue b/src/renderer/components/BaseMap.vue
index 26178817..66e3fd50 100644
--- a/src/renderer/components/BaseMap.vue
+++ b/src/renderer/components/BaseMap.vue
@@ -33,9 +33,12 @@ export default {
       this.map = L.map('map', {
          center: this.center || [0, 0],
          zoom: 15,
-         minZoom: 1
+         minZoom: 1,
+         attributionControl: false
       });
 
+      L.control.attribution({ prefix: '<b>Leaflet</b>' }).addTo(this.map);
+
       const geoJsonObj = L.geoJSON(this.markers, {
          style: function () {
             return {
@@ -66,7 +69,7 @@ export default {
       if (!this.center) this.map.fitBounds(geoJsonObj.getBounds());
 
       L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+         attribution: '&copy; <b>OpenStreetMap</b>'
       }).addTo(this.map);
    },
    methods: {

From 3f8771182f53d1d5f3287b4dea8cffdf045414fc Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Sun, 23 Jan 2022 12:21:43 +0100
Subject: [PATCH 4/5] feat(MySQL): support to MULTIPOINT, MULTILINESTRING,
 MULTIPOLYGON and GEOMCOLLECTION fields

---
 src/common/data-types/mysql.js                |  2 +-
 src/common/fieldTypes.js                      | 16 ++++++++-
 src/renderer/components/BaseMap.vue           | 35 +++++++++++++------
 .../components/WorkspaceTabQueryTableRow.vue  | 14 +++++---
 src/renderer/scss/_data-types.scss            |  5 +++
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/common/data-types/mysql.js b/src/common/data-types/mysql.js
index b3239f95..8e77f900 100644
--- a/src/common/data-types/mysql.js
+++ b/src/common/data-types/mysql.js
@@ -267,7 +267,7 @@ module.exports = [
             zerofill: false
          },
          {
-            name: 'GEOMETRYCOLLECTION',
+            name: 'GEOMCOLLECTION',
             length: false,
             collation: false,
             unsigned: false,
diff --git a/src/common/fieldTypes.js b/src/common/fieldTypes.js
index 8287965b..a7d3399f 100644
--- a/src/common/fieldTypes.js
+++ b/src/common/fieldTypes.js
@@ -89,5 +89,19 @@ export const SPATIAL = [
    'POINT',
    'LINESTRING',
    'POLYGON',
-   'GEOMETRY'
+   'GEOMETRY',
+   'MULTIPOINT',
+   'MULTILINESTRING',
+   'MULTIPOLYGON',
+   'GEOMCOLLECTION',
+   'GEOMETRYCOLLECTION'
+];
+
+// Used to check multi spatial fields only
+export const IS_MULTI_SPATIAL = [
+   'MULTIPOINT',
+   'MULTILINESTRING',
+   'MULTIPOLYGON',
+   'GEOMCOLLECTION',
+   'GEOMETRYCOLLECTION'
 ];
diff --git a/src/renderer/components/BaseMap.vue b/src/renderer/components/BaseMap.vue
index 66e3fd50..c1cbb836 100644
--- a/src/renderer/components/BaseMap.vue
+++ b/src/renderer/components/BaseMap.vue
@@ -3,31 +3,36 @@
 </template>
 <script>
 import L from 'leaflet';
-import { point, lineString, polygon } from '@turf/helpers';
+import {
+   point,
+   lineString,
+   polygon
+} from '@turf/helpers';
 import { getArrayDepth } from 'common/libs/getArrayDepth';
 
 export default {
    name: 'BaseMap',
    props: {
-      points: [Object, Array]
+      points: [Object, Array],
+      isMultiSpatial: Boolean
    },
    data () {
       return {
          map: null,
-         markers: null,
+         markers: [],
          center: null
       };
    },
    mounted () {
-      if (Array.isArray(this.points)) {
-         if (getArrayDepth(this.points) === 1)
-            this.markers = lineString(this.points.reduce((acc, curr) => [...acc, [curr.x, curr.y]], []));
-         else
-            this.markers = polygon(this.points.map(arr => arr.reduce((acc, curr) => [...acc, [curr.x, curr.y]], [])));
+      if (this.isMultiSpatial) {
+         for (const element of this.points)
+            this.markers.push(this.getMarkers(element));
       }
       else {
-         this.center = [this.points.y, this.points.x];
-         this.markers = point([this.points.x, this.points.y]);
+         this.markers = this.getMarkers(this.points);
+
+         if (!Array.isArray(this.points))
+            this.center = [this.points.y, this.points.x];
       }
 
       this.map = L.map('map', {
@@ -73,6 +78,16 @@ export default {
       }).addTo(this.map);
    },
    methods: {
+      getMarkers (points) {
+         if (Array.isArray(points)) {
+            if (getArrayDepth(points) === 1)
+               return lineString(points.reduce((acc, curr) => [...acc, [curr.x, curr.y]], []));
+            else
+               return polygon(points.map(arr => arr.reduce((acc, curr) => [...acc, [curr.x, curr.y]], [])));
+         }
+         else
+            return point([points.x, points.y]);
+      }
    }
 };
 </script>
diff --git a/src/renderer/components/WorkspaceTabQueryTableRow.vue b/src/renderer/components/WorkspaceTabQueryTableRow.vue
index 576ebd54..6fe51f13 100644
--- a/src/renderer/components/WorkspaceTabQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceTabQueryTableRow.vue
@@ -135,7 +135,7 @@
             </div>
          </template>
          <template #body>
-            <BaseMap :points="editingContent" />
+            <BaseMap :points="editingContent" :is-multi-spatial="isMultiSpatial" />
          </template>
       </ConfirmModal>
       <ConfirmModal
@@ -216,7 +216,8 @@ import {
    BLOB,
    BIT,
    HAS_TIMEZONE,
-   SPATIAL
+   SPATIAL,
+   IS_MULTI_SPATIAL
 } from 'common/fieldTypes';
 import { VueMaskDirective } from 'v-mask';
 import ConfirmModal from '@/components/BaseConfirmModal';
@@ -299,6 +300,7 @@ export default {
          isTextareaEditor: false,
          isBlobEditor: false,
          isMapModal: false,
+         isMultiSpatial: false,
          willBeDeleted: false,
          originalContent: null,
          editingContent: null,
@@ -459,8 +461,11 @@ export default {
          }
 
          if (SPATIAL.includes(type)) {
-            this.isMapModal = true;
-            this.editingContent = this.$options.filters.typeFormat(content, type);
+            if (content) {
+               this.isMultiSpatial = IS_MULTI_SPATIAL.includes(type);
+               this.isMapModal = true;
+               this.editingContent = this.$options.filters.typeFormat(content, type);
+            }
             return;
          }
 
@@ -536,6 +541,7 @@ export default {
          this.isTextareaEditor = false;
          this.isBlobEditor = false;
          this.isMapModal = false;
+         this.isMultiSpatial = false;
       },
       downloadFile () {
          const downloadLink = document.createElement('a');
diff --git a/src/renderer/scss/_data-types.scss b/src/renderer/scss/_data-types.scss
index 676b79c8..c4fc63fa 100644
--- a/src/renderer/scss/_data-types.scss
+++ b/src/renderer/scss/_data-types.scss
@@ -85,6 +85,11 @@
     "linestring": $array-color,
     "polygon": $array-color,
     "geometry": $array-color,
+    "multipoint": $array-color,
+    "multilinestring": $array-color,
+    "multipolygon": $array-color,
+    "geomcollection": $array-color,
+    "geometrycollection": $array-color,
     "aclitem": $array-color,
     "unknown": $unknown-color,
   )

From b2348639abe629e4abd60c213b2b799145c9e7bc Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Sat, 29 Jan 2022 09:51:33 +0100
Subject: [PATCH 5/5] test: temporary fix on Windows tests

---
 package.json      |  2 +-
 tests/app.spec.js | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 499a4d9d..66d8d4d2 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "html-webpack-plugin": "^5.5.0",
     "mini-css-extract-plugin": "~2.4.5",
     "node-loader": "^2.0.0",
-    "playwright": "^1.16.3",
+    "playwright": "^1.18.1",
     "progress-webpack-plugin": "^1.0.12",
     "sass": "^1.42.1",
     "sass-loader": "^12.3.0",
diff --git a/tests/app.spec.js b/tests/app.spec.js
index c2e6238f..3d5c0f31 100644
--- a/tests/app.spec.js
+++ b/tests/app.spec.js
@@ -1,18 +1,26 @@
 const { _electron: electron } = require('playwright');
 const { strict: assert } = require('assert');
 
+const isWindows = process.platform === 'win32';
+async function wait (ms) {
+   return new Promise(resolve => {
+      setTimeout(resolve, ms);
+   });
+}
+
 (async () => {
    console.log('Starting tests');
    // Launch Electron app.
    const electronApp = await electron.launch({ args: ['dist/main.js'] });
 
+   if (isWindows) await wait(5000);
+
    /**
      * App main window state
      * @type {{isVisible: boolean; isDevToolsOpened: boolean; isCrashed: boolean}}
      */
    const windowState = await electronApp.evaluate(({ BrowserWindow }) => {
       const mainWindow = BrowserWindow.getAllWindows()[0];
-
       const getState = () => ({
          isVisible: mainWindow.isVisible(),
          isDevToolsOpened: mainWindow.webContents.isDevToolsOpened()