Issue in storeCatalogs

Author: jjrom

app/resto/core/RestoConstants.php

@@ -20,7 +20,7 @@ class RestoConstants
     // [IMPORTANT] Starting resto 7.x, default routes are defined in RestoRouter class
 
     // resto version
-    const VERSION = '9.0.0-RC3';
+    const VERSION = '9.0.0-RC4';
 
     /* ============================================================
      *              NEVER EVER TOUCH THESE VALUES

app/resto/core/addons/Cataloger.php

@@ -206,6 +206,15 @@ private function processITagKeywords($iTagFeature)
                     }
                     break;
 
+                case 'physical':
+                    $catalogs[] = array(
+                        'id' => 'physical',
+                        'title' => 'Physical',
+                        'description' => 'Automatic physical classification processed by [iTag](https://github.com/jjrom/itag)'
+                    );
+                    $catalogs = array_merge($catalogs, $this->getCatalogsFromPhysical($value, 'physical'));
+                    break;
+
                 case 'landcover':
                     $catalogs[] = array(
                         'id' => 'landcover',
@@ -314,6 +323,37 @@ private function getCatalogsFromLandCover($properties, $parentId)
         return $catalogs;
     }
 
+    /**
+     * Get physical catalogs
+     *
+     * @param array $physicals
+     * @param string $parentId
+     */
+    private function getCatalogsFromPhysical($physicals, $parentId)
+    {
+        $catalogs = array();
+
+        /*
+         * Main landcover
+         */
+        for ($i = 0, $ii=count($physicals); $i < $ii; $i++) {
+            $exploded = explode(RestoConstants::TAG_SEPARATOR, $physicals[$i]['id']);
+            $type = $exploded[0];
+            $id = $parentId . '/' . $type . 's';
+            if ( !$this->alreadyExists($catalogs, $type) ) {
+                $catalogs[] = array(
+                    'id' => $id,
+                    'title' => ucfirst($type) . 's',
+                    'description' => 'Automatic ' . $type .  ' classification processed by [iTag](https://github.com/jjrom/itag)',
+                    'rtype' => $type
+                );
+            }
+            $catalogs[] = $this->getCatalogFromGeneric($physicals[$i], $id);
+        }
+
+        return $catalogs;
+    }
+
     /**
      * Get generic keywords
      *
@@ -365,6 +405,7 @@ private function getCatalogFromGeneric($property, $parentId)
         $catalog = array(
             'id' => (isset($parentId) ? $parentId : '') . '/' . $exploded[1],
             'title' => $property['name'] ?? $exploded[1],
+            'description' => 'Catalog of features for ' . ($property['name'] ?? $exploded[1]),
             'rtype' => $exploded[0],
             'hashtag' => $property['id']
         );

app/resto/core/dbfunctions/CatalogsFunctions.php

@@ -282,11 +282,10 @@ public function storeCatalog($catalog, $userid, $baseUrl, $collectionId, $featur
      *
      * @param array $catalogs
      * @param string $userid
-     * @param string $baseUrl
      * @param RestoCollection $collection
      * @param string $featureId
      */
-    public function storeCatalogs($catalogs, $userid, $baseUrl, $collection, $featureId)
+    public function storeCatalogs($catalogs, $userid, $collection, $featureId)
     {
         // Empty catalogs - do nothing
         if (!isset($catalogs) || count($catalogs) === 0) {
@@ -300,7 +299,7 @@ public function storeCatalogs($catalogs, $userid, $baseUrl, $collection, $featur
             $baseUrl = $collection->context->core['baseUrl'];
         }
         for ($i = count($catalogs); $i--;) {
-            $this->storeCatalog($catalog, $userid, $baseUrl, $collectionId, $featureId);
+            $this->storeCatalog($catalogs[$i], $userid, $baseUrl, $collectionId, $featureId);
         }
 
         return $catalogs;

docs/COLLECTIONS_AND_CATALOGS.md

@@ -40,6 +40,8 @@ Then get the feature :
 
 *Note: Any user with the "createFeature" right can insert a feature to a collection he owns ([see rights](./USERS.md))*
 
+        curl -X POST -d@examples/features/dummySargasse.json "http://admin:admin@localhost:5252/collections/S2/items"
+
 ## Catalogs
 
 ### Create a catalog

examples/features/dummySargasse.json

@@ -0,0 +1,30 @@
+{
+    "id": "DummySargasse",
+    "type": "Feature",
+    "properties": {
+        "datetime": "2024-06-21T16:27:00Z"
+    },
+    "geometry": {
+        "coordinates": [
+        [
+            [
+                -64.8,
+                32.3
+            ],
+            [
+                -65.5,
+                18.3
+            ],
+            [
+                -80.3,
+                25.2
+            ],
+            [
+                -64.8,
+                32.3
+            ]
+        ]
+        ],
+        "type": "Polygon"
+    }
+}