2022.04.12 增加arm架构配置

+From osgeo/gdal:ubuntu-small-3.4.1
+
+
+WORKDIR /root
+#设置编码
+ENV LANG=en_US.UTF-8
+#设置时区
+ENV TZ=Asia/Shanghai
+
+COPY . .
+
+RUN apt-get update
+#安装pip3
+RUN apt-get install python3-pip -y
+#安装apache2
+RUN apt-get install apache2 -y && apt-get install apache2-dev -y
+#安装pg_config
+RUN apt-get install libpq-dev
+#安装依赖
+RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn
+
+RUN mod_wsgi-express install-module
+

+flask==1.1.2
+SQLAlchemy==1.3.17
+Flask-SQLAlchemy==2.4.3
+flask_cors==3.0.8
+flasgger==0.9.5
+psycopg2-binary==2.8.5
+pyDes==2.0.1
+mod_wsgi==4.8.0
+opencv-python-headless==4.5.1.48
+thrift==0.13.0
+Authlib==0.13
+kazoo==2.8.0
+paramiko==2.8.0
+requests==2.26.0
+schedule==1.1.0
+gmssl==3.2.1
+pycryptodome==3.13.0
+oauthlib==3.2.0
+
+
+MarkupSafe==2.0.1
+itsdangerous==1.1.0
+Werkzeug==2.0.1
+Jinja2==3.0.1
\ No newline at end of file

+From osgeo/gdal:ubuntu-small-3.4.1
+WORKDIR /root
+#设置编码
+ENV LANG=en_US.UTF-8
+#设置时区
+ENV TZ=Asia/Shanghai
+
+#安装apache2
+RUN apt-get update
+RUN apt-get install apache2 -y 
+
+COPY --from=dci/dmapserver:build-dev /usr/local /usr/local
+COPY --from=dci/dmapserver:build-dev /usr/lib/apache2/modules /usr/lib/apache2/modules
+CMD ["/usr/sbin/apachectl", "-D", "FOREGROUND"]
+
+

@@ -14,6 +14,8 @@ RUN apt-get update
 RUN apt-get install python3-pip -y
 #安装apache2
 RUN apt-get install apache2 -y && apt-get install apache2-dev -y
+#安装pg_config
+RUN apt-get install libpq-dev
 #安装依赖
 RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn
 

@@ -14,4 +14,7 @@ paramiko==2.8.0
 requests==2.26.0
 schedule==1.1.0
 gmssl==3.2.1
-pycryptodome==3.13.0
\ No newline at end of file
+pycryptodome==3.13.0
+oauthlib==3.2.0
+
+

