philorg/gisaf-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages 6 Wiki Activity Actions

Fix map type

Browse source
This commit is contained in:
phil 2024-02-29 12:41:35 +05:30
parent 53216269cb
commit bcfda603be
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gisaf/models/store.py
View file

@ -13,6 +13,7 @@ class Store(StoreNameOnly):
custom: bool custom: bool
description: str description: str
#extra: dict[str, Any] | None #extra: dict[str, Any] | None
gis_type: str
group: str group: str
#icon: str #icon: str
in_menu: bool in_menu: bool
@ -22,13 +23,12 @@ class Store(StoreNameOnly):
long_name: str | None long_name: str | None
#mapbox_layout: dict[str, Any] | None #mapbox_layout: dict[str, Any] | None
#mapbox_paint: dict[str, Any] | None #mapbox_paint: dict[str, Any] | None
#mapbox_type: str type: str
# mapbox_type_custom: str | None # mapbox_type_custom: str | None
#mapbox_type_default: str #mapbox_type_default: str
minor_group_1: str | None minor_group_1: str | None
minor_group_2: str | None minor_group_2: str | None
#model: GeoModel #model: GeoModel
gis_type: str
#name_letter: str #name_letter: str
#name_number: int #name_number: int
#raw_model: GeoPointSurveyModel #raw_model: GeoPointSurveyModel

4
src/gisaf/registry.py
View file

@ -564,8 +564,8 @@ class ModelRegistry:
self.stores['attribution'] \ self.stores['attribution'] \
= zip(*self.stores.apply(fill_columns_from_model, axis=1)) = 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_custom'] = self.stores['mapbox_type_custom'].replace('', np.nan).fillna(np.nan)
self.stores['mapbox_type'] = self.stores['mapbox_type_custom'].fillna( self.stores['type'] = self.stores['mapbox_type_custom'].fillna(
self.stores['mapbox_type_default'] self.stores['mapbox_type_default']
) )