From 2cc57b1691a85bd42f10ca5279a50eeb2c46e78a Mon Sep 17 00:00:00 2001
From: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
Date: Thu, 7 Jul 2022 17:16:16 +0530
Subject: [PATCH 1/3] =?UTF-8?q?fix(geojson):=20clean=20up=20of=20props=20?=
 =?UTF-8?q?=F0=9F=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
---
 src/layers/mapbox/VLayerMapboxGeojson.vue | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/layers/mapbox/VLayerMapboxGeojson.vue b/src/layers/mapbox/VLayerMapboxGeojson.vue
index 6d2b1cd3..9ebb28d3 100644
--- a/src/layers/mapbox/VLayerMapboxGeojson.vue
+++ b/src/layers/mapbox/VLayerMapboxGeojson.vue
@@ -4,7 +4,6 @@
   </div>
 </template>
 <script lang="ts">
-  import type { FeatureCollection } from 'geojson';
   import type { AnyLayer, GeoJSONSourceRaw } from 'mapbox-gl';
   import type { PropType, Ref } from 'vue';
   import { defineComponent, onMounted, ref, watch } from 'vue';
@@ -24,7 +23,7 @@
         required: true,
       },
       source: {
-        type: Object as PropType<FeatureCollection | GeoJSONSourceRaw>,
+        type: Object as PropType<GeoJSONSourceRaw>,
         required: true,
       },
       layer: {
@@ -48,15 +47,6 @@
         source: props.sourceId,
       };
 
-      const source = () => {
-        // Assuming the source is FeatureCollection
-        if ('type' in props.source) {
-          return { type: 'geojson', data: props.source } as GeoJSONSourceRaw;
-        } else {
-          return props.source;
-        }
-      };
-
       map.value.on('style.load', () => {
         // https://github.com/mapbox/mapbox-gl-js/issues/2268#issuecomment-401979967
         const styleTimeout = () => {
@@ -89,7 +79,7 @@
        * @returns {void}
        */
       function addLayer(): void {
-        map.value.addSource(props.sourceId, source());
+        map.value.addSource(props.sourceId, props.source);
         map.value.addLayer(layer, props.before);
       }
     },

From f9269b517eea449a6bfca91169befcc84b413139 Mon Sep 17 00:00:00 2001
From: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
Date: Thu, 7 Jul 2022 17:17:00 +0530
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20issue=20with=20`container`=20undefin?=
 =?UTF-8?q?ed=20=F0=9F=90=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
---
 src/map/VMap.vue | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/map/VMap.vue b/src/map/VMap.vue
index 11dddd2f..a2367f54 100644
--- a/src/map/VMap.vue
+++ b/src/map/VMap.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :id="`${options.container}` || 'map'" class="v-map-container">
+  <div :id="getContainer()" class="v-map-container">
     <slot />
   </div>
 </template>
@@ -26,9 +26,10 @@
       let events: Ref<Array<keyof MapEventType>> = ref(mapEvents);
 
       onMounted(() => {
-        const options = props.options.container
-          ? props.options
-          : { ...props.options, container: 'map' };
+        const options =
+          'container' in props.options
+            ? props.options
+            : { ...props.options, container: 'map' };
         map.value = new Map(options);
         loaded.value = true;
         provide(MapKey, map);
@@ -55,6 +56,22 @@
           });
         });
       }
+
+      /**
+       * Gets the container element
+       *
+       * @returns {string} - The container element id
+       */
+      const getContainer = (): string => {
+        if (Object.keys(props.options).includes('container')) {
+          return `${props.options.container}`;
+        }
+        return 'map';
+      };
+
+      return {
+        getContainer,
+      };
     },
   });
 </script>

From 899c56990eceea18669dada1ab30fcfc5f36fcd1 Mon Sep 17 00:00:00 2001
From: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
Date: Thu, 7 Jul 2022 17:17:39 +0530
Subject: [PATCH 3/3] =?UTF-8?q?docs:=20update=20typings=20for=20components?=
 =?UTF-8?q?=20=F0=9F=93=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
---
 .../layers/mapbox/VLayerMapboxGeojson.vue.d.ts  | 17 ++---------------
 types/map/VMap.vue.d.ts                         |  4 +++-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/types/layers/mapbox/VLayerMapboxGeojson.vue.d.ts b/types/layers/mapbox/VLayerMapboxGeojson.vue.d.ts
index 33a2ab8b..6f613068 100644
--- a/types/layers/mapbox/VLayerMapboxGeojson.vue.d.ts
+++ b/types/layers/mapbox/VLayerMapboxGeojson.vue.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="@types/mapbox-gl" />
-import type { FeatureCollection } from 'geojson';
 import type { AnyLayer, GeoJSONSourceRaw } from 'mapbox-gl';
 import type { PropType } from 'vue';
 declare const _default: import('vue').DefineComponent<
@@ -15,13 +14,7 @@ declare const _default: import('vue').DefineComponent<
       required: true;
     };
     source: {
-      type: PropType<
-        | FeatureCollection<
-            import('geojson').Geometry,
-            import('geojson').GeoJsonProperties
-          >
-        | GeoJSONSourceRaw
-      >;
+      type: PropType<GeoJSONSourceRaw>;
       required: true;
     };
     layer: {
@@ -59,13 +52,7 @@ declare const _default: import('vue').DefineComponent<
         required: true;
       };
       source: {
-        type: PropType<
-          | FeatureCollection<
-              import('geojson').Geometry,
-              import('geojson').GeoJsonProperties
-            >
-          | GeoJSONSourceRaw
-        >;
+        type: PropType<GeoJSONSourceRaw>;
         required: true;
       };
       layer: {
diff --git a/types/map/VMap.vue.d.ts b/types/map/VMap.vue.d.ts
index d5e9647b..7dfed2f6 100644
--- a/types/map/VMap.vue.d.ts
+++ b/types/map/VMap.vue.d.ts
@@ -9,7 +9,9 @@ declare const _default: import('vue').DefineComponent<
       default: () => {};
     };
   },
-  void,
+  {
+    getContainer: () => string;
+  },
   unknown,
   {},
   {},