+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.4/ for detailed information about
+# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
+# hints.
+#
+#
+# Summary of how the Apache 2 configuration works in Debian:
+# The Apache 2 web server configuration in Debian is quite different to
+# upstream's suggested way to configure the web server. This is because Debian's
+# default Apache2 installation attempts to make adding and removing modules,
+# virtual hosts, and extra configuration directives as flexible as possible, in
+# order to make automating the changes and administering the server as easy as
+# possible.
+
+# It is split into several files forming the configuration hierarchy outlined
+# below, all located in the /etc/apache2/ directory:
+#
+#	/etc/apache2/
+#	|-- apache2.conf
+#	|	`--  ports.conf
+#	|-- mods-enabled
+#	|	|-- *.load
+#	|	`-- *.conf
+#	|-- conf-enabled
+#	|	`-- *.conf
+# 	`-- sites-enabled
+#	 	`-- *.conf
+#
+#
+# * apache2.conf is the main configuration file (this file). It puts the pieces
+#   together by including all remaining configuration files when starting up the
+#   web server.
+#
+# * ports.conf is always included from the main configuration file. It is
+#   supposed to determine listening ports for incoming connections which can be
+#   customized anytime.
+#
+# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
+#   directories contain particular configuration snippets which manage modules,
+#   global configuration fragments, or virtual host configurations,
+#   respectively.
+#
+#   They are activated by symlinking available configuration files from their
+#   respective *-available/ counterparts. These should be managed by using our
+#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
+#   their respective man pages for detailed information.
+#
+# * The binary is called apache2. Due to the use of environment variables, in
+#   the default configuration, apache2 needs to be started/stopped with
+#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
+#   work with the default configuration.
+
+
+# Global configuration
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the Mutex documentation (available
+# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+#ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+#Mutex file:${APACHE_LOCK_DIR} default
+
+#
+# The directory where shm and other runtime files will be stored.
+#
+
+DefaultRuntimeDir ${APACHE_RUN_DIR}
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
+#
+PidFile ${APACHE_PID_FILE}
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
+# LogLevel: Control the severity of messages logged to the error_log.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
+# "LogLevel info ssl:warn"
+#
+LogLevel warn
+
+# Include module configuration:
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
+
+# Include list of ports to listen on
+Include ports.conf
+
+
+# Sets the default security model of the Apache2 HTTPD server. It does
+# not allow access to the root filesystem outside of /usr/share and /var/www.
+# The former is used by web applications packaged in Debian,
+# the latter may be used for local directories served by the web server. If
+# your system is serving content from a sub-directory in /srv you must allow
+# access here, or in any related virtual host.
+<Directory />
+	Options FollowSymLinks
+	AllowOverride None
+	Require all denied
+</Directory>
+
+<Directory /usr/share>
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<Directory /var/www/>
+	Options Indexes FollowSymLinks
+	AllowOverride All
+	Require all granted
+</Directory>
+
+#<Directory /srv/>
+#	Options Indexes FollowSymLinks
+#	AllowOverride None
+#	Require all granted
+#</Directory>
+
+
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<FilesMatch "^\.ht">
+	Require all denied
+</FilesMatch>
+
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive.
+#
+# These deviate from the Common Log Format definitions in that they use %O
+# (the actual bytes sent including headers) instead of %b (the size of the
+# requested file), because the latter makes it impossible to detect partial
+# requests.
+#
+# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
+# Use mod_remoteip instead.
+#
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+IncludeOptional conf-enabled/*.conf
+
+# Include the virtual host configurations:
+IncludeOptional sites-enabled/*.conf
+
+LoadModule wsgi_module "/usr/lib/apache2/modules/mod_wsgi-py38.cpython-38-aarch64-linux-gnu.so"
+WSGIPythonHome "/usr"
+
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2022/2/28
+#email:         nheweijun@sina.com
+
+import py_compile
+import os
+import shutil
+
+def compile(des):
+
+
+    project_dir = os.path.dirname(os.path.realpath(__file__))
+    if os.path.normpath(project_dir) == os.path.normpath(des):
+        raise Exception("目标目录不能与代码目录一样！")
+
+    if os.path.exists(des):
+        os.system("rd/s/q {}".format(des))
+        shutil.rmtree(des, True)
+
+    shutil.copytree(project_dir, des)
+    git_path = os.path.join(des,".git")
+    if os.path.exists(os.path.join(des,".git")):
+        os.system("rd/s/q {}".format(git_path))
+
+    for root, dirs, files in os.walk(os.path.join(des,"app")):
+        for fn in files:
+            if fn.endswith("py"):
+                py_file = os.path.join(root, fn)
+                py_compile.compile(py_file)
+                os.remove(py_file)
+                pyc_file = os.path.join(root, "__pycache__",fn.split(".")[0]+".cpython-38.pyc")
+                des_pyc_file = os.path.join(root,fn.split(".")[0]+".pyc")
+                shutil.copy(pyc_file,des_pyc_file)
+
+if __name__ == '__main__':
+    des="H:\DMapManager"
+    compile(des)
+

@@ -34,6 +34,6 @@ def compile(des):
                 shutil.copy(pyc_file,des_pyc_file)
 
 if __name__ == '__main__':
-    des="D:\DMapManagerPublish" #D:\DMapManagerPublish
+    des="H:\DMapManagerPublish"
     compile(des)
 

@@ -17,3 +17,4 @@ requests==2.26.0
 schedule==1.1.0
 gmssl==3.2.1
 pycryptodome==3.13.0
+oauthlib==3.2.0
\ No newline at end of file

@@ -37,9 +37,9 @@ echo "正在启动容器..."
 
 set="--restart=always -e ALLOW_IP_RANGE=0.0.0.0/0 -p  $port1:80 -p $port2:81 "
 codeMap="-v ${curPath}:/usr/src/app -v ${curPath}/html:/var/www/html"
-apacheMap="-v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf -v ${curPath}/envvars:/etc/apache2/envvars"
+apacheMap="-v ${curPath}/apache2.arm64.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf -v ${curPath}/envvars:/etc/apache2/envvars"
 
-docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.1
+docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.0-arm64
 sleep 5
 curl localhost:$port2/release
 

+#! /bin/sh
+container_name="dmapmanager"
+#停止容器
+echo "正在关闭容器..."
+docker stop $container_name
+docker rm $container_name
+
+curPath=$(readlink -f $(dirname $0))
+
+
+#设置日志权限
+chmod -R 777 $curPath
+
+#设置端口
+port=""
+if [ ! -n "$1" ] ;then
+
+port1="8830"
+echo "未设置端口1，使用默认8830端口..."
+else
+port1=$1
+echo "端口1设置为$1 ..."
+fi
+
+port2=""
+if [ ! -n "$2" ] ;then
+port2="8840"
+echo "未设置端口2，使用默认8840端口..."
+else
+port2=$2
+echo "端口2设置为$2 ..."
+fi
+
+
+#启动容器
+echo "正在启动容器..."
+
+set="--restart=always -e ALLOW_IP_RANGE=0.0.0.0/0 -p  $port1:80 -p $port2:81 "
+codeMap="-v ${curPath}:/usr/src/app -v ${curPath}/html:/var/www/html"
+apacheMap="-v ${curPath}/apache2.x86.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf -v ${curPath}/envvars:/etc/apache2/envvars"
+
+docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.0-x86
+sleep 5
+curl localhost:$port2/release
+

@@ -16,7 +16,7 @@ else
   echo "端口设置为$1 ..."
 fi
 
-docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapmanager:4.1 python3 ./run.py
+docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapmanager:4.0 python3 ./run.py
 # 清除未完成的任务任务
 sleep 5
 curl localhost:$port/release
\ No newline at end of file

@@ -28,7 +28,7 @@ class MapSynthesize:
     data:ShapeData
     area_threshold = 10.0
     buffer_threshold = 100.0
-    distance_buffer_threshold = 1.114691025217302e-04
+
 
     def __init__(self,data):
         self.data = data
@@ -46,7 +46,7 @@ class MapSynthesize:
         short_length = min(polygon_env[1]-polygon_env[0],polygon_env[3]-polygon_env[2])
 
         center:Geometry = polygon.Centroid()
-        # print(center)
+
 
 
         # 提前return
@@ -87,6 +87,9 @@ class MapSynthesize:
         oneside_area, otherside_area = None,None
         for angle in direction:
 
+            # print("\"" + center.ExportToWkt() + "\",")
+
+
             if in_hole:
                 line = self.get_doubleline(center.GetX(),center.GetY(),angle,line_length)
             else:
@@ -181,7 +184,7 @@ class MapSynthesize:
             plist_d.sort(key=lambda x:x[1])
             reprecent_point = self.creat_point(((plist_d[0][0].GetX()+ plist_d[1][0].GetX())/2.0, (plist_d[0][0].GetY()+plist_d[1][0].GetY())/2.0))
 
-        # print("\""+reprecent_point.ExportToWkt() + "\",")
+
 
         rp = RepresentPoint(reprecent_point,polygon)
 
@@ -216,24 +219,33 @@ class MapSynthesize:
         return line
 
     def get_radline(self,x0,y0,x1,y1,len_size):
+
         a2 = math.pow((x1-x0),2)
         b2 = math.pow((y1-y0),2)
         len_size = len_size+ math.sqrt(a2+b2)
 
         line: Geometry = ogr.Geometry(ogr.wkbLineString)
         line.AddPoint(x0, y0)
-        tanx = abs(y1-y0) / abs(x1-x0)
-        cosx = 1 / math.sqrt(1 + tanx *tanx)
-        dx = cosx* len_size
-        dy = tanx * dx
+
+
 
         if x1 == x0:
             x2 = x0
+            # if y1 > y0 :
+            #     y2 = y0 + abs(dy)
+            # else:
+            #     y2 = y0 - abs(dy)
             if y1 > y0 :
-                y2 = y0 + abs(dy)
+                y2 = y0 + abs(len_size)
             else:
-                y2 = y0 - abs(dy)
+                y2 = y0 - abs(len_size)
         else:
+
+            tanx = abs(y1 - y0) / abs(x1 - x0)
+            cosx = 1 / math.sqrt(1 + tanx * tanx)
+            dx = cosx * len_size
+            dy = tanx * dx
+
             if x1 < x0:
                 x2 = x0 - dx
             else:
@@ -293,7 +305,6 @@ class MapSynthesize:
         else:
             triangle1, triangle2 = self.get_side_triangle(line, angle)
 
-
             for gi in range(clip_geom.GetGeometryCount()):
                 clip_geom_i: Geometry = clip_geom.GetGeometryRef(gi)
                 it = clip_geom_i.Intersection(triangle1)
@@ -320,7 +331,6 @@ class MapSynthesize:
 
         mid_angle = (angle1 + angle2)/2.0
 
-
         if in_hole:
             line = self.get_doubleline(center.GetX(), center.GetY(), mid_angle, line_length)
         else:
@@ -577,69 +587,6 @@ class MapSynthesize:
 
         return polygon_line
 
-    def merge_concave(self, trees, distance_threshold):
-        merge_polygons = []
-        count = 1
-
-        for tree in trees:
-            print(count)
-            count+=1
-            polygons = list(tree.get_polygons())
-
-            merge_raw: Geometry = polygons[0]
-            for p in polygons:
-                merge_raw = merge_raw.Union(p)
-
-            points = []
-
-
-            for i in range(merge_raw.GetGeometryCount()):
-
-                poly = merge_raw.GetGeometryRef(i)
-                poly_line :Geometry = self.get_polygon_lines(poly)
-                if poly_line:
-                    for indx in range(poly_line.GetPointCount() - 1):
-                        poi = poly_line.GetPoint(indx)
-
-                        points.append(poi)
-
-                        poi_next = poly_line.GetPoint(indx + 1)
-
-                        dis = math.sqrt(math.pow(poi[0] - poi_next[0], 2) + math.pow(poi[1] - poi_next[1], 2))
-                        # print(dis)
-                        if dis > distance_threshold:
-                            times = int(dis / distance_threshold)
-                            # print(times)
-                            for time in range(1, times + 1):
-                                x, y = self.get_subpoint(poi[0], poi[1], poi_next[0], poi_next[1], (time * distance_threshold))
-                                points.append([x, y])
-
-            points = np.array([[p[0], p[1]] for p in points])
-
-
-            cp = []
-            for pp in points:
-                poi = ogr.Geometry(ogr.wkbPoint)
-                poi.AddPoint(pp[0], pp[1])
-                cp.append(poi)
-
-            merge_p_line = concaveHull(points, 3)
-
-            ring = ogr.Geometry(ogr.wkbLinearRing)
-
-            merge_p = ogr.Geometry(ogr.wkbPolygon)
-
-            for l in merge_p_line:
-                ring.AddPoint(l[0], l[1])
-
-            ring.AddPoint(merge_p_line[0][0], merge_p_line[0][1])
-
-            merge_p.AddGeometry(ring)
-            merge_p = merge_p.Simplify(self.distance_buffer_threshold/10)
-            merge_polygons.append(merge_p)
-
-        return merge_polygons
-
     def get_subpoint(self, x0, y0, x1, y1, len_size):
 
         len_size = len_size
@@ -667,13 +614,19 @@ class MapSynthesize:
 
         return x2, y2
 
-    def process(self):
+    def process(self,distance_buffer_threshold):
+
+        # self.distance_buffer_threshold = distance_buffer_threshold
+
         polygons = self.data.get_polygons()
         rps = []
 
         for poly in polygons:
             rp = self.get_polygon_reprecent_point(poly)
             rps.append(rp)
+
+
+
         print("完成代表点计算")
 
         #代表点要融合
@@ -682,17 +635,26 @@ class MapSynthesize:
         print("完成树生成计算")
         min_delauney = self.create_min_delauney(delauney_lines,rps_sub)
         print("完成最小生成树计算")
-        trees = self.cut_delauney_min_tree(min_delauney,self.distance_buffer_threshold)
+
+
+
+        trees = self.cut_delauney_min_tree(min_delauney,distance_buffer_threshold)
         print("完成树裁剪")
 
+
         polygon_result = []
+        print(len(list(trees)))
         for index,tree in enumerate(trees):
-
-            polygons = tree.get_polygons()
             print(index)
+            polygons = tree.get_polygons()
+            # print(index)
             polygons = list(polygons)
-            print(len(polygons))
-            polygon_result.append(PolygonMerge.merge(polygons,self.distance_buffer_threshold))
+            # print(len(polygons))
+
+
+            polygon_result.append(PolygonMerge.merge(polygons,distance_buffer_threshold))
+
+            # polygon_result.extend(PolygonMerge.merge(polygons,self.distance_buffer_threshold))
 
         # polygons = self.merge_concave(trees,self.distance_buffer_threshold)
 
@@ -703,11 +665,16 @@ if __name__ == '__main__':
 
 
     t1 = time.time()
-    sd = ShapeData(r"J:\Data\制图综合result\zhongshansub.shp")
+    sd = ShapeData(r"J:\Data\制图综合result\zhongshan_2_5w.shp")
 
     mapsynthesize = MapSynthesize(sd)
-    wkts = mapsynthesize.process()
-    result = r"J:\Data\制图综合result\zhongshansub_merge22.shp"
+
+    base = 9.009009009009009009009009009009e-5
+
+    wkts = mapsynthesize.process(base*5)
+
+
+    result = r"J:\Data\制图综合result\zhongshan_5w.shp"
     ShapeData.create_shp_fromwkts(result,"zh",wkts)
 
     print(time.time()-t1)
\ No newline at end of file

@@ -6,10 +6,9 @@
 
 from osgeo import ogr,gdal
 from osgeo.ogr import *
-
-from test.zonghe.ShapeData import ShapeData
+from test.MapSynthesize.ShapeData import ShapeData
 import copy
-
+import math
 from rtreelib import RTree,Rect
 
 
@@ -49,38 +48,69 @@ class PolygonMerge:
             if d < 0:
                 polygon_line_points.reverse()
 
-            tris = list(cls.get_tri(polygon_line_points))
+            tris = list(cls.simple_polygon_division(polygon_line_points))
 
         return tris
 
     @classmethod
-    def get_tri(cls,polygon_line_points:list):
-
-        if len(polygon_line_points) == 4 or len(polygon_line_points) == 3:
+    def simple_polygon_division(cls,polygon_line_points:list):
+        '''
+        简单多边形三角剖分算法
+        :param polygon_line_points: 多边形逆时针点序列
+        :return:
+        '''
+
+        if len(polygon_line_points) == 4:
             yield cls.create_polygon(polygon_line_points)
         else:
             for index,point in enumerate(polygon_line_points):
-                if index == 0:
-                   continue
-                else:
-                    try:
-                        point_front = polygon_line_points[index-1]
-                        point_next = polygon_line_points[index+1]
-                    except Exception as e:
-                        print(e)
-                        kk=1
-                        d=1
-
-                check = (point[0]-point_front[0]) * (point_next[1]-point[1]) - (point_next[0]-point[0])*(point[1]-point_front[1])
-
+                try:
+                    if index == 0:
+                        point_front = polygon_line_points[-1]
+                        point_next = polygon_line_points[1]
+                    elif index == len(polygon_line_points) - 1:
+                        point_front = polygon_line_points[index - 1]
+                        point_next = polygon_line_points[0]
+                    else:
+                        point_front = polygon_line_points[index - 1]
+                        point_next = polygon_line_points[index + 1]
+
+                except:
+                    dd=1
+                check = (point[0] - point_front[0]) * (point_next[1] -point[1]) - (point_next[0] - point[0]) * (point[1] - point_front[1])
+
+                #如果是凸点
                 if check > 0:
                     triangle = cls.create_polygon([point_front,point,point_next,point_front])
-                    yield triangle
 
-                    polygon_line_points.pop(index)
-                    for tri in cls.get_tri(polygon_line_points):
-                        yield tri
-                    break
+                    #判断是否包含其他点
+                    contains = False
+                    for i,poi_xy in enumerate(polygon_line_points):
+
+                        if index == 0:
+                            if i in [0, 1, len(polygon_line_points) - 1]:
+                                continue
+
+                        elif index == len(polygon_line_points) - 1:
+                            if i in [index, 0 ,index - 1]:
+                                continue
+                        else:
+                            if i in [index, index-1, index+1]:
+                                continue
+
+                        poi:Geometry = ogr.Geometry(ogr.wkbPoint)
+                        poi.AddPoint(poi_xy[0],poi_xy[1])
+                        if triangle.Contains(poi):
+                            contains = True
+
+                    #如果不包含其他点，为有效剖分,结束循环
+                    if not contains:
+                        yield triangle
+                        polygon_line_points.pop(index)
+                        for tri in cls.simple_polygon_division(polygon_line_points):
+                            yield tri
+                        break
+
 
     @classmethod
     def merge(cls,polygons:list,distance_buffer_threshold):
@@ -92,30 +122,27 @@ class PolygonMerge:
         # for poly in polygons:
         #     multipolygon.AddGeometry(poly)
 
+        tris = []
         for poly in polygons:
             polygon = polygon.Union(poly)
 
-
-
         delauney: Geometry = polygon.DelaunayTriangulation()
 
         for index in range(delauney.GetGeometryCount()):
             de:Geometry = copy.deepcopy(delauney.GetGeometryRef(index))
             de_extent = de.GetEnvelope()
             rtree.insert(RTreeData(de,1), env2rect(de_extent))
+            tris.append(de)
 
         bians: list = cls.get_bian(polygon)
 
-
         for bian in bians:
 
             bian_ext = bian.GetEnvelope()
-
-            query_result = rtree.query(env2rect(bian_ext))
+            query_result = list(rtree.query(env2rect(bian_ext)))
 
             intersection_data = []
 
-
             for entry in query_result:
 
                 # 已被抛弃的不要
@@ -123,67 +150,65 @@ class PolygonMerge:
                     continue
                 intersection_geom: Geometry = bian.Intersection(entry.data.triangle)
 
+
                 if not intersection_geom.IsEmpty():
                     if not intersection_geom.Equals(bian):
                         if intersection_geom.GetGeometryType() in [2, 5, -2147483643, -2147483646, 3002, 3005]:
                             intersection_data.append(entry.data)
 
 
+
             for data in intersection_data:
                 data.set_state(0)
 
             if intersection_data:
 
+
                 inter_tri_merge:Geometry = intersection_data[0].triangle
 
                 for ind in range(1,len(intersection_data)):
                     inter_tri_merge = inter_tri_merge.Union(intersection_data[ind].triangle)
 
+                try:
+                    inter_tri_merge_line:Geometry = cls.get_polygon_lines(inter_tri_merge)
 
-                inter_tri_merge_line:Geometry = cls.get_polygon_lines(inter_tri_merge)
-
-                inter_tri_merge_line_points:list = inter_tri_merge_line.GetPoints()
+                    inter_tri_merge_line_points:list = inter_tri_merge_line.GetPoints()
 
-                bian_ps = bian.GetPoints()
+                    bian_ps = bian.GetPoints()
 
-                if len(inter_tri_merge_line_points[0]) == 3:
-                    try:
+                    if len(inter_tri_merge_line_points[0]) == 3:
                         first_index = inter_tri_merge_line_points.index(bian_ps[0])
                         second_index = inter_tri_merge_line_points.index(bian_ps[1])
-                    except:
-                        rtree.insert(RTreeData(inter_tri_merge, 1), env2rect(inter_tri_merge.GetEnvelope()))
-                        continue
-                else:
-                    try:
+                    else:
+
                         first_index = inter_tri_merge_line_points.index((bian_ps[0][0],bian_ps[0][1]))
                         second_index = inter_tri_merge_line_points.index((bian_ps[1][0],bian_ps[1][1]))
-                    except:
-                        rtree.insert(RTreeData(inter_tri_merge, 1), env2rect(inter_tri_merge.GetEnvelope()))
-                        continue
 
+                    small_index = min(first_index,second_index)
+                    big_index = max(first_index,second_index)
 
+                    small_points:list = inter_tri_merge_line_points[:small_index+1]
+                    small_points.extend(inter_tri_merge_line_points[big_index:])
+                    small_polygon:Geometry = cls.create_polygon(small_points)
 
-                small_index = min(first_index,second_index)
-                big_index = max(first_index,second_index)
+                    delauney = cls.get_delauney(small_polygon)
+                    for de in delauney:
+                        de_extent = de.GetEnvelope()
+                        rtree.insert(RTreeData(de, 1), env2rect(de_extent))
 
-                small_points:list = inter_tri_merge_line_points[:small_index+1]
-                small_points.extend(inter_tri_merge_line_points[big_index:])
-                small_polygon:Geometry = cls.create_polygon(small_points)
+                    big_points = inter_tri_merge_line_points[small_index:big_index+1]
+                    big_points.append(inter_tri_merge_line_points[small_index])
 
-                delauney = cls.get_delauney(small_polygon)
-                for de in delauney:
-                    de_extent = de.GetEnvelope()
-                    rtree.insert(RTreeData(de, 1), env2rect(de_extent))
+                    big_polygon:Geometry = cls.create_polygon(big_points)
 
-                big_points = inter_tri_merge_line_points[small_index:big_index+1]
-                big_points.append(inter_tri_merge_line_points[small_index])
+                    delauney = cls.get_delauney(big_polygon)
+                    for de in delauney:
+                        de_extent = de.GetEnvelope()
+                        rtree.insert(RTreeData(de, 1), env2rect(de_extent))
+                except:
+                    print(inter_tri_merge)
+                    print(bian)
 
-                big_polygon:Geometry = cls.create_polygon(big_points)
-
-                delauney = cls.get_delauney(big_polygon)
-                for de in delauney:
-                    de_extent = de.GetEnvelope()
-                    rtree.insert(RTreeData(de, 1), env2rect(de_extent))
 
         for entry in rtree.get_leaf_entries():
             triangle = entry.data.triangle
@@ -192,42 +217,176 @@ class PolygonMerge:
             if polygon.Contains(triangle):
                 pass
             else:
-                tri_center,tri_center2 = cls.get_center(triangle)
-                distance = tri_center.Distance(polygon)
-                distance2 = tri_center2.Distance(polygon)
+                centers = cls.get_center(triangle)
+                # querycenter :Geometry= tri_center.Buffer(distance_buffer_threshold)
+
+                # query_result = list(rtree.query(env2rect(querycenter.GetEnvelope())))
+
+                pass_ = False
+                for center in centers:
+                    distance = center.Distance(polygon)
+                    if distance > distance_buffer_threshold :
+                        pass_ = True
+                        break
 
-                if distance > distance_buffer_threshold :
+                if pass_:
                     continue
-                # if distance2 > distance_buffer_threshold:
+
+                # if len(query_result)==0:
                 #     continue
+                polygon:Geometry = polygon.Union(triangle)
 
-                polygon = polygon.Union(triangle)
                 # polygon.AddGeometry(triangle)
 
-        result :Geometry = polygon
+        # result: Geometry = polygon
+
+        # 去岛
+        result :Geometry = cls.remove_hole(polygon,distance_buffer_threshold)
 
         return result
 
+    @classmethod
+    def remove_hole(cls,polygon:Geometry,distance_buffer_threshold):
+
+        polygons = []
+
+        if polygon.GetGeometryType() in [6, -2147483642, 3006]:
+            for index in range(polygon.GetGeometryCount()):
+                each = polygon.GetGeometryRef(index)
+                polygons.append(each)
+        else:
+            polygons.append(polygon)
+
+        polygons = [cls.remove_hole_simple(p,distance_buffer_threshold) for p in polygons]
+
+        if len(polygons) == 1:
+            return polygons[0]
+        else:
+            mp:Geometry = ogr.Geometry(ogr.wkbMultiPolygon)
+            for p in polygons:
+                mp.AddGeometry(p)
+            return mp
 
     @classmethod
-    def get_center(cls,tri:Geometry):
+    def remove_hole_simple(cls,polygon:Geometry,distance_buffer_threshold):
+
+        if polygon.GetGeometryCount() >1:
+            for index in range(1,polygon.GetGeometryCount()):
+
+                each:Geometry = copy.deepcopy(polygon.GetGeometryRef(index))
+
+                if each.GetArea() < distance_buffer_threshold*distance_buffer_threshold*5:
+                    polygon.RemoveGeometry(index)
+                    cls.remove_hole_simple(polygon,distance_buffer_threshold)
+                    break
+
+        return polygon
+
+    @classmethod
+    def remove_hole_simple2(cls,polygon:Geometry,distance_buffer_threshold):
+
+        if polygon.GetGeometryCount() >1:
+            for index in range(1,polygon.GetGeometryCount()):
+
+                each:Geometry = polygon.GetGeometryRef(index)
+                print(polygon.GetGeometryCount())
+                if each:
+                    if each.GetArea() < distance_buffer_threshold*distance_buffer_threshold*18:
+                        polygon.RemoveGeometry(index)
+
+        return polygon
+
+    @classmethod
+    def get_center2(cls,tri:Geometry):
+
+        tri_line: Geometry = cls.get_polygon_lines(tri)
+        tri_line_points = tri_line.GetPoints()
+
+
+
+        max = 0
+        poi_tuple = []
+
+
+        center1 = ogr.Geometry(ogr.wkbPoint)
+        center2 = ogr.Geometry(ogr.wkbPoint)
+        center3 = ogr.Geometry(ogr.wkbPoint)
+
+
+        for index in range(len(tri_line_points)-1):
+
+            first = tri_line_points[index]
+            second = tri_line_points[index+1]
+
+            dis = math.sqrt(math.pow(first[0]-second[0],2) + math.pow(first[1]-second[1],2))
+
+            if dis > max:
+                max = dis
+                poi_tuple = [first, second]
+
+
+
+        center1.AddPoint((poi_tuple[0][0]+poi_tuple[1][0])/2,(poi_tuple[0][1]+poi_tuple[1][1])/2)
+        center2.AddPoint((poi_tuple[0][0] + center1.GetX()) / 2, (poi_tuple[0][1] + center1.GetY()) / 2)
+        center3.AddPoint((poi_tuple[1][0] + center1.GetX()) / 2, (poi_tuple[1][1] + center1.GetY()) / 2)
+
+
+
+        return [center1,center2,center3]
+
+    @classmethod
+    def get_center(cls, tri: Geometry):
+
+        center_set = set()
 
         tri_line: Geometry = cls.get_polygon_lines(tri)
         tri_line_points = tri_line.GetPoints()
 
-        lines = []
+
+
+        max = 0
+        poi_tuple = []
+
+
+        center1 = ogr.Geometry(ogr.wkbPoint)
+        center2 = ogr.Geometry(ogr.wkbPoint)
+        center3 = ogr.Geometry(ogr.wkbPoint)
+
 
         for index in range(len(tri_line_points)-1):
+
             first = tri_line_points[index]
             second = tri_line_points[index+1]
-            line: Geometry = ogr.Geometry(ogr.wkbLineString)
-            line.AddPoint(first[0], first[1])
-            line.AddPoint(second[0], second[1])
-            lines.append(line)
 
-        lines = sorted(lines,key=lambda l:l.Length())
+            dis = math.sqrt(math.pow(first[0]-second[0],2) + math.pow(first[1]-second[1],2))
+
+            if dis > max:
+                max = dis
+                poi_tuple = [first, second]
+
+
+
+        center1.AddPoint((poi_tuple[0][0]+poi_tuple[1][0])/2,(poi_tuple[0][1]+poi_tuple[1][1])/2)
+        center2.AddPoint((poi_tuple[0][0] + center1.GetX()) / 2, (poi_tuple[0][1] + center1.GetY()) / 2)
+        center3.AddPoint((poi_tuple[1][0] + center1.GetX()) / 2, (poi_tuple[1][1] + center1.GetY()) / 2)
+
+        center_set.add(center1)
+        center_set.add(center2)
+        center_set.add(center3)
 
-        return lines[-1].Centroid(),lines[-2].Centroid()
+        center4 = ogr.Geometry(ogr.wkbPoint)
+        center5 = ogr.Geometry(ogr.wkbPoint)
+        center6 = ogr.Geometry(ogr.wkbPoint)
+
+        center4.AddPoint((tri_line_points[0][0] + tri_line_points[1][0]) / 2, (tri_line_points[0][1] + tri_line_points[1][1]) / 2)
+        center5.AddPoint((tri_line_points[1][0] + tri_line_points[2][0]) / 2, (tri_line_points[1][1] + tri_line_points[2][1]) / 2)
+        center6.AddPoint((tri_line_points[2][0] + tri_line_points[3][0]) / 2, (tri_line_points[2][1] + tri_line_points[3][1]) / 2)
+
+        center_set.add(center4)
+        center_set.add(center5)
+        center_set.add(center6)
+
+        return center_set
 
     @classmethod
     def get_polygon_lines(cls,polygon):
@@ -289,32 +448,17 @@ if __name__ == '__main__':
     t1 = time.time()
 
 
-    # sd = ShapeData(r"J:\Data\制图综合result\t4.shp")
-    # mp = ogr.Geometry(ogr.wkbMultiPolygon)
-    # polygons = sd.get_polygons()
-    #
-    # wkts = PolygonMerge.merge(polygons)
-    #
-    # result = r"J:\Data\制图综合result\t4_merge.shp"
-    #
-    # ShapeData.create_shp_fromwkts(result,"zh",wkts)
-    #
-    # print(time.time()-t1)
+    sd = ShapeData(r"J:\Data\论文\rh.shp")
+
+    polygons = sd.get_polygons()
+
+    p_rh = [PolygonMerge.remove_hole(p,1.114691025217302e-04) for p in polygons]
 
+    wkts = [p.ExportToWkt() for p in p_rh]
 
-    p = PolygonMerge.create_polygon([(113.37029204400005, 22.526576828100076, 0.0), (113.36972403800007, 22.526369320699985, 0.0), (113.36974547200009, 22.526379207800005, 0.0), (113.37025989200004, 22.52656695200011, 0.0), (113.37029204400005, 22.526576828100076, 0.0)])
+    result = r"J:\Data\论文\rhresult.shp"
 
-    pl:Geometry = ogr.ForceToLineString(p)
+    ShapeData.create_shp_fromwkts(result,"zh",wkts)
 
-    ps:list = pl.GetPoints()
-    ps.reverse()
 
-    PolygonMerge.get_tri(ps)
 
-    # wkts =[p.ExportToWkt()]
-    #
-    # result = r"J:\Data\制图综合result\error.shp"
-    #
-    # ShapeData.create_shp_fromwkts(result,"zh",wkts)
-    #
-    # print(time.time()-t1)
\ No newline at end of file