diff --git a/diagrams/gis/cplusplus.py b/diagrams/gis/cplusplus.py
new file mode 100644
index 00000000..a772d45d
--- /dev/null
+++ b/diagrams/gis/cplusplus.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _GIS
+
+
+class _Cplusplus(_GIS):
+    _type = "cplusplus"
+    _icon_dir = "resources/gis/cplusplus"
+
+
+class Mapnik(_Cplusplus):
+    _icon = "mapnik.png"
+
+
+# Aliases
diff --git a/diagrams/gis/geocoding.py b/diagrams/gis/geocoding.py
index 8479c839..9aa420b4 100644
--- a/diagrams/gis/geocoding.py
+++ b/diagrams/gis/geocoding.py
@@ -12,6 +12,10 @@ class Addok(_Geocoding):
     _icon = "addok.png"
 
 
+class Gisgraphy(_Geocoding):
+    _icon = "gisgraphy.png"
+
+
 class Nominatim(_Geocoding):
     _icon = "nominatim.png"
 
diff --git a/diagrams/gis/javascript.py b/diagrams/gis/javascript.py
index 09123766..de498b8b 100644
--- a/diagrams/gis/javascript.py
+++ b/diagrams/gis/javascript.py
@@ -8,6 +8,18 @@ class _Javascript(_GIS):
     _icon_dir = "resources/gis/javascript"
 
 
+class Cesium(_Javascript):
+    _icon = "cesium.png"
+
+
+class Geostyler(_Javascript):
+    _icon = "geostyler.png"
+
+
+class Keplerjs(_Javascript):
+    _icon = "keplerjs.png"
+
+
 class Maplibre(_Javascript):
     _icon = "maplibre.png"
 
diff --git a/diagrams/gis/routing.py b/diagrams/gis/routing.py
index a6af4f4b..bbf723be 100644
--- a/diagrams/gis/routing.py
+++ b/diagrams/gis/routing.py
@@ -8,6 +8,10 @@ class _Routing(_GIS):
     _icon_dir = "resources/gis/routing"
 
 
+class Graphhopper(_Routing):
+    _icon = "graphhopper.png"
+
+
 class Osmr(_Routing):
     _icon = "osmr.png"
 
@@ -16,4 +20,8 @@ class Pgrouting(_Routing):
     _icon = "pgrouting.png"
 
 
+class Valhalla(_Routing):
+    _icon = "valhalla.png"
+
+
 # Aliases
diff --git a/diagrams/gis/server.py b/diagrams/gis/server.py
index aa535973..ec22f8c7 100644
--- a/diagrams/gis/server.py
+++ b/diagrams/gis/server.py
@@ -8,6 +8,14 @@ class _Server(_GIS):
     _icon_dir = "resources/gis/server"
 
 
+class Baremaps(_Server):
+    _icon = "baremaps.png"
+
+
+class Deegree(_Server):
+    _icon = "deegree.png"
+
+
 class Geohealthcheck(_Server):
     _icon = "geohealthcheck.png"
 
@@ -20,6 +28,10 @@ class Geonetwork(_Server):
     _icon = "geonetwork.png"
 
 
+class Geonode(_Server):
+    _icon = "geonode.png"
+
+
 class Georchestra(_Server):
     _icon = "georchestra.png"
 
@@ -40,6 +52,14 @@ class Mapserver(_Server):
     _icon = "mapserver.png"
 
 
+class Mapstore(_Server):
+    _icon = "mapstore.png"
+
+
+class Pycsw(_Server):
+    _icon = "pycsw.png"
+
+
 class Pygeoapi(_Server):
     _icon = "pygeoapi.png"
 
@@ -48,4 +68,8 @@ class QGISServer(_Server):
     _icon = "qgis-server.png"
 
 
+class Zooproject(_Server):
+    _icon = "zooproject.png"
+
+
 # Aliases
diff --git a/docs/nodes/gis.md b/docs/nodes/gis.md
index faf9a48d..eb8bb057 100644
--- a/docs/nodes/gis.md
+++ b/docs/nodes/gis.md
@@ -11,6 +11,12 @@ Node classes list of gis provider.
 <img width="30" src="/img/resources/gis/cli/gdal.png" alt="Gdal" style="float: left; padding-right: 5px;" >
 **diagrams.gis.cli.Gdal**
 
+## gis.cplusplus
+
+
+<img width="30" src="/img/resources/gis/cplusplus/mapnik.png" alt="Mapnik" style="float: left; padding-right: 5px;" >
+**diagrams.gis.cplusplus.Mapnik**
+
 ## gis.data
 
 
@@ -47,6 +53,9 @@ Node classes list of gis provider.
 <img width="30" src="/img/resources/gis/geocoding/addok.png" alt="Addok" style="float: left; padding-right: 5px;" >
 **diagrams.gis.geocoding.Addok**
 
