merge: simplify ogr2ogr clipping polygn

analysers/Analyser_Merge.py

@@ -739,7 +739,7 @@ def import_(self, table, osmosis):
                 source_layer.append(f"'{self.layer}'")
 
             s_src = re.search('EPSG:([0-9]+)', subprocess.run(["gdalsrsinfo", "-e", *source_layer], stdout=subprocess.PIPE).stdout.decode('utf-8')).group(1)
-            wkt = PointInPolygon.PointInPolygon(self.polygon_id).polygon.as_wkt(s_src) if self.polygon_id else None
+            wkt = PointInPolygon.PointInPolygon(self.polygon_id).polygon.as_simplified_wkt(s_src, self.srid()) if self.polygon_id else None
 
             select = "-select '{}'".format(','.join(self.fields)) if self.fields else ''
             gdal = "ogr2ogr -f PostgreSQL 'PG:{}' -lco SCHEMA={} -nln '{}' {} -lco OVERWRITE=yes -lco GEOMETRY_NAME=geom -lco OVERWRITE=YES -lco LAUNDER=NO -skipfailures {} -t_srs EPSG:{} '{}' {}".format(

modules/Polygon.py

@@ -43,12 +43,18 @@ def __init__(self, polygon_id, cache_delay=60):
             wkt = wkt.split(";", 1)[1]
         self.polygon = loads(wkt)
 
-    def as_wkt(self, srid) -> str:
+    def as_simplified_wkt(self, out_src, metric_src) -> str:
         wgs84 = pyproj.CRS('EPSG:4326')
-        t_src = pyproj.CRS(f'EPSG:{srid}')
-        project = pyproj.Transformer.from_crs(wgs84, t_src, always_xy=True).transform
-        t_poly = transform(project, self.polygon)
-        return t_poly
+        metric_src = pyproj.CRS(f'EPSG:{metric_src}')
+        out_src = pyproj.CRS(f'EPSG:{out_src}')
+        project_metric = pyproj.Transformer.from_crs(wgs84, metric_src, always_xy=True).transform
+        project_out = pyproj.Transformer.from_crs(metric_src, out_src, always_xy=True).transform
+
+        out_poly = transform(project_metric, self.polygon)
+        out_poly = out_poly.buffer(5000).simplify(5000)
+
+        out_poly = transform(project_out, out_poly)
+        return out_poly
 
     def bboxes(self):
         bbox = self.polygon.bounds