Skip to content

Commit 125549a

Browse files
passing tests
1 parent f9fade6 commit 125549a

9 files changed

+48116
-23
lines changed

models/top_level/providers/ProviderMvtProxy.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ def pack_data_to_list(self):
9494
]
9595

9696
def assign_value_list_to_provider_data_on_read(self, values: list):
97-
print("_______assign_value_list_to_provider_data_on_read")
9897
if len(values) != 9:
9998
raise ValueError(
10099
f"Unexpected number of value to unpack: {len(values)}. Expected: 9"

models/top_level/providers/ProviderPostgresql.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ def pack_data_to_list(self):
133133
]
134134

135135
def assign_value_list_to_provider_data_on_read(self, values: list):
136-
print("_______assign_value_list_to_provider_data_on_read")
137136
if len(values) != 16:
138137
raise ValueError(
139138
f"Unexpected number of value to unpack: {len(values)}. Expected: 16"

models/top_level/providers/ProviderWmsFacade.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ def pack_data_to_list(self):
8282
]
8383

8484
def assign_value_list_to_provider_data_on_read(self, values: list):
85-
print("_______assign_value_list_to_provider_data_on_read")
8685
if len(values) != 9:
8786
raise ValueError(
8887
f"Unexpected number of value to unpack: {len(values)}. Expected: 9"

models/utils.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ def cast_element_to_type(value: Any, expected_type, prop_name: str):
136136
for inner_type in args:
137137

138138
if inner_type.__name__.startswith("Provider"):
139+
# don't cast anything except supported providers
140+
if value.get("name") not in ["PostgreSQL", "MVT-proxy", "WMSFacade"]:
141+
continue
142+
139143
# don't cast to wrong provider, even if properties match
140144
if (
141145
(

pygeoapi_config_dialog.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
class PygeoapiConfigDialog(QtWidgets.QDialog, FORM_CLASS):
7979

8080
config_data: ConfigData
81+
yaml_original_data: dict
8182
ui_setter: UiSetter
8283
data_from_ui_setter: DataSetterFromUi
8384
current_res_name = ""
@@ -176,7 +177,12 @@ def open_file(self, file_name):
176177

177178
# reset data
178179
self.config_data = ConfigData()
179-
self.config_data.set_data_from_yaml(yaml.safe_load(file_content))
180+
181+
# set data and .all_missing_props:
182+
self.yaml_original_data = yaml.safe_load(file_content)
183+
self.config_data.set_data_from_yaml(self.yaml_original_data)
184+
185+
# set UI from data
180186
self.ui_setter.set_ui_from_data()
181187

182188
# log messages about missing or mistyped values during deserialization

0 commit comments

Comments
 (0)