+<img width="30" src="/img/resources/gis/geocoding/gisgraphy.png" alt="Gisgraphy" style="float: left; padding-right: 5px;" >
+**diagrams.gis.geocoding.Gisgraphy**
+
 <img width="30" src="/img/resources/gis/geocoding/nominatim.png" alt="Nominatim" style="float: left; padding-right: 5px;" >
 **diagrams.gis.geocoding.Nominatim**
 
@@ -59,6 +68,15 @@ Node classes list of gis provider.
 ## gis.javascript
 
 
+<img width="30" src="/img/resources/gis/javascript/cesium.png" alt="Cesium" style="float: left; padding-right: 5px;" >
+**diagrams.gis.javascript.Cesium**
+
+<img width="30" src="/img/resources/gis/javascript/geostyler.png" alt="Geostyler" style="float: left; padding-right: 5px;" >
+**diagrams.gis.javascript.Geostyler**
+
+<img width="30" src="/img/resources/gis/javascript/keplerjs.png" alt="Keplerjs" style="float: left; padding-right: 5px;" >
+**diagrams.gis.javascript.Keplerjs**
+
 <img width="30" src="/img/resources/gis/javascript/maplibre.png" alt="Maplibre" style="float: left; padding-right: 5px;" >
 **diagrams.gis.javascript.Maplibre**
 
@@ -107,15 +125,27 @@ Node classes list of gis provider.
 ## gis.routing
 
 
+<img width="30" src="/img/resources/gis/routing/graphhopper.png" alt="Graphhopper" style="float: left; padding-right: 5px;" >
+**diagrams.gis.routing.Graphhopper**
+
 <img width="30" src="/img/resources/gis/routing/osmr.png" alt="Osmr" style="float: left; padding-right: 5px;" >
 **diagrams.gis.routing.Osmr**
 
 <img width="30" src="/img/resources/gis/routing/pgrouting.png" alt="Pgrouting" style="float: left; padding-right: 5px;" >
 **diagrams.gis.routing.Pgrouting**
 
+<img width="30" src="/img/resources/gis/routing/valhalla.png" alt="Valhalla" style="float: left; padding-right: 5px;" >
+**diagrams.gis.routing.Valhalla**
+
 ## gis.server
 
 
+<img width="30" src="/img/resources/gis/server/baremaps.png" alt="Baremaps" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.Baremaps**
+
+<img width="30" src="/img/resources/gis/server/deegree.png" alt="Deegree" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.Deegree**
+
 <img width="30" src="/img/resources/gis/server/geohealthcheck.png" alt="Geohealthcheck" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.Geohealthcheck**
 
@@ -125,6 +155,9 @@ Node classes list of gis provider.
 <img width="30" src="/img/resources/gis/server/geonetwork.png" alt="Geonetwork" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.Geonetwork**
 
+<img width="30" src="/img/resources/gis/server/geonode.png" alt="Geonode" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.Geonode**
+
 <img width="30" src="/img/resources/gis/server/georchestra.png" alt="Georchestra" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.Georchestra**
 
@@ -140,8 +173,17 @@ Node classes list of gis provider.
 <img width="30" src="/img/resources/gis/server/mapserver.png" alt="Mapserver" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.Mapserver**
 
+<img width="30" src="/img/resources/gis/server/mapstore.png" alt="Mapstore" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.Mapstore**
+
+<img width="30" src="/img/resources/gis/server/pycsw.png" alt="Pycsw" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.Pycsw**
+
 <img width="30" src="/img/resources/gis/server/pygeoapi.png" alt="Pygeoapi" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.Pygeoapi**
 
 <img width="30" src="/img/resources/gis/server/qgis-server.png" alt="QGISServer" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.QGISServer**
