Merge pull request #2371 from lixun910/v1.20

update to 1.20.0.10
GeoDaCenter · Feb 6, 2022 · f463403 · f463403
2 parents 656ea88 + 3b12149
commit f463403
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 41 deletions.
diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml
@@ -57,7 +57,7 @@ jobs:
 
       # Build GeoDa
       - name: Build GeoDa
-        run: docker run --privileged=true -e CI -e WORK_DIR="$PWD" -e OS=${{ env.TARGET_OS }} -e VER=${{ env.GEODA_VER }} -e APT="apt-get" -v $PWD:$PWD -v /var/run/docker.sock:/var/run/docker.sock ${{ matrix.distro }} $PWD/BuildTools/ubuntu/install.sh
+        run: docker run --privileged=true -e CI -e WORK_DIR="$PWD" -e CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" -e OS=${{ env.TARGET_OS }} -e VER=${{ env.GEODA_VER }} -e APT="apt-get" -v $PWD:$PWD -v /var/run/docker.sock:/var/run/docker.sock ${{ matrix.distro }} $PWD/BuildTools/ubuntu/install.sh
 
       # Upload artifact
       - uses: actions/upload-artifact@v2

diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
@@ -22,7 +22,7 @@ jobs:
   # This workflow contains a single job called "build"
   windows_build:
     # The type of runner that the job will run on
-    runs-on: windows-latest
+    runs-on: windows-2019
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
 
     strategy:

diff --git a/BuildTools/macosx/GNUmakefile b/BuildTools/macosx/GNUmakefile
@@ -95,15 +95,16 @@ build-geoda-mac:
 	cp /usr/local/opt/gdal/share/gdal/* build/GeoDa.app/Contents/Resources/gdaldata
 	cp libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.1.dylib
 	cp libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib
-	cp /usr/local/opt/gdal/lib/libgdal.29.dylib build/GeoDa.app/Contents/Frameworks
+	cp /usr/local/opt/gdal/lib/libgdal.30.dylib build/GeoDa.app/Contents/Frameworks
 	install_name_tool -id "GeoDa" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau_gl-3.1.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.1.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau-3.1.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
-	install_name_tool -change "/usr/local/opt/gdal/lib/libgdal.29.dylib" "@executable_path/../Frameworks/libgdal.29.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
-	install_name_tool -change "/opt/homebrew/opt/gdal/lib/libgdal.29.dylib" "@executable_path/../Frameworks/libgdal.29.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
+	install_name_tool -change "/usr/local/opt/gdal/lib/libgdal.30.dylib" "@executable_path/../Frameworks/libgdal.30.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
+	install_name_tool -change "/opt/homebrew/opt/gdal/lib/libgdal.30.dylib" "@executable_path/../Frameworks/libgdal.30.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	python3 install_name.py $(GEODA_HOME)/build/GeoDa.app/Contents/Frameworks "Developer ID Application: Geodapress LLC (26M5NG43GP)"
 	install_name_tool -change "@executable_path/../Frameworks/libwx_osx_cocoau-3.1.4.0.0.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib
+	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.1.4.0.0.dylib
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.1.dylib
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/MacOS/lisa_kernel.cl
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/MacOS/GeoDa

diff --git a/BuildTools/macosx/GeoDa.m1.xcodeproj/project.pbxproj b/BuildTools/macosx/GeoDa.m1.xcodeproj/project.pbxproj
@@ -1897,7 +1897,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\nif [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/opt/gdal/lib/libgdal.29.dylib\n    codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib\n    codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib\n    \nelse\n    mkdir $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\n    cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau-3.1.dylib\n    cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib\n    cp /usr/local/opt/gdal/lib/libgdal.29.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libgdal.29.dylib\n    install_name_tool -id \"GeoDa\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/usr/local/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/opt/homebrew/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\"\n    codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app\nfi\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\nif [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/opt/gdal/lib/libgdal.29.dylib\n    codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib\n    codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib\n    #install_name_tool -change \"@rpath/libgeos.3.10.1.dylib\" \"/opt/homebrew/opt/geos/lib/libgeos.3.10.1.dylib\" /opt/homebrew/Cellar/geos/3.10.1/lib/libgeos_c.1.16.0.dylib\n    #codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/Cellar/geos/3.10.1/lib/libgeos_c.1.16.0.dylib\nelse\n    mkdir $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\n    cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau-3.1.dylib\n    cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib\n    cp /usr/local/opt/gdal/lib/libgdal.29.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libgdal.29.dylib\n    install_name_tool -id \"GeoDa\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/usr/local/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    install_name_tool -change \"/opt/homebrew/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\"\n    codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n    codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -2304,13 +2304,13 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/libraries/lib",
-					"/opt/homebrew/Cellar/gdal/*/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.1;
 				MARKETING_VERSION = 1.18;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
