Merge branch 'release/v5.3.0' into master

Author: pmeems

.gitignore

@@ -174,6 +174,7 @@ support/GDAL_SDK/**/*.c
 support/GDAL_SDK/**/*.inc
 support/GDAL_SDK/**/*.proto
 support/GDAL_SDK/**/*.pc
+support/temp/
 
 # Custom
 *.dll

src/COM classes/OgrLayer.cpp

@@ -100,6 +100,7 @@ void COgrLayer::UpdateShapefileFromOGRLoader()
 {
     CSingleLock lock(&_loader.ProviderLock, TRUE);
     if (!_shapefile) return;
+	lock.Unlock();
 
     // Wait for tasks to finish loading:
     _loader.AwaitTasks();
@@ -110,9 +111,9 @@ void COgrLayer::UpdateShapefileFromOGRLoader()
     CSingleLock sfLock(&_loader.ShapefileLock, TRUE);
 
     // Grab the loaded data:
-    vector<ShapeRecordData*> data = _loader.FetchData();
-    if (data.size() == 0)
+	if (!_loader.HasData())
 		return;
+    vector<ShapeRecordData*> data = _loader.FetchData();
 
 	CStringW fid = OgrHelper::OgrString2Unicode(_layer->GetFIDColumn());
 	bool hasFid = fid.GetLength() > 0;
@@ -861,9 +862,21 @@ STDMETHODIMP COgrLayer::SaveChanges(int* savedCount, tkOgrSaveType saveType, VAR
 	}
 
 	{ // Locking provider & shapefile here
+		CSingleLock loadingLock(&_loader.LoadingLock, _dynamicLoading ? TRUE : FALSE);
 		CSingleLock lock(&_loader.ProviderLock, _dynamicLoading ? TRUE : FALSE);
 		CSingleLock sfLock(&_loader.ShapefileLock, _dynamicLoading ? TRUE : FALSE);
-		*savedCount = Shape2Ogr::SaveShapefileChanges(_layer, _shapefile, shapeCmnId, saveType, validateShapes ? true : false, _updateErrors);
+		auto safeToDelete = true;
+		if (_dynamicLoading)
+		{
+			VARIANT_BOOL hasFIDMap;
+			_shapefile->get_HasOgrFidMapping(&hasFIDMap);
+			if (!hasFIDMap)
+				safeToDelete = false; //don't delete when there's no FID map to track them
+		}
+		*savedCount = Shape2Ogr::SaveShapefileChanges(
+			_layer, _shapefile, shapeCmnId, 
+			saveType, validateShapes ? true : false,
+			safeToDelete, _updateErrors);
 	}
 
 	HasLocalChanges(&hasChanges);

src/COM classes/Shape.cpp

@@ -2083,7 +2083,7 @@ void CShape::get_LabelPosition(tkLabelPositioning method, double& x, double& y,
 	if (method == labelPositioning && orientation == labelOrientation)
 	{
 		x = labelX;
-		y = labelX;
+		y = labelY;
 		rotation = labelRotation;
 		return;
 	}

src/COM classes/Shapefile.cpp

@@ -809,6 +809,8 @@ HRESULT CShapefile::CreateNewCore(BSTR ShapefileName, ShpfileType ShapefileType,
             }
             else
             {
+
+                ((CTableClass*)_table)->InjectShapefile(this);
                 _shpfiletype = ShapefileType;
                 _isEditingShapes = true;
                 _sourceType = sstInMemory;
@@ -880,6 +882,7 @@ HRESULT CShapefile::CreateNewCore(BSTR ShapefileName, ShpfileType ShapefileType,
         }
         else
         {
+            ((CTableClass*)_table)->InjectShapefile(this);
             _shpfileName = tmp_shpfileName;
             _shxfileName = tmp_shpfileName.Left(tmp_shpfileName.GetLength() - 3) + "shx";
             _dbffileName = tmp_shpfileName.Left(tmp_shpfileName.GetLength() - 3) + "dbf";

src/COM classes/Shapefile.h

@@ -314,6 +314,7 @@ class ATL_NO_VTABLE CShapefile :
     // OGR layers can lookup by fixed FID rather than ever-changing ShapeIndex
     // (Shape indices change when removing rows, and may change on OGR reload)
     std::map<long, long> _ogrFid2ShapeIndex;
+	std::set<long> _deletedFids;
     bool _hasOgrFidMapping = false;
 
 	// table is initialized in CreateNew or Open methods
@@ -503,6 +504,23 @@ class ATL_NO_VTABLE CShapefile :
     {
         _ogrFid2ShapeIndex.insert(std::make_pair(ogrFid, shapeIndex));
     }
+	bool MarkShapeDeleted(long shapeIndex)
+	{
+		if (!_hasOgrFidMapping)
+			return false;
+		
+		for (auto const& it : _ogrFid2ShapeIndex)
+			if (it.second == shapeIndex)
+				_deletedFids.insert(it.first);
+	}
+	std::set<long> GetDeletedShapeFIDs()
+	{
+		return std::set<long>(_deletedFids);
+	}
+	void ClearDeleteShapeFIDs()
+	{
+		_deletedFids.clear();
+	}
 
     // give OGR layers the ability to retain visibility flags on reload
     bool GetVisibilityFlags(map<long, BYTE> &flags);

src/COM classes/ShapefileCategories.cpp

@@ -617,11 +617,11 @@ void CShapefileCategories::ApplyExpressionCore(long CategoryIndex, long startRow
     //		Saving results
     // -------------------------------------------------------------
     for (unsigned long i = 0; i < results.size(); i++) {
-        // Is this a category we need?
-        if (!allCategories && i != CategoryIndex)
+		// Is this a category we need?
+		const int categoryIndex = results[i];
+		if (!allCategories && categoryIndex != CategoryIndex)
             continue;
 
-		const int categoryIndex = results[i];
 		const int rowIndex = startRowIndex + i;
         _shapefile->put_ShapeCategory(rowIndex, categoryIndex);
         _shapefile->put_ShapeRotation(rowIndex, rotations[categoryIndex + 1][i]);

src/COM classes/Shapefile_Selection.cpp

@@ -183,6 +183,8 @@ bool CShapefile::SelectShapesCore(Extent& extents, double Tolerance, SelectMode
 				get_Shape(shapeVal, &shape);
 				// convert querying shape to GEOS
                 GEOSGeom geosShape = GeosConverter::ShapeToGeom(shape);
+				if (geosShape == nullptr)
+					continue;
                 // check for containment
                 if (GeosHelper::Contains(geosShape, geosPoint))
                 {

src/COM classes/TableClass.cpp

@@ -29,6 +29,7 @@
 #include "Field.h"
 #include "TableHelper.h"
 #include "FieldHelper.h"
+#include "Shapefile.h"
 
 #pragma warning(disable:4996)
 
@@ -717,6 +718,9 @@ bool CTableClass::SaveToFile(const CStringW& dbfFilename, bool updateFileInPlace
 		return false;
 	}
 
+	// is the Shapefile UTF-8 (if unspecified or specified as UTF-8)
+	bool isUTF8 = (DBFGetCodePage(_dbfHandle) == nullptr || strcmp(DBFGetCodePage(_dbfHandle), "UTF-8") == 0);
+
 	// joined fields must be removed; they will be restored in the process of reopening table
 	// after saving operation
 	this->RemoveJoinedFields();
@@ -798,7 +802,7 @@ bool CTableClass::SaveToFile(const CStringW& dbfFilename, bool updateFileInPlace
 			continue;
 		}
 
-		if (!WriteRecord(newdbfHandle, rowIndex, ++currentRowIndex))
+		if (!WriteRecord(newdbfHandle, rowIndex, ++currentRowIndex, isUTF8))
 		{
 			ErrorMessage(tkDBF_CANT_WRITE_ROW);
 			return false;
@@ -934,6 +938,8 @@ void CTableClass::LoadDefaultFields()
 		field->put_Width(fwidth);
 		field->put_Precision(fdecimals);
 		field->put_Type((FieldType)type);
+		//// field has not really been modified
+		//((CField*)field)->SetIsUpdated(false);
 
 		FieldWrapper* fw = new FieldWrapper();
 		fw->oldIndex = i;
@@ -1439,7 +1445,7 @@ bool CTableClass::ReadRecord(long RowIndex)
 //		WriteRecord()
 // *******************************************************************
 //Write a cached RecordWrapper into dbf file 
-bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex)
+bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex, bool isUTF8)
 {
 	AFX_MANAGE_STATE(AfxGetStaticModuleState())
 		USES_CONVERSION;
@@ -1453,7 +1459,7 @@ bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowI
 	if (fromRowIndex < 0 || fromRowIndex >= RowCount())
 		return false;
 
-	char * nonstackString = NULL;
+	const char * nonstackString = NULL;
 
 	for (long i = 0; i < FieldCount(); i++)
 	{
@@ -1467,7 +1473,7 @@ bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowI
 		{
 			if (val.vt == VT_BSTR)
 			{
-				nonstackString = Utility::SYS2A(val.bstrVal);
+				nonstackString = Utility::ConvertBSTRToLPSTR(val.bstrVal, (isUTF8 ? CP_UTF8 : CP_ACP)); // ((LPCSTR)Utility::ConvertToUtf8(val.bstrVal)); // Utility::SYS2A(val.bstrVal);
 				DBFWriteStringAttribute(dbfHandle, toRowIndex, i, nonstackString);
 				delete[] nonstackString;
 				nonstackString = NULL;
@@ -1991,6 +1997,8 @@ STDMETHODIMP CTableClass::EditDeleteRow(long RowIndex, VARIANT_BOOL *retval)
 	AFX_MANAGE_STATE(AfxGetStaticModuleState())
 		*retval = VARIANT_FALSE;
 
+	((CShapefile*) _shapefile)->MarkShapeDeleted(RowIndex);
+
 	if (_isEditingTable == FALSE)
 	{
 		ErrorMessage(tkDBF_NOT_IN_EDIT_MODE);

src/COM classes/TableClass.h

@@ -206,7 +206,7 @@ class ATL_NO_VTABLE CTableClass :
 	long RowCount() { return _rows.size(); }
 	long FieldCount() { return _fields.size(); }
 	bool ReadRecord(long RowIndex);
-	bool WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex);
+	bool WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex, bool isUTF8 = false);
 	void ClearRow(long rowIndex);
 	FieldType GetFieldType(long fieldIndex);
 	long GetFieldPrecision(long fieldIndex);

src/COM classes/Utils_GDAL.cpp

@@ -4342,7 +4342,11 @@ GDALWarpCreateOutput( char **papszSrcFiles, const char *pszFilename,
                      && (pszMethod == NULL || EQUALN(pszMethod,"GCP_",4)) )
                 pszThisSourceSRS = GDALGetGCPProjection( hSrcDS );
             else if( pszMethod != NULL && EQUAL(pszMethod,"RPC") )
-                pszThisSourceSRS = SRS_WKT_WGS84;
+#if GDAL_VERSION_MAJOR >= 3
+                pszThisSourceSRS = SRS_WKT_WGS84_LAT_LONG; //  SRS_WKT_WGS84 macro is no longer declared by default since WKT without AXIS is too ambiguous. Preferred remediation: use SRS_WKT_WGS84_LAT_LONG
+#else
+				pszThisSourceSRS = SRS_WKT_WGS84;
+#endif
             else
                 pszThisSourceSRS = "";
         }