@@ -32,7 +32,21 @@ class MapViewerConfig(ServiceConfig):
3232 'POLYGON' : 'Polygon' ,
3333 'POLYGONZ' : 'PolygonZ' ,
3434 'MULTIPOLYGON' : 'MultiPolygon' ,
35- 'MULTIPOLYGONZ' : 'MultiPolygonZ'
35+ 'MULTIPOLYGONZ' : 'MultiPolygonZ' ,
36+ 'CURVE' : 'Curve' ,
37+ 'CURVEZ' : 'CurveZ' ,
38+ 'CIRCULARSTRING' : 'CircularString' ,
39+ 'CIRCULARSTRINGZ' : 'CircularStringZ' ,
40+ 'COMPOUNDCURVE' : 'CompoundCurve' ,
41+ 'COMPOUNDCURVEZ' : 'CompoundCurveZ' ,
42+ 'MULTICURVE' : 'MultiCurve' ,
43+ 'MULTICURVEZ' : 'MultiCurveZ' ,
44+ 'SURFACE' : 'Surface' ,
45+ 'SURFACEZ' : 'SurfaceZ' ,
46+ 'CURVEPOLYGON' : 'CurvePolygon' ,
47+ 'CURVEPOLYGONZ' : 'CurvePolygonZ' ,
48+ 'MULTISURFACE' : 'MultiSurface' ,
49+ 'MULTISURFACEZ' : 'MultiSurfaceZ'
3650 }
3751
3852 # lookup for edit field types:
@@ -879,7 +893,7 @@ def edit_config(self, map_name, cfg_item, assets_dir):
879893 continue
880894
881895 # check geometry type
882- if not 'geometry_type' in meta or meta [ 'geometry_type' ] not in self .EDIT_GEOM_TYPES :
896+ if meta . get ( 'geometry_type' ) not in self .EDIT_GEOM_TYPES :
883897 table = (
884898 "%s.%s" % (meta .get ('schema' ), meta .get ('table_name' ))
885899 )
@@ -895,9 +909,7 @@ def edit_config(self, map_name, cfg_item, assets_dir):
895909 dataset ['layerName' ] = layer_name
896910 dataset ['displayField' ] = meta ['displayField' ]
897911 dataset ['editDataset' ] = dataset_name
898- dataset ['geomType' ] = self .EDIT_GEOM_TYPES .get (
899- meta ['geometry_type' ]
900- )
912+ dataset ['geomType' ] = self .EDIT_GEOM_TYPES .get (meta ['geometry_type' ])
901913
902914 nested_nrels = cfg_item .get ('editConfig' , {}).get (layer_name , {}).get ('generate_nested_nrel_forms' , False )
903915 forms = self .themes_reader .collect_ui_forms (map_name , assets_dir , layer_name , nested_nrels )
0 commit comments