-					"-I/opt/homebrew/include",
+					"-I/opt/homebrew/opt/boost/include",
+					"-I/opt/homebrew/opt/gdal/include",
 					"-I/usr/include",
 					"-I./libraries/lib/wx/include/osx_cocoa-unicode-3.1",
 					"-I./libraries/include/wx-3.1/",
@@ -2398,7 +2398,6 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/libraries/lib",
-					"/opt/homebrew/Cellar/gdal/*/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.1;
 				MARKETING_VERSION = 1.18;

diff --git a/BuildTools/macosx/install.sh b/BuildTools/macosx/install.sh
@@ -21,15 +21,15 @@ mkdir -p libraries/include
 mkdir -p ../../o
 
 # FIX for libgdal on Monterey using sqlite 3.30.1
-cd temp
-curl -L -O https://sqlite.org/2019/sqlite-autoconf-3300100.tar.gz
-tar -xvf sqlite-autoconf-3300100.tar.gz
-cd sqlite-autoconf-3300100
-./configure --enable-readline CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1" --prefix=/usr/local/opt/sqlite
-make
-make install
-cd ..
-cd ..
+# cd temp
+# curl -L -O https://sqlite.org/2019/sqlite-autoconf-3300100.tar.gz
+# tar -xvf sqlite-autoconf-3300100.tar.gz
+# cd sqlite-autoconf-3300100
+# ./configure --enable-readline CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1" --prefix=/usr/local/opt/sqlite
+# make
+# make install
+# cd ..
+# cd ..
 
 # Build wxWidgets 3.1.4
 cd temp

diff --git a/BuildTools/macosx/install_name.py b/BuildTools/macosx/install_name.py
@@ -4,8 +4,9 @@
 
 framework_path = sys.argv[1] #e.g. '/Users/xun/Github/geoda/BuildTools/macosx/build/GeoDa.app/Contents/Frameworks'
 id = sys.argv[2]
+codesign_only = bool(sys.argv[3]) if len(sys.argv) > 3  else False
 
-print(id)
+print(id, codesign_only)
 
 def ProcessDependency(dir_path, dylib_name):
     dylib_path = dir_path + '/' + dylib_name
@@ -14,22 +15,23 @@ def ProcessDependency(dir_path, dylib_name):
     for item in items:
         item = item.strip().split(" ")[0]
 
-        # workaround for gdal 3.3.3 that @rpath/libgeos.3.10.1.dylib was used instead of dir path
+        # workaround for gdal 3.3.3 that @rpath/libgeos.3.10.2.dylib was used instead of dir path
         copyitem = item
-        if item == '@rpath/libgeos.3.10.1.dylib':
+        if item == '@rpath/libgeos.3.10.2.dylib':
             copyitem = '/usr/local/opt/geos/lib/libgeos.dylib'
 
-        if item.startswith('/usr/lib') == False and item.startswith('/System') == False and item.startswith('@executable_path/')==False:
+        if item.startswith('/usr/lib') == False and item.startswith('/System') == False and (codesign_only or item.startswith('@executable_path/')==False):
             print("Process:", item)
             file_name = os.path.basename(item)
             # Copy the dylib to Frameworks if needed
             dest = dir_path + '/' + file_name
