Merge branch 'master' into offline

.github/workflows/main.yaml

@@ -0,0 +1,49 @@
+name: ci
+on: [ push, workflow_dispatch ]
+
+jobs:
+  build_app:
+    name: Build app
+    if: ${{ !contains(github.event.head_commit.message, 'skip app') }}
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [ 20 ]
+        debian: [ 'bookworm' ]    
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Init runner
+        run: bash ./scripts/init_runner.sh ${{ github.job }}
+      - name: Setup workspace
+        env:
+          KALISIO_GITHUB_URL: ${{ secrets.KALISIO_GITHUB_URL }}
+        run: bash ./scripts/setup_workspace.sh -k kli
+      - name: Build app
+        env:
+          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+        run: bash ./scripts/build_app.sh -p -r ${{ github.job }} -n ${{ matrix.node }} -d ${{ matrix.debian }}
+
+  build_docs:
+    name: Build docs
+    if: ${{ startsWith(github.event.head_commit.message, 'docs:') || contains(github.event.head_commit.message, 'build doc') }}
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Init runner
+        run: bash ./scripts/init_runner.sh ${{ github.job }}
+      - name: Setup workspace
+        env:
+          KALISIO_GITHUB_URL: ${{ secrets.KALISIO_GITHUB_URL }}
+        run: bash ./scripts/setup_workspace.sh -k nokli
+      - name: Build docs
+        env:
+          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+        # run: bash ./scripts/build_docs.sh -p -r ${{ github.job }}
+        run: bash ./scripts/build_docs.sh -r ${{ github.job }}

.gitignore

@@ -74,6 +74,9 @@ config/client-config.json
 # Test
 test/run
 
+#Cesium assets
+public/Cesium
+
 # KDK extras
 public/icons/kdk
 public/kalisio.png

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "scripts/kash"]
+	path = scripts/kash
+	url = https://github.com/kalisio/kash.git

README.md

