From bcfda603be5042ef0a8230cea1bfd1f674d0d7d6 Mon Sep 17 00:00:00 2001
From: phil <phil.dev@philome.mooo.com>
Date: Thu, 29 Feb 2024 12:41:35 +0530
Subject: [PATCH] Fix map type

---
 src/gisaf/models/store.py | 4 ++--
 src/gisaf/registry.py     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gisaf/models/store.py b/src/gisaf/models/store.py
index 46b6885..95d9bdf 100644
--- a/src/gisaf/models/store.py
+++ b/src/gisaf/models/store.py
@@ -13,6 +13,7 @@ class Store(StoreNameOnly):
     custom: bool
     description: str
     #extra: dict[str, Any] | None
+    gis_type: str
     group: str
     #icon: str
     in_menu: bool
@@ -22,13 +23,12 @@ class Store(StoreNameOnly):
     long_name: str | None
     #mapbox_layout: dict[str, Any] | None
     #mapbox_paint: dict[str, Any] | None
-    #mapbox_type: str
+    type: str
     # mapbox_type_custom: str | None
     #mapbox_type_default: str
     minor_group_1: str | None
     minor_group_2: str | None
     #model: GeoModel
-    gis_type: str
     #name_letter: str
     #name_number: int
     #raw_model: GeoPointSurveyModel
diff --git a/src/gisaf/registry.py b/src/gisaf/registry.py
index 4f7af62..4f301f1 100644
--- a/src/gisaf/registry.py
+++ b/src/gisaf/registry.py
@@ -564,8 +564,8 @@ class ModelRegistry:
         self.stores['attribution'] \
         = zip(*self.stores.apply(fill_columns_from_model, axis=1))
 
-        #self.stores['mapbox_type_custom'] = self.stores['mapbox_type_custom'].replace('', np.nan).fillna(np.nan)
-        self.stores['mapbox_type'] = self.stores['mapbox_type_custom'].fillna(
+        self.stores['mapbox_type_custom'] = self.stores['mapbox_type_custom'].replace('', np.nan).fillna(np.nan)
+        self.stores['type'] = self.stores['mapbox_type_custom'].fillna(
             self.stores['mapbox_type_default']
         )