-            if os.path.exists(dest) == False:
+            if os.path.exists(dest) == False and not codesign_only:
                 copyfile(copyitem, dest, follow_symlinks=True)
             # install_name_tool current item
             new_path = "@executable_path/../Frameworks/{}".format(file_name)
             cmd = "install_name_tool -change \"{}\" \"{}\" {}".format(item, new_path, dylib_path)
-            os.system(cmd)
+            if not codesign_only:
+                os.system(cmd)
             # process item
             ProcessDependency(dir_path, file_name)
     print("codesign {}", dylib_path)
@@ -39,4 +41,4 @@ def ProcessDependency(dir_path, dylib_name):
 
 ProcessDependency(framework_path, "libwx_osx_cocoau_gl-3.1.dylib")
 ProcessDependency(framework_path, "libwx_osx_cocoau-3.1.dylib")
-ProcessDependency(framework_path, "libgdal.29.dylib")
+ProcessDependency(framework_path, "libgdal.30.dylib")
diff --git a/BuildTools/ubuntu/install.sh b/BuildTools/ubuntu/install.sh
@@ -23,6 +23,9 @@ cd temp
 # Install libgdal
 export DEBIAN_FRONTEND=noninteractive
 $APT update -y
+# fix curl 60 error
+$APT install -y ca-certificates libgnutls30
+echo '-k' > ~/.curlrc
 $APT install -y libpq-dev
 $APT install -y gdal-bin
 $APT install -y libgdal-dev

diff --git a/BuildTools/windows/installer/32bit/GeoDa-win7+.iss b/BuildTools/windows/installer/32bit/GeoDa-win7+.iss
@@ -71,7 +71,7 @@ Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_PG.dll"; DestDir: "{app}"
 Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_MSSQLSpatial.dll"; DestDir: "{app}"
 Source: "..\..\libraries\bin\gdal\plugins-external\ogr_FileGDB.dll"; DestDir: "{app}"
 Source: "..\..\..\..\Algorithms\lisa_kernel.cl"; DestDir: "{app}"
-Source: "..\..\..\..\internationalization\lang\*"; DestDir: "{app}\lang"; Flags: recursesubdirs
+Source: "..\..\..\..\internationalization\lang\*"; DestDir: "{userappdata}\GeoDa\lang"; Flags: recursesubdirs
 Source: "..\..\..\..\internationalization\lang\config.ini"; DestDir: "{userappdata}\GeoDa\lang"
 Source: "..\..\libraries\bin\gdal-data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
 

diff --git a/BuildTools/windows/installer/64bit/GeoDa-win7+.iss b/BuildTools/windows/installer/64bit/GeoDa-win7+.iss
@@ -84,7 +84,7 @@ Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_PG.dll"; DestDir: "{app}"
 Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_MSSQLSpatial.dll"; DestDir: "{app}"
 Source: "..\..\libraries\bin\gdal\plugins-external\ogr_FileGDB.dll"; DestDir: "{app}"
 Source: "..\..\..\..\Algorithms\lisa_kernel.cl"; DestDir: "{app}"
-Source: "..\..\..\..\internationalization\lang\*"; DestDir: "{app}\lang"; Flags: recursesubdirs
+Source: "..\..\..\..\internationalization\lang\*"; DestDir: "{userappdata}\GeoDa\lang"; Flags: recursesubdirs
 Source: "..\..\..\..\internationalization\lang\config.ini"; DestDir: "{userappdata}\GeoDa\lang"
 Source: "..\..\libraries\bin\gdal-data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
 

diff --git a/GenUtils.cpp b/GenUtils.cpp
@@ -163,6 +163,7 @@ wxString Gda::DetectDateFormat(wxString s, vector<wxString>& date_items)
     wxString yy = "([0-9]{2})";
     wxString MM = "([0-9]{1,2})";//"(0?[1-9]|1[0-2])";
     wxString DD = "([0-9]{1,2})";//"(0?[1-9]|[12][0-9]|3[01])";
