From 18ad3c06931d8a01a9a8f180527313da88b13128 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 7 Nov 2024 10:00:00 +0100 Subject: [PATCH 1/4] Upgrade QGIS to 3.40 --- vcpkg/ports/qgis/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg/ports/qgis/portfile.cmake b/vcpkg/ports/qgis/portfile.cmake index 6cfb0fd6..4663254a 100644 --- a/vcpkg/ports/qgis/portfile.cmake +++ b/vcpkg/ports/qgis/portfile.cmake @@ -1,6 +1,6 @@ string(REPLACE "." "_" TAG ${VERSION}) -set(QGIS_REF d4d76845261c5cf74421d55e68682b5824e2230b) +set(QGIS_REF bf5907c68d0a4ed5f3c2e2ab6e3633742c6010f7) set(QGIS_SHA512 ae28388e062b6c0fe151f7ce0add897548c367f0897ba71494d767cf048a925daf5bb0a82f08520110b4011037b41be81effa314c27496194e8d147a7f7fe55f) vcpkg_from_github( From 86f629f79e96dbc2fd7857dcca21bd7ce17e40ff Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 7 Nov 2024 10:11:07 +0100 Subject: [PATCH 2/4] Update portfile.cmake --- vcpkg/ports/qgis/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg/ports/qgis/portfile.cmake b/vcpkg/ports/qgis/portfile.cmake index 4663254a..00cc6f13 100644 --- a/vcpkg/ports/qgis/portfile.cmake +++ b/vcpkg/ports/qgis/portfile.cmake @@ -1,7 +1,7 @@ string(REPLACE "." "_" TAG ${VERSION}) set(QGIS_REF bf5907c68d0a4ed5f3c2e2ab6e3633742c6010f7) -set(QGIS_SHA512 ae28388e062b6c0fe151f7ce0add897548c367f0897ba71494d767cf048a925daf5bb0a82f08520110b4011037b41be81effa314c27496194e8d147a7f7fe55f) +set(QGIS_SHA512 11636afbb26aa541f15ad8e4cda84ac6568c92d11f64a70da5a5cd5bef49e5d5f39ad20eb486593eaf6da05f73a5a55e6e18f9363d0fe31aca8a41fc8497eb11) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From 013edf6aaec1b911369d52b3a57a9ee4aa2f72e0 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 7 Nov 2024 13:22:27 +0100 Subject: [PATCH 3/4] add == operator for KadasItemPos --- kadas/gui/mapitems/kadasmapitem.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kadas/gui/mapitems/kadasmapitem.h b/kadas/gui/mapitems/kadasmapitem.h index ce8dda3b..02c4ea82 100644 --- a/kadas/gui/mapitems/kadasmapitem.h +++ b/kadas/gui/mapitems/kadasmapitem.h @@ -91,6 +91,13 @@ class KADAS_GUI_EXPORT KadasItemPos #else KadasItemPos( double x = 0., double y = 0 ) : mX( x ), mY( y ) {} #endif + bool operator== ( const KadasItemPos &other ) const { + return mX == other.mX && + mY == other.mY && + hasZ() == other.hasZ() && + ( !hasZ() || mZ == other.mZ ); + } + double x() const { return mX; } void setX( double x ) { mX = x; } double y() const { return mY; } From e960e26a1b1deb8bf87105cb1c3f94e2414a66a8 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 7 Nov 2024 13:43:33 +0100 Subject: [PATCH 4/4] geopdf -> geospatialpdf follow-up https://github.com/qgis/QGIS/pull/59017 --- kadas/app/kadaslayoutdesignerdialog.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/kadas/app/kadaslayoutdesignerdialog.cpp b/kadas/app/kadaslayoutdesignerdialog.cpp index ea52a36d..df42bb11 100644 --- a/kadas/app/kadaslayoutdesignerdialog.cpp +++ b/kadas/app/kadaslayoutdesignerdialog.cpp @@ -1657,9 +1657,9 @@ bool KadasLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExpo bool includeMetadata = true; bool disableRasterTiles = false; bool simplify = true; - bool geoPdf = false; + bool geospatialPdf = false; bool useOgcBestPracticeFormat = false; - bool exportGeoPdfFeatures = true; + bool exportGeospatialPdfFeatures = true; QStringList exportThemes; if ( mLayout ) { @@ -1669,9 +1669,9 @@ bool KadasLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExpo includeMetadata = mLayout->customProperty( QStringLiteral( "pdfIncludeMetadata" ), 1 ).toBool(); disableRasterTiles = mLayout->customProperty( QStringLiteral( "pdfDisableRasterTiles" ), 0 ).toBool(); simplify = mLayout->customProperty( QStringLiteral( "pdfSimplify" ), 1 ).toBool(); - geoPdf = mLayout->customProperty( QStringLiteral( "pdfCreateGeoPdf" ), 0 ).toBool(); + geospatialPdf = mLayout->customProperty( QStringLiteral( "pdfCreateGeoPdf" ), 0 ).toBool(); useOgcBestPracticeFormat = mLayout->customProperty( QStringLiteral( "pdfOgcBestPracticeFormat" ), 0 ).toBool(); - exportGeoPdfFeatures = mLayout->customProperty( QStringLiteral( "pdfExportGeoPdfFeatures" ), 1 ).toBool(); + exportGeospatialPdfFeatures = mLayout->customProperty( QStringLiteral( "pdfExportGeoPdfFeatures" ), 1 ).toBool(); const QString themes = mLayout->customProperty( QStringLiteral( "pdfExportThemes" ) ).toString(); if ( !themes.isEmpty() ) exportThemes = themes.split( QStringLiteral( "~~~" ) ); @@ -1693,9 +1693,9 @@ bool KadasLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExpo dialog.setMetadataEnabled( includeMetadata ); dialog.setRasterTilingDisabled( disableRasterTiles ); dialog.setGeometriesSimplified( simplify ); - dialog.setExportGeoPdf( geoPdf ); + dialog.setExportGeospatialPdf( geospatialPdf ); dialog.setUseOgcBestPracticeFormat( useOgcBestPracticeFormat ); - dialog.setExportGeoPdf( exportGeoPdfFeatures ); + dialog.setExportGeospatialPdf( exportGeospatialPdfFeatures ); dialog.setExportThemes( exportThemes ); if ( dialog.exec() != QDialog::Accepted ) @@ -1707,9 +1707,9 @@ bool KadasLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExpo disableRasterTiles = dialog.rasterTilingDisabled(); simplify = dialog.geometriesSimplified(); Qgis::TextRenderFormat textRenderFormat = dialog.textRenderFormat(); - geoPdf = dialog.exportGeoPdf(); + geospatialPdf = dialog.exportGeospatialPdf(); useOgcBestPracticeFormat = dialog.useOgcBestPracticeFormat(); - exportGeoPdfFeatures = dialog.exportGeoPdf(); + exportGeospatialPdfFeatures = dialog.exportGeospatialPdf(); exportThemes = dialog.exportThemes(); if ( mLayout ) @@ -1721,9 +1721,9 @@ bool KadasLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExpo mLayout->setCustomProperty( QStringLiteral( "pdfDisableRasterTiles" ), disableRasterTiles ? 1 : 0 ); mLayout->setCustomProperty( QStringLiteral( "pdfTextFormat" ), static_cast< int >( textRenderFormat ) ); mLayout->setCustomProperty( QStringLiteral( "pdfSimplify" ), simplify ? 1 : 0 ); - mLayout->setCustomProperty( QStringLiteral( "pdfCreateGeoPdf" ), geoPdf ? 1 : 0 ); + mLayout->setCustomProperty( QStringLiteral( "pdfCreateGeoPdf" ), geospatialPdf ? 1 : 0 ); mLayout->setCustomProperty( QStringLiteral( "pdfOgcBestPracticeFormat" ), useOgcBestPracticeFormat ? 1 : 0 ); - mLayout->setCustomProperty( QStringLiteral( "pdfExportGeoPdfFeatures" ), exportGeoPdfFeatures ? 1 : 0 ); + mLayout->setCustomProperty( QStringLiteral( "pdfExportGeoPdfFeatures" ), exportGeospatialPdfFeatures ? 1 : 0 ); mLayout->setCustomProperty( QStringLiteral( "pdfExportThemes" ), exportThemes.join( QStringLiteral( "~~~" ) ) ); } @@ -1732,10 +1732,10 @@ bool KadasLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExpo settings.exportMetadata = includeMetadata; settings.textRenderFormat = textRenderFormat; settings.simplifyGeometries = simplify; - settings.writeGeoPdf = geoPdf; + settings.writeGeoPdf = geospatialPdf; settings.useOgcBestPracticeFormatGeoreferencing = useOgcBestPracticeFormat; settings.useIso32000ExtensionFormatGeoreferencing = !useOgcBestPracticeFormat; - settings.includeGeoPdfFeatures = exportGeoPdfFeatures; + settings.includeGeoPdfFeatures = exportGeospatialPdfFeatures; settings.exportThemes = exportThemes; settings.predefinedMapScales = predefinedScales();