Merge pull request #43 from rok4/develop

Release 2.0.0

Author: Dolite

.github/workflows/build-and-release.yaml

@@ -54,7 +54,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt -y install zlib1g-dev libcurl4-openssl-dev libproj-dev libssl-dev libturbojpeg0-dev \
-            libjpeg-dev libc6-dev libjson11-1-dev libboost-log-dev libboost-filesystem-dev libboost-system-dev \
+            libjpeg-dev libc6-dev libboost-log-dev libboost-filesystem-dev libboost-system-dev \
             libsqlite3-dev libpng-dev libtiff5-dev libopenjp2-7-dev librados-dev \
             gettext build-essential cmake libcppunit-dev doxygen graphviz
 

CHANGELOG.md

@@ -1,3 +1,38 @@
+## 2.0.0
+
+### [Added]
+
+* Internalisation de la lib json
+* Ajout d'exporteur XML (via la lib boost) pour les entités Style, BoundingBox, Keyword, LegendURL, TileMatrixLimit et Style
+* Création d'un annuaire pour les CRS pour éviter les créations en double
+
+### [Changed]
+
+* Passage complet en snake case
+* Le format de canal contient le nombre de bits d'encodage
+* Renommage StyledImage -> PaletteImage
+* Renommage lzwEncoder -> LzwCompressor
+* Renommage lzwDecoder -> LzwUncompressor
+* Renommage pkbEncoder -> PkbCompressor
+* Renommage pkbDecoder -> PkbUncompressor
+
+### [Deprecated]
+
+Liste de fonctionnalités dépréciées.
+
+### [Removed]
+
+* Suppression de la notion 'inspire' dans la gestion des styles
+* Suppression de la classe ConvertedChannelsImage
+* Suppression de la gestion de la compilation avec la librairie Kakadu
+* Suppression des factory pour les classes filles de Image
+* Suppression de la fonctionnalité de crop dans Rok4Image
+
+### [Fixed]
+
+* Correction du nettoyage des annuaires de TMS et styles
+
+
 ## 1.4.0
 
 ### [Added]

CMakeLists.txt

@@ -14,7 +14,6 @@ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation location")
 set(BUILD_VERSION "0.0.0" CACHE STRING "Build version")
 set(CEPH_ENABLED 0 CACHE BOOL "Build with ceph storage")
 set(KDU_ENABLED 0 CACHE BOOL "Build with kakadu")
-set(KDU_THREADING 0 CACHE STRING "Threading level for kakadu")
 set(UNITTEST_ENABLED 1 CACHE BOOL "Unit tests compilation")
 set(DOC_ENABLED 1 CACHE BOOL "Documentation compilation")
 set(CPACK_SYSTEM_NAME "ubuntu-20.04" CACHE STRING "Building OS, to deduce package format to generate")
@@ -69,13 +68,13 @@ file(GLOB LIBROK4_SRCS
     "src/image/*.cpp"
     "src/image/file/*.cpp"
     "src/storage/*.cpp"
+    "src/thirdparty/*.cpp"
 )
 
-include_directories(${PROJECT_BINARY_DIR} ${PROJ_INCLUDE_DIR} ${TURBOJPEG_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CURL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${BOOSTLOG_INCLUDE_DIR})
+include_directories(${PROJECT_BINARY_DIR} ${PROJ_INCLUDE_DIR} ${TURBOJPEG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CURL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${BOOSTLOG_INCLUDE_DIR})
 
 if(KDU_ENABLED)
-    set(LIBROK4_SRCS ${LIBROK4_SRCS} "src/image/file/kakadu/LibkakaduImage.cpp")
-    include_directories(${KAKADU_INCLUDE_DIR})
+    message( FATAL_ERROR "Use Kakadu driver to read JPEG2000 is no more available" )
 else(KDU_ENABLED)
     set(LIBROK4_SRCS ${LIBROK4_SRCS} "src/image/file/openjpeg/LibopenjpegImage.cpp")
     include_directories(${OPENJPEG_INCLUDE_DIR})
@@ -103,7 +102,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${CMAKE_PROJECT_VERSI
 
 ################### LIEN DES DÉPENDANCES
 
-target_link_libraries(${PROJECT_NAME} PUBLIC proj turbojpeg jpeg json zlib curl openssl crypto boostlog jpeg2000 tiff png)
+target_link_libraries(${PROJECT_NAME} PUBLIC proj turbojpeg jpeg zlib curl openssl crypto boostlog jpeg2000 tiff png)
 
 if(CEPH_ENABLED)
     target_link_libraries(${PROJECT_NAME} PUBLIC rados)
@@ -191,7 +190,7 @@ if(CPACK_SYSTEM_NAME AND CPACK_SYSTEM_NAME STREQUAL "ubuntu-20.04" OR CPACK_SYST
     # Debian
     set(CPACK_DEBIAN_PACKAGE_SECTION "science")
     set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-    set(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g-dev, libcurl4-openssl-dev, libproj-dev, libssl-dev, libturbojpeg0-dev, libjpeg-dev, libc6-dev, libjson11-1-dev, libboost-log-dev, libboost-filesystem-dev, libboost-system-dev, libsqlite3-dev, libpng-dev, libtiff5-dev")
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g-dev, libcurl4-openssl-dev, libproj-dev, libssl-dev, libturbojpeg0-dev, libjpeg-dev, libc6-dev, libboost-log-dev, libboost-filesystem-dev, libboost-system-dev, libsqlite3-dev, libpng-dev, libtiff5-dev")
     if(NOT KDU_ENABLED)
         set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libopenjp2-7-dev")
     endif(NOT KDU_ENABLED)