+    wxString ii = "([0-9]{1,2})";//"(00|[0-9]|1[0-9]|2[0-3])";
     wxString hh = "([0-9]{1,2})";//"(00|[0-9]|1[0-9]|2[0-3])";
     wxString mm = "([0-9]{1,2})";//"([0-9]|[0-5][0-9])";
     wxString ss = "([0-9]{1,2})"; //"([0-9]|[0-5][0-9])";
@@ -177,6 +178,7 @@ wxString Gda::DetectDateFormat(wxString s, vector<wxString>& date_items)
         select_pattern.Replace("%y", yy);
         select_pattern.Replace("%m", MM);
         select_pattern.Replace("%d", DD);
+        select_pattern.Replace("%I", ii);
         select_pattern.Replace("%H", hh);
         select_pattern.Replace("%M", mm);
         select_pattern.Replace("%S", ss);
@@ -197,7 +199,7 @@ wxString Gda::DetectDateFormat(wxString s, vector<wxString>& date_items)
 
     if (!pattern.IsEmpty()){
         wxString select_pattern = original_pattern;
-        wxRegEx regex("(%[YymdHMSp])");
+        wxRegEx regex("(%[YymdIHMSp])");
         while (regex.Matches(select_pattern) ) {
             size_t start, len;
             regex.GetMatch(&start, &len, 0);
@@ -233,7 +235,7 @@ unsigned long long Gda::DateToNumber(wxString s_date, wxRegEx& regex, vector<wxS
             } else if (date_items[i-1] == "%d") {
                 _day = regex.GetMatch(s_date, i);
                 _day.ToLong(&_l_day);
-            } else if (date_items[i-1] == "%H") {
+            } else if (date_items[i-1] == "%H" || date_items[i-1] == "%I") {
                 _hour = regex.GetMatch(s_date, i);
                 _hour.ToLong(&_l_hour);
             } else if (date_items[i-1] == "%M") {
@@ -247,9 +249,7 @@ unsigned long long Gda::DateToNumber(wxString s_date, wxRegEx& regex, vector<wxS
             }
         }
         if (!_am_pm.IsEmpty()) {
-            if (_am_pm.CmpNoCase("AM")) {
-
-            } else if (_am_pm.CmpNoCase("PM")) {
+            if (_am_pm.CmpNoCase("PM") == 0) {
                 _l_hour += 12;
             }
         }

diff --git a/ShapeOperations/VoronoiUtils.cpp b/ShapeOperations/VoronoiUtils.cpp
@@ -631,12 +631,21 @@ bool Gda::VoronoiUtils::PointsToContiguity(const std::vector<double>& x,
 			}
 
 			double x0, y0, x1, y1;
-			if (clipEdge(*edge, int_pts,
-						 bb_xmin, bb_ymin, bb_xmax, bb_ymax,
-						 x0, y0, x1, y1)) {
-				nbr_set.insert(nbr_list);
-			}
 
+            bool intersects_e = false;
+            if (edge < edge->twin()) {
+                intersects_e = clipEdge(*edge, int_pts,
+                                        bb_xmin, bb_ymin, bb_xmax, bb_ymax,
+                                        x0, y0, x1, y1);
+            } else {
+                intersects_e = clipEdge(*edge->twin(), int_pts,
+                                        bb_xmin, bb_ymin, bb_xmax, bb_ymax,
+                                        x0, y0, x1, y1);
+            }
+            if (intersects_e) {
+                nbr_set.insert(nbr_list);
+            }
+
 			if (queen) { // add all cells that share each edge vertex
 				if (edge->vertex0() &&
 					!isVertexOutsideBB(*edge->vertex0(), bb_xmin, bb_ymin,

diff --git a/version.h b/version.h
@@ -2,10 +2,10 @@ namespace Gda {
 	const int version_major = 1;
 	const int version_minor = 20;
 	const int version_build = 0;
-	const int version_subbuild = 8;
-	const int version_year = 2021;
-	const int version_month = 10;
-	const int version_day = 14;
+	const int version_subbuild = 10;
+	const int version_year = 2022;
+	const int version_month = 2;
+	const int version_day = 5;
 	const int version_night = 0;
 	const int version_type = 2; // 0: alpha, 1: beta, 2: release
 }