+
+<img width="30" src="/img/resources/gis/server/zooproject.png" alt="Zooproject" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.Zooproject**
diff --git a/resources/gis/cplusplus/mapnik.png b/resources/gis/cplusplus/mapnik.png
new file mode 100644
index 00000000..622cacf4
Binary files /dev/null and b/resources/gis/cplusplus/mapnik.png differ
diff --git a/resources/gis/geocoding/gisgraphy.png b/resources/gis/geocoding/gisgraphy.png
new file mode 100644
index 00000000..2d23928f
Binary files /dev/null and b/resources/gis/geocoding/gisgraphy.png differ
diff --git a/resources/gis/javascript/cesium.png b/resources/gis/javascript/cesium.png
new file mode 100644
index 00000000..299a77d0
Binary files /dev/null and b/resources/gis/javascript/cesium.png differ
diff --git a/resources/gis/javascript/geostyler.png b/resources/gis/javascript/geostyler.png
new file mode 100644
index 00000000..ba4b1584
Binary files /dev/null and b/resources/gis/javascript/geostyler.png differ
diff --git a/resources/gis/javascript/keplerjs.png b/resources/gis/javascript/keplerjs.png
new file mode 100644
index 00000000..88363f02
Binary files /dev/null and b/resources/gis/javascript/keplerjs.png differ
diff --git a/resources/gis/routing/graphhopper.png b/resources/gis/routing/graphhopper.png
new file mode 100644
index 00000000..7d9bda14
Binary files /dev/null and b/resources/gis/routing/graphhopper.png differ
diff --git a/resources/gis/routing/valhalla.png b/resources/gis/routing/valhalla.png
new file mode 100644
index 00000000..4756cf99
Binary files /dev/null and b/resources/gis/routing/valhalla.png differ
diff --git a/resources/gis/server/baremaps.png b/resources/gis/server/baremaps.png
new file mode 100644
index 00000000..1614db7b
Binary files /dev/null and b/resources/gis/server/baremaps.png differ
diff --git a/resources/gis/server/deegree.png b/resources/gis/server/deegree.png
new file mode 100644
index 00000000..7ca17425
Binary files /dev/null and b/resources/gis/server/deegree.png differ
diff --git a/resources/gis/server/geonode.png b/resources/gis/server/geonode.png
new file mode 100644
index 00000000..b8de5c25
Binary files /dev/null and b/resources/gis/server/geonode.png differ
diff --git a/resources/gis/server/mapstore.png b/resources/gis/server/mapstore.png
new file mode 100644
index 00000000..c8bf5fdb
Binary files /dev/null and b/resources/gis/server/mapstore.png differ
diff --git a/resources/gis/server/pycsw.png b/resources/gis/server/pycsw.png
new file mode 100644
index 00000000..acf6c054
Binary files /dev/null and b/resources/gis/server/pycsw.png differ
diff --git a/resources/gis/server/zooproject.png b/resources/gis/server/zooproject.png
new file mode 100644
index 00000000..53e71524
Binary files /dev/null and b/resources/gis/server/zooproject.png differ
diff --git a/website/static/img/resources/gis/cplusplus/mapnik.png b/website/static/img/resources/gis/cplusplus/mapnik.png
new file mode 100644
index 00000000..622cacf4
Binary files /dev/null and b/website/static/img/resources/gis/cplusplus/mapnik.png differ
diff --git a/website/static/img/resources/gis/geocoding/gisgraphy.png b/website/static/img/resources/gis/geocoding/gisgraphy.png
new file mode 100644
index 00000000..2d23928f
Binary files /dev/null and b/website/static/img/resources/gis/geocoding/gisgraphy.png differ
diff --git a/website/static/img/resources/gis/javascript/cesium.png b/website/static/img/resources/gis/javascript/cesium.png
new file mode 100644
index 00000000..299a77d0
Binary files /dev/null and b/website/static/img/resources/gis/javascript/cesium.png differ
diff --git a/website/static/img/resources/gis/javascript/geostyler.png b/website/static/img/resources/gis/javascript/geostyler.png
new file mode 100644
index 00000000..ba4b1584
Binary files /dev/null and b/website/static/img/resources/gis/javascript/geostyler.png differ
diff --git a/website/static/img/resources/gis/javascript/keplerjs.png b/website/static/img/resources/gis/javascript/keplerjs.png
new file mode 100644
index 00000000..88363f02
Binary files /dev/null and b/website/static/img/resources/gis/javascript/keplerjs.png differ
diff --git a/website/static/img/resources/gis/routing/graphhopper.png b/website/static/img/resources/gis/routing/graphhopper.png
new file mode 100644
index 00000000..7d9bda14
Binary files /dev/null and b/website/static/img/resources/gis/routing/graphhopper.png differ
diff --git a/website/static/img/resources/gis/routing/valhalla.png b/website/static/img/resources/gis/routing/valhalla.png
new file mode 100644
index 00000000..4756cf99
Binary files /dev/null and b/website/static/img/resources/gis/routing/valhalla.png differ
diff --git a/website/static/img/resources/gis/server/baremaps.png b/website/static/img/resources/gis/server/baremaps.png
new file mode 100644
index 00000000..1614db7b
Binary files /dev/null and b/website/static/img/resources/gis/server/baremaps.png differ
diff --git a/website/static/img/resources/gis/server/deegree.png b/website/static/img/resources/gis/server/deegree.png
new file mode 100644
index 00000000..7ca17425
Binary files /dev/null and b/website/static/img/resources/gis/server/deegree.png differ
diff --git a/website/static/img/resources/gis/server/geonode.png b/website/static/img/resources/gis/server/geonode.png
new file mode 100644
index 00000000..b8de5c25
Binary files /dev/null and b/website/static/img/resources/gis/server/geonode.png differ
diff --git a/website/static/img/resources/gis/server/mapstore.png b/website/static/img/resources/gis/server/mapstore.png
new file mode 100644
index 00000000..c8bf5fdb
Binary files /dev/null and b/website/static/img/resources/gis/server/mapstore.png differ
diff --git a/website/static/img/resources/gis/server/pycsw.png b/website/static/img/resources/gis/server/pycsw.png
new file mode 100644
index 00000000..acf6c054
Binary files /dev/null and b/website/static/img/resources/gis/server/pycsw.png differ
diff --git a/website/static/img/resources/gis/server/zooproject.png b/website/static/img/resources/gis/server/zooproject.png
new file mode 100644
index 00000000..53e71524
Binary files /dev/null and b/website/static/img/resources/gis/server/zooproject.png differ