Merge pull request #45 from rok4/develop

Release 2.0.1

Author: Dolite

.github/labeler.yml

@@ -1,20 +1,32 @@
 ci-cd:
-  - .github/**/*
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/**
 
 dependencies:
-  - cmake/**/*
+- changed-files:
+  - any-glob-to-any-file:
+    - cmake/**
 
 documentation:
-  - docs/**/*
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/**
 
 enhancement:
-  - src/**/*
-  - include/**/*
+- changed-files:
+  - any-glob-to-any-file:
+    - src/**
+    - include/**
 
 quality:
-  - tests/**/*
+- changed-files:
+  - any-glob-to-any-file:
+    - tests/**
 
 tooling:
-  - CMakeLists.txt
-  - config.h.in
-  - '**/CMakeLists.txt'
+- changed-files:
+  - any-glob-to-any-file:
+    - CMakeLists.txt
+    - config.h.in
+    - '**/CMakeLists.txt'

.github/workflows/pr-auto-labeler.yml

@@ -1,15 +1,12 @@
 name: "🏷 PR Labeler"
 on:
-  - pull_request_target
-
-permissions:
-  contents: read
-  pull-requests: write
+  - pull_request
 
 jobs:
-  triage:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v5
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    - uses: actions/labeler@v5

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.1
+
+### [Added]
+
+* `Keyword` : ajout d'un exporteur JSON (API Tiles)
+* `TileMatrixLimits` : ajout d'un exporteur JSON (API Tiles)
+
 ## 2.0.0
 
 ### [Added]

include/rok4/style/Style.h

@@ -97,7 +97,7 @@ class Style;
  *         "slope_max": 254
  *     },
  *     "palette": {
- *         "max_value": 255,
+ *         "no_alpha": false,
  *         "rgb_continuous": true,
  *         "alpha_continuous": true,
  *         "colours": [

include/rok4/utils/Keyword.h

@@ -202,6 +202,10 @@ class Keyword {
         }
     }
 
+    json11::Json to_json() const {
+        return content;
+    }
+
     /**
      * \~french
      * \brief Destructeur par défaut

include/rok4/utils/TileMatrix.h

@@ -97,12 +97,12 @@ friend class TileMatrixSet;
     double res;
     /**
      * \~french \brief Abcisse du point en haut à gauche dans le système de coordonnées associé.
-     * \~english \brief X-coordinate of the top right corner in the linked coordinate system.
+     * \~english \brief X-coordinate of the top left corner in the linked coordinate system.
      */
     double x0;
     /**
      * \~french \brief Ordonnée du point en haut à gauche dans le système de coordonnées associé.
-     * \~english \brief Y-coordinate of the top right corner in the linked coordinate system.
+     * \~english \brief Y-coordinate of the top left corner in the linked coordinate system.
      */
     double y0;
     /**
@@ -186,7 +186,7 @@ friend class TileMatrixSet;
      * \brief Retourne l'abscisse du point en haut à gauche dans le système de coordonnées associé.
      * \return abscisse
      * \~english
-     * \brief Return the x-coordinate of the top right corner in the linked coordinate system.
+     * \brief Return the x-coordinate of the top left corner in the linked coordinate system.
      * \return x-coordinate
      */
     double get_x0();
@@ -195,7 +195,7 @@ friend class TileMatrixSet;
      * \brief Retourne l'ordonnée du point en haut à gauche dans le système de coordonnées associé.
      * \return ordonnée
      * \~english
-     * \brief Return the y-coordinate of the top right corner in the linked coordinate system.
+     * \brief Return the y-coordinate of the top left corner in the linked coordinate system.
      * \return y-coordinate
      */
     double get_y0();

include/rok4/utils/TileMatrixLimits.h

@@ -171,6 +171,18 @@ class TileMatrixLimits
         node.add("MaxTileCol", std::to_string(max_tile_col));
     }
 
+    json11::Json to_json() const {
+        json11::Json::object res = json11::Json::object {
+            { "tileMatrix", tm_id },
+            { "minTileRow", int(min_tile_row) },
+            { "maxTileRow", int(max_tile_row) },
+            { "minTileCol", int(min_tile_col) },
+            { "maxTileCol", int(max_tile_col) }
+        };
+        
+        return res;
+    }
+
 };