2022.02.17 修复切片服务修改bug和推荐抽稀算法

@@ -12,10 +12,11 @@ from app.util.component.PGUtil import PGUtil
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.StructurePrint import StructurePrint
 from app.util.component.StructurePrint import StructurePrint
 
 
-from osgeo.ogr import DataSource
+from osgeo.ogr import DataSource,Layer
 
 
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.VacuateConf import VacuateConf
 import copy
 import copy
+import json
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "推荐抽稀"
     api_name = "推荐抽稀"
     def process(self):
     def process(self):
@@ -36,7 +37,7 @@ class Api(ApiTemplate):
             # 判断图层是否存在
             # 判断图层是否存在
 
 
             pg_ds :DataSource= PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             pg_ds :DataSource= PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
-            layer = pg_ds.GetLayerByName(table.name)
+            layer:Layer = pg_ds.GetLayerByName(table.name)
 
 
             # 判断用户权限
             # 判断用户权限
 
 
@@ -55,27 +56,34 @@ class Api(ApiTemplate):
 
 
 
 
                 # 判断需要抽稀多少级
                 # 判断需要抽稀多少级
-                lc = layer.GetFeatureCount()
-                extent = layer.GetExtent()
-
+                # lc = layer.GetFeatureCount()
+                lc = table.feature_count
+                # extent = layer.GetExtent()
+                extent = [float(x) for x in table.extent.split(",")]
                 # 判断疏密程度
                 # 判断疏密程度
-                p_x = (extent[1] - extent[0]) / 10.0
-                p_y = (extent[3] - extent[2]) / 10.0
+                p_x = (extent[1] - extent[0]) / 5.0
+                p_y = (extent[3] - extent[2]) / 5.0
                 fill_precent = 0
                 fill_precent = 0
                 StructurePrint().print("判断疏密")
                 StructurePrint().print("判断疏密")
-                for ix in range(10):
-                    for iy in range(10):
+                for ix in range(5):
+                    for iy in range(5):
                         grid_extent = [extent[0] + ix * p_x, extent[0] + ix * p_x + p_x, extent[2] + iy * p_y,
                         grid_extent = [extent[0] + ix * p_x, extent[0] + ix * p_x + p_x, extent[2] + iy * p_y,
                                        extent[2] + iy * p_y + p_y]
                                        extent[2] + iy * p_y + p_y]
-                        poly = GeometryAdapter.envelop_2_polygon(grid_extent)
 
 
-                        layer.SetSpatialFilter(None)
-                        layer.SetSpatialFilter(poly)
-                        layer.ResetReading()
-                        if layer.GetNextFeature():
-                            fill_precent += 1
+                        poly = GeometryAdapter.envelop_2_polygon(grid_extent)
 
 
-                print(fill_precent)
+                        sql = '''select * from "{}" where st_intersects({},st_geogfromtext('{}')) limit 1'''.format(layer.GetName(),
+                                                                                layer.GetGeometryColumn(),poly.ExportToWkt())
+                        query_layer: Layer = pg_ds.ExecuteSQL(sql)
+                        if query_layer.GetFeatureCount() == 1:
+                            fill_precent += 4
+                        # layer.SetSpatialFilter(None)
+                        # layer.SetSpatialFilter(poly)
+                        # layer.ResetReading()
+                        # if layer.GetNextFeature():
+                        #     fill_precent += 4
+
+                StructurePrint().print(fill_precent)
                 StructurePrint().print("判断疏密结束")
                 StructurePrint().print("判断疏密结束")
 
 
                 layer.SetSpatialFilter(None)
                 layer.SetSpatialFilter(None)

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructurePrint import StructurePrint
+
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 import uuid
 import uuid
 from ..models import TileService,Service,db,ServiceFunction,TileScheme
 from ..models import TileService,Service,db,ServiceFunction,TileScheme