Skip to content

Commit e90be31

Browse files
committed
Read default map crs from project if not specified
1 parent 2d02969 commit e90be31

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

src/config_generator/config_generator.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,8 +753,6 @@ def search_qgs_projects(self, generator_config, themes_config):
753753
"defaultBackgroundLayers", [])
754754
theme_item["searchProviders"] = themes_config.get(
755755
"defaultSearchProviders", [])
756-
theme_item["mapCrs"] = themes_config.get(
757-
"defaultMapCrs")
758756

759757
if not has_default:
760758
theme_item["default"] = True

src/config_generator/map_viewer_config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ def theme_item(self, cfg_item, themes_config, assets_dir, autogenExternalLayers,
436436
item['contact'] = cap.get('contact', {})
437437

438438

439-
item['mapCrs'] = cfg_item.get('mapCrs', themes_config.get('defaultMapCrs', 'EPSG:3857'))
439+
projectCrs = self.themes_reader.project_crs(service_name)
440+
item['mapCrs'] = cfg_item.get('mapCrs', projectCrs or themes_config.get('defaultMapCrs', 'EPSG:3857'))
440441
self.set_optional_config(cfg_item, 'additionalMouseCrs', item)
441442
featureReports = cfg_item.get("featureReport", {})
442443

src/config_generator/qgs_reader.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ def pg_layers(self):
153153

154154
return layers
155155

156+
def project_crs(self):
157+
authid = self.root.find('./projectCrs/spatialrefsys/authid')
158+
return authid.text if authid is not None else None
159+
156160
def layer_metadata(self, layer_name):
157161
"""Collect layer metadata from QGS.
158162

src/config_generator/theme_reader.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ def wms_capabilities(self, service_name):
125125
def wfs_capabilities(self, service_name):
126126
return self.theme_metadata[service_name]['wfs_capabilities']
127127

128+
def project_crs(self, service_name):
129+
if not self.theme_metadata[service_name]['project']:
130+
return None
131+
return self.theme_metadata[service_name]['project'].project_crs()
132+
128133
def pg_layers(self, service_name):
129134
if not service_name in self.theme_metadata:
130135
return []

0 commit comments

Comments
 (0)