@@ -6,6 +6,7 @@
 [![Build Status](https://app.travis-ci.com/kalisio/kano.svg?branch=master)](https://app.travis-ci.com/kalisio/kano)
 [![Code Climate](https://codeclimate.com/github/kalisio/kano/badges/gpa.svg)](https://codeclimate.com/github/kalisio/kano)
 [![Test Coverage](https://codeclimate.com/github/kalisio/kano/badges/coverage.svg)](https://codeclimate.com/github/kalisio/kano/coverage)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Documentation](https://img.shields.io/badge/documentation-available-brightgreen.svg)](https://kalisio.github.io/kano/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/kalisio/kano.svg)](https://hub.docker.com/r/kalisio/kano/)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fkalisio%2Fkano.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fkalisio%2Fkano?ref=badge_shield)

api/config/default.cjs

@@ -232,11 +232,11 @@ module.exports = {
       name: 'kano-jwt',
       httpOnly: false,
       secure: (process.env.NODE_ENV !== 'development')
-    },
-    authorisation: {
-      cache: {
-        maxUsers: 1000
-      }
+    }
+  },
+  authorisation: {
+    cache: {
+      maxUsers: 1000
     }
   },
   catalog: {

api/config/layers/administrative/adminexpress-layers.cjs

@@ -32,5 +32,91 @@ module.exports = function ({ wmtsUrl, tmsUrl, wmsUrl, wcsUrl, k2Url, s3Url }) {
       type: 'TileMapService',
       url: `${tmsUrl}/admin-express@GLOBAL_WEBMERCATOR`
     }
+  }, {
+    name: 'Layers.ADMINEXPRESS_FILTERED',
+    description: 'Layers.ADMINEXPRESS_FILTERED__DESCRIPTION',
+    i18n: {
+      fr: {
+        Layers: {
+          ADMINEXPRESS_FILTERED: 'Limites administratives (filtrées)',
+          ADMINEXPRESS_FILTERED_DESCRIPTION: 'Limites administratives (Admin Express COG, ING)',
+          ADMINEXPRESS_FILTERED_ARRONDISSEMENT: 'Niveau des arrondissements',
+          ADMINEXPRESS_FILTERED_DEPARTEMENT: 'Niveau départemental',
+          ADMINEXPRESS_FILTERED_CANTON: 'Niveau cantonal',
+          ADMINEXPRESS_FILTERED_EPCI: 'Niveau des ECPI',
+          ADMINEXPRESS_FILTERED_COLLECTIVITE_TERRITORIALE: 'Niveau des collectivités territoriales',
+          ADMINEXPRESS_FILTERED_REGION: 'Niveau régional',
+          ADMINEXPRESS_FILTERED_COMMUNE: 'Niveau communal'
+        }
+      },
+      en: {
+        Layers: {
+          ADMINEXPRESS_FILTERED: 'Administrative limits (filtered)',
+          ADMINEXPRESS_FILTERED_DESCRIPTION: 'Administrative limits (Admin Express COG, ING)',
+          ADMINEXPRESS_FILTERED_ARRONDISSEMENT: 'Disctrict level',
+          ADMINEXPRESS_FILTERED_DEPARTEMENT: 'Departemental level',
+          ADMINEXPRESS_FILTERED_CANTON: 'Cantonal level',
+          ADMINEXPRESS_FILTERED_EPCI: 'ECPI level',
+          ADMINEXPRESS_FILTERED_COLLECTIVITE_TERRITORIALE: 'Territorial collectivities level',
+          ADMINEXPRESS_FILTERED_REGION: 'Regional level',
+          ADMINEXPRESS_FILTERED_COMMUNE: 'Municipal level'
+        }
+      }
+    },
+    tags: [
+      'administrative'
+    ],
+    attribution: 'Admin Express © <a href="http://www.ign.fr">IGN</a> contributors',
+    type: 'OverlayLayer',
+    service: 'admin-express',
+    dbName: (process.env.DATA_DB_URL ? 'data' : undefined),
+    // No unique identifier, used default generated ID
+    //featureId: 'name:en',
+    featureLabel: ['NOM', 'NOM_M'],
+    filters: [{
+      label: 'Layers.ADMINEXPRESS_FILTERED_REGION',
+      isActive: true,
+      active: { 'properties.layer': 'REGION' },
+      inactive: {}
+    },{
+      label: 'Layers.ADMINEXPRESS_FILTERED_COLLECTIVITE_TERRITORIALE',
+      isActive: false,
+      active: { 'properties.layer': 'COLLECTIVITE_TERRITORIALE' },
+      inactive: {}
+    },{
+      label: 'Layers.ADMINEXPRESS_FILTERED_EPCI',
+      isActive: false,
+      active: { 'properties.layer': 'EPCI' },
+      inactive: {}
+    },{
+      label: 'Layers.ADMINEXPRESS_FILTERED_CANTON',
+      isActive: false,
+      active: { 'properties.layer': 'CANTON' },
+      inactive: {}
+    },{
+      label: 'Layers.ADMINEXPRESS_FILTERED_DEPARTEMENT',
+      isActive: false,
+      active: { 'properties.layer': 'DEPARTEMENT' },
+      inactive: {}
+    },{
+      label: 'Layers.ADMINEXPRESS_FILTERED_ARRONDISSEMENT',
+      isActive: false,
+      active: { 'properties.layer': 'ARRONDISSEMENT' },
+      inactive: {}
+    },{
+      label: 'Layers.ADMINEXPRESS_FILTERED_COMMUNE',
+      isActive: false,
+      active: { 'properties.layer': 'COMMUNE' },
+      inactive: {}
+    }  
+    ],
+    leaflet: {
+      type: 'geoJson',
+      source: '/api/admin-express',
+      realtime: true, 
+      tiled: true,
+      maxZoom: 21,
+      'fill-opacity': 0
+    }
   }]
 }